From efa1227dca0b69ccd71d9586a19c67b9139b9457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 13 May 2023 12:00:51 +0200 Subject: [PATCH 1/2] ldtk: 1.3.2 -> 1.3.3 --- pkgs/applications/editors/ldtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix index ecdb9946ce26..2777c260a664 100644 --- a/pkgs/applications/editors/ldtk/default.nix +++ b/pkgs/applications/editors/ldtk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "ldtk"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip"; - hash = "sha256-8GiMm1Nb2jRLFWtGNsSfrW1jIi9yKCcyuUKwMEqoUZI="; + hash = "sha256-egvAe4nAzPDBeTaAzrqhlDsG60bGNnKXB5Vt16vIZrQ"; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ]; From 24114b5f834cfa732781e1cf901ab07ef995caab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Thu, 8 Jun 2023 21:05:20 +0200 Subject: [PATCH 2/2] ldtk: use finalAttrs pattern with mkDerivation instead of rec --- pkgs/applications/editors/ldtk/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix index 2777c260a664..48d635138326 100644 --- a/pkgs/applications/editors/ldtk/default.nix +++ b/pkgs/applications/editors/ldtk/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, unzip , appimage-run }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ldtk"; version = "1.3.3"; src = fetchurl { - url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip"; + url = "https://github.com/deepnight/ldtk/releases/download/v${finalAttrs.version}/ubuntu-distribution.zip"; hash = "sha256-egvAe4nAzPDBeTaAzrqhlDsG60bGNnKXB5Vt16vIZrQ"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { runHook preUnpack unzip $src - appimage-run -x src 'LDtk ${version} installer.AppImage' + appimage-run -x src 'LDtk ${finalAttrs.version} installer.AppImage' runHook postUnpack ''; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm644 'LDtk ${version} installer.AppImage' $out/share/ldtk.AppImage + install -Dm644 'LDtk ${finalAttrs.version} installer.AppImage' $out/share/ldtk.AppImage makeWrapper ${appimage-run}/bin/appimage-run $out/bin/ldtk \ --add-flags $out/share/ldtk.AppImage install -Dm644 src/ldtk.png $out/share/icons/hicolor/1024x1024/apps/ldtk.png @@ -50,10 +50,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Modern, lightweight and efficient 2D level editor"; homepage = "https://ldtk.io/"; - changelog = "https://github.com/deepnight/ldtk/releases/tag/v${version}"; + changelog = "https://github.com/deepnight/ldtk/releases/tag/v${finalAttrs.version}"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ felschr ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; -} +})