diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-12 00:02:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-12 00:02:14 +0000 |
| commit | 33248a2cafb255edb4c91a290864194242622de3 (patch) | |
| tree | 13114ade9e94e05d17dc1c77935efa08dab925d2 /pkgs/os-specific/linux | |
| parent | 9776723357705dedeb933221c8f9b295d44813d7 (diff) | |
| parent | 647a6f42eef18d2e8367f1870dfa718640b8a63a (diff) | |
| download | nixpkgs-33248a2cafb255edb4c91a290864194242622de3.tar nixpkgs-33248a2cafb255edb4c91a290864194242622de3.tar.gz nixpkgs-33248a2cafb255edb4c91a290864194242622de3.tar.bz2 nixpkgs-33248a2cafb255edb4c91a290864194242622de3.tar.lz nixpkgs-33248a2cafb255edb4c91a290864194242622de3.tar.xz nixpkgs-33248a2cafb255edb4c91a290864194242622de3.tar.zst nixpkgs-33248a2cafb255edb4c91a290864194242622de3.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/linux-firmware/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firmware/linux-firmware/source.nix | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index b76a77fb3a6..283e04b4754 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -4,6 +4,8 @@ in { stdenvNoCC, fetchzip, lib, + rdfind, + which, }: stdenvNoCC.mkDerivation rec { @@ -15,6 +17,11 @@ stdenvNoCC.mkDerivation rec { hash = source.sourceHash; }; + nativeBuildInputs = [ + rdfind + which + ]; + installFlags = [ "DESTDIR=$(out)" ]; # Firmware blobs do not need fixing and should not be modified diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index 722970e8945..afe371a8887 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,7 +1,6 @@ -# This file is autogenerated! Run ./update.sh to regenerate. { - version = "20231030"; - revision = "20231030"; - sourceHash = "sha256-ocqikHJfvs4gWqnBeLgSnXHzUTPi8l8cSfNarhD8G3w="; - outputHash = "sha256-vaMYuAqkkuyY+bAxAe0uAokWZ7HlaR62UTu4L8yOofs="; + version = "20231111"; + revision = "20231111"; + sourceHash = "sha256-S9Xkj2CbamHxqjTDfqRJu91MNrSntxrQ7HYyhvdH6Jo="; + outputHash = "sha256-Qrz9fSHUQf0Gl8pfol4yfe95sD8DQV/+riT1NCFussQ="; } |