diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-11-09 07:20:00 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-11-09 07:26:53 +0100 |
| commit | 457e94d9008a55f0302100b00b77ea9ea478eaef (patch) | |
| tree | fa6c4caad3cd47fcff78421a553086cd49dc9f54 /pkgs/os-specific/linux/firmware | |
| parent | 4fc27edf074b63a46782832279f8ac1c27b43829 (diff) | |
| parent | 5e70be026ee4eb05ed1c25d659848ab2f7102100 (diff) | |
| download | nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.gz nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.bz2 nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.lz nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.xz nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.zst nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.zip | |
Merge branch 'master' into staging-next
~4k rebuilds on each Linux.
Diffstat (limited to 'pkgs/os-specific/linux/firmware')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 75144799d01..78569327219 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -262,7 +262,7 @@ stdenv.mkDerivation rec { ]; tests = { - installedTests = nixosTests.fwupd; + installedTests = nixosTests.installed-tests.fwupd; }; }; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 98cf56f799e..a8c4bd559d3 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raspberrypi-firmware"; - version = "1.20190819"; + version = "1.20190925"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0qzpc092qg748i5s23xa1jk6qpga9wn0441r2awsz0apkysqx5fj"; + sha256 = "0xyj3f04dcfnl9hp8hakgwcb1msqh7934n0pclcmzy47xjkz7ris"; }; installPhase = '' |