diff --git a/ci/default.nix b/ci/default.nix index 6aa80f977901..06fa75bbc38f 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -70,7 +70,7 @@ rec { }; parse = pkgs.lib.recurseIntoAttrs { nix_latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; }; - nix_2_28 = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_28; }; + stable = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.stable; }; lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; }; lix_latest = pkgs.callPackage ./parse.nix { nix = pkgs.lixPackageSets.latest.lix; }; }; diff --git a/ci/pinned.json b/ci/pinned.json index fc034a85bccf..0b3d817d1b06 100644 --- a/ci/pinned.json +++ b/ci/pinned.json @@ -9,9 +9,9 @@ }, "branch": "nixpkgs-unstable", "submodules": false, - "revision": "8c91a71d13451abc40eb9dae8910f972f979852f", - "url": "https://github.com/NixOS/nixpkgs/archive/8c91a71d13451abc40eb9dae8910f972f979852f.tar.gz", - "hash": "sha256-fnzKKPvS+oieI/pTzotA5tkoM47EB1NpaBcgk4R97hE=" + "revision": "6edbf1a6a03e75886a6609c088801a0856449e88", + "url": "https://github.com/NixOS/nixpkgs/archive/6edbf1a6a03e75886a6609c088801a0856449e88.tar.gz", + "hash": "sha256-0lkauQbtrljJqwtzTCILPAiHAJyMvn6XDo264moDv30=" } }, "version": 8 diff --git a/ci/update-pinned.sh b/ci/update-pinned.sh index 69ba7df9131d..51c99b0da98d 100755 --- a/ci/update-pinned.sh +++ b/ci/update-pinned.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p npins -I nixpkgs=../ +#!nix-shell -i bash -E 'with import ../. {}; mkShell { packages = [ npins ]; }' set -euo pipefail diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 0ecb59dd3bb6..24061021d125 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -493,7 +493,7 @@ In this example, `prePnpmInstall` will be run by both `pnpmConfigHook` and by th #### pnpm `fetcherVersion` {#javascript-pnpm-fetcherVersion} -This is the version of the output of `fetchPnpmDeps`. New packages should use `3`: +This is the version of the output of `fetchPnpmDeps`. New packages should use `4`: ```nix { diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 54d62f87b3d5..280c88cee66b 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -9,7 +9,6 @@ pkgsBB ? pkgs.pkgsBuildBuild, nix ? pkgs-nixVersions.stable, nixVersions ? [ - pkgs-nixVersions.nix_2_28 nix pkgs-nixVersions.latest ], diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 46282f3a2953..221e3080e1ae 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -405,8 +405,8 @@ }; aaravrav = { name = "aaravrav"; - github = "Aarav"; - githubId = 3279912; + github = "aaravrav"; + githubId = 37036762; }; aarnphm = { email = "contact@aarnphm.xyz"; diff --git a/pkgs/applications/editors/jetbrains/ides/clion.nix b/pkgs/applications/editors/jetbrains/ides/clion.nix index 5b6885bb4614..063d2c752ad2 100644 --- a/pkgs/applications/editors/jetbrains/ides/clion.nix +++ b/pkgs/applications/editors/jetbrains/ides/clion.nix @@ -21,20 +21,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/cpp/CLion-2026.1.2.tar.gz"; - hash = "sha256-Q3LOhpwpU6vrPWEzA+s2ZnbRxo+EeodBUHUYs3Xikrs="; + url = "https://download.jetbrains.com/cpp/CLion-2026.1.4.tar.gz"; + hash = "sha256-uOhFuDqVw3pxtqBvOQH+FpJTFrneaD/R0VcpJZRYD2o="; }; aarch64-linux = { - url = "https://download.jetbrains.com/cpp/CLion-2026.1.2-aarch64.tar.gz"; - hash = "sha256-YM105ozP78oLDmwKL0t4Z4wGjCDh6xvhf/C1oCD6Qi8="; + url = "https://download.jetbrains.com/cpp/CLion-2026.1.4-aarch64.tar.gz"; + hash = "sha256-I6IKQng4lNtRlQIq08K5bueqgKI/q1awX4EuRnyAnOk="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/cpp/CLion-2026.1.2.dmg"; - hash = "sha256-UEkYDJBjRvvUUB2UFsc37kdp/i+1ctqULSKs62/t9/I="; + url = "https://download.jetbrains.com/cpp/CLion-2026.1.4.dmg"; + hash = "sha256-AJt+K1zv4eyjdzubUeFGwB9mqzvOeb3ffA2k0MajPBs="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/cpp/CLion-2026.1.2-aarch64.dmg"; - hash = "sha256-scMwDF+mIfx/66cBrvdxp+gU3+qA2sUWqoGCEhPItjE="; + url = "https://download.jetbrains.com/cpp/CLion-2026.1.4-aarch64.dmg"; + hash = "sha256-i3stX7dyRgSOJkFTMD9/hkw6e2mGNqn13S7X/vJ66RQ="; }; }; # update-script-end: urls @@ -48,8 +48,8 @@ in product = "CLion"; # update-script-start: version - version = "2026.1.2"; - buildNumber = "261.24374.148"; + version = "2026.1.4"; + buildNumber = "261.26222.59"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/goland.nix b/pkgs/applications/editors/jetbrains/ides/goland.nix index fe92428cd2a8..692e2ba49fc8 100644 --- a/pkgs/applications/editors/jetbrains/ides/goland.nix +++ b/pkgs/applications/editors/jetbrains/ides/goland.nix @@ -12,20 +12,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/go/goland-2026.1.2.tar.gz"; - hash = "sha256-1FkDEaapyDbTPe4soOdyCHLkp/UT3rZ6siGyGyjmGJo="; + url = "https://download.jetbrains.com/go/goland-2026.1.4.tar.gz"; + hash = "sha256-pHSbmAZ+tSfa0wdtDp/3Ib/GNMP30OFNQlHWUfMwrW0="; }; aarch64-linux = { - url = "https://download.jetbrains.com/go/goland-2026.1.2-aarch64.tar.gz"; - hash = "sha256-E8WpA4s/ePEDAs47IPC0v10C1VKl9UYU7VNX/5igpm4="; + url = "https://download.jetbrains.com/go/goland-2026.1.4-aarch64.tar.gz"; + hash = "sha256-7s98kY08aKjdRGQLDkffeVhgj1FWurLmTTYmtb5Qx6c="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/go/goland-2026.1.2.dmg"; - hash = "sha256-iWYTMImwzMh9KSJgek8a84o/KlLWBaOj80vKlB8Ftes="; + url = "https://download.jetbrains.com/go/goland-2026.1.4.dmg"; + hash = "sha256-RbvcLpLVyeL4B1DJ2/9Ub/6Cz6fJGXMPCHsJ705GsAo="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/go/goland-2026.1.2-aarch64.dmg"; - hash = "sha256-TFnEMq7u51UvtaOjnxS+abJhsR3aSnaQjNFfF8EQrcQ="; + url = "https://download.jetbrains.com/go/goland-2026.1.4-aarch64.dmg"; + hash = "sha256-y7mEke0z0MvQs+kMtrmrq7EeAtJUbgo6sGZrOB0MraM="; }; }; # update-script-end: urls @@ -39,8 +39,8 @@ in product = "Goland"; # update-script-start: version - version = "2026.1.2"; - buildNumber = "261.24374.154"; + version = "2026.1.4"; + buildNumber = "261.26222.72"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/applications/editors/jetbrains/ides/idea.nix index bf9dbdae54be..e77c6a800f61 100644 --- a/pkgs/applications/editors/jetbrains/ides/idea.nix +++ b/pkgs/applications/editors/jetbrains/ides/idea.nix @@ -15,20 +15,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3.tar.gz"; - hash = "sha256-pvBJcW2h0J2eDsFQDGC/AaX/ig/iQZF43R/y/bK3dWM="; + url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4.tar.gz"; + hash = "sha256-MQTYXZUH/4ggZeP465UGQCtKgSkJLSaCZiu26cTwY/w="; }; aarch64-linux = { - url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3-aarch64.tar.gz"; - hash = "sha256-dlnnkWCSM8Pmv2fBv8yG9foRdkd8pYFa5hJbDq6EqIs="; + url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4-aarch64.tar.gz"; + hash = "sha256-MDZFuLrUxcCIc0Zhi4QhgKPeU7Pgs9oJ/FxQH1n3gBM="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3.dmg"; - hash = "sha256-Sv6A37Y5yIkaE+qnFEGDBq/q9fSSSZPjJC59NB2Fsns="; + url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4.dmg"; + hash = "sha256-8K+LiewiINP4S9eqV0kGWtfy2Ff/zvBwX89iX7mYZ78="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3-aarch64.dmg"; - hash = "sha256-LRyg2DLmTgChdFKR8NMGGjWDZTAWnjQpoTp3NIBvYrI="; + url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4-aarch64.dmg"; + hash = "sha256-XIBK/+Lxaz9dX+Lxl7HXsl+Z3Z7GBzSuDxNssb/4A2s="; }; }; # update-script-end: urls @@ -43,8 +43,8 @@ mkJetBrainsProduct { productShort = "IDEA"; # update-script-start: version - version = "2026.1.3"; - buildNumber = "261.25134.95"; + version = "2026.1.4"; + buildNumber = "261.26222.65"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix index a034954c8e1e..be56d33d23bc 100644 --- a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix +++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix @@ -12,20 +12,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3.tar.gz"; - hash = "sha256-hXb2KcCaNKIJOGbN0ZUDxMKuX++dO1FRoxvC580VIHQ="; + url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4.tar.gz"; + hash = "sha256-SF25D7dDn7b6AzcXEDLKwhpjTnCqYz1fEmvND5dl8Is="; }; aarch64-linux = { - url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3-aarch64.tar.gz"; - hash = "sha256-+As41qcyCvAICIttMEi30b8mBTZoWKK4rjxjkVx4TXs="; + url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4-aarch64.tar.gz"; + hash = "sha256-T9q3/nxv/AA6y7CHWtOhUibR7bnKN8OZmfN3NWYTsIQ="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3.dmg"; - hash = "sha256-Q9m/XIgDg4F4yH0P35IaInk/se5CXqewvp248VqA4uc="; + url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4.dmg"; + hash = "sha256-W7EwYu7S3hs1564tXq8H1Uok/Gwx/8QJO4brUGOfFY4="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3-aarch64.dmg"; - hash = "sha256-Yo50EhVQDg7c/C3JZ9utZxpsOY0DuZfgYzYtBN9Nmwk="; + url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4-aarch64.dmg"; + hash = "sha256-XGcfEWHHeLugvkT/WlQDsVRN33F46b1PCNhINQitqSY="; }; }; # update-script-end: urls @@ -39,8 +39,8 @@ mkJetBrainsProduct { product = "PhpStorm"; # update-script-start: version - version = "2026.1.3"; - buildNumber = "261.25134.104"; + version = "2026.1.4"; + buildNumber = "261.26222.71"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix index df8d35ea2f20..c962306f3389 100644 --- a/pkgs/applications/editors/jetbrains/ides/rider.nix +++ b/pkgs/applications/editors/jetbrains/ides/rider.nix @@ -24,20 +24,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2.tar.gz"; - hash = "sha256-OmysaGXGMxxAAa2qrHvX8yXIwJLU7tKG8/EBGhr55EA="; + url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4.tar.gz"; + hash = "sha256-K+X2M4idv+oDqC/dkbzMTX3W3zx0b0e8ZTsxkP7rAfI="; }; aarch64-linux = { - url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2-aarch64.tar.gz"; - hash = "sha256-xcwd4OgobMXFQ2W+SN6O5I3mud4kedVQ/0rZBWbXIGY="; + url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4-aarch64.tar.gz"; + hash = "sha256-GXmyBrqxUpwK4djjwllvK+pnfktDrDHpLJKoe4D2xFo="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2.dmg"; - hash = "sha256-uoOP+EYB11M99MlAFF7efZSKmCk0fwjCImFiasUQPUw="; + url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4.dmg"; + hash = "sha256-GfQ5WpKunJ+JhE1VcArm3UxZ5udCbfnS1Kw3D4gZorA="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2-aarch64.dmg"; - hash = "sha256-Mo6gxWatX6wlL3s8Li19F58cnKZtOtFUfNyGPrC6CtA="; + url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4-aarch64.dmg"; + hash = "sha256-cfwT22BN1jzKZzrZHMQqYFJPGuRwta/sqoOJOp+PfBE="; }; }; # update-script-end: urls @@ -51,8 +51,8 @@ in product = "Rider"; # update-script-start: version - version = "2026.1.2"; - buildNumber = "261.24374.190"; + version = "2026.1.4"; + buildNumber = "261.26222.60"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix index 807fe17c4e06..b4ab8c0b34c4 100644 --- a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix +++ b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix @@ -12,20 +12,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3.tar.gz"; - hash = "sha256-0KF/IEVRT8kgHpULEmqMy9gOf06IIDA4vEV3RujjQoE="; + url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4.tar.gz"; + hash = "sha256-0EhtU4XKWI9i7ij+m5uvxHSYnbQaYJy8Sa6S1OW4CFU="; }; aarch64-linux = { - url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3-aarch64.tar.gz"; - hash = "sha256-kiuRp9JhdS0aUFPX1brI1T9ik/iWhglIckHvv4bdPWk="; + url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4-aarch64.tar.gz"; + hash = "sha256-oSu19pkGVWt31vWBdAffSZsu4QzsUznVbUSwDy98nug="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3.dmg"; - hash = "sha256-UjpwMCXhI+bMOvyyEbRBoNW3GGCDpi7aF6hUxffW/h0="; + url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4.dmg"; + hash = "sha256-BLo2weIJK8gQAcMtAiETM7FMdhw9aoFIGh5Yqjv3k7s="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3-aarch64.dmg"; - hash = "sha256-lqa3L+rBiEH/hPmFcevWBumvvyBBzoUR3ttvA8s0uT0="; + url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4-aarch64.dmg"; + hash = "sha256-4wEnwcPRtwp0wxePUMiLow6sMxirwndRMdmJL8LBh9k="; }; }; # update-script-end: urls @@ -39,8 +39,8 @@ mkJetBrainsProduct { product = "RubyMine"; # update-script-start: version - version = "2026.1.3"; - buildNumber = "261.25134.97"; + version = "2026.1.4"; + buildNumber = "261.26222.67"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix index db6201d672b8..3f82ae6aea2e 100644 --- a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix +++ b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix @@ -18,20 +18,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.3.tar.gz"; - hash = "sha256-0+v05zxvFqXV13c8oV9dTTwtO+shgywD75cwUiZAab0="; + url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4.tar.gz"; + hash = "sha256-8x/AP6uKSVJavwjA9tYT1IM1xVspOZZzwmcwpGloIcw="; }; aarch64-linux = { - url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.3-aarch64.tar.gz"; - hash = "sha256-SZ4OkWgAGeSafFo1ml5dv5tN5su+HgzbEhQ5GzPqGdo="; + url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4-aarch64.tar.gz"; + hash = "sha256-KpF3jCnLKCEeEXkBdB8ZsPPqP9FOVRTwRV/FQLKyh1Q="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.3.dmg"; - hash = "sha256-JA++mbKvRTvjHEblbgmjBzbWbxcV7ss3+W9M6i6ePu0="; + url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4.dmg"; + hash = "sha256-2BwgAD0xF9IxRJh+gW4vLzBW13rFQSzQPbEwdmQGvLU="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.3-aarch64.dmg"; - hash = "sha256-ndipMTztrYeUdo4MfOHjJHk3liHutWmMj+J6G8xjtWA="; + url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4-aarch64.dmg"; + hash = "sha256-Hly4NBv9mg/RMmxCM6m9w5eS/CQ7ycxp7V2VQZwyGQE="; }; }; # update-script-end: urls @@ -45,8 +45,8 @@ in product = "RustRover"; # update-script-start: version - version = "2026.1.3"; - buildNumber = "261.25134.134"; + version = "2026.1.4"; + buildNumber = "261.26222.73"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/by-name/ar/ariang/package.nix b/pkgs/by-name/ar/ariang/package.nix index 45ec0b597869..1aeb512c61ce 100644 --- a/pkgs/by-name/ar/ariang/package.nix +++ b/pkgs/by-name/ar/ariang/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + nodejs_22, buildNpmPackage, copyDesktopItems, imagemagick, @@ -19,6 +20,8 @@ buildNpmPackage rec { hash = "sha256-u4MnjGMvnnb9EGHwK2QYpW7cuX1e1+6z2/1X1baR8iA="; }; + nodejs = nodejs_22; + npmDepsHash = "sha256-kxoSEdM8H7M9s6U2dtCdfuvqVROEk35jAkO7MgyVVRg="; makeCacheWritable = true; diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix index f029fa8f1453..fcb85a166a8b 100644 --- a/pkgs/by-name/ba/bazarr/package.nix +++ b/pkgs/by-name/ba/bazarr/package.nix @@ -17,11 +17,11 @@ let in stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.5.6"; + version = "1.6.0"; src = fetchzip { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - hash = "sha256-S3idNH9Wm9f6aNj69dERmeks1rLvUeQJYFebXa5cWQo="; + hash = "sha256-LRcc2wg5u260yl3A7rRwBfldl6WOyvF2T9NKGTKabfw="; stripRoot = false; }; diff --git a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix index 614410a039aa..6310280b1dec 100644 --- a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix +++ b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix @@ -4,6 +4,7 @@ bcachefs-tools: stdenv, kernelModuleMakeFlags, kernel, + rustPlatform, }: stdenv.mkDerivation { @@ -27,6 +28,7 @@ stdenv.mkDerivation { makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=${placeholder "out"}" + "RUST_LIB_SRC=${rustPlatform.rustLibSrc}" ]; installPhase = '' @@ -50,6 +52,6 @@ stdenv.mkDerivation { platforms ; - broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.2"); + broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.3"); }; } diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index e1c2935d906d..887fe38cecdf 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -19,6 +19,7 @@ cargo, rustc, rustPlatform, + rust-bindgen, makeWrapper, nix-update-script, versionCheckHook, @@ -30,18 +31,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.38.6"; + version = "1.38.8"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-VNY9kURuXky504utCZ0Ye76mDG2TFAdzrgYI2iup/PI="; + hash = "sha256-9sDE7ua3WMCfV9ZbwQdAbpatv2IhvcwHzzPr+/l2au0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-rajYbfE98j/YqniUoV66LHh22PwEc6sWWJ/7bgGgGtA="; + hash = "sha256-F1+FeAlYSqOxeWJI8vHShpXrOZqYXjNGvty/s6f6u8w="; }; postPatch = '' @@ -58,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { rustc rustPlatform.cargoSetupHook rustPlatform.bindgenHook + rust-bindgen makeWrapper installShellFiles ]; diff --git a/pkgs/by-name/et/etcd_3_5/package.nix b/pkgs/by-name/et/etcd_3_5/package.nix index 376ebcf8a0c3..98b60520ffb7 100644 --- a/pkgs/by-name/et/etcd_3_5/package.nix +++ b/pkgs/by-name/et/etcd_3_5/package.nix @@ -7,11 +7,11 @@ }: let - version = "3.5.31"; - etcdSrcHash = "sha256-X3b1TBimNYo03fW0c5NeiD4uALMqtOQbJwPot11FCk8="; - etcdServerVendorHash = "sha256-1/XJGpyYuTsb+1hReksX5VyD+6xbKaiLA8520cDKc/4="; - etcdUtlVendorHash = "sha256-dUXAoIcOSlEbiSmy1M+oPaHt089gOttQwrB9ZhYc7v0="; - etcdCtlVendorHash = "sha256-l1j00Mzv1z021rfBbFZrIce2pifQyRkST0bkZhVoST0="; + version = "3.5.32"; + etcdSrcHash = "sha256-pqCMgY5veIF5kQDjqTg9B7aSL+V6bdMZpc464wjTLMo="; + etcdServerVendorHash = "sha256-FDzAF2J9wbRmQETvrdJK3gL4cfAhiiihb5EOrimE11M="; + etcdUtlVendorHash = "sha256-0xfq7f7Xr3SWxiU8C1bWQPxdFvEaoIrlK+gX3hkd4ho="; + etcdCtlVendorHash = "sha256-59e/TORi/XX+GXRjMO/45SMumYgrFbOHEXqV7sM72H8="; src = fetchFromGitHub { owner = "etcd-io"; diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index e639b0005187..f0f9d5ba9f5b 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -289,11 +289,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "149.0.7827.201"; + version = "150.0.7871.47"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/ph3mj7mqtvbfhr67ckmjvjj5a4_149.0.7827.201/GoogleChrome-149.0.7827.201.dmg"; - hash = "sha256-AI5oBE0uB2/YacF9LB4d6rXlAqEuZtlPYNQwLbs1K7E="; + url = "http://dl.google.com/release2/chrome/ad2pojsfcj6hr5telal5kk4t6gua_150.0.7871.47/GoogleChrome-150.0.7871.47.dmg"; + hash = "sha256-1VTMVSBLfSRp9CxPaRkmdgAC0H5KNuZNWywTGLSphUI="; }; dontPatch = true; diff --git a/pkgs/by-name/gs/gsasl/package.nix b/pkgs/by-name/gs/gsasl/package.nix index eb7fccdd294f..c34d638c5163 100644 --- a/pkgs/by-name/gs/gsasl/package.nix +++ b/pkgs/by-name/gs/gsasl/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gsasl"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { url = "mirror://gnu/gsasl/gsasl-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-QejkQmSOzK9kWdmtk9SxhTC5bI6vUOPzQlMu8nXv87o="; + sha256 = "sha256-/uNsZqwS0y078pp7Na2PREt5lv42m52l02/WrmScaOs="; }; buildInputs = [ diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix index fea01ad0d0b5..338cb9e06897 100644 --- a/pkgs/by-name/ha/haproxy/package.nix +++ b/pkgs/by-name/ha/haproxy/package.nix @@ -33,11 +33,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "3.3.9"; + version = "3.3.11"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-8x6OaNsHfMCVb07T/3oexjeqXjSMbRxc0hY+ev6xueY="; + hash = "sha256-ywGFCNBymseyaGlEqKk37a3bB0ThDNEFfdZQFQzcKD4="; }; buildInputs = [ diff --git a/pkgs/by-name/im/imagemagick/package.nix b/pkgs/by-name/im/imagemagick/package.nix index d6db5a726e11..4de5ca5bdfa5 100644 --- a/pkgs/by-name/im/imagemagick/package.nix +++ b/pkgs/by-name/im/imagemagick/package.nix @@ -88,13 +88,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.2-25"; + version = "7.1.2-26"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; tag = finalAttrs.version; - hash = "sha256-7z1oIKXZcumsESLrFRvU6z0M8JVsogG7yDWwF62jPwo="; + hash = "sha256-Nl4C5XLwwQviy+GsLgNfbq+Ed6gWsI/ozB3BzM8bkV8="; }; outputs = [ diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix index 4ccf3c299e9e..6a545c1b71f1 100644 --- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix +++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix @@ -36,7 +36,7 @@ let pname = "librewolf-bin-unwrapped"; - version = "152.0.2-1"; + version = "152.0.4-1"; in stdenv.mkDerivation { @@ -46,8 +46,8 @@ stdenv.mkDerivation { url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz"; hash = { - x86_64-linux = "sha256-Tq2bj75oZXSH2YHXShjRRs4Aqxo86BuwONXu+IsdCuA="; - aarch64-linux = "sha256-xk3o5FODm5ge2I8JzgwXTpgu/SI6VcROIJ7005ew2PY="; + x86_64-linux = "sha256-4vmsv93ENtteE18uGJF2ZEhaRA3nGJg//WYYdBREIig="; + aarch64-linux = "sha256-Q1vT/9qOs2AiMRsLcofF7F2Y+5QJJloI/QSVZwA9gC8="; } .${stdenv.hostPlatform.system} or throwSystem; }; diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix index 7f5b682121a5..9d5b78c1e168 100644 --- a/pkgs/by-name/my/mysql84/package.nix +++ b/pkgs/by-name/my/mysql84/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.4.9"; + version = "8.4.10"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-5KqLOeQtH+B48zu9c2lfrCtU28e7E38L2+Y/e+GgLWs="; + hash = "sha256-1XpnMLrvFK4Rj39KbgKEW1tQkzdY32H7BuEE8nzMj5Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nh/nh-unwrapped/package.nix b/pkgs/by-name/nh/nh-unwrapped/package.nix index 16210de364d4..351c1797e2b4 100644 --- a/pkgs/by-name/nh/nh-unwrapped/package.nix +++ b/pkgs/by-name/nh/nh-unwrapped/package.nix @@ -11,12 +11,12 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "nh-unwrapped"; - version = "4.3.2"; + version = "4.4.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nh"; tag = "v${finalAttrs.version}"; - hash = "sha256-TSXa6nL2TpOfDCsZIGCFAMbkQy2Z40gam7JrxBy5FGY="; + hash = "sha256-ebAi5ODaNRfhKISPPchWoI6FZNO2v+lEyvua7e5OOZo="; }; strictDeps = true; @@ -100,7 +100,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm $out/bin/xtask ''; - cargoHash = "sha256-ZR8vvG2mXrGg6GeyP7C0uWhPW6cp2QPYj2cOJUSyeAs="; + cargoHash = "sha256-dRSueVz0BeWwYpMBO1KUUeRoa/CdCWsKPRw0Zeulfe8="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/nimlsp/package.nix b/pkgs/by-name/ni/nimlsp/package.nix index 1e01f33bb859..a24a0ab7f15f 100644 --- a/pkgs/by-name/ni/nimlsp/package.nix +++ b/pkgs/by-name/ni/nimlsp/package.nix @@ -15,13 +15,13 @@ let in buildNimPackage' (finalAttrs: { pname = "nimlsp"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "PMunch"; repo = "nimlsp"; rev = "v${finalAttrs.version}"; - hash = "sha256-MCtpCx8jMQp0VXuMowh69d1DQreU5cDftBf0lww7PUM="; + hash = "sha256-jUNW+tukZXv41HTWP2F2BdEn7nesFXVg2TffKPWfSss="; }; lockFile = ./lock.json; diff --git a/pkgs/by-name/rm/rmapi/package.nix b/pkgs/by-name/rm/rmapi/package.nix index 509c11d6ea86..615a5f5f0bdc 100644 --- a/pkgs/by-name/rm/rmapi/package.nix +++ b/pkgs/by-name/rm/rmapi/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "rmapi"; - version = "0.0.32"; + version = "0.0.34"; src = fetchFromGitHub { owner = "ddvk"; repo = "rmapi"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-0FrcvOjcVg5lXR6iS/eo7IUQnNvqHVHEj1XSIbdrzms="; + sha256 = "sha256-g7KFLa+VBkubzdrgMFDVvAuscw41nyfHd7DWvh3S+NU="; }; vendorHash = "sha256-Qisfw+lCFZns13jRe9NskCaCKVj5bV1CV8WPpGBhKFc="; @@ -24,7 +24,10 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/ddvk/rmapi"; changelog = "https://github.com/ddvk/rmapi/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.agpl3Only; - maintainers = [ lib.maintainers.nickhu ]; + maintainers = with lib.maintainers; [ + nickhu + wamserma + ]; mainProgram = "rmapi"; }; }) diff --git a/pkgs/by-name/se/seafile-client/package.nix b/pkgs/by-name/se/seafile-client/package.nix index 07a6bf03666e..b4f1ea6534e7 100644 --- a/pkgs/by-name/se/seafile-client/package.nix +++ b/pkgs/by-name/se/seafile-client/package.nix @@ -3,6 +3,7 @@ stdenv, fetchpatch, fetchFromGitHub, + nix-update-script, pkg-config, cmake, qt6, @@ -15,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "seafile-client"; - version = "9.0.15"; + version = "9.0.20"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; tag = "v${finalAttrs.version}"; - hash = "sha256-BV1+9/+ryZB1BQyRJ5JaIU6bbOi4h8vt+V+FQIfUJp8="; + hash = "sha256-0idZCoTsuC32DolSLFDknQjvGWHGd4DQPCUyqocuuKA="; }; patches = [ @@ -72,4 +73,5 @@ stdenv.mkDerivation (finalAttrs: { ]; mainProgram = "seafile-applet"; }; + passthru.updateScript = nix-update-script { }; }) diff --git a/pkgs/by-name/se/seafile-shared/package.nix b/pkgs/by-name/se/seafile-shared/package.nix index 64b3ccfe34f4..d6cc528cab50 100644 --- a/pkgs/by-name/se/seafile-shared/package.nix +++ b/pkgs/by-name/se/seafile-shared/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "seafile-shared"; - version = "9.0.15"; + version = "9.0.20"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${finalAttrs.version}"; - hash = "sha256-mWIOk8O3vlg7Sm/5ZQUB5nOgi8/pEczCGQ94p0km/GI="; + hash = "sha256-PBoZDhY7GN8UuYUSXBCPZyBHBtlNcYK+0yS/rl66v9I="; }; postPatch = '' diff --git a/pkgs/by-name/sn/snouty/package.nix b/pkgs/by-name/sn/snouty/package.nix index 0fa03747f8d9..2f9609b9b534 100644 --- a/pkgs/by-name/sn/snouty/package.nix +++ b/pkgs/by-name/sn/snouty/package.nix @@ -52,6 +52,8 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "version"; doInstallCheck = true; + __darwinAllowLocalNetworking = true; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/sy/syncthing/package.nix b/pkgs/by-name/sy/syncthing/package.nix index de32f29866a9..d6f857ab86c8 100644 --- a/pkgs/by-name/sy/syncthing/package.nix +++ b/pkgs/by-name/sy/syncthing/package.nix @@ -22,16 +22,16 @@ assert builtins.elem target [ buildGoModule (finalAttrs: { pname = "syncthing"; - version = "2.0.15"; + version = "2.1.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; tag = "v${finalAttrs.version}"; - hash = "sha256-v77ovjV+UoCRA1GteP+HDqC8dsRvtOhFX/IkSgSIf8Y="; + hash = "sha256-OwR1OiwtlJSRnFXFEyyHcL3q6NdDUQd4JEy0YSQ18fg="; }; - vendorHash = "sha256-boYTLgvH+iWlh3y3Z0LPvSVGEget3X94AthtJKphhCw="; + vendorHash = "sha256-gfGuXBvGdQr+o8zV4MM1FYnOy2fpytIIEdQ9waGNSW4="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when @@ -119,6 +119,7 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ joko peterhoeg + zainkergaye ]; mainProgram = target; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/vt/vtsls/package.nix b/pkgs/by-name/vt/vtsls/package.nix index 7cd84da104b5..7fac88f81b36 100644 --- a/pkgs/by-name/vt/vtsls/package.nix +++ b/pkgs/by-name/vt/vtsls/package.nix @@ -5,23 +5,25 @@ nodejs-slim_22, gitMinimal, gitSetupHook, - pnpm_8, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, nix-update-script, + vtsls, + runCommand, }: let - pnpm' = pnpm_8.override { nodejs-slim = nodejs-slim_22; }; + pnpm' = pnpm_11.override { nodejs-slim = nodejs-slim_22; }; in stdenv.mkDerivation (finalAttrs: { pname = "vtsls"; - version = "0.2.9"; + version = "0.3.0"; src = fetchFromGitHub { owner = "yioneko"; repo = "vtsls"; tag = "server-v${finalAttrs.version}"; - hash = "sha256-vlw84nigvQqRB9OQBxOmrR9CClU9M4dNgF/nrvGN+sk="; + hash = "sha256-RuxaT3u9OOUMbDN6A2biIeUC+Z4leELF3OhKXxmCqbM="; fetchSubmodules = true; }; @@ -36,7 +38,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ nodejs-slim_22 ]; - pnpmWorkspaces = [ "@vtsls/language-server" ]; + pnpmWorkspaces = [ + "@vtsls/language-server" + "@vtsls/language-service" + "@vtsls/vscode-fuzzy" + ]; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) @@ -46,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: { version ; pnpm = pnpm'; - fetcherVersion = 3; - hash = "sha256-1P2ph8ZX6/KptkLP4wk0dZzuvnYCLOWorM1b9+otKsE="; + fetcherVersion = 4; + hash = "sha256-jYh79MtcfW/p6twuDM1JDwukSnn2/TJQYvHBlut0QnE="; }; # Patches to get submodule sha from file instead of 'git submodule status' @@ -90,6 +96,25 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = nix-update-script { }; + + tests.smoke = + runCommand "vtsls-smoke-test" + { + } + '' + INIT_REQUEST='{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"processId":null,"rootUri":"file:///tmp","workspaceFolders":[{"uri":"file:///tmp","name":"test"}],"capabilities":{}}}' + CONTENT_LENGTH=''${#INIT_REQUEST} + + RESPONSE=$( + { + printf "Content-Length: %d\r\n\r\n%s" "$CONTENT_LENGTH" "$INIT_REQUEST" + sleep 1 + } | timeout 3 ${lib.getExe vtsls} --stdio 2>&1 | head -c 1000 + ) || true + + echo "$RESPONSE" | grep -q '"capabilities"' + touch $out + ''; }; meta = { diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix index 93e2aa0b451a..4d310ebc1ac4 100644 --- a/pkgs/by-name/yo/youtrack/package.nix +++ b/pkgs/by-name/yo/youtrack/package.nix @@ -10,15 +10,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "youtrack"; - version = "2026.1.13757"; + version = "2026.2.17012"; src = dockerTools.exportImage { diskSize = 8192; fromImage = dockerTools.pullImage { imageName = "jetbrains/youtrack"; arch = "amd64"; - imageDigest = "sha256:56c4d6b6cb3781e21a369857943a366931b69f22dee76c16b2173de0fd56a0a9"; - hash = "sha256-vWNe/1PTLX1rNR66iOZizubH2YVda8GTfXrQikWTML0="; + imageDigest = "sha256:fa50e2e07435dc91461c00ef05ee064ff76748d4d8feaf8aeaa9f9e4a9bf6606"; + hash = "sha256-8hoMtFqG5T4gnMDorIe6UXs/d3z7epAS352reipPjWI="; }; }; unpackPhase = '' diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index e3e313e175ef..212953626216 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -90,6 +90,13 @@ stdenv.mkDerivation rec { excludes = [ "networking/httpd_ratelimit_cgi.c" ]; # New since release. hash = "sha256-Msm9sDZrVx7ofunnvnTS73SPKUUpR3Tv5xZ/wBd+rts="; }) + # tar: only strip unsafe components from hardlinks, not symlinks + # fix issue introduced by the previous patch (CVE-2026-26157_CVE-2026-26158.patch) + (fetchpatch { + name = "CVE-2026-26157_CVE-2026-26158-2.patch"; + url = "https://github.com/vda-linux/busybox_mirror/commit/599f5dd8fac390c18b79cba4c14c334957605dae.patch"; + hash = "sha256-go/KHSsuMSm21nC0yvKEtAQs8Jnjjqdcs5i8RWBGwT4="; + }) # syslogd: fix writing to local log file # https://lists.busybox.net/pipermail/busybox/2024-October/090969.html (fetchpatch { diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index b1bbd932a1ee..5da7c32252b6 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,43 +5,38 @@ "lts": false }, "6.1": { - "version": "6.1.176", - "hash": "sha256:1xj4ms4gd8ghd0l0dzsyi762dgpdrmqhc3f0arrp7sa0p8npf6da", + "version": "6.1.177", + "hash": "sha256:0c0ayz4nygcmz4865r7mcgmh7hic4fi7zysnj6vdlyj53bz9nlpn", "lts": true }, "5.15": { - "version": "5.15.210", - "hash": "sha256:008a55av0x9fa3fspcz43sycik143gqxg2agcalrax2yw5ma82wi", + "version": "5.15.211", + "hash": "sha256:0qfry534wl5sbm6b4hf6fxqrr6mzf1k9pa2435sqp4hp6vjm9fdy", "lts": true }, "5.10": { - "version": "5.10.259", - "hash": "sha256:02dn8rf9p0afkl8kbdv28ijq974zfnv8zdsqcqbmapjm19c8wpma", + "version": "5.10.260", + "hash": "sha256:113bka32apz5pfqjfnv97k9hf9arkn5asfcd6cw7snsh65qjka27", "lts": true }, "6.6": { - "version": "6.6.143", - "hash": "sha256:0ci9b6kjp7r2xwqifs2963l9ihk2rllk4zpl2kgzbny0r66izkns", + "version": "6.6.144", + "hash": "sha256:1hzcax2ypzhrjzmq4b0jyqyc4al0ncyfcj9pq36phl29gcqbh6gc", "lts": true }, "6.12": { - "version": "6.12.94", - "hash": "sha256:1ln83ljmc7wr1nrjjq1hp1m1vx54j7i6i15m3hqb73a1p4ra5679", + "version": "6.12.95", + "hash": "sha256:1xmrsi0kimirky4cailnkkrbd72pp9n8irfx6lfmss8yrcgwbs59", "lts": true }, "6.18": { - "version": "6.18.37", - "hash": "sha256:0maj2ap1m09bxl6a3g9wc65h9sdr6y8rwc5qcqlbavb4wq0d4g58", + "version": "6.18.38", + "hash": "sha256:0igh9xy1lk2hv2jni00dqyy27j4zqh86waw7i65ryvnmmc4fa9mc", "lts": true }, - "7.0": { - "version": "7.0.14", - "hash": "sha256:160ggaq9rh50a39gz02fpia8maq85bwxhqlwsc03yafjhjvrk6fy", - "lts": false - }, "7.1": { - "version": "7.1.2", - "hash": "sha256:0gw8nnq6nix9xk2dhb1jwmhnqjayrn3bn2akzg4lgqkvfa9qq69p", + "version": "7.1.3", + "hash": "sha256:1p6iknvzmd04alrf49zn8mxw863v0yzgznyckfhl4llgx1lc0hdy", "lts": false } } diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 17dadd967c92..1267c15608e5 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,14 +15,14 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.18.37"; - hash = "sha256-8H8V9z8fizt/2DCTTCme0DVYOfJ4431SFs0iubUHONE="; + version = "6.18.38"; + hash = "sha256-PJq69EQXiOJKgQnegxsEcJqAaL10G542Joh5dBrZN0I="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "7.0.14"; - hash = "sha256-9vb4ORzAppq5S/ukEhDHohNQBW+jWwGnjhv21HztWdk="; + version = "7.1.3"; + hash = "sha256-EvxKUWDp0KAKhYO4rZKKx22RCGOimzPm5epchME/pJ8="; }; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 26f2a6530991..36ba1fca1510 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -156,12 +156,12 @@ rec { # LTSB supported until Aug 2028 legacy_580 = generic { - version = "580.142"; - sha256_64bit = "sha256-IJFfzz/+icNVDPk7YKBKKFRTFQ2S4kaOGRGkNiBEdWM="; - sha256_aarch64 = "sha256-jntr88SpTYR648P1rizQjB/8KleBoa14Ay12vx8XETM="; - openSha256 = "sha256-v968LbRqy8jB9+yHy9ceP2TDdgyqfDQ6P41NsCoM2AY="; - settingsSha256 = "sha256-BnrIlj5AvXTfqg/qcBt2OS9bTDDZd3uhf5jqOtTMTQM="; - persistencedSha256 = "sha256-il403KPFAnDbB+dITnBGljhpsUPjZwmLjGt8iPKuBqw="; + version = "580.173.02"; + sha256_64bit = "sha256-jY65AB4FqaimY9PV0wT+tk7yhE7hhczf2VJ4aCD0bhs="; + sha256_aarch64 = "sha256-1lvVYIfvTXjwSoCNp4g8NaWQHF/TfpXRUKdgLrqXqoA="; + openSha256 = "sha256-lhloZdf6XbaAFTZBF1DxE0Nv9VC6obY8UPf0VyfVepE="; + settingsSha256 = "sha256-dfdu/3tnwHUfP7WoeQFNOMalMlpmUWjeMDIOnu+yi8E="; + persistencedSha256 = "sha256-j8YM1w231X+JIP3c3TpUNurEBumEu1stVjzFGWu1JXE="; }; # Last one without the bug reported here: diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 22f9cbf3aba3..5ca73ec6c351 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -285,6 +285,9 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.dnspython python3Packages.markdown tdb + ] + ++ lib.optionals enableDomainController [ + python3Packages.cryptography ]; strictDeps = true; @@ -348,6 +351,13 @@ stdenv.mkDerivation (finalAttrs: { command = "${finalAttrs.finalPackage}/bin/smbd -V"; package = finalAttrs.finalPackage; }; + } + // lib.optionalAttrs enableDomainController { + versionSambaTool = testers.testVersion { + command = "${lib.getExe' finalAttrs.finalPackage "samba-tool"} --version"; + package = finalAttrs.finalPackage; + version = finalAttrs.version; + }; }; meta = { diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index bee9e1744aba..a61d981d53f0 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -23,11 +23,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openvpn"; - version = "2.6.19"; + version = "2.6.21"; src = fetchurl { url = "https://swupdate.openvpn.net/community/releases/openvpn-${finalAttrs.version}.tar.gz"; - hash = "sha256-E3AlJvaHwYslQMGj8uGJGHuqplIR7c9/9ncvpp8FNs8="; + hash = "sha256-JMthheVEpHMj1nmLA9OfI2fZbyJ77pzRVD6O1Sgxmxc="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5f56485094a9..84f1d5838539 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -92,14 +92,6 @@ in ]; }; - linux_7_0 = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "7.0"; - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - linux_7_1 = callPackage ../os-specific/linux/kernel/mainline.nix { branch = "7.1"; kernelPatches = [ @@ -175,6 +167,7 @@ in linux_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream"; linux_6_17 = throw "linux 6.17 was removed because it has reached its end of life upstream"; linux_6_19 = throw "linux 6.19 was removed because it has reached its end of life upstream"; + linux_7_0 = throw "linux 7.0 was removed because it has reached its end of life upstream"; linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; @@ -674,7 +667,6 @@ in linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); linux_6_18 = recurseIntoAttrs (packagesFor kernels.linux_6_18); - linux_7_0 = recurseIntoAttrs (packagesFor kernels.linux_7_0); linux_7_1 = recurseIntoAttrs (packagesFor kernels.linux_7_1); } // lib.optionalAttrs config.allowAliases { @@ -689,6 +681,7 @@ in linux_6_16 = throw "linux 6.16 was removed because it reached its end of life upstream"; # Added 2025-10-22 linux_6_17 = throw "linux 6.17 was removed because it reached its end of life upstream"; # Added 2025-12-22 linux_6_19 = throw "linux 6.19 was removed because it reached its end of life upstream"; # Added 2026-04-23 + linux_7_0 = throw "linux 7.0 was removed because it has reached its end of life upstream"; # Added 2026-06-27 }; rpiPackages = {