From fc6ccc25ccc31315be234e53ec6aa385107d61d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 28 Oct 2021 19:48:26 -0500 Subject: [PATCH] treewide: fix /bin/coursier references After https://github.com/NixOS/nixpkgs/pull/142254 coursier provides its binary as /bin/cs rather than /bin/coursier --- pkgs/development/compilers/scala-runners/default.nix | 2 +- pkgs/development/tools/build-managers/bloop/default.nix | 2 +- pkgs/development/tools/metals/default.nix | 2 +- pkgs/development/tools/scalafix/default.nix | 2 +- pkgs/development/tools/scalafmt/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/scala-runners/default.nix b/pkgs/development/compilers/scala-runners/default.nix index 0f0de015af5f..57756b423d55 100644 --- a/pkgs/development/compilers/scala-runners/default.nix +++ b/pkgs/development/compilers/scala-runners/default.nix @@ -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 diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index d940e6ca54d1..8710d390dea0 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -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 diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 298c55c47e96..83060ecf113b 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -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 diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix index 666087e4f225..a38b6cee8524 100644 --- a/pkgs/development/tools/scalafix/default.nix +++ b/pkgs/development/tools/scalafix/default.nix @@ -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/ ''; diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index cf4faa36b558..07119dc75d67 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -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/ '';