diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-17 12:01:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-17 12:01:55 +0000 |
| commit | 732bd85cf5ce831a88eb7871fd186c386a6493b0 (patch) | |
| tree | f2f0e28400338209efd16ff0459e5769e566b052 /pkgs/os-specific/linux | |
| parent | 29bbe7c6169adf86e8e51f14ef6c133480f608df (diff) | |
| parent | 4ee4d805d29afac902a3c631ab13ad08fbe1e84d (diff) | |
| download | nixpkgs-732bd85cf5ce831a88eb7871fd186c386a6493b0.tar nixpkgs-732bd85cf5ce831a88eb7871fd186c386a6493b0.tar.gz nixpkgs-732bd85cf5ce831a88eb7871fd186c386a6493b0.tar.bz2 nixpkgs-732bd85cf5ce831a88eb7871fd186c386a6493b0.tar.lz nixpkgs-732bd85cf5ce831a88eb7871fd186c386a6493b0.tar.xz nixpkgs-732bd85cf5ce831a88eb7871fd186c386a6493b0.tar.zst nixpkgs-732bd85cf5ce831a88eb7871fd186c386a6493b0.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/lxcfs/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index a5445488534..4293f53e47d 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2021-05-11"; + version = "2021-07-16"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = "refs/tags/" + lib.replaceStrings ["-"] [""] version; - sha256 = "015hajf3mq8dv2hw5wsyvi34zdqiwxp9p5dwdp8nrk4r9z5ysqxw"; + sha256 = "185pnaqf2qmhbcdvvldmbar09zgaxhh3h8x9bxn6079bcdpaskn6"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "034bwbl616vzl7lhcbvyz9dzmpzwi12vca3r5mszdxqh3z3s1g6a"; + outputHash = "0g470hj2ylpviijfpjqzsndn2k8kkscj27wqwk51xlk8cr3mrahb"; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 440e81266c8..3ed80269d3a 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "lxcfs"; - version = "4.0.8"; + version = "4.0.9"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = "lxcfs-${version}"; - sha256 = "sha256-8Tack2gM3AU3coGXs5hEbAaBCo5ss1sGUFFEjZDn5Lg="; + sha256 = "0zx58lair8hwi4bxm5h7i8n1j5fcdgw5cr6f4wk9qhks0sr5dip5"; }; nativeBuildInputs = [ pkg-config help2man autoreconfHook makeWrapper ]; |