Merge staging-next-21.05 into staging-21.05

pkgs/applications/graphics/imagej/default.nix

@@ -1,36 +1,64 @@
-{ lib, stdenv, fetchurl, jre, unzip, makeWrapper }:
-
-# Note:
-# - User config dir is hard coded by upstream to $HOME/.imagej on linux systems
-#   and to $HOME/Library/Preferences on macOS.
-#  (The current trend appears to be to use $HOME/.config/imagej
-#    on linux systems, but we here do not attempt to fix it.)
+{ lib
+, stdenv
+, fetchurl
+, jre
+, unzip
+, makeWrapper
+, makeDesktopItem
+, copyDesktopItems
+}:
 
 let
-  imagej150 = stdenv.mkDerivation {
+  icon = fetchurl {
+    url = "https://imagej.net/media/icons/imagej.png";
+    sha256 = "sha256-nU2nWI1wxZB/xlOKsZzdUjj+qiCTjO6GwEKYgZ5Risg=";
+  };
+in stdenv.mkDerivation rec {
   pname = "imagej";
-    version = "150";
+  version = "153";
 
   src = fetchurl {
-      url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip";
-      sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b";
+    url = "https://wsr.imagej.net/distros/cross-platform/ij${version}.zip";
+    sha256 = "sha256-MGuUdUDuW3s/yGC68rHr6xxzmYScUjdXRawDpc1UQqw=";
   };
-    nativeBuildInputs = [ makeWrapper unzip ];
+  nativeBuildInputs = [ copyDesktopItems makeWrapper unzip ];
+  desktopItems = lib.optionals stdenv.isLinux [
+    (makeDesktopItem {
+      name = "ImageJ";
+      desktopName = "ImageJ";
+      icon = "imagej";
+      categories = "Science;Utility;Graphics;";
+      exec = "imagej";
+    })
+  ];
+
+  passthru = {
     inherit jre;
+  };
 
   # JAR files that are intended to be used by other packages
   # should go to $out/share/java.
   # (Some uses ij.jar as a library not as a standalone program.)
   installPhase = ''
-      mkdir -p $out/share/java
+    runHook preInstall
+
+    mkdir -p $out/share/java $out/bin
     # Read permisssion suffices for the jar and others.
     # Simple cp shall clear suid bits, if any.
     cp ij.jar $out/share/java
     cp -dR luts macros plugins $out/share
-      mkdir $out/bin
     makeWrapper ${jre}/bin/java $out/bin/imagej \
       --add-flags "-jar $out/share/java/ij.jar -ijpath $out/share"
+
+    runHook postInstall
   '';
+
+  postFixup = lib.optionalString stdenv.isLinux ''
+    install -Dm644 ${icon} $out/share/icons/hicolor/128x128/apps/imagej.png
+    substituteInPlace $out/share/applications/ImageJ.desktop \
+      --replace Exec=imagej Exec=$out/bin/imagej
+  '';
+
   meta = with lib; {
     homepage = "https://imagej.nih.gov/ij/";
     description = "Image processing and analysis in Java";
@@ -40,9 +68,7 @@ let
       It runs on any computer with a Java 1.4 or later virtual machine.
     '';
     license = licenses.publicDomain;
-      platforms = with platforms; linux ++ darwin;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ yuriaisaka ];
   };
-  };
-in
-  imagej150
+}

pkgs/applications/networking/browsers/chromium/upstream-info.json

@@ -44,9 +44,9 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "94.0.4606.54",
-    "sha256": "0p8kfnyhykbv1cylsx4hj2qdzqr2xdql9rhpva8bfla2w9hr8g83",
-    "sha256bin64": "0lq34l00zrr92g882xzqwq1lf2vf12x1mwidrr2qh6fz7v5418d3",
+    "version": "94.0.4606.61",
+    "sha256": "1gxrxmd2almwf067zycilyxkmc0d62h99ln8wp3n3i02bi9xnik4",
+    "sha256bin64": "116xrf8hcprbdpdx6a4xysac2phyvw88vs3n1bs24ly6pxydsasz",
     "deps": {
       "gn": {
         "version": "2021-08-11",
@@ -55,8 +55,8 @@
         "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0"
       },
       "ungoogled-patches": {
-        "rev": "94.0.4606.54-1",
-        "sha256": "0phy87fiqdgikgl60yap7n1mvyvsidgznqp06j86287iihml3z2m"
+        "rev": "94.0.4606.61-1",
+        "sha256": "1sb6n3dnp8d1bzhyl9d8yc0x9imyccnwxf1fqzv7vs3fd6dgcprp"
       }
     }
   }