about summary refs log tree commit diff
path: root/pkgs/development/tools/build-managers
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-04-18 07:42:26 +0200
committerVladimír Čunát <v@cunat.cz>2020-04-18 07:42:26 +0200
commitd96487b9cadb27aba64cb05c2e4962fb3c9e1890 (patch)
tree901e2d0a53fd23b7579ca3dddfbd8b533c46d39c /pkgs/development/tools/build-managers
parent312e9037f49bf0b163d071dc68fe76c2b5d77319 (diff)
parenteb4acb6ca9c4482e7a65d4b1aaf4ec7c48ea6641 (diff)
downloadnixlib-d96487b9cadb27aba64cb05c2e4962fb3c9e1890.tar
nixlib-d96487b9cadb27aba64cb05c2e4962fb3c9e1890.tar.gz
nixlib-d96487b9cadb27aba64cb05c2e4962fb3c9e1890.tar.bz2
nixlib-d96487b9cadb27aba64cb05c2e4962fb3c9e1890.tar.lz
nixlib-d96487b9cadb27aba64cb05c2e4962fb3c9e1890.tar.xz
nixlib-d96487b9cadb27aba64cb05c2e4962fb3c9e1890.tar.zst
nixlib-d96487b9cadb27aba64cb05c2e4962fb3c9e1890.zip
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1582510
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r--pkgs/development/tools/build-managers/shards/default.nix19
-rw-r--r--pkgs/development/tools/build-managers/shards/shards.nix8
2 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
index 7f0cc8100ac0..4ad78778a916 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -1,27 +1,18 @@
 { stdenv, fetchFromGitHub, crystal, pcre, libyaml, which }:
 
-stdenv.mkDerivation rec {
+crystal.buildCrystalPackage rec {
   pname = "shards";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner  = "crystal-lang";
     repo   = "shards";
     rev    = "v${version}";
-    sha256 = "19q0xww4v0h5ln9gz8d8zv0c9ig761ik7gw8y31yxynzgzihwpf4";
+    sha256 = "1bjy3hcdqq8769bx73f3pwn26rnkj23dngyfbw4iv32bw23x1d49";
   };
 
-  buildInputs = [ crystal libyaml pcre which ];
-
-  buildFlags = [ "CRFLAGS=--release" ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 bin/shards $out/bin/shards
-
-    runHook postInstall
-  '';
+  shardsFile = ./shards.nix;
+  crystalBinaries.shards.src = "./src/shards.cr";
 
   meta = with stdenv.lib; {
     description = "Dependency manager for the Crystal language";
diff --git a/pkgs/development/tools/build-managers/shards/shards.nix b/pkgs/development/tools/build-managers/shards/shards.nix
new file mode 100644
index 000000000000..901b7f6e47d1
--- /dev/null
+++ b/pkgs/development/tools/build-managers/shards/shards.nix
@@ -0,0 +1,8 @@
+{
+  molinillo = {
+    owner = "crystal-lang";
+    repo = "crystal-molinillo";
+    rev = "v0.1.0";
+    sha256 = "0rs0w59m6ccsgkdxfy3xv6alxsziy9sy9smz71cz0dnyvlzlnaxj";
+  };
+}