diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-27 12:02:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-27 12:02:07 +0000 |
| commit | 51f9ea2d15aea8f78d5caaf2cf03d5f4ca7a57e8 (patch) | |
| tree | 56e45c4cf9410c3ffc2d3a38c38d1c44b5e54eca /pkgs/os-specific | |
| parent | 9916ff9d6178249582e5dae9fa912974de6fb97d (diff) | |
| parent | a6cd11f3d296a4c27d081d97774378dbaf88674c (diff) | |
| download | nixlib-51f9ea2d15aea8f78d5caaf2cf03d5f4ca7a57e8.tar nixlib-51f9ea2d15aea8f78d5caaf2cf03d5f4ca7a57e8.tar.gz nixlib-51f9ea2d15aea8f78d5caaf2cf03d5f4ca7a57e8.tar.bz2 nixlib-51f9ea2d15aea8f78d5caaf2cf03d5f4ca7a57e8.tar.lz nixlib-51f9ea2d15aea8f78d5caaf2cf03d5f4ca7a57e8.tar.xz nixlib-51f9ea2d15aea8f78d5caaf2cf03d5f4ca7a57e8.tar.zst nixlib-51f9ea2d15aea8f78d5caaf2cf03d5f4ca7a57e8.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/ipset/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/kernels-org.json | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-libre.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 8326ef1c4614..4b8fadcecf25 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.19"; + version = "7.21"; src = fetchurl { url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-m8H7pI1leG4+C2Pca2aahmgj13hAxpkMDGsjB47CxNY="; + sha256 = "sha256-4sbOT886yziTyl01yGk1+ArXb8XMrmARhYQt92DgvGk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 13fa601a8e28..bd65d7d27b1b 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.8-rc5", - "hash": "sha256:0cfv90lf0vccpasqxilr62p23qy5in5b9pz2916iifqs9sngj469" + "version": "6.8-rc6", + "hash": "sha256:03ci53snbv917ccyjdm3xzl2fwijq5da7nkg05dpwb99wrzp8fkd" }, "6.5": { "version": "6.5.13", diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index e4716dfa6d96..6c3d3eb153fa 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19489"; - sha256 = "1adnk4710iyq87bj48bfxzmzhv5hk0x3fmyz6ydk5af364fl87mk"; + rev = "19491"; + sha256 = "047gvbg8dlmnwqll17hkla2rqf97g8p90z4jncqdk5hf2v5wqgi7"; } , ... }: |