Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f4bedb49b767
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 38c7aa05eff8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 10, 2019

  1. git: Add git to update script 

    Otherwise the system's git will be used, which may not exist
or, as is the case with Ubuntu, not have the --sort flag for ls-remote.
    @NeQuissimus
    NeQuissimus committed Dec 10, 2019
    Copy the full SHA
    6870834 View commit details

  2. mill: 0.5.2 -> 0.5.3 (#75423)

    @scalavision @c0bw3b
    scalavision authored and c0bw3b committed Dec 10, 2019
    Copy the full SHA
    38c7aa0 View commit details
Showing with 7 additions and 4 deletions.
  1. +1 −1 pkgs/applications/version-management/git-and-tools/git/update.sh
  2. +6 −3 pkgs/development/tools/build-managers/mill/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/git-and-tools/git/update.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl common-updater-scripts jq
#!nix-shell -i bash -p curl common-updater-scripts jq git

set -eu -o pipefail

9 changes: 6 additions & 3 deletions pkgs/development/tools/build-managers/mill/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "mill";
version = "0.5.2";
version = "0.5.3";

src = fetchurl {
url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}";
sha256 = "14az9znpbaads5dbcfpzw38yipmncz94i6gcl6bdjgngn0barhga";
sha256 = "1m4p0d15qgayfnknvl99sd1kpgrqfaj1yczvwh7ip0gxcladn1wv";
};

nativeBuildInputs = [ makeWrapper ];
@@ -19,7 +19,10 @@ stdenv.mkDerivation rec {
runHook preInstall
install -Dm555 "$src" "$out/bin/.mill-wrapped"
# can't use wrapProgram because it sets --argv0
makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" --set JAVA_HOME "${jre}"
makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" \
--prefix PATH : "${jre}/bin" \
--set JAVA_HOME "${jre}" \
--set MILL_VERSION "${version}"
runHook postInstall
'';