Merge staging-next into staging

pkgs/development/tools/build-managers/mill/default.nix

@@ -21,8 +21,7 @@ stdenv.mkDerivation rec {
     # can't use wrapProgram because it sets --argv0
     makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" \
       --prefix PATH : "${jre}/bin" \
-      --set JAVA_HOME "${jre}" \
-      --set MILL_VERSION "${version}"
+      --set JAVA_HOME "${jre}"
     runHook postInstall
   '';
 

pkgs/development/tools/build-managers/sbt-extras/default.nix

@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "sbt-extras";
-  rev = "a36958f50bf8806c13f7c67ab0f13936e189351b";
-  version = "2020-11-08";
+  rev = "b3ecc86936d005dc3327ebd6b61a33d625d60ee6";
+  version = "2020-11-17";
 
   src = fetchFromGitHub {
     owner = "paulp";
     repo = "sbt-extras";
     inherit rev;
-    sha256 = "1xp5r7ia8r2nr4g76wp0mnh95d5ha0dblsqvgicq240dgc28360r";
+    sha256 = "0cnwvjqs81ca0ssj02x41fq6fn1drqwzpbc7v006vgbard8ww9xb";
   };
 
   dontBuild = true;

pkgs/development/tools/build-managers/sbt/default.nix

@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   pname = "sbt";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchurl {
     url =
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
-    sha256 = "1dw4l91sw4ybqxjid1hsb6r33ka5bl85rfdrbsr9m5vxl82a3mmc";
+    sha256 = "17h1lqnas276515y49fvpcysf8hkkrqq60kwbvyz68yvdrs5rrwr";
   };
 
   patchPhase = ''

pkgs/development/tools/build-managers/shards/default.nix

@@ -1,30 +1,56 @@
-{ stdenv, fetchFromGitHub, crystal }:
+{ stdenv
+, fetchFromGitHub
+, crystal_0_34
+, crystal_0_35
+}:
 
-crystal.buildCrystalPackage rec {
-  pname = "shards";
-  version = "0.10.0";
+let
+  generic = (
+    { version
+    , sha256
+    , crystal
+    }:
 
-  src = fetchFromGitHub {
-    owner = "crystal-lang";
-    repo = "shards";
-    rev = "v${version}";
-    sha256 = "1bjy3hcdqq8769bx73f3pwn26rnkj23dngyfbw4iv32bw23x1d49";
+    crystal.buildCrystalPackage {
+      pname = "shards";
+      inherit version;
+
+      src = fetchFromGitHub {
+        owner = "crystal-lang";
+        repo  = "shards";
+        rev   = "v${version}";
+        inherit sha256;
+      };
+
+      # we cannot use `make` here as it would introduce a dependency on itself
+      format = "crystal";
+      shardsFile = ./shards.nix;
+      crystalBinaries.shards.src = "./src/shards.cr";
+
+      # tries to execute git which fails spectacularly
+      doCheck = false;
+
+      meta = with stdenv.lib; {
+        description = "Dependency manager for the Crystal language";
+        license = licenses.asl20;
+        maintainers = with maintainers; [ peterhoeg ];
+        inherit (crystal.meta) homepage platforms;
+      };
+    }
+  );
+
+in rec {
+  shards_0_11 = generic {
+    version = "0.11.1";
+    sha256 = "05qnhc23xbmicdl4fwyxfpcvd8jq4inzh6v7jsjjw4n76vzb1f71";
+    crystal = crystal_0_34;
   };
 
-  # we cannot use `make` here as it would introduce a dependency on itself
-  format = "crystal";
-
-  shardsFile = ./shards.nix;
-
-  crystalBinaries.shards.src = "./src/shards.cr";
-
-  # tries to execute git which fails spectacularly
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "Dependency manager for the Crystal language";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ peterhoeg ];
-    inherit (crystal.meta) homepage platforms;
+  shards_0_12 = generic {
+    version = "0.12.0";
+    sha256 = "0dginczw1gc5qlb9k4b6ldxzqz8n97jrrnjvj3mm9wcdbc9j6h3c";
+    crystal = crystal_0_35;
   };
+
+  shards = shards_0_12;
 }