Unverified Commit 18bba242 authored by K900's avatar K900 Committed by GitHub
Browse files

staging-nixos merge for 2026-01-18 (#481252)

parents a5f8735c 270308b9

nixos/modules/installer/tools/nix-fallback-paths.nix

+6 −6
Original line number Diff line number Diff line 
{

  x86_64-linux = "/nix/store/x30lnlgk1s16rynrfslbf8phr6h6rqf2-nix-2.31.2";

  i686-linux = "/nix/store/ix94q6rrdg6cr4893cjpzdbmibhlm0dv-nix-2.31.2";

  aarch64-linux = "/nix/store/xnybj9lk0kwvmr2va253avanq7m3cpyg-nix-2.31.2";

  riscv64-linux = "/nix/store/33as1vqp8mq36nr5bb5gr7ziw1nf4q1v-nix-riscv64-unknown-linux-gnu-2.31.2";

  x86_64-darwin = "/nix/store/b9dvary8rcljj7ajv1x64hwwch4cvyvp-nix-2.31.2";

  aarch64-darwin = "/nix/store/lvv1j8qbrvlnl3aagcjrhf42d458zgb5-nix-2.31.2";

  x86_64-linux = "/nix/store/mxn3vxpvk2b42kgd08aw4bn27qhf434w-nix-2.31.3";

  i686-linux = "/nix/store/b7d35ifww9683l74ydkb0qhrq6lqcisi-nix-2.31.3";

  aarch64-linux = "/nix/store/ysz7dwmy4zd1zm3wzx5dh9g999xv7pbm-nix-2.31.3";

  riscv64-linux = "/nix/store/avfv2lqbnphj2ap8y5ihg1l0sqhpjll7-nix-riscv64-unknown-linux-gnu-2.31.3";

  x86_64-darwin = "/nix/store/s8lcl6nrd5ia7nr4zx9mg720i9f8qm37-nix-2.31.3";

  aarch64-darwin = "/nix/store/vfjzbcl3kf9jjwh0g2x03cvz2x5hg8py-nix-2.31.3";

}

nixos/modules/system/boot/systemd/fido2.nix

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ in 
      '')

    ];

    boot.initrd.systemd.storePaths = [

      "${pkgs.systemd}/lib/udev/fido_id"

      "${cfg.package}/lib/udev/fido_id"

      "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so"

      "${pkgs.libfido2}/lib/libfido2.so.1"

    ];

pkgs/by-name/ru/ruff/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -16,18 +16,18 @@ 


rustPlatform.buildRustPackage (finalAttrs: {

  pname = "ruff";

  version = "0.14.11";

  version = "0.14.13";



  src = fetchFromGitHub {

    owner = "astral-sh";

    repo = "ruff";

    tag = finalAttrs.version;

    hash = "sha256-W8BYc0m/3WsguchDweUapreLrNp47jzkuldI5yEWgvA=";

    hash = "sha256-ComgiY6fvM2f3Ul8kTgykyktvxEHL85X5C1Tudi5ZB4=";

  };



  cargoBuildFlags = [ "--package=ruff" ];



  cargoHash = "sha256-0axyrkSHjBPhv40LvdcRDUqC+j0mUL/VzpgL/I0R5/o=";

  cargoHash = "sha256-Vd9y9VQF7d62tjHJ0ikWlvV7+KDs4q61ld9yoJWaqpY=";



  nativeBuildInputs = [ installShellFiles ];

pkgs/os-specific/linux/kernel/kernels-org.json

+8 −8
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
        "lts": false

    },

    "6.1": {

        "version": "6.1.160",

        "hash": "sha256:15l4s87vyv4rnf5yagl6x7kz4yrlalh191ssxwbvwn3m8fl4d18f",

        "version": "6.1.161",

        "hash": "sha256:0aasgrq6mv5nj7b8ashzx0pxlaah5y0f3sq7d8w00di2lyync5ml",

        "lts": true

    },

    "5.15": {
@@ -20,18 +20,18 @@ 
        "lts": true

    },

    "6.6": {

        "version": "6.6.120",

        "hash": "sha256:08fwwi9wjnhaj4ig0n0ycppzw384djh0gzv3i3blzp7fb4nk6p20",

        "version": "6.6.121",

        "hash": "sha256:1fhl9pr02s10j4b5nli0isy7ps644cpbmjqzkwf5mk14rr7rvbvn",

        "lts": true

    },

    "6.12": {

        "version": "6.12.65",

        "hash": "sha256:1h9rl62lffwxan5ggz1vi9wmyzzsclg330gwdk80wp7kg9k55s2l",

        "version": "6.12.66",

        "hash": "sha256:1bvfadb5149sh927f8cbr1rnypn7v0h6znjdrc1mmc30q2hrff5s",

        "lts": true

    },

    "6.18": {

        "version": "6.18.5",

        "hash": "sha256:0h6r5w7755gd8ys18zi9rgw95wrd2yalbq0h88ihv3ggki01z78q",

        "version": "6.18.6",

        "hash": "sha256:06x3z649mzwwkb1hvsy0yh7j5jk9qrnwqcmwy7dx8s1ggccrf927",

        "lts": false

    }

}

pkgs/tools/package-management/nix/default.nix

+11 −28
Original line number Diff line number Diff line
@@ -167,34 +167,17 @@ lib.makeExtensible ( 


      nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything;



      nixComponents_2_31 =

        (nixDependencies.callPackage ./modular/packages.nix rec {

          version = "2.31.2";

      nixComponents_2_31 = nixDependencies.callPackage ./modular/packages.nix rec {

        version = "2.31.3";

        inherit (self.nix_2_30.meta) teams;

        otherSplices = generateSplicesForNixComponents "nixComponents_2_31";

        src = fetchFromGitHub {

          owner = "NixOS";

          repo = "nix";

          tag = version;

            hash = "sha256-NLGXPLjENLeKVOg3OZgHXZ+1x6sPIKq9FHH8pxbCrDI=";

          hash = "sha256-oe0YWe8f+pwQH4aYD2XXLW5iEHyXNUddurqJ5CUVCIk=";

        };

      };

        }).appendPatches

          (

            [

              (fetchpatch2 {

                name = "nix-2.31-14692-mdbook-0.5-support.patch";

                url = "https://github.com/NixOS/nix/commit/a4f5f365090980a6eeb2ef483e49c04bdefd71a8.patch";

                hash = "sha256-GOWZtHSzHovnD8iUknr61bo7y85i0BKdw3kVBGDfBX0=";

              })

            ]

            ++

              # issues on darwin: https://github.com/NixOS/nixpkgs/pull/468208#issuecomment-3626314109

              lib.optional stdenv.isLinux (fetchpatch2 {

                name = "nix-2.31-14240-sri-error-message.patch";

                url = "https://github.com/NixOS/nix/commit/56751b1cd2c4700c71c545f2246adf602c97fdf5.patch";

                hash = "sha256-CerSBAI+H2RqPp9jsCP0QIM2rZYx3yBZHVVUAztgc18=";

              })

          );



      nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything;