summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-01-01 11:46:35 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-01-01 11:46:35 +0100
commite0caf82ccf7c051f14d03d7c1e4d058a2dacd08f (patch)
tree46c4f6fe0b20d01a5b07d7755f70294ff3c4a99a /pkgs
parente92a133238aea65770556631bdff307855ecdc77 (diff)
downloadnixlib-e0caf82ccf7c051f14d03d7c1e4d058a2dacd08f.tar
nixlib-e0caf82ccf7c051f14d03d7c1e4d058a2dacd08f.tar.gz
nixlib-e0caf82ccf7c051f14d03d7c1e4d058a2dacd08f.tar.bz2
nixlib-e0caf82ccf7c051f14d03d7c1e4d058a2dacd08f.tar.lz
nixlib-e0caf82ccf7c051f14d03d7c1e4d058a2dacd08f.tar.xz
nixlib-e0caf82ccf7c051f14d03d7c1e4d058a2dacd08f.tar.zst
nixlib-e0caf82ccf7c051f14d03d7c1e4d058a2dacd08f.zip
python.pkgs.regex: move expression
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/regex/default.nix23
-rw-r--r--pkgs/top-level/python-packages.nix20
2 files changed, 24 insertions, 19 deletions
diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
new file mode 100644
index 000000000000..0e58aafc1b6a
--- /dev/null
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -0,0 +1,23 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+
+buildPythonPackage rec {
+  pname = "regex";
+  version = "2016.11.18";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "126ds2b355n3pgl7brshhscpxn14ycs0yznzl8k4akj4sps1i6c6";
+  };
+
+  meta = {
+    description = "Alternative regular expression module, to replace re";
+    homepage = "https://bitbucket.org/mrabarnett/mrab-regex";
+    license = lib.licenses.psfl;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ abbradar ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b4ec2cf73fc7..53367981a249 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7000,23 +7000,7 @@ in {
     };
   };
 
-  regex = buildPythonPackage rec {
-    name = "regex-${version}";
-    version = "2016.11.18";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/regex/${name}.tar.gz";
-      sha256 = "126ds2b355n3pgl7brshhscpxn14ycs0yznzl8k4akj4sps1i6c6";
-    };
-
-    meta = {
-      description = "Alternative regular expression module, to replace re";
-      homepage = "https://bitbucket.org/mrabarnett/mrab-regex";
-      license = licenses.psfl;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ abbradar ];
-    };
-  };
+  regex = callPackage ../development/python-modules/regex { };
 
   repoze_lru = buildPythonPackage rec {
     name = "repoze.lru-0.6";
@@ -7032,8 +7016,6 @@ in {
     };
   };
 
-
-
   repoze_sphinx_autointerface = buildPythonPackage rec {
     name = "repoze.sphinx.autointerface-0.7.1";