diff options
| -rw-r--r-- | nixos/tests/all-tests.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/sbt.nix | 18 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/sbt/default.nix | 54 |
3 files changed, 48 insertions, 25 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 4e4d8b5e68943..10ac6c84d0ef9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -310,6 +310,7 @@ in rxe = handleTest ./rxe.nix {}; samba = handleTest ./samba.nix {}; sanoid = handleTest ./sanoid.nix {}; + sbt = handleTest ./sbt.nix {}; sddm = handleTest ./sddm.nix {}; service-runner = handleTest ./service-runner.nix {}; shadowsocks = handleTest ./shadowsocks {}; diff --git a/nixos/tests/sbt.nix b/nixos/tests/sbt.nix new file mode 100644 index 0000000000000..004d9c2e140a0 --- /dev/null +++ b/nixos/tests/sbt.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "sbt"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + machine = { pkgs, ... }: + { + environment.systemPackages = [ pkgs.sbt ]; + }; + + testScript = + '' + machine.succeed( + "(sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${pkgs.sbt.version} (this may take some time)'" + ) + ''; +}) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 6f34ef03b00f5..dbace29d7e741 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript -, common-updater-scripts, git, nixfmt, nix, coreutils, gnused }: +, common-updater-scripts, git, nixfmt, nix, coreutils, gnused, nixosTests }: stdenv.mkDerivation rec { pname = "sbt"; @@ -36,30 +36,34 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; - passthru.updateScript = writeScript "update.sh" '' - #!${stdenv.shell} - set -o errexit - PATH=${ - stdenv.lib.makeBinPath [ - common-updater-scripts - git - nixfmt - nix - coreutils - gnused - ] - } + passthru = { + tests = { inherit (nixosTests) sbt; }; - oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion sbt" | tr -d '"')" - latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:sbt/sbt.git '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + git + nixfmt + nix + coreutils + gnused + ] + } - if [ ! "$oldVersion" = "$latestTag" ]; then - update-source-version sbt "$latestTag" --version-key=version --print-changes - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix" - nixfmt "$default_nix" - else - echo "sbt is already up-to-date" - fi - ''; + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion sbt" | tr -d '"')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:sbt/sbt.git '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" + + if [ ! "$oldVersion" = "$latestTag" ]; then + update-source-version sbt "$latestTag" --version-key=version --print-changes + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix" + nixfmt "$default_nix" + else + echo "sbt is already up-to-date" + fi + ''; + }; } |