ammonite: add scala-2.13 version

authored by volth and committed by Tim Steinbach 1673f3d4 b952f5dd

+19 -15
+15 -14
pkgs/development/tools/ammonite/default.nix
··· 1 - { stdenv, lib, fetchurl, makeWrapper, jre, gnused 2 , disableRemoteLogging ? true 3 }: 4 5 with stdenv.lib; 6 stdenv.mkDerivation rec { 7 pname = "ammonite"; 8 version = "1.7.1"; 9 - scalaVersion = "2.12"; 10 11 src = fetchurl { 12 url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; 13 - sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0"; 14 }; 15 16 - propagatedBuildInputs = [ jre ] ; 17 - buildInputs = [ makeWrapper gnused ] ; 18 - 19 phases = "installPhase"; 20 21 installPhase = '' 22 - mkdir -p $out/bin 23 - cp ${src} $out/bin/amm 24 - chmod +x $out/bin/amm 25 - ${gnused}/bin/sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm 26 '' + optionalString (disableRemoteLogging) '' 27 - ${gnused}/bin/sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm 28 ''; 29 30 meta = { ··· 36 that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh. 37 ''; 38 homepage = http://www.lihaoyi.com/Ammonite/; 39 - license = lib.licenses.mit; 40 - platforms = lib.platforms.all; 41 - maintainers = [ lib.maintainers.nequissimus ]; 42 }; 43 }
··· 1 + { stdenv, fetchurl, jre 2 , disableRemoteLogging ? true 3 }: 4 5 with stdenv.lib; 6 + 7 + let 8 + common = { scalaVersion, sha256 }: 9 stdenv.mkDerivation rec { 10 pname = "ammonite"; 11 version = "1.7.1"; 12 13 src = fetchurl { 14 url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; 15 + inherit sha256; 16 }; 17 18 phases = "installPhase"; 19 20 installPhase = '' 21 + install -Dm755 ${src} $out/bin/amm 22 + sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm 23 '' + optionalString (disableRemoteLogging) '' 24 + sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm 25 ''; 26 27 meta = { ··· 33 that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh. 34 ''; 35 homepage = http://www.lihaoyi.com/Ammonite/; 36 + license = licenses.mit; 37 + platforms = platforms.all; 38 + maintainers = [ maintainers.nequissimus ]; 39 }; 40 + }; 41 + in { 42 + ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0"; }; 43 + ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "01dyc6bilhcr1mwrpmhjc8nhzfqgjh44bx36gd3gk9mkvlbys5mp"; }; 44 }
+4 -1
pkgs/top-level/all-packages.nix
··· 576 inherit (darwin.apple_sdk.frameworks) Security; 577 }; 578 579 - ammonite = callPackage ../development/tools/ammonite {}; 580 581 amp = callPackage ../applications/editors/amp {}; 582
··· 576 inherit (darwin.apple_sdk.frameworks) Security; 577 }; 578 579 + inherit (callPackages ../development/tools/ammonite {}) 580 + ammonite_2_12 581 + ammonite_2_13; 582 + ammonite = if scala == scala_2_12 then ammonite_2_12 else ammonite_2_13; 583 584 amp = callPackage ../applications/editors/amp {}; 585