alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

treewide: fix /bin/coursier references

Browse source 
After https://github.com/NixOS/nixpkgs/pull/142254 coursier provides its
binary as /bin/cs rather than /bin/coursier
This commit is contained in:
Fabián Heredia Montiel 2021-10-28 19:48:26 -05:00
parent 83fdaff9f7
commit fc6ccc25cc
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/compilers/scala-runners/default.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = ''
mkdir -p $out/bin $out/lib
sed -ie "s| cs | ${coursier}/bin/coursier |" scala-runner
sed -ie "s| cs | ${coursier}/bin/cs |" scala-runner
cp scala-runner $out/lib
ln -s $out/lib/scala-runner $out/bin/scala
ln -s $out/lib/scala-runner $out/bin/scalac

2
pkgs/development/tools/build-managers/bloop/default.nix
View file

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
mkdir channel
ln -s ${bloop-coursier-channel} channel/bloop.json
${coursier}/bin/coursier install --install-dir $out --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop
${coursier}/bin/cs install --install-dir $out --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop
# Remove binary part of the coursier launcher script to make derivation output hash stable
sed -i '5,$ d' $out/bloop

2
pkgs/development/tools/metals/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
name = "${pname}-deps-${version}";
buildCommand = ''
export COURSIER_CACHE=$(pwd)
${coursier}/bin/coursier fetch org.scalameta:metals_2.12:${version} \
${coursier}/bin/cs fetch org.scalameta:metals_2.12:${version} \
-r bintray:scalacenter/releases \
-r sonatype:snapshots > deps
mkdir -p $out/share/java

2
pkgs/development/tools/scalafix/default.nix
View file

@ -7,7 +7,7 @@ let
name = "${baseName}-deps-${version}";
buildCommand = ''
export COURSIER_CACHE=$(pwd)
${coursier}/bin/coursier fetch ch.epfl.scala:scalafix-cli_2.12.7:${version} > deps
${coursier}/bin/cs fetch ch.epfl.scala:scalafix-cli_2.12.7:${version} > deps
mkdir -p $out/share/java
cp $(< deps) $out/share/java/
'';

2
pkgs/development/tools/scalafmt/default.nix
View file

@ -7,7 +7,7 @@ let
name = "${baseName}-deps-${version}";
buildCommand = ''
export COURSIER_CACHE=$(pwd)
${coursier}/bin/coursier fetch org.scalameta:scalafmt-cli_2.13:${version} > deps
${coursier}/bin/cs fetch org.scalameta:scalafmt-cli_2.13:${version} > deps
mkdir -p $out/share/java
cp $(< deps) $out/share/java/
'';