Merge branch 'master.upstream' into staging.upstream

1 files changed, 21 insertions, 10 deletions

diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix
index d8c88b6ee657..6b442e7bf660 100644
--- a/pkgs/tools/archivers/innoextract/default.nix
+++ b/pkgs/tools/archivers/innoextract/default.nix
@@ -1,10 +1,21 @@
-{stdenv, fetchurl, cmake, python, doxygen, lzma, boost}:

-stdenv.mkDerivation rec {

-  name = "innoextract-1.4";

-  src = fetchurl {

-    url = "http://constexpr.org/innoextract/files/${name}.tar.gz";

-    sha256 = "1j8wj0ijdnfh0r9qjr7ykp9v3n2yd4qisxln81bl6474w5d4njas";

-  };

-  buildInputs = [ python doxygen lzma boost ];

-  nativeBuildInputs = [ cmake ];

-}
\ No newline at end of file
+{stdenv, fetchurl, cmake, python, doxygen, lzma, boost}:
+
+stdenv.mkDerivation rec {
+  name = "innoextract-1.5";
+
+  src = fetchurl {
+    url = "http://constexpr.org/innoextract/files/${name}.tar.gz";
+    sha256 = "1ks8z8glak63xvqlv7dnmlzkjrwsn81lhybmai2mja6g5jclwngj";
+  };
+
+  buildInputs = [ python doxygen lzma boost ];
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "A tool to unpack installers created by Inno Setup";
+    homepage = "http://constexpr.org/innoextract/";
+    platforms = platforms.linux;
+    license = licenses.zlib;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}