diff options
author | Matthieu Coudron <mattator@gmail.com> | 2018-05-17 20:57:32 +0900 |
---|---|---|
committer | Matthieu Coudron <mattator@gmail.com> | 2018-05-21 18:51:34 +0900 |
commit | d9dadce7589a77f9cc2d3ca763b6bf4ec082a004 (patch) | |
tree | 3c7159f716fa95430784c6d3575454d3c64db69e /pkgs | |
parent | b33e666b0aa9570d1859450ea4e9b60bbb3acc16 (diff) | |
download | nixpkgs-d9dadce7589a77f9cc2d3ca763b6bf4ec082a004.tar nixpkgs-d9dadce7589a77f9cc2d3ca763b6bf4ec082a004.tar.gz nixpkgs-d9dadce7589a77f9cc2d3ca763b6bf4ec082a004.tar.bz2 nixpkgs-d9dadce7589a77f9cc2d3ca763b6bf4ec082a004.tar.lz nixpkgs-d9dadce7589a77f9cc2d3ca763b6bf4ec082a004.tar.xz nixpkgs-d9dadce7589a77f9cc2d3ca763b6bf4ec082a004.tar.zst nixpkgs-d9dadce7589a77f9cc2d3ca763b6bf4ec082a004.zip |
libnl: 3.3.0 -> 3.4.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/libnl/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index c79a4314d6f..52b5b272fb6 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig }: -let version = "3.3.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "libnl-${version}"; + version = "3.4.0"; src = fetchFromGitHub { repo = "libnl"; owner = "thom311"; rev = "libnl${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1796kyq2lkhz2802v9kp32vlxf8ynlyqgyw9nhmry3qh5d0ahcsv"; + sha256 = "1bqf1f5glwf285sa98k5pkj9gg79lliixk1jk85j63v5510fbagp"; }; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index be41d5eef49..64f9178cd87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6951,6 +6951,9 @@ in { pylru = callPackage ../development/python-modules/pylru { }; + libnl-python = disabledIf isPy3k + (toPythonModule (pkgs.libnl.override{pythonSupport=true; inherit python; })).py; + lark-parser = callPackage ../development/python-modules/lark-parser { }; lazy-object-proxy = buildPythonPackage rec { |