From aed489629d565e4a6c87e8676a342ffc55012ab6 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Sun, 4 Aug 2024 03:51:48 +0700 Subject: [PATCH 1/2] techmino: add update script --- pkgs/by-name/te/techmino/ccloader.nix | 3 ++- pkgs/by-name/te/techmino/libcoldclear.nix | 8 ++------ pkgs/by-name/te/techmino/package.nix | 10 ++++++++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/te/techmino/ccloader.nix b/pkgs/by-name/te/techmino/ccloader.nix index 3fe632a93785..38a4b32c821a 100644 --- a/pkgs/by-name/te/techmino/ccloader.nix +++ b/pkgs/by-name/te/techmino/ccloader.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { owner = "26F-Studio"; repo = "cold_clear_ai_love2d_wrapper"; rev = version; - hash = "sha256-zfTSMWqjFrAKW5m+9q3K2Je8bbSyhC6pC/vPAWDGCNg="; + fetchSubmodules = true; + hash = "sha256-sguV+Dw+etZH43tXZYL46NAdsI/qvyvGWCPUiTEjhy4="; }; buildInputs = [ libcoldclear luajit ]; diff --git a/pkgs/by-name/te/techmino/libcoldclear.nix b/pkgs/by-name/te/techmino/libcoldclear.nix index 4160e0bdcb87..516f5c4dd9cd 100644 --- a/pkgs/by-name/te/techmino/libcoldclear.nix +++ b/pkgs/by-name/te/techmino/libcoldclear.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, ccloader }: let @@ -17,12 +18,7 @@ rustPlatform.buildRustPackage { pname = "libcoldclear"; version = "0.1.0"; - src = fetchFromGitHub { - owner = "26F-Studio"; - repo = "cold-clear"; - rev = "1564ce9ad14aa60f32bf9a5120594933b3501548"; - hash = "sha256-6fZpKHEJ0dsOTp755GLnxa/befCUJhjqA3Zna5UkKVo="; - }; + src = "${ccloader.src}/cold-clear"; # remove workspace cargo.toml so we don't load all of workspace's deps postPatch = '' diff --git a/pkgs/by-name/te/techmino/package.nix b/pkgs/by-name/te/techmino/package.nix index 8b49abd69340..638509cbe555 100644 --- a/pkgs/by-name/te/techmino/package.nix +++ b/pkgs/by-name/te/techmino/package.nix @@ -6,7 +6,9 @@ , makeDesktopItem , love , luajit -, libcoldclear ? callPackage ./libcoldclear.nix { } +, writeShellScript +, nix-update +, libcoldclear ? callPackage ./libcoldclear.nix { inherit ccloader; } , ccloader ? callPackage ./ccloader.nix { inherit libcoldclear luajit; } }: @@ -39,7 +41,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ love ccloader ]; dontUnpack = true; @@ -62,6 +63,11 @@ stdenv.mkDerivation rec { passthru = { inherit ccloader libcoldclear; + updateScript = writeShellScript "update-script.sh" '' + if ${lib.getExe nix-update} techmino | grep "Packages updated"; then + ${lib.getExe nix-update} techmino.ccloader + fi + ''; }; meta = with lib; { From 9c984efbec2cbbc7ee0baf0c2b41a12cbe817915 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 8 Aug 2024 17:56:08 +0000 Subject: [PATCH 2/2] techmino: 0.17.17 -> 0.17.21 --- pkgs/by-name/te/techmino/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/techmino/package.nix b/pkgs/by-name/te/techmino/package.nix index 638509cbe555..3d15feeb49fd 100644 --- a/pkgs/by-name/te/techmino/package.nix +++ b/pkgs/by-name/te/techmino/package.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "0.17.17"; + version = "0.17.21"; src = fetchurl { url = "https://github.com/26F-Studio/Techmino/releases/download/v${version}/Techmino_Bare.love"; - hash = "sha256-ExVdS2QXSRVMlRhrjD/Plo7fhQ3uUBHlwv6y91/S3uA="; + hash = "sha256-8gMIyNP1FS52LnbpQ+G9XNtK3rQruzkMDRz7Gk9LZcQ="; }; nativeBuildInputs = [ makeWrapper ];