From 48e89259b10dde643e07b9fbc760f0223e739545 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 15 Aug 2013 14:32:25 +0200 Subject: [PATCH] pypi2nix should only be avaliable for python27 --- pkgs/top-level/python-packages.nix | 42 ++++++++++++++++-------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ee2c935fa0a..358d90591faf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -53,25 +53,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { inherit python setuptools; }; - pypi2nix = buildPythonPackage rec { - rev = "e231db7e8874d4543a6f0fffc46c0fffbe6108c5"; - name = "pypi2nix-1.0_${rev}"; - - src = fetchurl { - url = "https://github.com/garbas/pypi2nix/tarball/${rev}"; - name = "${name}.tar.bz"; - sha256 = "0wqk6milnagr0b0v8igjp8p25d5y63pki3pkdy7hbgjxvyw8wril"; - }; - - propagatedBuildInputs = [ pythonPackages."Distutils2-1.0a4" ]; - doCheck = false; - - meta = { - homepage = https://github.com/garbas/pypi2nix; - description = ""; - maintainers = [ stdenv.lib.maintainers.garbas ]; - }; - }; # packages defined elsewhere blivet = callPackage ../development/python-modules/blivet { }; @@ -6987,4 +6968,27 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; +# python2.7 specific eggs +} // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") { + + pypi2nix = pythonPackages.buildPythonPackage rec { + rev = "e231db7e8874d4543a6f0fffc46c0fffbe6108c5"; + name = "pypi2nix-1.0_${rev}"; + + src = pkgs.fetchurl { + url = "https://github.com/garbas/pypi2nix/tarball/${rev}"; + name = "${name}.tar.bz"; + sha256 = "0wqk6milnagr0b0v8igjp8p25d5y63pki3pkdy7hbgjxvyw8wril"; + }; + + propagatedBuildInputs = [ pythonPackages."Distutils2-1.0a4" ]; + doCheck = false; + + meta = { + homepage = https://github.com/garbas/pypi2nix; + description = ""; + maintainers = [ pkgs.stdenv.lib.maintainers.garbas ]; + }; + }; + }; in pythonPackages