diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 9b9ae869e861..00a3999741bf 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -29,9 +29,9 @@ # The list can be found at https://github.com/bitcoin-core/guix.sigs/tree/main/builder-keys builderKeys ? [ "152812300785C96444D3334D17565732E08E5E41" # achow101.gpg - "9EDAFF80E080659604F4A76B2EBB056FD847F8A7" # Emzy.gpg - "D1DBF2C4B96F2DEBF4C16654410108112E7EA81F" # hebasto.gpg - # "71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg (not signed 31.1) + # "9EDAFF80E080659604F4A76B2EBB056FD847F8A7" # Emzy.gpg (not signed 32.1) + # "D1DBF2C4B96F2DEBF4C16654410108112E7EA81F" # hebasto.gpg (not signed 32.1) + # "71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg (not signed 32.1) "67AA5B46E7AF78053167FE343B8F814A784218F8" # willcl-ark.gpg ], }: @@ -45,14 +45,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = if withGui then "bitcoin" else "bitcoind"; - version = "31.1"; + version = "32.1"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "50411d5b43c7e4c90099394759eb6c2add6e7c2dbe728840893d638b6fc6afc9"; + sha256 = "a5f2f61e32cf7f790641c9ec306a3c88ca7b5a556946956b1f35ffd7e27813f9"; }; nativeBuildInputs = [ @@ -86,18 +86,18 @@ stdenv.mkDerivation (finalAttrs: { publicKeys = fetchFromGitHub { owner = "bitcoin-core"; repo = "guix.sigs"; - rev = "8427342623f66a98e4b2503e5e15eb41485200d2"; - sha256 = "sha256-X1mA1iPAb0OE9RNP9O5rFe9rzsui+BWQ2zMcV7SghXE="; + rev = "d48edd96db3740c2073545cfb4010d47c3df7f50"; + sha256 = "sha256-uMxAatrLXezDkzsthLrrPlAy8Mx8lM7L477CbmEMUM8="; }; checksums = fetchurl { url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS"; - hash = "sha256-5jAo0Lsz0iyEdHnXOGa+jBFCJGkRdlwAXvv2EbZF5wY="; + hash = "sha256-jv4kLpn+hdlvalZKFOQermq5A3NvBzKvTWwAvx2SU00="; }; signatures = fetchurl { url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS.asc"; - hash = "sha256-wi4TibZR36L3EDReI/OtxS1OOz2tjteXen4p1VxVmV8="; + hash = "sha256-pp0otABWlxt7TlqgKhUR7d4uEoh5YfAvhr0Zf1+ca68="; }; verifyBuilderKeys = diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index cc63a5b79886..255bcf8b1f5e 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -10,13 +10,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; binaryName = "firefox-devedition"; - version = "159.0b1"; + version = "160.0b1"; applicationName = "Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "ed21e4789376874e5937b57075005c1c19e7e31a86cac1246ce0871d3833385795318e1d1e02caaef5088d3589697bd4fa5e10ae216faebc0e19303e92783443"; + sha512 = "3d156efc2a76543f11e7fd554bc2cd50916faaa705181f936347ee5a18b09013186002b002dba623d0fc03e2853069a956eaf000363bc5d32eca69b08bf67b27"; }; # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix index 1d52d0885475..6c849ce56144 100644 --- a/pkgs/by-name/bt/btop/package.nix +++ b/pkgs/by-name/bt/btop/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "btop"; - version = "1.4.7"; + version = "1.4.8"; src = fetchFromGitHub { owner = "aristocratos"; repo = "btop"; tag = "v${finalAttrs.version}"; - hash = "sha256-3gECGBSWcGTYQkUlD4X2zrxZVvH2x2xfh5zdZ2jJbDQ="; + hash = "sha256-NujxQ6d8K+cRlwPfcoJk9XC0GDeh6Omx8x+WkCbxTcs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index bcc36379dcb2..5422ee58ccb2 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -20,18 +20,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cinny-desktop"; - version = "4.12.7"; + version = "4.12.8"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-mGlenx9Dl4YZyg+noNVC+5PYe87Dfi0MGYBpdPjLFH0="; + hash = "sha256-vP5csQPRmfAuXY0enLVZJoY4uOSPm6OOJNKdRKuErDQ="; }; sourceRoot = "${finalAttrs.src.name}/src-tauri"; - cargoHash = "sha256-14PevMGb0nI89uma0dK7JScn8xkefv2VDb/Sh1rt/qI="; + cargoHash = "sha256-1Ja4u+KZLrJBlUsTFaUTrZ3OOLb/ZdhpeXXQgZnw6nw="; postPatch = let diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index 86c85ad3c06b..86d120e71e8f 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -7,17 +7,17 @@ buildNpmPackage (finalAttrs: { pname = "cinny-unwrapped"; # Remember to update cinny-desktop when bumping this version. - version = "4.12.7"; + version = "4.12.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; tag = "v${finalAttrs.version}"; - hash = "sha256-H4a7HgadpuINie5NGQcHtLHW/MHc9Cc01GO4VPPMDr4="; + hash = "sha256-lDb4j8u9OheobXNjA1Q/75r6JITn+wLgtgEX+aKl9nk="; }; - npmDepsHash = "sha256-L4QlQE6lzNSbRWgYyVV4Xy85KfSv6jDSnkiTQrxzIaQ="; + npmDepsHash = "sha256-QnsU22wjiayk6cBmlk9NChmSET7t4xkBLeGxgFIJArs="; # Skip rebuilding native modules since they're not needed for the web app npmRebuildFlags = [ diff --git a/pkgs/by-name/gi/git-lfs/package.nix b/pkgs/by-name/gi/git-lfs/package.nix index 345aa81d8370..77084339c959 100644 --- a/pkgs/by-name/gi/git-lfs/package.nix +++ b/pkgs/by-name/gi/git-lfs/package.nix @@ -12,16 +12,17 @@ buildGoModule (finalAttrs: { pname = "git-lfs"; - version = "3.7.1"; + version = "3.8.1"; src = fetchFromGitHub { owner = "git-lfs"; repo = "git-lfs"; tag = "v${finalAttrs.version}"; - hash = "sha256-N5ckTnyA3mueZre+rMhFZBiAFgEu4pmtzkiUidXnan8="; + hash = "sha256-HqAzgnct0myRef8K95qdCNY9v8tDn0tHw1VbCpHuzjs="; }; - vendorHash = "sha256-6H0KpLin+DqwEg5bdzaxj2CoNSneZ/ET43MTrrdF3h8="; + proxyVendor = true; + vendorHash = "sha256-M8wYdEMYUrmEXPUCnSa4zL9/G4w/+CL+jXwmZDDNOrw="; nativeBuildInputs = [ asciidoctor @@ -37,7 +38,7 @@ buildGoModule (finalAttrs: { subPackages = [ "." ]; preBuild = '' - GOARCH= go generate ./commands + CC= GOOS= GOARCH= go generate ./commands ''; postBuild = '' diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index c614bd3e18c3..c657cac062c6 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -180,7 +180,7 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta; - version = "156.0.8078.73"; + version = "156.0.8078.79"; src = let @@ -195,8 +195,8 @@ let url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_${debArch}.deb"; hash = { - amd64 = "sha256-/RnGiV2td/TX9xLC2fDV62gvSm5/8isb0NQNA3ENKIw="; - arm64 = "sha256-/umXYTVl1DFNJvmhThTAHTdSo9c68JzrjsGVaBjpQ00="; + amd64 = "sha256-vhoeFhQZ9cgnJDL2hgkSVQ2OKZheklkT+oAEk6DQyVU="; + arm64 = "sha256-3Gby2WhTFT41DEoJRNpFA8rjnC/LzbTgBXxk9sSSAv8="; } .${debArch}; }; @@ -306,11 +306,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta; - version = "156.0.8078.74"; + version = "156.0.8078.80"; src = fetchurl { - url = "https://dl.google.com/release2/chrome/acg2teiapq4qsajscuhoyboaquhq_156.0.8078.74/GoogleChrome-156.0.8078.74.dmg"; - hash = "sha256-VdfHUiP08np0i4x+yYXXp1LvNX6tQ/W/GlR3rtt5dVE="; + url = "https://dl.google.com/release2/chrome/hmx6fwnspbytmrtkulm2cctvey_156.0.8078.80/GoogleChrome-156.0.8078.80.dmg"; + hash = "sha256-+AU0DHP15WkSTQ/V4MC5o+uoG3YBYZjqdwOzScAAbZo="; }; dontPatch = true; diff --git a/pkgs/by-name/gr/grafana/package.nix b/pkgs/by-name/gr/grafana/package.nix index 74c833800e2e..8d98fe18a377 100644 --- a/pkgs/by-name/gr/grafana/package.nix +++ b/pkgs/by-name/gr/grafana/package.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { pname = "grafana"; - version = "13.0.11"; + version = "13.0.12"; subPackages = [ "pkg/cmd/grafana" @@ -33,7 +33,7 @@ buildGoModule (finalAttrs: { owner = "grafana"; repo = "grafana"; rev = "v${finalAttrs.version}"; - hash = "sha256-mPs6kU+SuTDtBzpBqm3od/wRJ1ZlNyPCBBnfH0c9Y0w="; + hash = "sha256-umpXzGVT+8QZE34X2R/fqWM7sMjdYfw4rFLSkzzHivg="; }; patches = [ @@ -55,12 +55,12 @@ buildGoModule (finalAttrs: { # Since this is not a dependency attribute the buildPackages has to be specified. offlineCache = buildPackages.yarn-berry_4-fetcher.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes patches; - hash = "sha256-e/8klQG1870hvLm8JGX3NLHv5lI9bjPgMss1X8FK1Uc="; + hash = "sha256-qrwG1FXSW3DWJWTmZnxVsC+2z6vrFPKQ4BQW6fOlRWQ="; }; disallowedRequisites = [ finalAttrs.offlineCache ]; - vendorHash = "sha256-cfA6QMSYDdKhxsi3ovrPmjsodoVd9hZxtwwzNM8QZ9U="; + vendorHash = "sha256-0eADuuVlNGNJw8embj9aWrMEFCerVXaMYsiJRb13v4g="; # Grafana seems to just set it to the latest version available # nowadays. diff --git a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix index 964d30a227a9..fb0157c4bc35 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix @@ -35,10 +35,10 @@ rec { patch -p1 < ${source}/$patch_name done <${source}/assets/patches.txt + sed -i 's/8b28662ab15031496b495fa701f211aa336c119b99c25b522be6f396a1231891/c07441d4938b3331ea81162efc079a489c7c75c48f63b6d6741f699ab420de73/g' third_party/rust/glean-core/.cargo-checksum.json sed -i 's/ada8f059f0fa8a3a82315606318429d3a70200bbb2886d1a1bcaad2856a6303b/70a4a176b6494fce419e590180bc9c631945282ded0ab05bc1591bdd37b65093/g' third_party/rust/glean-core/.cargo-checksum.json - sed -i 's/1753c69b71ae24a9b339d98e9b71166740a15506cfc46245251eb63c0222568f/af3ae3d026bd2e26fd9cc7c710847ac4f853b0c899412ddc9ee7e0ef1027de87/g' third_party/rust/glean-core/.cargo-checksum.json - find . -type f -exec sed -i 's/follows_collection_enabled: false/follows_collection_enabled: true/g' {} + + find . -type f -name '*.yaml' -exec sed -i 's/follows_collection_enabled: false/follows_collection_enabled: true/g' {} + rm toolkit/components/ml/content/backends/OpenAIPipeline.mjs rm -rf toolkit/components/ml/vendor/openai diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json index 5d4d4734a7a5..0d6df59db1b5 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.json +++ b/pkgs/by-name/li/librewolf-unwrapped/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "158.0.1-1", + "packageVersion": "159.0-1", "source": { - "rev": "158.0.1-1", - "hash": "sha256-QSLFfwPZNDdiufjTLiVMJr9rLCfQUMUIAYRD/hBHk9o=" + "rev": "159.0-1", + "hash": "sha256-tU6Ibw7NjHMJK3i0taPj0BJHYnL1I+uze8dnzeHy9Ag=" }, "firefox": { - "version": "158.0.1", - "hash": "sha512-pcwWpj9LQ/Abwm4v6xLlTlKBrr3IF3XLwOjXfdXO76UFXnjSpq1UiVw5fUFNH6wT1J3fKAmfU0JppqFm3tr6Xg==" + "version": "159.0", + "hash": "sha512-ZpJB8/xnLYJA3cQVi2El5cJWa9ABOgqWo4dO4Xvw2bPZHIQuZTyzXqsJIYKc42YOnXlZALPDpUiM1gIPhaCqww==" } } diff --git a/pkgs/by-name/ma/mailpit/source.nix b/pkgs/by-name/ma/mailpit/source.nix index 9fe5294c2e58..e6c8eed550c7 100644 --- a/pkgs/by-name/ma/mailpit/source.nix +++ b/pkgs/by-name/ma/mailpit/source.nix @@ -1,6 +1,6 @@ { - version = "1.31.6"; - hash = "sha256-kk5OGfOP259BGkhrin9oQDkDBrb/6h2aGSNpLWfoIVQ="; - npmDepsHash = "sha256-dwsxvCpRM04lY5PK0kWHkRE9JtLHcqYuES504e4wV4U="; - vendorHash = "sha256-Blim2ekjovEQXdiRBOavTWGo5TVzokvrQMQS5Y9fyFU="; + version = "1.32.0"; + hash = "sha256-JqxeEizBeokpWy6C5dpPfhzcyopO9hnpQ7FZPtahpPk="; + npmDepsHash = "sha256-9GwUOIOEMnyaPrsTK4SJhsqsxtBoKoRWaatNonaf8Og="; + vendorHash = "sha256-fMnggC4klFjpbY6bpbJxIwtzKiTGetiwSDHBd1sciZQ="; } diff --git a/pkgs/by-name/ma/mastodon/gemset.nix b/pkgs/by-name/ma/mastodon/gemset.nix index 591a2f21a489..0490892d589e 100644 --- a/pkgs/by-name/ma/mastodon/gemset.nix +++ b/pkgs/by-name/ma/mastodon/gemset.nix @@ -805,24 +805,25 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15djj19ynz3sbw54fsf8n7y3sha8a333f2mgvjfwhr46jhcqg1ll"; + sha256 = "1zjfw8xs3zlqaa07s4m500x84i6437l9r9mk4dwqx7y5lb3la0bs"; type = "gem"; }; - version = "1.0.7"; + version = "1.0.8"; }; css_parser = { dependencies = [ "addressable" + "base64" "ssrf_filter" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "119q8j23xyb9pifka1n6jjrw04099zpwwdajh5pd10fm7wlfkw7a"; + sha256 = "1jnphcdbr6j104kvxybx1b1symzrjc0k2vybbc42m3di5327zfkr"; type = "gem"; }; - version = "3.0.0"; + version = "3.3.0"; }; csv = { groups = [ "default" ]; @@ -1151,10 +1152,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0l3dpg45i74ap1d7c4wyrdlc67l9vj4kgzv2l2r8mg1304fss0y5"; + sha256 = "14qwz5qsrnzcf1xkc05gkjjbih1g19lx82l0vnavya7zkd8i9m2n"; type = "gem"; }; - version = "1.5.0"; + version = "1.8.0"; }; fabrication = { groups = [ @@ -3016,10 +3017,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0q5kmfy1rgax98ivkcl5fy7lrz1zd8v9bf2cjm9x2asw15xaizgn"; + sha256 = "1pn3vb9c51li1mrf5vs88c2lx1k7wbm1v2k44wf1f9d8mwaha078"; type = "gem"; }; - version = "3.8.0"; + version = "4.1.0"; }; playwright-ruby-client = { dependencies = [ @@ -4093,10 +4094,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "111r4xdcf6ihdnrs6wkfc6nqdzrjq0z69x9sf83r7ri6fffip796"; + sha256 = "0ydcw4hn7q89v4yfbik0k0sh187ym0d01vinj2xzdrdpv87dih3d"; type = "gem"; }; - version = "7.0.0"; + version = "7.0.1"; }; scenic = { dependencies = [ diff --git a/pkgs/by-name/ma/mastodon/source.nix b/pkgs/by-name/ma/mastodon/source.nix index e7827b206f05..7b617086141d 100644 --- a/pkgs/by-name/ma/mastodon/source.nix +++ b/pkgs/by-name/ma/mastodon/source.nix @@ -5,14 +5,14 @@ patches ? [ ], }: let - version = "4.6.9"; + version = "4.6.10"; in applyPatches { src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-zMQr28kIUgB/AoS1ZGiJqpsNyk1tu49SCnGWedVfNMw="; + hash = "sha256-cwPiF9OKJg0rcoGO89YYXEqqjZl7kS81hFbhs0WxzTs="; passthru = { inherit version; yarnHash = "sha256-VlOG91ZuO+1UXTbtwIrYUbqHjmSfPSfLhrf4TxCJqJ0="; diff --git a/pkgs/by-name/mc/mcp-nixos/package.nix b/pkgs/by-name/mc/mcp-nixos/package.nix index 9216ba38d076..8a843fb2b5d1 100644 --- a/pkgs/by-name/mc/mcp-nixos/package.nix +++ b/pkgs/by-name/mc/mcp-nixos/package.nix @@ -1,7 +1,7 @@ { lib, - stdenv, fetchFromGitHub, + fetchpatch, python3Packages, }: @@ -17,6 +17,13 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-mWq9nnL4IGhUFkXJr8+t6BresOTDFS1caG8NuFqjrJg="; }; + patches = [ + (fetchpatch { + url = "https://github.com/utensils/mcp-nixos/commit/0ef99b6a5674e60ca315dc55a0f458673bb1e4fa.patch"; + sha256 = "sha256-f57qS6V8mSv2kLKiudSG2enAofeUZwKvjfdowmGRIxw="; + }) + ]; + build-system = [ python3Packages.hatchling ]; dependencies = with python3Packages; [ @@ -40,9 +47,6 @@ python3Packages.buildPythonApplication (finalAttrs: { disabledTests = [ # Requires network access "test_valid_channel" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "test_read_text_file" ]; pythonImportsCheck = [ "mcp_nixos" ]; diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 400636becea6..114c000c6680 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -186,11 +186,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta; - version = "156.0.4314.42"; + version = "156.0.4314.50"; 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-qGQvgp4QX+ekrEQFSOb6frcmtJ//j/xqJ/PQ+yWltAU="; + hash = "sha256-DQvGMDqLk1Qk4gr6cRbGHdfnzLyiScPPSYA640Pqz40="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -296,12 +296,12 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta; - version = "156.0.4314.42"; - uuid = "f082dcef-be0f-4c7c-83a8-ff101a911cf2"; + version = "156.0.4314.50"; + uuid = "334669ab-f520-4e6d-bee8-3b5353699b27"; src = fetchurl { url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/${finalAttrs.uuid}/MicrosoftEdge-${finalAttrs.version}.dmg"; - hash = "sha256-eMIfTwvMp+kUgF3ms+k4vURkz47X0DkiVsDMr8W5bdo="; + hash = "sha256-KB8XWBDPbQv1CGPI7GGbmmLphhaTxOlOpfBsi8LuQ2I="; }; dontPatch = true; diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix index 7909a3d14989..57faeca88159 100644 --- a/pkgs/by-name/ms/msedgedriver/package.nix +++ b/pkgs/by-name/ms/msedgedriver/package.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "msedgedriver"; - version = "156.0.4314.42"; + version = "156.0.4314.50"; src = let @@ -28,9 +28,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_${driverArch}.zip"; hash = { - mac64_m1 = "sha256-IM7UgWiTdQC3s/GGnanzLbxX3LjTR0MP6Flz2D2cwmA="; - mac64 = "sha256-bvmQnGSsrOs//cr49bMoRMQ18gruOdPqC/x3GCSAFSk="; - linux64 = "sha256-+PrXbYFHFr7BbFggxwfB3Qs5aXOnrGPddE7pM9pBTms="; + mac64_m1 = "sha256-PfG14CoVbkhyC5BJz8m9YRhVunaDG8GZULflNJmgHy0="; + mac64 = "sha256-MWz3QkPPiEJV5zq7ZwjlCZZOBCOeU43dbMhWer/nJ44="; + linux64 = "sha256-M3+Ynr4Xu4YUm6u/un6Dj3qaw2QSTqz/J9f6qw3xpis="; } .${driverArch}; stripRoot = false; diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index 9f7ca52db0d6..728a9025a5e4 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -40,7 +40,7 @@ libGL, mediaSupport ? true, - ffmpeg_7, + ffmpeg_8, audioSupport ? mediaSupport, @@ -94,10 +94,10 @@ let ++ lib.optionals pipewireSupport [ pipewire ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ] ++ lib.optionals libvaSupport [ libva ] - ++ lib.optionals mediaSupport [ ffmpeg_7 ] + ++ lib.optionals mediaSupport [ ffmpeg_8 ] ); - version = "15.0.26"; + version = "16.0"; sources = { x86_64-linux = fetchurl { @@ -109,7 +109,19 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-MKkfpXnigxoyCEHwhhMT/aj7XncmdUmARpWWaN4ngHk="; + hash = "sha256-qlccbcAKrSFK+akuQU86a9nhITm0gZ9a8vOqqj2fSqM="; + }; + + aarch64-linux = fetchurl { + urls = [ + "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux-aarch64-${version}.tar.xz" + "https://github.com/mullvad/mullvad-browser/releases/download/${version}/mullvad-browser-linux-aarch64-${version}.tar.xz" + "https://archive.torproject.org/tor-package-archive/mullvadbrowser/${version}/mullvad-browser-linux-aarch64-${version}.tar.xz" + "https://dist.torproject.org/mullvadbrowser/${version}/mullvad-browser-linux-aarch64-${version}.tar.xz" + "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-aarch64-${version}.tar.xz" + "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-aarch64-${version}.tar.xz" + ]; + hash = "sha256-f9pB/+TC1zKlRPVQku9IMSjCJKKqRoDYY+eTx14Ds9k="; }; }; @@ -220,9 +232,6 @@ stdenv.mkDerivation rec { // Reset pref that captures store paths. clearPref("extensions.xpiState"); - // Stop obnoxious first-run redirection. - lockPref("noscript.firstRunRedirection", false); - // Allow sandbox access to sound devices if using ALSA directly ${ if (audioSupport && !pulseaudioSupport) then diff --git a/pkgs/by-name/mu/mullvad-browser/update.nix b/pkgs/by-name/mu/mullvad-browser/update.nix index 16cfdb2cc197..f07468308b9c 100644 --- a/pkgs/by-name/mu/mullvad-browser/update.nix +++ b/pkgs/by-name/mu/mullvad-browser/update.nix @@ -61,7 +61,7 @@ writeShellScript "update-${pname}" '' declare -A platforms=( ['x86_64-linux']='linux-x86_64' - ['i686-linux']='linux-i686' + ['aarch64-linux']='linux-aarch64' ) for platform in ${lib.escapeShellArgs meta.platforms}; do diff --git a/pkgs/by-name/ne/nezha-theme-user/package.nix b/pkgs/by-name/ne/nezha-theme-user/package.nix index a17260a7e13e..6b0bf5d8f9d5 100644 --- a/pkgs/by-name/ne/nezha-theme-user/package.nix +++ b/pkgs/by-name/ne/nezha-theme-user/package.nix @@ -13,13 +13,13 @@ let in buildNpmPackage (finalAttrs: { pname = "nezha-theme-user"; - version = "2.5.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "hamster1963"; repo = "nezha-dash-v2"; tag = "v${finalAttrs.version}"; - hash = "sha256-qtKU+icxGQKiBtwfZp/ec2SjDCWhlnsCVsmuwLrq+24="; + hash = "sha256-ECunE/tW83Ndp953SPiuZ5o8CozcI1GccgF8bhS1xtY="; }; postPatch = '' diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 957dfd9c5110..04dd7d2f63d8 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -119,6 +119,21 @@ python.pkgs.buildPythonApplication rec { url = "https://github.com/pretix/pretix/commit/abeb615d3d093093668ebaaa0966301640b3a88e.patch"; hash = "sha256-glYhBPL6pVKYlFDmEoPQrrO2L2SxMQOZ3A1Q20uFiew="; }) + (fetchpatch { + name = "CVE-2026-101273.patch"; + url = "https://github.com/pretix/pretix/commit/122f04019e8fcb1eae94139f6eb21899a36fe313.patch"; + hash = "sha256-oUCSxA4QaFGvz7HqIA36+a/A/o1uijhyc4Y1+2zG9Lo="; + }) + (fetchpatch { + name = "CVE-2026-101274.patch"; + url = "https://github.com/pretix/pretix/commit/e7193f28845a9c624a9822edd2452f47ef028b10.patch"; + hash = "sha256-rLZ+Nv6Myj/c/H3/PX2rQ6DMqmrA3r5C1Lz8In+maxo="; + }) + (fetchpatch { + name = "CVE-2026-101272.patch"; + url = "https://github.com/pretix/pretix/commit/eabfe9c2fab6ad61a8325d6a766324830fce43b6.patch"; + hash = "sha256-YXetX9/kwV6qEbRjwqz5VPPkZWPaWESwpXcrdRC6MhA="; + }) ]; pythonRelaxDeps = [ diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix index 2dcacfd43deb..7446d32a7839 100644 --- a/pkgs/by-name/re/redis/package.nix +++ b/pkgs/by-name/re/redis/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "redis"; - version = "8.8.3"; + version = "8.8.4"; src = fetchFromGitHub { owner = "redis"; repo = "redis"; tag = finalAttrs.version; - hash = "sha256-AN2tkDJGUwvFL9rwBkyWxvvt5j0AGtVg08shyrOMdmI="; + hash = "sha256-VKIBSFx5cwTQ+kiPih8FIbjqUjQjYEapnY+9wi+8wDE="; }; patches = lib.optional useSystemJemalloc (fetchpatch2 { @@ -41,14 +41,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-A9qp+PWQRuNy/xmv9KLM7/XAyL7Tzkyn0scpVCGngcc="; }); - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - # The path `/Library/...` isn't available in the build sandbox. The package `apple-sdk` - # can provide that functionality for us. - substituteInPlace src/modules/Makefile modules/vector-sets/Makefile tests/modules/Makefile \ - --replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib' \ - '${apple-sdk.sdkroot}/usr/lib' - ''; - nativeBuildInputs = [ pkg-config which diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 19791bb70157..87931f5ab6a3 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -40,7 +40,7 @@ libGL, mediaSupport ? true, - ffmpeg_7, + ffmpeg_8, audioSupport ? mediaSupport, @@ -99,10 +99,10 @@ let ++ lib.optionals pipewireSupport [ pipewire ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ] ++ lib.optionals libvaSupport [ libva ] - ++ lib.optionals mediaSupport [ ffmpeg_7 ] + ++ lib.optionals mediaSupport [ ffmpeg_8 ] ); - version = "15.0.26"; + version = "16.0"; sources = { x86_64-linux = fetchurl { @@ -112,17 +112,17 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-MnrHRDckuettNpdQY5GxEO4Vlzm9wUvXMcqm/Bb/v3Q="; + hash = "sha256-3jNwtnOJwoSHOM3VFbsuOyMqSukykOrnQYXExDopGiQ="; }; - i686-linux = fetchurl { + aarch64-linux = fetchurl { urls = [ - "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" - "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" - "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" - "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" + "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-aarch64-${version}.tar.xz" + "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-aarch64-${version}.tar.xz" + "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-aarch64-${version}.tar.xz" + "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-aarch64-${version}.tar.xz" ]; - hash = "sha256-fGKevSLvOxThirW/Nd4vpu8yyRqb1pxb8KpDHoauy7Q="; + hash = "sha256-HMUMziBz1IyIKZSX54bVH299ZtXPONMuMAd3LWwUanc="; }; }; @@ -220,7 +220,7 @@ stdenv.mkDerivation rec { ''} # Fixup paths to pluggable transports. - substituteInPlace TorBrowser/Data/Tor/torrc-defaults \ + substituteInPlace TorBrowser/Tor/torrc-defaults \ --replace-fail './TorBrowser' "$TBB_IN_STORE/TorBrowser" # Prepare for autoconfig. @@ -239,13 +239,10 @@ stdenv.mkDerivation rec { // Reset pref that captures store paths. clearPref("extensions.xpiState"); - // Stop obnoxious first-run redirection. - lockPref("noscript.firstRunRedirection", false); - // User should never change these. Locking prevents these // values from being written to prefs.js, avoiding Store // path capture. - lockPref("extensions.torlauncher.torrc-defaults_path", "$TBB_IN_STORE/TorBrowser/Data/Tor/torrc-defaults"); + lockPref("extensions.torlauncher.torrc-defaults_path", "$TBB_IN_STORE/TorBrowser/Tor/torrc-defaults"); lockPref("extensions.torlauncher.tor_path", "$TBB_IN_STORE/TorBrowser/Tor/tor"); // Optionally use IPC for communicating with Tor @@ -288,9 +285,9 @@ stdenv.mkDerivation rec { # relative to torrc-defaults_path but if we do not hard-code them # here, these paths end up being written to the torrc in the user's # state dir. - cat >>TorBrowser/Data/Tor/torrc-defaults <>TorBrowser/Tor/torrc-defaults < deps.json diff --git a/pkgs/development/compilers/dotnet/source/stage1.nix b/pkgs/development/compilers/dotnet/source/stage1.nix index 4e286f2475e1..8124cb003853 100644 --- a/pkgs/development/compilers/dotnet/source/stage1.nix +++ b/pkgs/development/compilers/dotnet/source/stage1.nix @@ -7,13 +7,21 @@ tarballHash, depsFile, bootstrapSdk, + pkgsBuildBuild, }@args: let mkVMR = callPackage ./vmr.nix; - stage0 = callPackage ./stage0.nix ( - args + stage0 = pkgsBuildBuild.dotnetCorePackages.callPackage ./stage0.nix ( + { + inherit (args) + releaseManifestFile + tarballHash + depsFile + bootstrapSdk + ; + } // { baseName = "dotnet-stage0"; } diff --git a/pkgs/development/compilers/dotnet/source/vmr.nix b/pkgs/development/compilers/dotnet/source/vmr.nix index 083076e8c03b..766953b719c9 100644 --- a/pkgs/development/compilers/dotnet/source/vmr.nix +++ b/pkgs/development/compilers/dotnet/source/vmr.nix @@ -29,6 +29,9 @@ unzip, yq, installShellFiles, + runCommand, + pkgsBuildHost, + sigtool, baseName ? "dotnet", bootstrapSdk, @@ -46,23 +49,39 @@ let isLinux isDarwin buildPlatform - targetPlatform + hostPlatform ; inherit (swiftPackages) swift; + isCross = !lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform; releaseManifest = lib.importJSON releaseManifestFile; inherit (releaseManifest) sourceRepository tag; release = releaseManifest.${if hasRuntime then "release" else "sdkVersion"}; buildRid = dotnetCorePackages.systemToDotnetRid buildPlatform.system; - targetRid = dotnetCorePackages.systemToDotnetRid targetPlatform.system; - targetArch = lib.elemAt (lib.splitString "-" targetRid) 1; - - sigtool = callPackage ../sigtool.nix { }; + hostRid = dotnetCorePackages.systemToDotnetRid hostPlatform.system; + buildArch = lib.elemAt (lib.splitString "-" buildRid) 1; + hostArch = lib.elemAt (lib.splitString "-" hostRid) 1; _icu = if isDarwin then darwin.ICU else icu; version = release; + + runtimeDeps = + hostPlatform: + [ + zlib + _icu + openssl + ] + ++ lib.optionals hostPlatform.isLinux [ + krb5 + lttng-ust_2_12 + ] + ++ lib.optionals hostPlatform.isDarwin [ + krb5 + ]; + in stdenv.mkDerivation { pname = "${baseName}-vmr"; @@ -82,6 +101,13 @@ stdenv.mkDerivation { hash = tarballHash; }; + depsBuildBuild = lib.optionals isCross ( + [ + pkgsBuildHost.llvmPackages_20.stdenv.cc + ] + ++ runtimeDeps stdenv.buildPlatform + ); + nativeBuildInputs = [ # this gets copied into the tree, but we still need the sandbox profile bootstrapSdk @@ -115,18 +141,7 @@ stdenv.mkDerivation { sigtool ]; - buildInputs = [ - zlib - _icu - openssl - ] - ++ lib.optionals isLinux [ - krb5 - lttng-ust_2_12 - ] - ++ lib.optionals isDarwin [ - krb5 - ]; + buildInputs = runtimeDeps stdenv.hostPlatform; # This is required to fix the error: # > CSSM_ModuleLoad(): One or more parameters passed to a function were not valid. @@ -144,7 +159,10 @@ stdenv.mkDerivation { ''; patches = - lib.optionals (lib.versionAtLeast version "9" && lib.versionOlder version "10") [ + lib.optionals isCross ( + [ ./clr-cc-cross.patch ] ++ lib.optional (lib.versionAtLeast version "11") ./fix-cross-linker.patch + ) + ++ lib.optionals (lib.versionAtLeast version "9" && lib.versionOlder version "10") [ ./UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch ./vmr-compiler-opt-v9.patch ] @@ -156,10 +174,12 @@ stdenv.mkDerivation { ++ lib.optional ( lib.versionAtLeast version "10" && lib.versionOlder version "11" ) ./Prefer-DOTNET_ROOT-over-directory-traversal-when-fin.patch - ++ lib.optionals (lib.versionAtLeast version "11") [ - ./Prefer-DOTNET_ROOT-over-directory-traversal-when-fin.2.patch - ] - ++ lib.optional (lib.versionAtLeast version "11" && isDarwin) ./fix-cmake-darwin.patch; + ++ lib.optionals (lib.versionAtLeast version "11") ( + [ + ./Prefer-DOTNET_ROOT-over-directory-traversal-when-fin.2.patch + ] + ++ lib.optional isDarwin ./fix-cmake-darwin.patch + ); postPatch = '' # set the sdk version in global.json to match the bootstrap sdk @@ -208,6 +228,11 @@ stdenv.mkDerivation { substituteInPlace \ src/runtime/src/native/libs/CMakeLists.txt \ --replace-fail 'add_compile_options(-Weverything)' 'add_compile_options(-Wall)' + + # fix missing target vendor + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ + --replace-fail '$(CrossCompileArch)-linux-' '$(CrossCompileArch)-unknown-linux-' '' + lib.optionalString (lib.versionAtLeast version "9" && hasRuntime) ( '' @@ -215,7 +240,7 @@ stdenv.mkDerivation { xmlstarlet ed \ --inplace \ -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \ + -s \$prev -t elem -n RuntimeIdentifiers -v ${hostRid} \ src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj # https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627 @@ -361,7 +386,18 @@ stdenv.mkDerivation { src/runtime/src/mono/CMakeLists.txt \ --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' '' - ); + ) + + lib.optionalString (isCross && lib.versionOlder version "10") '' + # copy the patched script into runtime + # v10+ does this itself in UpdateEngCommonFiles + cp src/{arcade,runtime}/eng/common/native/init-compiler.sh + '' + + lib.optionalString (lib.versionAtLeast version "10.0.402" && lib.versionOlder version "11") '' + # https://github.com/dotnet/dotnet/issues/10416 + substituteInPlace \ + src/arcade/src/Microsoft.DotNet.ArcadeAzureIntegration/Microsoft.DotNet.ArcadeAzureIntegration.csproj \ + --replace-fail ';$(NetMinimum)' "" + ''; prepFlags = [ "--no-artifacts" @@ -426,6 +462,13 @@ stdenv.mkDerivation { // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "11") { # error : supplying the --target arm64-apple-macos14.0 != arm64-apple-darwin argument to a nix-wrapped compiler may not work correctly NIX_CC_WRAPPER_SUPPRESS_TARGET_WARNING = "1"; + } + // lib.optionalAttrs isCross { + TOOLCHAIN = stdenv.hostPlatform.config; + ROOTFS_DIR = runCommand "rootfs" { } '' + mkdir $out + ln -s /nix $out/ + ''; }; buildFlags = [ @@ -438,16 +481,21 @@ stdenv.mkDerivation { ++ lib.optionals (lib.versionAtLeast version "9") [ "--source-build" ] - ++ [ - "--" - "-p:PortableBuild=true" - ] - ++ lib.optional (targetRid != buildRid) "-p:TargetRid=${targetRid}" # https://github.com/dotnet/source-build/issues/5521 ++ lib.optionals (version == "11.0.0-preview.2") [ "--branding" "repodefault " - ]; + ] + ++ lib.optionals (isCross && lib.versionAtLeast version "10") [ + "--arch" + hostArch + ] + ++ [ + "--" # msbuild args follow here + "-p:PortableBuild=true" + ] + ++ lib.optional (hostRid != buildRid) "-p:TargetRid=${hostRid}" + ++ lib.optional (isCross && !lib.versionAtLeast version "10") "-p:TargetArchitecture=${hostArch}"; buildPhase = '' runHook preBuild @@ -459,8 +507,14 @@ stdenv.mkDerivation { # CLR_CC/CXX need to be set to stop the build system from using clang-11, # which is unwrapped version= \ - CLR_CC=$(command -v clang) \ - CLR_CXX=$(command -v clang++) \ + CLR_CC=$(command -v $CC) \ + CLR_CXX=$(command -v $CXX) \ + '' + + lib.optionalString isCross '' + CLR_CC_FOR_${buildArch}=$(command -v $CC_FOR_BUILD) \ + CLR_CXX_FOR_${buildArch}=$(command -v $CXX_FOR_BUILD) \ + '' + + '' ./build.sh "''${buildFlags[@]}" runHook postBuild @@ -473,7 +527,7 @@ stdenv.mkDerivation { installPhase = let - assets = if (lib.versionAtLeast version "9") then "assets" else targetArch; + assets = if (lib.versionAtLeast version "9") then "assets" else hostArch; # 10.0.0-preview.6 ends up creating duplicate files in .nupkgs, for example in # Microsoft.Internal.Runtime.AspNetCore.Transport.10.0.0-preview.6.25358.103.nupkg # @@ -499,11 +553,11 @@ stdenv.mkDerivation { '' # unzip tarballs so we don't break dependency detection + lib.optionalString (lib.versionAtLeast version "10") '' - find "$out"/lib/Private.SourceBuilt.Artifacts.*.${targetRid}/assets . -name \*.gz -exec gunzip {} \; + find "$out"/lib/Private.SourceBuilt.Artifacts.*.${hostRid}/assets . -name \*.gz -exec gunzip {} \; '' + '' local -r unpacked="$PWD/.unpacked" - for nupkg in $out/lib/Private.SourceBuilt.Artifacts.*.${targetRid}/{,SourceBuildReferencePackages/}*.nupkg; do + for nupkg in $out/lib/Private.SourceBuilt.Artifacts.*.${hostRid}/{,SourceBuildReferencePackages/}*.nupkg; do rm -rf "$unpacked" unzip ${unzipFlags} "$unpacked" "$nupkg" chmod -R +rw "$unpacked" @@ -535,7 +589,7 @@ stdenv.mkDerivation { separateDebugInfo = true; passthru = { - inherit releaseManifest buildRid targetRid; + inherit releaseManifest buildRid hostRid; icu = _icu; # ilcompiler is currently broken: https://github.com/dotnet/source-build/issues/1215 hasILCompiler = lib.versionAtLeast version "9"; diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index b81cc38e28df..95151883676b 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -115,7 +115,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { sdk = finalAttrs.finalPackage; built = stdenv.mkDerivation { name = "${sdk.name}-test-${name}"; - buildInputs = [ sdk ] ++ buildInputs ++ lib.optionals usePackageSource sdk.packages; + nativeBuildInputs = [ sdk ]; + buildInputs = buildInputs ++ lib.optionals usePackageSource sdk.packages; # make sure ICU works in a sandbox propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile; unpackPhase = diff --git a/pkgs/development/ocaml-modules/jose/default.nix b/pkgs/development/ocaml-modules/jose/default.nix index a32201228299..7e9ce5ddfefe 100644 --- a/pkgs/development/ocaml-modules/jose/default.nix +++ b/pkgs/development/ocaml-modules/jose/default.nix @@ -13,11 +13,11 @@ buildDunePackage (finalAttrs: { pname = "jose"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://github.com/ulrikstrid/ocaml-jose/releases/download/v${finalAttrs.version}/jose-${finalAttrs.version}.tbz"; - hash = "sha256-F6Odq5JXTkAxdqV3HQusoF+9rvt4BZytslKnsIjJLI8="; + url = "https://github.com/ulrikstrid/ocaml-jose/releases/download/${finalAttrs.version}/jose-${finalAttrs.version}.tbz"; + hash = "sha256-fg0HLIb5caJw7p1kL6TYzPLijhdoqlbrm3NvoUBBQXQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index ac008f45da4f..58859e68fadf 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -100,8 +100,13 @@ buildPythonPackage rec { disabledTestMarks = [ "needs_internet" ]; - # These tests require the old and vulnerable freeimage binaries; skip. - disabledTestPaths = [ "tests/test_freeimage.py" ]; + disabledTestPaths = [ + # These tests require the old and vulnerable freeimage binaries; skip. + "tests/test_freeimage.py" + # These tests require an older version of pillow + "tests/test_pillow.py::test_png_16bit" + "tests/test_pillow_legacy.py::test_png" + ]; preCheck = '' export IMAGEIO_USERDIR=$(mktemp -d) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 347a8f318b0a..5eb677518698 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -52,6 +52,7 @@ let libsodium, msgpack-cxx, zeromq, + git, withStorageRocks ? true, withEmbedded ? false, withNuma ? false, @@ -285,6 +286,7 @@ let judy libevent libxml2 + git ] ++ lib.optional withNuma numactl ++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ] @@ -404,8 +406,8 @@ self: { }; mariadb_114 = self.callPackage generic { # Supported until 2029-05-29 - version = "11.4.12"; - hash = "sha256-WreIPbUZv86/3SqsCbxVRKEs4yjznt1G0L8BaQYV72w="; + version = "11.4.13"; + hash = "sha256-G7JUsQbQp8qHHPoY+m4Y1LgKdDD57J0VcexCcaE975Y="; }; mariadb_118 = self.callPackage generic { # Supported until 2028-06-04 diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index d09cbd9cfdf7..3ab296a2903c 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,23 +2,23 @@ builtins.mapAttrs (_: callPackage ./generic.nix) rec { wordpress = wordpress_6_9; wordpress_6_7 = { - version = "6.7.10"; - hash = "sha256-+eHqMxMl9bwM+eQTdiPDH2AWgb1rNhvkqqzE/N9ZKJ8="; + version = "6.7.11"; + hash = "sha256-r42LPAPO28vl3UFc8xb7JFX6rcJpL/gopU2CjxyESL4="; }; wordpress_6_8 = { - version = "6.8.11"; - hash = "sha256-Bp5CyKey0hevB+uQrZqQVJ+8PWL799xdkVRA04c/kVk="; + version = "6.8.12"; + hash = "sha256-S91r7zisRvgKzA079obZZwi1pE2ra7ZqDJfTw9dANx4="; }; wordpress_6_9 = { - version = "6.9.10"; - hash = "sha256-ocDcEuInHGr6q/Mp1a96l2+NLIxZJ3MXiluq6vwtT0o="; + version = "6.9.11"; + hash = "sha256-uHDQc9FdRXM3O87pYbnuzsixBjqr8mM1vZZImLDXcQo="; }; wordpress_7_0 = { - version = "7.0.7"; - hash = "sha256-5PEraQhT5M9lqmdNAYU21cRqWGmDE8WZfKDF0sa4ug0="; + version = "7.0.8"; + hash = "sha256-TTrtbRfddyq6iiciJuYRYnzmW1MMgI21tmvSlaVN2yk="; }; wordpress_7_1 = { - version = "7.1.3"; - hash = "sha256-0qCay2oV47nEcdclV3U8Jm1vQaee0Zv+BMv+SeKDsqU="; + version = "7.1.4"; + hash = "sha256-iB5TpGgf8s2RFlGxHMze3lrkd93wdlr11qGoshmh2DU="; }; }