diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix index 246de955fe4f..1be7b7a09349 100644 --- a/pkgs/by-name/fl/flake-checker/package.nix +++ b/pkgs/by-name/fl/flake-checker/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "flake-checker"; - version = "0.2.11"; + version = "0.2.13"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "flake-checker"; rev = "v${version}"; - hash = "sha256-0ftHzqFpFkKZKByWJ49/YySrXBU4lCxvcpbTuMY8ZXs="; + hash = "sha256-QE/Druzo/EDiuh7Vb+kipPgUxkIRPLsHFMSpSRMFIVw="; }; - cargoHash = "sha256-5zzSLk5QT3X6rdGEPHPelXFd5nOxNtlbqDHwV7fFDKY="; + cargoHash = "sha256-kKEHYKXtccXRsa1cON0oMHOWagi3mVdnf3pEgkoNn/k="; meta = { description = "Health checks for your Nix flakes"; diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index cb1b754ca7de..fbd77a0d4226 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -22,12 +22,14 @@ let # Requires running Docker daemon "TestDocker" "TestJobExecutor" + "TestRunContext_PrepareJobContainer/Overlapping" "TestRunExec" "TestRunner" "Test_validateCmd" # Docker network request for image "TestImageExistsLocally" + "TestStepDockerMain" # Reaches out to different websites "TestFindGitRemoteURL" @@ -48,21 +50,22 @@ let ++ lib.optionals stdenv.isDarwin [ # Uses docker-specific options, unsupported on Darwin "TestMergeJobOptions" + "TestNewEndpointHonoursTLSEnv" ]; in buildGoModule (finalAttrs: { pname = "forgejo-runner"; - version = "12.10.2"; + version = "12.11.1"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${finalAttrs.version}"; - hash = "sha256-Uo+x02HgpfOY+KXug7cmnW4d85AlX6wqz+nYGF/JrHk="; + hash = "sha256-Qc43zWDDCjL8RW9Q30H4N5VRSFT3LR4Pt8/P0NcMacU="; }; - vendorHash = "sha256-0gOftkxkBPziU0Tm8lIiD72rXcMMY5M57G9/Bt/mneI="; + vendorHash = "sha256-du7fXehcxZ70Lsr5VCkz646G0Us/XwM4Sl98HXimoao="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/li/librewolf-unwrapped/package.nix b/pkgs/by-name/li/librewolf-unwrapped/package.nix index d279ee6ccf2c..c6384d64ce5a 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/package.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/package.nix @@ -40,6 +40,9 @@ in maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; mainProgram = "librewolf"; + knownVulnerabilities = [ + "librewolf lacks an active committer in nixpkgs, consider using an alternative" + ]; }; tests = { inherit (nixosTests) librewolf; }; updateScript = callPackage ./update.nix { diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 5fe46e372054..518689eb5725 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -170,11 +170,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "149.0.4022.52"; + version = "149.0.4022.69"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-3lFhfxkS80P59dk00lpBp+8IIFUvSEJVGGTfAghxw4g="; + hash = "sha256-0Ur+0KKJQ7VTr7IMax5BIgwSf6jNhr0Aiz+So7Hj/OE="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix index 0dcbed31f1f2..b689c7e1a01b 100644 --- a/pkgs/by-name/ms/msedgedriver/package.nix +++ b/pkgs/by-name/ms/msedgedriver/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "msedgedriver"; - version = "149.0.4022.52"; + version = "149.0.4022.69"; src = fetchzip { url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip"; - hash = "sha256-GLPkBOlXDTpjYrrc9odDeHXXZ8vLPiw06v1bIN1zOpo="; + hash = "sha256-BtyQD+zkZWv5GhnxJOg4BkVLrCdBZr7KN1bvXyvp4B8="; stripRoot = false; }; diff --git a/pkgs/by-name/pl/plausible/package.nix b/pkgs/by-name/pl/plausible/package.nix index b1acaae50a50..d0d7209c9e81 100644 --- a/pkgs/by-name/pl/plausible/package.nix +++ b/pkgs/by-name/pl/plausible/package.nix @@ -8,23 +8,23 @@ runCommand, nixosTests, npm-lockfile-fix, + cmake, nix-update-script, brotli, - tailwindcss_3, esbuild, buildPackages, }: let pname = "plausible"; - version = "3.0.1"; + version = "3.2.1"; mixEnv = "ce"; src = fetchFromGitHub { owner = "plausible"; repo = "analytics"; rev = "v${version}"; - hash = "sha256-DQIRsqkH2zgIkb3yezuJEKJ99PS031GJ+bDAeHMLNUY="; + hash = "sha256-2roIj0s2cybYdGmmJSPJ5Rc1gNunxlYew9JR5xxMv+k="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/assets/package-lock.json sed -ie ' @@ -46,7 +46,7 @@ let pname = "${pname}-assets"; inherit version; src = "${src}/assets"; - npmDepsHash = "sha256-hPbKEC8DE/gb483COG/ZbTuEP8Y44Fs7ppHMpXphCjg="; + npmDepsHash = "sha256-grYxPRzpu3pcv3lyTQxx0RDhmgFhsOKZoYbzd701xjA="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -59,7 +59,7 @@ let pname = "${pname}-tracker"; inherit version; src = "${src}/tracker"; - npmDepsHash = "sha256-kfqJVUw3xnMT0sOkc5O42CwBxPQXiYnOQ5WpdZwzxfE"; + npmDepsHash = "sha256-hrsvQXvbcfRDUc1qinyUJ7Oh4yMM1e+UEdYudjYyJxk="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -68,6 +68,18 @@ let ''; }; + # lazy_html (new dep since 3.1.0) builds a NIF against lexbor + # its Makefile clones lexbor at build time (which sandbox forbids) + # pre-seed commit in lazy_html's mix.exs so the clone target is skipped + # and force a build in preBuild below + lexborCommit = "244b84956a6dc7eec293781d051354f351274c46"; + lexborSrc = fetchFromGitHub { + owner = "lexbor"; + repo = "lexbor"; + rev = lexborCommit; + hash = "sha256-Oup/lGU8a9Dqfho4Llg39t9Y9n4xfUmGk0772OkpnLQ="; + }; + mixFodDeps = beamPackages.fetchMixDeps { inherit pname @@ -75,7 +87,7 @@ let src mixEnv ; - hash = "sha256-caCbuMEDsLcxm8xehWEJiaTfgl435crBfnQFQpzGsLY"; + hash = "sha256-fm/elkCNpu5sduBxly06i/z30Y9BMtt+qthXmLuvlUc="; }; mjmlNif = rustPlatform.buildRustPackage { @@ -83,7 +95,7 @@ let version = ""; src = "${mixFodDeps}/mjml/native/mjml_nif"; - cargoHash = "sha256-zDWOik65PWAMpIDDcG+DibprPVW/k+Q83+fjFI5vWaY="; + cargoHash = "sha256-a8xSRdFtMYF0n2rl7A5ZgHoaunUJLVJwHvrkc9uyZKo="; doCheck = false; env = { @@ -108,7 +120,13 @@ let file=''${lib##*/} base=''${file%.*} ln -s "$lib" $out/mjml/priv/native/$base.so + # mjml >= 4.0 loads through RustlerPrecompiled (expects NIF name w/o lib prefix) + ln -s "$lib" $out/mjml/priv/native/''${base#lib}.so done + + mkdir -p $out/lazy_html/_build/c/third_party/lexbor + cp -r --no-preserve=mode ${lexborSrc} \ + $out/lazy_html/_build/c/third_party/lexbor/${lexborCommit} ''; in @@ -123,10 +141,22 @@ beamPackages.mixRelease rec { nativeBuildInputs = [ nodejs brotli + cmake ]; + dontUseCmakeConfigure = true; + mixFodDeps = patchedMixFodDeps; + # deps are compiled in mixRelease configurePhase + # so the force_build switch must be in place before then + # preBuild would be too late + preConfigure = '' + cat >> config/config.exs <= 3.1.0 needs tailwind v4 cat >> config/config.exs <