summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2017-11-06 20:33:29 +0100
committerGitHub <noreply@github.com>2017-11-06 20:33:29 +0100
commita346dc66a7ac0c36e8394495aad34c5c17b6c065 (patch)
tree3e07341eb60d4f94f25b8c0f633d95877f3cfc30
parentbf585f288100b5cf08499f3053b811581b0fa1a6 (diff)
parentc3786d07b16bdc7c8268a979fdcdf0307974e9d2 (diff)
downloadnixlib-a346dc66a7ac0c36e8394495aad34c5c17b6c065.tar
nixlib-a346dc66a7ac0c36e8394495aad34c5c17b6c065.tar.gz
nixlib-a346dc66a7ac0c36e8394495aad34c5c17b6c065.tar.bz2
nixlib-a346dc66a7ac0c36e8394495aad34c5c17b6c065.tar.lz
nixlib-a346dc66a7ac0c36e8394495aad34c5c17b6c065.tar.xz
nixlib-a346dc66a7ac0c36e8394495aad34c5c17b6c065.tar.zst
nixlib-a346dc66a7ac0c36e8394495aad34c5c17b6c065.zip
Merge pull request #31297 from fahadsadah/master
python: fastimport 0.9.4 -> 0.9.6
-rw-r--r--pkgs/development/python-modules/fastimport/default.nix22
-rw-r--r--pkgs/top-level/python-packages.nix26
2 files changed, 24 insertions, 24 deletions
diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix
new file mode 100644
index 000000000000..ee1048ec5fac
--- /dev/null
+++ b/pkgs/development/python-modules/fastimport/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, python, fetchurl }:
+
+buildPythonPackage rec {
+  name = "fastimport-${version}";
+  version = "0.9.6";
+
+  src = fetchurl {
+    url = "mirror://pypi/f/fastimport/${name}.tar.gz";
+    sha256 = "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://launchpad.net/python-fastimport;
+    description = "VCS fastimport/fastexport parser";
+    maintainers = with maintainers; [ koral ];
+    license = licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b42195e3630b..12aafc7e25ff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8656,30 +8656,8 @@ in {
     };
   };
 
-  fastimport = buildPythonPackage rec {
-    name = "fastimport-${version}";
-    version = "0.9.4";
-
-    # Judging from SyntaxError
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/f/fastimport/${name}.tar.gz";
-      sha256 = "0k8x7552ypx9rc14vbsvg2lc6z0r8pv9laah28pdwyynbq10825d";
-    };
-
-    checkPhase = ''
-      ${python.interpreter} -m unittest discover
-    '';
-
-    meta = {
-      homepage = https://launchpad.net/python-fastimport;
-      description = "VCS fastimport/fastexport parser";
-      maintainers = with maintainers; [ koral ];
-      license = licenses.gpl2Plus;
-    };
-  };
-
+  fastimport = callPackage ../development/python-modules/fastimport { };
+ 
   feedgen = callPackage ../development/python-modules/feedgen { };
 
   feedgenerator = callPackage ../development/python-modules/feedgenerator {