diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-12 09:47:19 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-12 09:47:19 +0100 |
| commit | 960f062825d22e328828766f4910b702f81ddade (patch) | |
| tree | fa16e624b184fa3ee21681ac9a98eaf6fbef4ce3 /pkgs/os-specific | |
| parent | 1a654573b0a29c5ac8bbe16169cd544c02e945a9 (diff) | |
| parent | e5672143d86ef0beb4b200105330e7da65c9d773 (diff) | |
| download | nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.gz nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.bz2 nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.lz nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.xz nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.zst nixpkgs-960f062825d22e328828766f4910b702f81ddade.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/ipset/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-libre.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/libratbag/default.nix | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 4463e689851..6696252678d 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "ipset-7.4"; + pname = "ipset"; + version = "7.5"; src = fetchurl { - url = "http://ipset.netfilter.org/${name}.tar.bz2"; - sha256 = "110q996yrf74ckpkc5f4pn8j5bqq98f27fsak3ibgr3zwmv435sa"; + url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2"; + sha256 = "02vangpxdyyk9z84vc0ba1vbjvfnd6zlniisc029xzkgmdafwym5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 0593e341a9c..799a84d96df 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17179"; + rev = "17185"; sha256 = "0hyd7wp73w4555d42xcvk4x4nxrfckbzah2ckb4d2aqzxab87789"; } , ... diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index 2f92b316003..9c926800c30 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libratbag"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "libratbag"; repo = "libratbag"; rev = "v${version}"; - sha256 = "1fcdcs4i83yic4rp3dsr7rq040f78lh8fb1ni1nnvp3y78fmibmi"; + sha256 = "00m0f87fqf5i2yvlz5r02f55fbcb13kwlkqx8m69zwya8jhv0j7d"; }; nativeBuildInputs = [ |