Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/pkgs/build-support/go/module.nix

2 files changed, 18 insertions, 21 deletions

diff --git a/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix b/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix
index 4dcfbb76e0b0..c01e74dd9a80 100644
--- a/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix
+++ b/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix
@@ -4,31 +4,28 @@
 , makeWrapper
 }:
 
-let
+appimageTools.wrapType2 rec {
   pname = "lunar-client";
-  version = "3.1.3";
+  version = "3.2.1";
 
   src = fetchurl {
     url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
-    hash = "sha512-VV6UH0mEv+bABljDKZUOZXBjM1Whf2uacUQI8AnyLDBYI7pH0fkdjsBfjhQhFL0p8nHOwPAQflA+8vRFLH/uZw==";
+    hash = "sha512-ZW+SFIZ5+xxgesaZ7ZQbUnv7H5U92SZdfAU7GhJR1H0mhkrIb5Go6GWrIXaWYZLrmOlD98LSLihYi7SemJp+Yg==";
   };
 
-  appimageContents = appimageTools.extract { inherit pname version src; };
-in
-appimageTools.wrapType2 rec {
-  inherit pname version src;
-
-  extraInstallCommands = ''
-    mv $out/bin/{${pname}-${version},${pname}}
-    source "${makeWrapper}/nix-support/setup-hook"
-    wrapProgram $out/bin/${pname} \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
-    install -Dm444 ${appimageContents}/launcher.desktop $out/share/applications/lunar-client.desktop
-    install -Dm444 ${appimageContents}/launcher.png $out/share/pixmaps/lunar-client.png
-    substituteInPlace $out/share/applications/lunar-client.desktop \
-      --replace 'Exec=AppRun --no-sandbox %U' 'Exec=lunar-client' \
-      --replace 'Icon=launcher' 'Icon=lunar-client'
-  '';
+  extraInstallCommands =
+    let contents = appimageTools.extract { inherit pname version src; };
+    in ''
+      mv $out/bin/{lunar-client-*,lunar-client}
+      source "${makeWrapper}/nix-support/setup-hook"
+      wrapProgram $out/bin/lunar-client \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
+      install -Dm444 ${contents}/launcher.desktop $out/share/applications/lunar-client.desktop
+      install -Dm444 ${contents}/launcher.png $out/share/pixmaps/lunar-client.png
+      substituteInPlace $out/share/applications/lunar-client.desktop \
+        --replace 'Exec=AppRun --no-sandbox %U' 'Exec=lunar-client' \
+        --replace 'Icon=launcher' 'Icon=lunar-client'
+    '';
 
   passthru.updateScript = ./update.sh;
 
diff --git a/nixpkgs/pkgs/by-name/lu/lunar-client/update.sh b/nixpkgs/pkgs/by-name/lu/lunar-client/update.sh
index aa0adbff2b29..d3c4529fcd01 100755
--- a/nixpkgs/pkgs/by-name/lu/lunar-client/update.sh
+++ b/nixpkgs/pkgs/by-name/lu/lunar-client/update.sh
@@ -6,7 +6,7 @@ target="$(dirname "$(readlink -f "$0")")/package.nix"
 host="https://launcherupdates.lunarclientcdn.com"
 metadata=$(curl "$host/latest-linux.yml")
 version=$(echo "$metadata" | yq .version -r)
-sha512=$(echo "$metadata" | yq .sha512 -r)
+hash=$(echo "$metadata" | yq .sha512 -r)
 
 sed -i "s@version = .*;@version = \"$version\";@g" "$target"
-sed -i "s@hash.* = .*;@hash = \"sha512-$sha512\";@g" "$target"
+sed -i "s@hash.* = .*;@hash = \"sha512-$hash\";@g" "$target"