From aebe8586bc94ffe6c828abd2712475a14b681108 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 4 Jul 2017 21:17:04 -0400 Subject: [PATCH 1/2] ammonite: 0.9.9 -> 1.0.0 --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 12551ed741c..feb6865566f 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "0.9.9"; + version = "1.0.0"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0qiqy681y1w21gjxw30kn44vxh9615j3825v06aq690p56w3rc63"; + sha256 = "0d74b3aasgg4ap5ishzzm4jbf1k4dxv7gzd88d69miyapsaa4p0c"; }; propagatedBuildInputs = [ jre ] ; From fbbf926ce956808509fc94fafcd8ce12b4d93934 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 4 Jul 2017 21:36:30 -0400 Subject: [PATCH 2/2] ammonite: add test --- nixos/tests/ammonite.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 nixos/tests/ammonite.nix diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix new file mode 100644 index 00000000000..e1dee71fddf --- /dev/null +++ b/nixos/tests/ammonite.nix @@ -0,0 +1,20 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "ammonite"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + amm = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.ammonite ]; + }; + }; + + testScript = '' + startAll; + + $amm->succeed("amm -c 'val foo = 21; println(foo * 2)' | grep 42") + ''; +})