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