From 2a0ec8b4456b7aa210d18419e816c3c8fccfe4a6 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Tue, 5 Jun 2018 19:29:34 +0200
Subject: [PATCH 1/2] ctmg: add 1.2

---
 pkgs/tools/security/ctmg/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/security/ctmg/default.nix

diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/tools/security/ctmg/default.nix
new file mode 100644
index 000000000000..270e702cf110
--- /dev/null
+++ b/pkgs/tools/security/ctmg/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, ...  }:
+
+stdenv.mkDerivation rec {
+  name    = "ctmg-${version}";
+  version = "1.2";
+
+  src = fetchurl {
+    url    = "https://git.zx2c4.com/ctmg/snapshot/ctmg-${version}.tar.xz";
+    sha256 = "1djxrf66abl63cybxfgjshr8avbp6nq158d0jx4mlfa3pdj32kv9";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ctmg.sh $out/bin/ctmg
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An encrypted container manager for Linux using cryptsetup";
+    homepage    = https://git.zx2c4.com/ctmg/about/;
+    license     = licenses.free;
+    maintainers = with maintainers; [ mrVanDalo ];
+    platforms   = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8906893112d8..a3a81001b470 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7816,6 +7816,8 @@ with pkgs;
 
   ctodo = callPackage ../applications/misc/ctodo { };
 
+  ctmg = callPackage ../tools/security/ctmg { };
+
   cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { };
 
   cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { };

From 706cc4ac68af7a04ec2881f4127b7663f2789755 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Tue, 5 Jun 2018 22:05:11 +0300
Subject: [PATCH 2/2] ctmg: review

---
 pkgs/tools/security/ctmg/default.nix | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/tools/security/ctmg/default.nix
index 270e702cf110..1e0618412210 100644
--- a/pkgs/tools/security/ctmg/default.nix
+++ b/pkgs/tools/security/ctmg/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, fetchurl, ...  }:
+{ stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name    = "ctmg-${version}";
+  name = "ctmg-${version}";
   version = "1.2";
 
-  src = fetchurl {
-    url    = "https://git.zx2c4.com/ctmg/snapshot/ctmg-${version}.tar.xz";
-    sha256 = "1djxrf66abl63cybxfgjshr8avbp6nq158d0jx4mlfa3pdj32kv9";
+  src = fetchzip {
+    url = "https://git.zx2c4.com/ctmg/snapshot/ctmg-${version}.tar.xz";
+    sha256 = "1i4v8sriwjrmj3yizbl1ysckb711yl9qsn9x45jq0ij1apsydhyc";
   };
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ctmg.sh $out/bin/ctmg
-  '';
+  installPhase = "install -D ctmg.sh $out/bin/ctmg";
 
   meta = with stdenv.lib; {
     description = "An encrypted container manager for Linux using cryptsetup";
-    homepage    = https://git.zx2c4.com/ctmg/about/;
-    license     = licenses.free;
+    homepage = https://git.zx2c4.com/ctmg/about/;
+    license = licenses.isc;
     maintainers = with maintainers; [ mrVanDalo ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }
-