aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorClément Delafargue <39330590+clementd-fretlink@users.noreply.github.com>2019-10-08 14:30:49 +0200
committerGitHub <noreply@github.com>2019-10-08 14:30:49 +0200
commit2d492a117cf31d1a4951ae9e9dcc5dd6ebeabaa2 (patch)
tree2fed81e562802c9d539ac944fb7c684606c00ef8
parente3b8f435cbb59fd64743ab495dcffb3496fee8e5 (diff)
parentf55a64c688209e625e7e1ccb50e4db00ee1d8ec3 (diff)
downloadclever-tools-nix-2d492a117cf31d1a4951ae9e9dcc5dd6ebeabaa2.tar.gz
clever-tools-nix-2d492a117cf31d1a4951ae9e9dcc5dd6ebeabaa2.tar.zst
clever-tools-nix-2d492a117cf31d1a4951ae9e9dcc5dd6ebeabaa2.zip
Merge pull request #10 from clementd-fretlink/v1.6.2
Add v1.6.2
-rw-r--r--.gitignore1
-rw-r--r--README.md12
-rwxr-xr-xcheck.sh2
-rw-r--r--clever-tools/default.nix6
-rw-r--r--default.nix9
5 files changed, 24 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 92d225d..08dd670 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
1*.sw* 1*.sw*
2result 2result
3result-*
diff --git a/README.md b/README.md
index 3d9894a..9d744f5 100644
--- a/README.md
+++ b/README.md
@@ -5,3 +5,15 @@ Nix derivation to install clever-tools - see https://github.com/CleverCloud/clev
5## How to use it 5## How to use it
6 6
7[See the example.nix](https://github.com/fretlink/clever-tools-nix/blob/master/example.nix) 7[See the example.nix](https://github.com/fretlink/clever-tools-nix/blob/master/example.nix)
8
9## How to publish a new version
10
11First, edit `clever-tools/default.nix`, to update the version number. For the expected hash, you can put `0000000000000000000000000000000000000000000000000000` (52 zeroes).
12
13Then, edit `default.nix`, update the `callPackage` line to the new version, as well as the `latest` value.
14
15Once you've done that, add a `mkOlderVersion` for the previous latest version. Once again, you can use the null hash for `sha256`.
16
17Then, run `nix build`. It will give you the correct values for the hashes. Correct those, run it again and you'll see `result-` directories, one per version. Go ahead and make sure they all work.
18
19Finally, don't forget to update `check.sh` with the latest version number.
diff --git a/check.sh b/check.sh
index 120dfa5..e08a588 100755
--- a/check.sh
+++ b/check.sh
@@ -1 +1 @@
[ "$(clever --version)" == "1.4.2" ] [ "$(clever --version)" == "1.6.2" ]
diff --git a/clever-tools/default.nix b/clever-tools/default.nix
index 72d966e..4884860 100644
--- a/clever-tools/default.nix
+++ b/clever-tools/default.nix
@@ -2,11 +2,11 @@
2 2
3stdenv.mkDerivation rec { 3stdenv.mkDerivation rec {
4 name = "clever-tools-${version}"; 4 name = "clever-tools-${version}";
5 version = "1.4.2"; 5 version = "1.6.2";
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.clever-cloud.com/releases/${version}/clever-tools-${version}_linux.tar.gz";
9 sha256 = "080q7z526g5hikm8gy7i8fjm2kv656r17dcmgi0d8jg7w0z5759c"; 9 sha256 = "00kmk1dxfs5d8qj74qj917gcssq0c1gm513wq4a7a4v5fm4zmirl";
10 }; 10 };
11 11
12 libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc glibc ]; 12 libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc glibc ];
diff --git a/default.nix b/default.nix
index 908a3c2..c2eaf10 100644
--- a/default.nix
+++ b/default.nix
@@ -30,7 +30,12 @@ in rec {
30 sha256 = "1r7n6cn2hj15a9msp55bbrb4j3srpmx00dxjj8vf0h5wagy8h1r5"; 30 sha256 = "1r7n6cn2hj15a9msp55bbrb4j3srpmx00dxjj8vf0h5wagy8h1r5";
31 }; 31 };
32 32
33 v1_4_2 = callPackage ./clever-tools {}; 33 v1_4_2 = mkOlderVersion {
34 rev = "e3b8f435cbb59fd64743ab495dcffb3496fee8e5";
35 sha256 = "1wnz52m0ilsi18yrrv4iw2629ja0kjhqf53aldyrfb32ri8zcjxg";
36 };
37
38 v1_6_2 = callPackage ./clever-tools {};
34 39
35 latest = v1_4_2; 40 latest = v1_6_2;
36} 41}