split installPhase, introduce clever 1.3.0 and update changelog

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b379600399b994095c0062d2458f559eba17eb3..931c34d6e3f1a495bcaab2205fbd9d52838265ab 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.3.0
+
+* split the `installPhase` by extracting the `unpackPhase`
+
 ## 1.1.0
 
 * Get rid of nodegit, not being used anymore by clever-tools.

diff --git a/check.sh b/check.sh
index 8515fa442c341dca2683b6d87f913a5e7364ce1e..7525fedd286f20bf46af2ebf4a0d86d30b6fceb1 100755 (executable)
--- a/check.sh
+++ b/check.sh
@@ -1 +1 @@
-[ "$(clever --version)" == "1.1.0" ]
+[ "$(clever --version)" == "1.3.0" ]

diff --git a/clever-tools/default.nix b/clever-tools/default.nix
index 9ac69e60b094f4931fe7b6567ae50226209b506d..18f85ecb62c2cd4947fb29f86afc12bdc09a5872 100644 (file)
--- a/clever-tools/default.nix
+++ b/clever-tools/default.nix
@@ -2,20 +2,23 @@
 
 stdenv.mkDerivation rec {
   name = "clever-tools-${version}";
-  version = "1.1.0";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "https://clever-tools.cellar.services.clever-cloud.com/releases/${version}/clever-tools-${version}_linux.tar.gz";
-    sha256 = "1lkwckmlz2gf41xmnzydpcbly0jcry3bn8lp570gha768ic7xmb1";
+    sha256 = "03dasjxkg6x6f5d3l7dacc2h9v1i9q1vfzppnlzdpzkzkgv9vy6n";
   };
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc glibc ];
 
-  installPhase = ''
+  unpackPhase = ''
     tar --extract --file=$src
+  '';
+
+  installPhase = ''
     bin=$out/bin/clever
     mkdir -p $out/bin
-    mv clever $bin
+    mv clever-tools-${version}_linux/clever $bin
   '';
 
   dontStrip = "true";

diff --git a/default.nix b/default.nix
index bed769c3b3d935a09ddd00d70cdcdbc45173fa8c..79d6ef2148620726a51f5263e9554ded7c20fd13 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -16,6 +16,11 @@ in
     sha256 = "1n831iw55di0s2izbl03xivs59792swfji2n46vhi3mkdawrsjkg";
   };
 
-  # 1.1.0
+  v1_1_1 = mkOlderVersion {
+    rev = "63d289fd2f02a4d45e60f61e11f8dd9d3b4963fc";
+    sha256 = "14ni1iaygbxihihmjiv7a7cg1q83y15lpqdp54frfyymjb7y12nj";
+  };
+
+  # 1.3.0
   latest = callPackage ./clever-tools {};
 }