diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-13 00:03:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-13 00:03:39 +0000 |
| commit | 240772e5b92157cc20604eef1d38a85c75c7c4fb (patch) | |
| tree | 9c85de6286670c5dc54bd93955fb616b5a43293f /pkgs/os-specific | |
| parent | 5f9e6b829c51bc09b4b3bbe44b9ffc4f2d1cb03b (diff) | |
| parent | 1f2a99e505fbbce63f3e1098010ffb2717c3b96d (diff) | |
| download | nixpkgs-240772e5b92157cc20604eef1d38a85c75c7c4fb.tar nixpkgs-240772e5b92157cc20604eef1d38a85c75c7c4fb.tar.gz nixpkgs-240772e5b92157cc20604eef1d38a85c75c7c4fb.tar.bz2 nixpkgs-240772e5b92157cc20604eef1d38a85c75c7c4fb.tar.lz nixpkgs-240772e5b92157cc20604eef1d38a85c75c7c4fb.tar.xz nixpkgs-240772e5b92157cc20604eef1d38a85c75c7c4fb.tar.zst nixpkgs-240772e5b92157cc20604eef1d38a85c75c7c4fb.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/usbguard/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index a4304e9e936..3d07fd3175b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0-rc1"; + version = "6.0-rc5"; extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "sha256-RReHoEYavib86K9XQKwguBYQvyQboRl7537p69P8ca0="; + hash = "sha256-GELU1ZEOM5gGUJxG54JoiI9qLQXJ2Cd/kyOLcp0AWgc="; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index b950e2a6575..535ba772dde 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -21,14 +21,14 @@ }: stdenv.mkDerivation rec { - version = "1.1.1"; + version = "1.1.2"; pname = "usbguard"; src = fetchFromGitHub { owner = "USBGuard"; repo = pname; rev = "usbguard-${version}"; - sha256 = "sha256-lAh+l9GF+FHQqv2kEYU5JienZKGwR5e45BYAwjieYgw="; + sha256 = "sha256-uwNoKczmVOMpkU4KcKTOtbcTHiYVGXjk/rVbqMl5pGk="; fetchSubmodules = true; }; |