From 6b89277fed6bf06417776cc9423e5f3c01e465e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 5 Jun 2017 15:53:12 +0100 Subject: [PATCH] python.pkgs.systemd: 233 -> 234 also python library does not match with our systemd version, the changes done in this release are systemd 233 and python 3.6 related. --- .../python-modules/systemd/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 ++-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/systemd/default.nix diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix new file mode 100644 index 00000000000..c856e019f46 --- /dev/null +++ b/pkgs/development/python-modules/systemd/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkgconfig }: + +buildPythonPackage rec { + name = "python-systemd-${version}"; + version = "234"; + + src = fetchFromGitHub { + owner = "systemd"; + repo = "python-systemd"; + rev = "v${version}"; + sha256 = "1fakw7qln44mfd6pj4kqsgyrhkc6cyr653id34kv0rdnb1bvysrz"; + }; + + buildInputs = [ systemd ]; + nativeBuildInputs = [ pkgconfig ]; + + doCheck = false; + + meta = with stdenv.licenses; { + description = "Python module for native access to the systemd facilities"; + homepage = http://www.freedesktop.org/software/systemd/python-systemd/; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a3b424780b..595894ad505 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24042,25 +24042,8 @@ in { }; }; - systemd = buildPythonPackage rec { - version = "233"; - name = "python-systemd-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/systemd/python-systemd/archive/v${version}.tar.gz"; - sha256 = "1ryzv0d5y448mxpf2cx97rk0403w2w44bha8rqgww1fasx0c9dgg"; - }; - - buildInputs = with pkgs; [ systemd pkgconfig ]; - - # Certain tests only run successfully on a machine w/ systemd. - doCheck = false; - - meta = { - description = "Python module for native access to the systemd facilities"; - homepage = http://www.freedesktop.org/software/systemd/python-systemd/; - license = licenses.lgpl21; - }; + systemd = callPackage ../development/python-modules/systemd { + inherit (pkgs) pkgconfig systemd; }; tabulate = buildPythonPackage rec {