summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2016-09-29 09:08:53 +0200
committerGitHub <noreply@github.com>2016-09-29 09:08:53 +0200
commit33b3bd6b368ef2ee9b67df2f01cb7d6fcf68d91b (patch)
tree803adf2981b8b2ff67be167012f6b81d69191573
parent1729dcd264a4066b45e6a65936e749a9b3191cc7 (diff)
parentd945046be9367912c80ec951eb9cfbf8f8815449 (diff)
downloadnixlib-33b3bd6b368ef2ee9b67df2f01cb7d6fcf68d91b.tar
nixlib-33b3bd6b368ef2ee9b67df2f01cb7d6fcf68d91b.tar.gz
nixlib-33b3bd6b368ef2ee9b67df2f01cb7d6fcf68d91b.tar.bz2
nixlib-33b3bd6b368ef2ee9b67df2f01cb7d6fcf68d91b.tar.lz
nixlib-33b3bd6b368ef2ee9b67df2f01cb7d6fcf68d91b.tar.xz
nixlib-33b3bd6b368ef2ee9b67df2f01cb7d6fcf68d91b.tar.zst
nixlib-33b3bd6b368ef2ee9b67df2f01cb7d6fcf68d91b.zip
Merge pull request #18963 from rycee/package/xdxf2slob
Add xdxf2slob tool and dependencies
-rw-r--r--pkgs/tools/misc/xdxf2slob/default.nix22
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix52
3 files changed, 76 insertions, 0 deletions
diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix
new file mode 100644
index 000000000000..b5c3f9371459
--- /dev/null
+++ b/pkgs/tools/misc/xdxf2slob/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  name = "xdxf2slob-unstable-2015-06-30";
+
+  src = fetchFromGitHub {
+    owner = "itkach";
+    repo = "xdxf2slob";
+    rev = "6831b93c3db8c73200900fa4ddcb17350a677e1b";
+    sha256 = "0m3dnc3816ja3kmik1wabb706dkqdf5sxvabwgf2rcrq891xcddd";
+  };
+
+  propagatedBuildInputs = [ python3Packages.PyICU python3Packages.slob ];
+
+  meta = with stdenv.lib; {
+    description = "Tool to convert XDXF dictionary files to slob format";
+    homepage = https://github.com/itkach/xdxf2slob/;
+    license = licenses.gpl3;
+    maintainer = [ maintainers.rycee ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9702500fc382..f74390771ca7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4234,6 +4234,8 @@ in
 
   xdummy = callPackage ../tools/misc/xdummy { };
 
+  xdxf2slob = callPackage ../tools/misc/xdxf2slob { };
+
   xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { };
 
   xflux = callPackage ../tools/misc/xflux { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4430583ba580..31be94fd0226 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19584,6 +19584,33 @@ in modules // {
     };
   };
 
+  PyICU = buildPythonPackage rec {
+    name = "PyICU-1.9.3";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/P/PyICU/${name}.tar.gz";
+      sha256 = "0hps2314w7ddiwhqgw249m3hgqnny7qn542vz26jxr5k5hhrcyhs";
+    };
+
+    buildInputs = [ pkgs.icu ];
+
+    patches = [
+      # Fixes a bug in the test suite.
+      (pkgs.fetchpatch {
+        url = "https://github.com/ovalhub/pyicu/commit/6ab20d48d85638acb3a811c8676f713bd26f0df9.patch";
+        sha256 = "0z4585r6bi0xxvrr93n450ka43vixx9zd063qna078vck0i3bkjg";
+      })
+    ];
+
+    meta = {
+      homepage = https://pypi.python.org/pypi/PyICU/;
+      description = "Python extension wrapping the ICU C++ API";
+      license = licenses.mit;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   pyinotify = buildPythonPackage rec {
     name = "pyinotify";
     version = "0.9.6";
@@ -22380,6 +22407,31 @@ in modules // {
     };
   };
 
+  slob = buildPythonPackage rec {
+    name = "slob-unstable-2016-03-04";
+
+    disabled = !isPy3k;
+
+    src = pkgs.fetchFromGitHub {
+      owner = "itkach";
+      repo = "slob";
+      rev = "31ad0e769360a5b10a4893f686587bb8e48c3895";
+      sha256 = "06yn510178awhjsvy88cpjz7rlmyviqd5g58gc8gf4ivyqdlqbsl";
+    };
+
+    propagatedBuildInputs = [ self.PyICU ];
+
+    checkPhase = "python3 -m unittest slob";
+
+    meta = {
+      homepage = https://github.com/itkach/slob/;
+      description = "Reference implementation of the slob (sorted list of blobs) format";
+      license = licenses.gpl3;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   slowaes = buildPythonPackage rec {
     name = "slowaes-${version}";
     version = "0.1a1";