diff options
author | Hussein A <44173825+haitlahcen@users.noreply.github.com> | 2019-02-25 15:12:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-25 15:12:50 +0100 |
commit | 2ea3abd717a23803bb936b49791d302d08cd29a6 (patch) | |
tree | 70558f1745720a1e9df7bcceeccf414e5bbbc7c3 | |
parent | 2f7e1a82773077034b335e3fa0a36ca41fc18032 (diff) | |
parent | 615a108434e9ac7f086754f002dd56f6e6844a2c (diff) | |
download | clever-tools-nix-2ea3abd717a23803bb936b49791d302d08cd29a6.tar.gz clever-tools-nix-2ea3abd717a23803bb936b49791d302d08cd29a6.tar.zst clever-tools-nix-2ea3abd717a23803bb936b49791d302d08cd29a6.zip |
Merge pull request #7 from haitlahcen/clever-1.3.0
Refactor and introduce clever-tools 1.3.0
-rw-r--r-- | CHANGELOG.md | 4 | ||||
-rwxr-xr-x | check.sh | 2 | ||||
-rw-r--r-- | clever-tools/default.nix | 11 | ||||
-rw-r--r-- | 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 | ## 1.3.0 | ||
2 | |||
3 | * split the `installPhase` by extracting the `unpackPhase` | ||
4 | |||
1 | ## 1.1.0 | 5 | ## 1.1.0 |
2 | 6 | ||
3 | * Get rid of nodegit, not being used anymore by clever-tools. | 7 | * Get rid of nodegit, not being used anymore by clever-tools. |
@@ -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 @@ | |||
2 | 2 | ||
3 | stdenv.mkDerivation rec { | 3 | stdenv.mkDerivation rec { |
4 | name = "clever-tools-${version}"; | 4 | name = "clever-tools-${version}"; |
5 | version = "1.1.0"; | 5 | version = "1.3.0"; |
6 | 6 | ||
7 | src = fetchurl { | 7 | src = fetchurl { |
8 | url = "https://clever-tools.cellar.services.clever-cloud.com/releases/${version}/clever-tools-${version}_linux.tar.gz"; | 8 | url = "https://clever-tools.cellar.services.clever-cloud.com/releases/${version}/clever-tools-${version}_linux.tar.gz"; |
9 | sha256 = "1lkwckmlz2gf41xmnzydpcbly0jcry3bn8lp570gha768ic7xmb1"; | 9 | sha256 = "03dasjxkg6x6f5d3l7dacc2h9v1i9q1vfzppnlzdpzkzkgv9vy6n"; |
10 | }; | 10 | }; |
11 | 11 | ||
12 | libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc glibc ]; | 12 | libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc glibc ]; |
13 | 13 | ||
14 | installPhase = '' | 14 | unpackPhase = '' |
15 | tar --extract --file=$src | 15 | tar --extract --file=$src |
16 | ''; | ||
17 | |||
18 | installPhase = '' | ||
16 | bin=$out/bin/clever | 19 | bin=$out/bin/clever |
17 | mkdir -p $out/bin | 20 | mkdir -p $out/bin |
18 | mv clever $bin | 21 | mv clever-tools-${version}_linux/clever $bin |
19 | ''; | 22 | ''; |
20 | 23 | ||
21 | dontStrip = "true"; | 24 | 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 | |||
16 | sha256 = "1n831iw55di0s2izbl03xivs59792swfji2n46vhi3mkdawrsjkg"; | 16 | sha256 = "1n831iw55di0s2izbl03xivs59792swfji2n46vhi3mkdawrsjkg"; |
17 | }; | 17 | }; |
18 | 18 | ||
19 | # 1.1.0 | 19 | v1_1_1 = mkOlderVersion { |
20 | rev = "63d289fd2f02a4d45e60f61e11f8dd9d3b4963fc"; | ||
21 | sha256 = "14ni1iaygbxihihmjiv7a7cg1q83y15lpqdp54frfyymjb7y12nj"; | ||
22 | }; | ||
23 | |||
24 | # 1.3.0 | ||
20 | latest = callPackage ./clever-tools {}; | 25 | latest = callPackage ./clever-tools {}; |
21 | } | 26 | } |