diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-21 00:02:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-21 00:02:05 +0000 |
| commit | 6e6944dbcc2493731e7b82059189efe41b2f9646 (patch) | |
| tree | f82aab0cfe3cce7c8b3de67dc56d124e3c86bbe7 /pkgs/os-specific | |
| parent | 36232fff71d83ffd6df00c11c237f1fc478a4911 (diff) | |
| parent | 71a5d2c832a3af02a649713d502515bd33acef4a (diff) | |
| download | nixlib-6e6944dbcc2493731e7b82059189efe41b2f9646.tar nixlib-6e6944dbcc2493731e7b82059189efe41b2f9646.tar.gz nixlib-6e6944dbcc2493731e7b82059189efe41b2f9646.tar.bz2 nixlib-6e6944dbcc2493731e7b82059189efe41b2f9646.tar.lz nixlib-6e6944dbcc2493731e7b82059189efe41b2f9646.tar.xz nixlib-6e6944dbcc2493731e7b82059189efe41b2f9646.tar.zst nixlib-6e6944dbcc2493731e7b82059189efe41b2f9646.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index 1e46068b2124..65e259667516 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Firmware extractor for cards supported by the b43 kernel module"; mainProgram = "b43-fwcutter"; homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; - license = lib.licenses.free; + license = lib.licenses.bsd2; platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 449ff8042a70..9bfbe18f16ab 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -33,14 +33,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "535.154.05"; - sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg="; - sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k="; - openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo="; - settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10="; - persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE="; - - patches = [ rcu_patch ]; + version = "550.67"; + sha256_64bit = "sha256-mSAaCccc/w/QJh6w8Mva0oLrqB+cOSO1YMz1Se/32uI="; + sha256_aarch64 = "sha256-+UuK0UniAsndN15VDb/xopjkdlc6ZGk5LIm/GNs5ivA="; + openSha256 = "sha256-M/1qAQxTm61bznAtCoNQXICfThh3hLqfd0s1n1BFj2A="; + settingsSha256 = "sha256-FUEwXpeUMH1DYH77/t76wF1UslkcW721x9BHasaRUaM="; + persistencedSha256 = "sha256-ojHbmSAOYl3lOi2X6HOBlokTXhTCK6VNsH6+xfGQsyo="; }; latest = selectHighestVersion production (generic { |