summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2021-07-20 10:23:48 -0700
committerJonathan Ringer <jonringer@users.noreply.github.com>2021-08-01 22:56:38 -0700
commit71e370e534b5de281f5e5dbd758a9b5c0ac18f6b (patch)
tree9a3e3b511e9fdbb1229a677de328f84c4dbd9db8
parentMerge pull request #131961 from NixOS/backport-131954-to-release-21.05 (diff)
downloadnixpkgs-71e370e534b5de281f5e5dbd758a9b5c0ac18f6b.tar.gz
mill: 0.9.6 -> 0.9.9
Use the `${version}-assembly` artifact, which avoids having to download it using the release script (cherry picked from commit 74090eb68a2fd8e0a6ef0000f36a784ed2d27194)
-rw-r--r--pkgs/development/tools/build-managers/mill/default.nix16
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index 4fbd0365af95..27a21619c1d7 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mill";
- version = "0.9.6";
+ version = "0.9.9";
src = fetchurl {
- url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}";
- sha256 = "sha256-cAhcTmSPkV5z5ryuCNrpxy9/1iWvvminiVYul9c/DwM=";
+ url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
+ sha256 = "sha256-HIT7bxMEz7jpSsYvohN9+zYuyCf/ARE7hd48YMTo9/4=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
dontConfigure = true;
dontBuild = true;
+ # this is mostly downloading a pre-built artifact
+ preferLocal = true;
+
installPhase = ''
runHook preInstall
install -Dm555 "$src" "$out/bin/.mill-wrapped"
@@ -25,6 +28,13 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
+ doInstallCheck = true;
+ # The default release is a script which will do an impure download
+ # just ensure that the application can run without network
+ installCheckPhase = ''
+ $out/bin/mill --help > /dev/null
+ '';
+
meta = with lib; {
homepage = "https://www.lihaoyi.com/mill";
license = licenses.mit;