diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-07 00:02:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-07 00:02:12 +0000 |
| commit | b4b1ce4d4f9a28f934b10ff7a96601b735834a75 (patch) | |
| tree | 36d7f1bdb391d1902d833eee6eb0d5bac843aaf6 /pkgs/top-level | |
| parent | 68a45fb1f2d9986a1551a5f88b0235758e0a95de (diff) | |
| parent | 619b8fd35b1225bbfa8b9e091346b3e105efe0d5 (diff) | |
| download | nixlib-b4b1ce4d4f9a28f934b10ff7a96601b735834a75.tar nixlib-b4b1ce4d4f9a28f934b10ff7a96601b735834a75.tar.gz nixlib-b4b1ce4d4f9a28f934b10ff7a96601b735834a75.tar.bz2 nixlib-b4b1ce4d4f9a28f934b10ff7a96601b735834a75.tar.lz nixlib-b4b1ce4d4f9a28f934b10ff7a96601b735834a75.tar.xz nixlib-b4b1ce4d4f9a28f934b10ff7a96601b735834a75.tar.zst nixlib-b4b1ce4d4f9a28f934b10ff7a96601b735834a75.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd5f536c7355..587ef34b8fca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9134,6 +9134,8 @@ with pkgs; pubs = callPackage ../tools/misc/pubs {}; + pulumictl = callPackage ../development/tools/pulumictl { }; + pure-prompt = callPackage ../shells/zsh/pure-prompt { }; pv = callPackage ../tools/misc/pv { }; @@ -33628,6 +33630,8 @@ with pkgs; DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { }; + i3a = callPackage ../misc/i3a { }; + lkproof = callPackage ../tools/typesetting/tex/lkproof { }; lice = python3Packages.callPackage ../tools/misc/lice {}; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5f043faecfd7..9e254ee64a10 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -92,14 +92,7 @@ in { rpiVersion = 4; }; - linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper_updated - kernelPatches.cpu-cgroup-v2."4.4" - kernelPatches.modinst_arg_list_too_long - ]; - }; + linux_4_4 = throw "linux 4.4 was removed because it reached its end of life upstream"; linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { kernelPatches = @@ -484,7 +477,7 @@ in { vanillaPackages = { # recurse to build modules for the kernels - linux_4_4 = recurseIntoAttrs (packagesFor kernels.linux_4_4); + linux_4_4 = throw "linux 4.4 was removed because it reached its end of life upstream"; # Added 2022-02-11 linux_4_9 = recurseIntoAttrs (packagesFor kernels.linux_4_9); linux_4_14 = recurseIntoAttrs (packagesFor kernels.linux_4_14); linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19); |