diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-07-05 00:13:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-05 00:13:53 +0000 |
| commit | 2c20067f5d490447f448809cecd3addd297e7a62 (patch) | |
| tree | 706f29f94ce0fd50e1ce692aef5aee3f565041b6 /pkgs/applications/graphics | |
| parent | 942e0062aa9309545be5e3aa7ef4bc257b9931c5 (diff) | |
| parent | d2a6a829adb4ee780838a0ab7aabed520983b6ca (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/fiji/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/applications/graphics/hydrus/default.nix | 6 |
2 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix index c5f4d08f30e4a..3d8cf49711c8c 100644 --- a/pkgs/applications/graphics/fiji/default.nix +++ b/pkgs/applications/graphics/fiji/default.nix @@ -7,19 +7,21 @@ , makeDesktopItem , copyDesktopItems , runtimeShell +, unzip }: + stdenv.mkDerivation rec { pname = "fiji"; - version = "20201104-1356"; + version = "20240614-2117"; src = fetchurl { - url = "https://downloads.imagej.net/${pname}/archive/${version}/${pname}-nojre.tar.gz"; - sha256 = "1jv4wjjkpid5spr2nk5xlvq3hg687qx1n5zh8zlw48y1y09c4q7a"; + url = "https://downloads.imagej.net/fiji/archive/${version}/fiji-nojre.zip"; + sha256 = "sha256-OCNnN8CYniNEIfKRHRBoJ3Fo+u5AwXoPJAzUCc4P+f0="; }; dontBuild = true; - nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems unzip ]; buildInputs = [ stdenv.cc.cc.lib ]; desktopItems = [ @@ -46,10 +48,11 @@ stdenv.mkDerivation rec { cp -R * $out/fiji rm -f $out/fiji/jars/imagej-updater-*.jar - # Disgusting hack to stop a local desktop entry being created + # Don't create a local desktop entry and avoid deprecated garbage + # collection option cat <<EOF > $out/bin/.fiji-launcher-hack #!${runtimeShell} - exec \$($out/fiji/ImageJ-linux64 --dry-run "\$@") + exec \$($out/fiji/ImageJ-linux64 --default-gc --dry-run "\$@") EOF chmod +x $out/bin/.fiji-launcher-hack @@ -72,6 +75,6 @@ stdenv.mkDerivation rec { binaryNativeCode ]; license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ davisrichard437 ]; }; } diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 03d7be3dfad1e..d16e0e87b633b 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "578"; + version = "580"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-u2SXhL57iNVjRFqerzc/TByB9ArAJx81mxOjTBVBMkg="; + hash = "sha256-QdRItwbgVYgA6PU9Ybimk+/sBe1CHV79ssTrIturVpg="; }; nativeBuildInputs = [ @@ -60,6 +60,7 @@ python3Packages.buildPythonPackage rec { lz4 numpy opencv4 + olefile pillow pillow-heif psutil @@ -74,6 +75,7 @@ python3Packages.buildPythonPackage rec { pyyaml qtpy requests + show-in-file-manager send2trash service-identity twisted |