From 61edb1cb2ec30bd437650a18a1a8a7556c813af0 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 9 Mar 2017 13:40:56 +0100 Subject: [PATCH] pythonPackages.pyudev: 0.20.0 -> 0.21.0 Also move expression --- pkgs/development/python-modules/pyudev.nix | 26 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 ++------------------- 2 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/pyudev.nix diff --git a/pkgs/development/python-modules/pyudev.nix b/pkgs/development/python-modules/pyudev.nix new file mode 100644 index 000000000000..98607501e032 --- /dev/null +++ b/pkgs/development/python-modules/pyudev.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl, buildPythonPackage +, six, systemd +}: + +buildPythonPackage rec { + name = "pyudev-${version}"; + version = "0.21.0"; + + src = fetchurl { + url = "mirror://pypi/p/pyudev/${name}.tar.gz"; + sha256 = "0arz0dqp75sszsmgm6vhg92n1lsx91ihddx3m944f4ah0487ljq9"; + }; + + postPatch = '' + substituteInPlace src/pyudev/_ctypeslib/libudev.py \ + --replace "find_library('udev')" "'${systemd.lib}/lib/libudev.so'" + ''; + + propagatedBuildInputs = [ systemd six ]; + + meta = { + homepage = "http://pyudev.readthedocs.org/"; + description = "Pure Python libudev binding"; + license = lib.licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e6493d910c7..11ebfad988c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21184,31 +21184,10 @@ in { buildInputs = with self; [ pyasn1 pycrypto ]; }; - pyudev = buildPythonPackage rec { - name = "pyudev-${version}"; - version = "0.20.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyudev/${name}.tar.gz"; - sha256 = "0al4cpg0m8n7cd06w94x3cx8mxaqg08bfv4r6a3pkgqxc74mpn0l"; - }; - - postPatch = '' - substituteInPlace src/pyudev/_ctypeslib/libudev.py \ - --replace "find_library('udev')" "'${pkgs.systemd.lib}/lib/libudev.so'" - ''; - - propagatedBuildInputs = with self; [ pkgs.systemd six ]; - - meta = { - homepage = "http://pyudev.readthedocs.org/"; - description = "Pure Python libudev binding"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; + pyudev = callPackage ../development/python-modules/pyudev.nix { + inherit (pkgs) fetchurl systemd; }; - pynzb = buildPythonPackage (rec { name = "pynzb-0.1.0";