From 150d0b7428c2a92e70844df92c3b4a3b112d9b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Mar 2018 02:37:58 +0100 Subject: [PATCH] pythonPackages.pycups: move expression --- .../python-modules/pycups/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------------ 2 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/pycups/default.nix diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix new file mode 100644 index 000000000000..c9dce5597017 --- /dev/null +++ b/pkgs/development/python-modules/pycups/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchurl, cups }: + +buildPythonPackage rec { + pname = "pycups"; + version = "1.9.73"; + + src = fetchurl { + url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2"; + sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335"; + }; + + buildInputs = [ cups ]; + + # Wants to connect to CUPS + doCheck = false; + + meta = with lib; { + description = "Python bindings for libcups"; + homepage = http://cyberelk.net/tim/software/pycups/; + license = with licenses; [ gpl2Plus ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43c6936e8480..322168954bd3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13079,27 +13079,7 @@ in { }; }); - pycups = buildPythonPackage rec { - name = "pycups-${version}"; - version = "1.9.73"; - - src = pkgs.fetchurl { - url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2"; - sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335"; - }; - - buildInputs = [ pkgs.cups ]; - - # Wants to connect to CUPS - doCheck = false; - - meta = { - description = "Python bindings for libcups"; - homepage = http://cyberelk.net/tim/software/pycups/; - license = with licenses; [ gpl2Plus ]; - }; - - }; + pycups = callPackage ../development/python-modules/pycups { }; pycurl = buildPythonPackage (rec { name = "pycurl-7.19.5.1";