diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-19 10:53:44 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-19 10:53:44 +0100 |
commit | f6b39f852e0a9eb35a7434f02e5579c15519c41c (patch) | |
tree | 8af93c37d0e1ec97607e92ba1926ce24ed744040 /pkgs/os-specific | |
parent | ed9fb90b2855fe09772958494a611248cc23a89c (diff) | |
parent | 41d921292e922a6cd1aba64259341c244d4c2cc7 (diff) | |
download | nixlib-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar nixlib-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.gz nixlib-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.bz2 nixlib-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.lz nixlib-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.xz nixlib-f6b39f852e0a9eb35a7434f02e5579c15519c41c.tar.zst nixlib-f6b39f852e0a9eb35a7434f02e5579c15519c41c.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/dpdk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/ell/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/iwd/default.nix | 9 | ||||
-rw-r--r-- | pkgs/os-specific/linux/odp-dpdk/default.nix | 4 |
4 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 9a74b0bb4a86..7525fc8e405b 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}"; - version = "19.08"; + version = "19.08.2"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "0xgrkip2aji1c7jy5gk38zzwlp5ap1s6dmbcag5dnyy3bmwvmp9y"; + sha256 = "141bqqy4w6nzs9z70x7yv94a4gmxjfal46pxry9bwdh3zi1jwnyd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index a8776f688cad..bd0ddb4ce1df 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.24"; + version = "0.26"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "1dspi6ds58dy7g1q3chapxydfiyz8bjjlryq66jvwgpynzp0c1h1"; + sha256 = "1gnqd7dghwkcn48f6fr9qvkkm976b3x4bn3l7l2k9pamzpng084i"; }; patches = [ diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 6d0eba0b0dbc..2ee5629451ea 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -8,16 +8,17 @@ , docutils , readline , python3Packages +, systemd }: stdenv.mkDerivation rec { pname = "iwd"; - version = "0.22"; + version = "1.1"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "0mjc08ayq2k7sinqanrlm97dn88dxkqkyk2vqqcx1nqjvwvbpbsp"; + sha256 = "1rvsr5i79wpdicghplrxamb4qbkdm5cpgw3mk0rsqzwwj6d6l0vs"; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { ell python3Packages.python readline + systemd ]; pythonPath = [ @@ -46,6 +48,7 @@ stdenv.mkDerivation rec { "--with-dbus-datadir=${placeholder "out"}/share/" "--with-systemd-modloaddir=${placeholder "out"}/etc/modules-load.d/" # maybe "--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/" + "--with-systemd-networkdir=${placeholder "out"}/lib/systemd/network/" ]; postUnpack = '' @@ -77,6 +80,6 @@ stdenv.mkDerivation rec { description = "Wireless daemon for Linux"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill fpletz ]; }; } diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 2d1e59668aa5..789668cb89e5 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -3,10 +3,10 @@ }: let dpdk_17_11 = dpdk.overrideAttrs (old: rec { - version = "17.11.6"; + version = "17.11.9"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "0g4l6yjcn17n18c7q1pxkmnj4fg2kiv0krz7n2vjjsb8s6gmbps2"; + sha256 = "0vrcc9mdjs5fk69lh7bigsk9208dfmjsz3jxaddkjlvk2hds1id6"; }; }); |