Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1582510

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";

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";
+  };
+}