diff options
| author | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-03-02 04:08:10 +0000 |
|---|---|---|
| committer | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-03-02 04:08:10 +0000 |
| commit | a04ddbe327635af96d4b5a95087331a9e4d5fdb4 (patch) | |
| tree | 5018a7a328a537460050e4023be034308644372d /pkgs/top-level/linux-kernels.nix | |
| parent | ee9c2b7c6a141a054a8d451b777d0682b5af1751 (diff) | |
| parent | aa94fc78b0a49ed2a4a69b6f5082a1b286dd392d (diff) | |
| download | nixlib-a04ddbe327635af96d4b5a95087331a9e4d5fdb4.tar nixlib-a04ddbe327635af96d4b5a95087331a9e4d5fdb4.tar.gz nixlib-a04ddbe327635af96d4b5a95087331a9e4d5fdb4.tar.bz2 nixlib-a04ddbe327635af96d4b5a95087331a9e4d5fdb4.tar.lz nixlib-a04ddbe327635af96d4b5a95087331a9e4d5fdb4.tar.xz nixlib-a04ddbe327635af96d4b5a95087331a9e4d5fdb4.tar.zst nixlib-a04ddbe327635af96d4b5a95087331a9e4d5fdb4.zip | |
Merge remote-tracking branch 'upstream/master' into sn-remove
Diffstat (limited to 'pkgs/top-level/linux-kernels.nix')
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index ffb572730050..5f0fe736d38a 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -559,15 +559,15 @@ in { configFile = "kernel"; inherit pkgs kernel; }; - zfsStable = callPackage ../os-specific/linux/zfs/stable.nix { + zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix { configFile = "kernel"; inherit pkgs kernel; }; - zfsUnstable = callPackage ../os-specific/linux/zfs/unstable.nix { + zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix { configFile = "kernel"; inherit pkgs kernel; }; - zfs = zfsStable; + zfs = zfs_2_2; can-isotp = callPackage ../os-specific/linux/can-isotp { }; |