diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-12 00:01:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-12 00:01:49 +0000 |
| commit | be8c1707399fb5d8b5de0531d09661eded9cf0a1 (patch) | |
| tree | e415b55376b6c4ee521da33defc77896ff0f53c3 /pkgs/top-level | |
| parent | 7573d7fe79dff36b24606e695a935ce7f1337b4a (diff) | |
| parent | 14260bb7ba68fd8c7cc088b71d9ae947bdba4c10 (diff) | |
| download | nixlib-be8c1707399fb5d8b5de0531d09661eded9cf0a1.tar nixlib-be8c1707399fb5d8b5de0531d09661eded9cf0a1.tar.gz nixlib-be8c1707399fb5d8b5de0531d09661eded9cf0a1.tar.bz2 nixlib-be8c1707399fb5d8b5de0531d09661eded9cf0a1.tar.lz nixlib-be8c1707399fb5d8b5de0531d09661eded9cf0a1.tar.xz nixlib-be8c1707399fb5d8b5de0531d09661eded9cf0a1.tar.zst nixlib-be8c1707399fb5d8b5de0531d09661eded9cf0a1.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 | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e00c54077bc4..d6cd59a550c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6062,6 +6062,8 @@ with pkgs; gnome-photos = callPackage ../applications/graphics/gnome-photos { }; + gnome-randr = callPackage ../tools/wayland/gnome-randr { }; + gnokii = callPackage ../tools/misc/gnokii { }; gnuapl = callPackage ../development/interpreters/gnu-apl { }; @@ -22102,6 +22104,8 @@ with pkgs; slurm = callPackage ../servers/computing/slurm { gtk2 = null; }; + slurm-spank-stunnel = callPackage ../servers/computing/slurm-spank-stunnel { }; + slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 9e254ee64a10..dedb8f015fc4 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -324,7 +324,7 @@ in { nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); + nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { })); nvidia_x11_legacy340 = nvidiaPackages.legacy_340; nvidia_x11_legacy390 = nvidiaPackages.legacy_390; |