soapui: 5.5.0 -> 5.6.0 (#131307)

Co-authored-by: Benjamin Asbach <asbachb@users.noreply.github.com>

authored by

Benjamin Asbach
Benjamin Asbach
and committed by
GitHub
f22a7ae1 9fc2cddf

+36 -5
+24
nixos/tests/soapui.nix
··· 1 + import ./make-test-python.nix ({ pkgs, ... }: { 2 + name = "soapui"; 3 + meta = with pkgs.lib.maintainers; { 4 + maintainers = [ asbachb ]; 5 + }; 6 + 7 + machine = { config, pkgs, ... }: { 8 + imports = [ 9 + ./common/x11.nix 10 + ]; 11 + 12 + services.xserver.enable = true; 13 + 14 + environment.systemPackages = [ pkgs.soapui ]; 15 + }; 16 + 17 + testScript = '' 18 + machine.wait_for_x() 19 + machine.succeed("soapui &") 20 + machine.wait_for_window(r"SoapUI \d+\.\d+\.\d+") 21 + machine.sleep(1) 22 + machine.screenshot("soapui") 23 + ''; 24 + })
+9 -4
pkgs/applications/networking/soapui/default.nix
··· 1 - { fetchurl, lib, stdenv, writeText, jdk, maven, makeWrapper }: 1 + { fetchurl, lib, stdenv, writeText, jdk, makeWrapper }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "soapui"; 5 - version = "5.5.0"; 5 + version = "5.6.0"; 6 6 7 7 src = fetchurl { 8 8 url = "https://s3.amazonaws.com/downloads.eviware/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz"; 9 - sha256 = "0v1wiy61jgvlxjk8qdvcnyn1gh2ysxf266zln7r4wpzwd5gc3dpw"; 9 + sha256 = "0vmj11fswja0ddnbc4vb7gj1al8km7ilma9bv1waaj8h5c8qpayi"; 10 10 }; 11 11 12 12 nativeBuildInputs = [ makeWrapper ]; 13 - buildInputs = [ jdk maven ]; 13 + buildInputs = [ jdk ]; 14 14 15 15 installPhase = '' 16 + runHook preInstall 17 + 16 18 mkdir -p $out/share/java 17 19 cp -R bin lib $out/share/java 18 20 19 21 makeWrapper $out/share/java/bin/soapui.sh $out/bin/soapui --set SOAPUI_HOME $out/share/java 22 + 23 + runHook postInstall 20 24 ''; 21 25 22 26 patches = [ 27 + # Adjust java path to point to derivation paths 23 28 (writeText "soapui-${version}.patch" '' 24 29 --- a/bin/soapui.sh 25 30 +++ b/bin/soapui.sh
+3 -1
pkgs/top-level/all-packages.nix
··· 8952 8952 inherit (darwin.apple_sdk.frameworks) Security; 8953 8953 }; 8954 8954 8955 - soapui = callPackage ../applications/networking/soapui { }; 8955 + soapui = callPackage ../applications/networking/soapui { 8956 + jdk = jdk11; 8957 + }; 8956 8958 8957 8959 spglib = callPackage ../development/libraries/spglib { }; 8958 8960