diff options
| author | Benjamin Asbach <asbachb.github@impl.it> | 2021-08-01 12:11:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-01 20:11:12 +0200 |
| commit | f22a7ae1a8efe6c322de04b86adcf0b6c5ea5646 (patch) | |
| tree | 42b844f6648c0861212a2e2cbb059680596a569f | |
| parent | 9fc2cddf24ad1819f17174cbae47789294ea6dc4 (diff) | |
| download | nixpkgs-f22a7ae1a8efe6c322de04b86adcf0b6c5ea5646.tar nixpkgs-f22a7ae1a8efe6c322de04b86adcf0b6c5ea5646.tar.gz nixpkgs-f22a7ae1a8efe6c322de04b86adcf0b6c5ea5646.tar.bz2 nixpkgs-f22a7ae1a8efe6c322de04b86adcf0b6c5ea5646.tar.lz nixpkgs-f22a7ae1a8efe6c322de04b86adcf0b6c5ea5646.tar.xz nixpkgs-f22a7ae1a8efe6c322de04b86adcf0b6c5ea5646.tar.zst nixpkgs-f22a7ae1a8efe6c322de04b86adcf0b6c5ea5646.zip | |
soapui: 5.5.0 -> 5.6.0 (#131307)
Co-authored-by: Benjamin Asbach <asbachb@users.noreply.github.com>
| -rw-r--r-- | nixos/tests/soapui.nix | 24 | ||||
| -rw-r--r-- | pkgs/applications/networking/soapui/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 36 insertions, 5 deletions
diff --git a/nixos/tests/soapui.nix b/nixos/tests/soapui.nix new file mode 100644 index 00000000000..205128df91f --- /dev/null +++ b/nixos/tests/soapui.nix @@ -0,0 +1,24 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "soapui"; + meta = with pkgs.lib.maintainers; { + maintainers = [ asbachb ]; + }; + + machine = { config, pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + + environment.systemPackages = [ pkgs.soapui ]; + }; + + testScript = '' + machine.wait_for_x() + machine.succeed("soapui &") + machine.wait_for_window(r"SoapUI \d+\.\d+\.\d+") + machine.sleep(1) + machine.screenshot("soapui") + ''; +}) diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix index 12301981f65..96d3de98d89 100644 --- a/pkgs/applications/networking/soapui/default.nix +++ b/pkgs/applications/networking/soapui/default.nix @@ -1,25 +1,30 @@ -{ fetchurl, lib, stdenv, writeText, jdk, maven, makeWrapper }: +{ fetchurl, lib, stdenv, writeText, jdk, makeWrapper }: stdenv.mkDerivation rec { pname = "soapui"; - version = "5.5.0"; + version = "5.6.0"; src = fetchurl { url = "https://s3.amazonaws.com/downloads.eviware/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz"; - sha256 = "0v1wiy61jgvlxjk8qdvcnyn1gh2ysxf266zln7r4wpzwd5gc3dpw"; + sha256 = "0vmj11fswja0ddnbc4vb7gj1al8km7ilma9bv1waaj8h5c8qpayi"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk maven ]; + buildInputs = [ jdk ]; installPhase = '' + runHook preInstall + mkdir -p $out/share/java cp -R bin lib $out/share/java makeWrapper $out/share/java/bin/soapui.sh $out/bin/soapui --set SOAPUI_HOME $out/share/java + + runHook postInstall ''; patches = [ + # Adjust java path to point to derivation paths (writeText "soapui-${version}.patch" '' --- a/bin/soapui.sh +++ b/bin/soapui.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63c64bb3e3b..2a13a470668 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8952,7 +8952,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - soapui = callPackage ../applications/networking/soapui { }; + soapui = callPackage ../applications/networking/soapui { + jdk = jdk11; + }; spglib = callPackage ../development/libraries/spglib { }; |