Unverified Commit 87695e30 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #143512 from LibreCybernetics/treewide-coursier

parents ad5aba1e fc6ccc25

pkgs/development/compilers/scala-runners/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/development/tools/metals/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/development/tools/scalafix/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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/

    '';

pkgs/development/tools/scalafmt/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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/

    '';