From 615a108434e9ac7f086754f002dd56f6e6844a2c Mon Sep 17 00:00:00 2001 From: Hussein Ait-Lahcen Date: Mon, 25 Feb 2019 14:11:57 +0100 Subject: split installPhase, introduce clever 1.3.0 and update changelog --- CHANGELOG.md | 4 ++++ check.sh | 2 +- clever-tools/default.nix | 11 +++++++---- default.nix | 7 ++++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b37960..931c34d 100644 --- 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 8515fa4..7525fed 100755 --- 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 9ac69e6..18f85ec 100644 --- 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 bed769c..79d6ef2 100644 --- 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 {}; } -- cgit v1.2.3