From d501166f31fb011a9fd75e57a72ff87c56089c84 Mon Sep 17 00:00:00 2001 From: Unai Zalakain Date: Thu, 18 May 2017 10:53:35 +0200 Subject: [PATCH 1/2] enzyme: init at 0.4.1 --- .../python-modules/enzyme/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/enzyme/default.nix diff --git a/pkgs/development/python-modules/enzyme/default.nix b/pkgs/development/python-modules/enzyme/default.nix new file mode 100644 index 000000000000..57894add982c --- /dev/null +++ b/pkgs/development/python-modules/enzyme/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, buildPythonPackage }: + +buildPythonPackage rec { + name = "enzyme-${version}"; + version = "0.4.1"; + + # Tests rely on files obtained over the network + doCheck = false; + + src = fetchurl { + url = "mirror://pypi/e/enzyme/${name}.tar.gz"; + sha256 = "1fv2kh2v4lwj0hhrhj9pib1pdjh01yr4xgyljhx11l94gjlpy5pj"; + }; + + meta = { + homepage = https://github.com/Diaoul/enzyme; + license = with stdenv.lib; licenses.asl20; + description = "Python video metadata parser"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1516ccaa94f5..a7ba3e84d3c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6471,6 +6471,8 @@ in { propagatedBuildInputs = with self; [ configparser ]; }; + enzyme = callPackage ../development/python-modules/enzyme {}; + escapism = buildPythonPackage rec { name = "escapism-${version}"; version = "0.0.1"; From 689f0ce372399a1a29e5fd4505d46ee398a26a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 21 May 2017 14:38:27 +0100 Subject: [PATCH 2/2] enzyme: use fetchPypi --- pkgs/development/python-modules/enzyme/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/enzyme/default.nix b/pkgs/development/python-modules/enzyme/default.nix index 57894add982c..60c92fe76fb2 100644 --- a/pkgs/development/python-modules/enzyme/default.nix +++ b/pkgs/development/python-modules/enzyme/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, buildPythonPackage }: +{ stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - name = "enzyme-${version}"; + name = "${pname}-${version}"; + pname = "enzyme"; version = "0.4.1"; # Tests rely on files obtained over the network doCheck = false; - src = fetchurl { - url = "mirror://pypi/e/enzyme/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1fv2kh2v4lwj0hhrhj9pib1pdjh01yr4xgyljhx11l94gjlpy5pj"; };