Merge branch 'master.upstream' into staging.post-15.06

2 files changed, 25 insertions, 19 deletions

diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index c8b5131bf75d..011ebf7198e6 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -1,29 +1,13 @@
 { lib, pythonPackages, fetchgit, libxslt, docbook5_xsl, openssh }:
 
-let
-
-  # Use this until the patches are upstreamed.
-  # Warning: will be rebased at will
-  libcloud = lib.overrideDerivation pythonPackages.libcloud ( args: {
-    src = fetchgit {
-      url = https://github.com/Phreedom/libcloud.git;
-      rev = "784427f549829a00d551e3468184a708420ad1ec";
-      sha256 = "fd0e092b39fa1fde6a8847e6dc69855d30c2dad9e95ee0373297658ff53edf8a";
-    };
-
-    preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py";
-  });
-
-in
-
 pythonPackages.buildPythonPackage rec {
   name = "nixops-1.3pre-cefcd9ba";
   namePrefix = "";
 
   src = fetchgit {
     url = https://github.com/NixOS/nixops;
-    rev = "cefcd9bae9a4d3bac83f188460619d18972321a8";
-    sha256 = "1jwkbnfwics2j0m6mr75rz914vg0z46d2xv0z1717c1ac5rki0l2";
+    rev = "9a05ebc332701247fa99fbf6d1215d48e08f3edd";
+    sha256 = "17vxr51wpdd5dnasiaafga3a6ddhxyrwgr0yllczxj6bq0n5skp2";
   };
 
   buildInputs = [ /* libxslt */ pythonPackages.nose pythonPackages.coverage ];
@@ -32,7 +16,7 @@ pythonPackages.buildPythonPackage rec {
     [ pythonPackages.prettytable
       pythonPackages.boto
       pythonPackages.hetzner
-      libcloud
+      pythonPackages.libcloud
       pythonPackages.sqlite3
     ];
 
diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix
new file mode 100644
index 000000000000..bd51e2082d92
--- /dev/null
+++ b/pkgs/tools/text/zimwriterfs/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchgit, automake, autoconf, libtool, lzma, pkgconfig, zimlib, file, zlib }:
+
+stdenv.mkDerivation {
+  name = "zimwriterfs";
+  version = "20150710";
+
+  src = fetchgit {
+    url = https://gerrit.wikimedia.org/r/p/openzim.git;
+    rev = "165eab3e154c60b5b6436d653dc7c90f56cf7456";
+    sha256 = "0x0d3rx6zcc8k66nqkacmwdvslrz70h9bliqawzv90ribq3alb0q";
+  };
+
+  buildInputs = [ automake autoconf libtool lzma pkgconfig zimlib file zlib ];
+  setSourceRoot = "cd openzim-*/zimwriterfs; export sourceRoot=`pwd`";
+  preConfigurePhases = [ "./autogen.sh" ];
+
+  meta = {
+    description = "A console tool to create ZIM files";
+    homepage = http://git.wikimedia.org/log/openzim;
+    maintainers = with stdenv.lib.maintainers; [ robbinch ];
+  };
+}