From 6d0d288cccb1be3aba5c7b05c971663a6306b70b Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 8 Nov 2024 20:51:18 +0800 Subject: [PATCH 1/5] clanlib: add passthru.updateScript --- pkgs/by-name/cl/clanlib/package.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/cl/clanlib/package.nix b/pkgs/by-name/cl/clanlib/package.nix index 6369128d5a05..7ad09a7458ec 100644 --- a/pkgs/by-name/cl/clanlib/package.nix +++ b/pkgs/by-name/cl/clanlib/package.nix @@ -12,27 +12,20 @@ fontconfig, alsa-lib, libXrender, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clanlib"; version = "4.1.0"; src = fetchFromGitHub { repo = "ClanLib"; owner = "sphair"; - rev = "v${version}"; - sha256 = "sha256-SVsLWcTP+PCIGDWLkadMpJPj4coLK9dJrW4sc2+HotE="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-SVsLWcTP+PCIGDWLkadMpJPj4coLK9dJrW4sc2+HotE="; }; - patches = [ - (fetchpatch { - name = "clanlib-add-support-for-riscv.patch"; - url = "https://github.com/sphair/ClanLib/commit/f5f694205054b66dc800135c9b01673f69a7a671.patch"; - hash = "sha256-/1XLFaTZDQAlT2mG9P6SJzXtTg7IWYGQ18Sx0e9zh0s="; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook @@ -48,6 +41,8 @@ stdenv.mkDerivation rec { libXrender ]; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/sphair/ClanLib"; description = "Cross platform toolkit library with a primary focus on game creation"; @@ -55,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ nixinator ]; platforms = with lib.platforms; lib.intersectLists linux (x86 ++ arm ++ aarch64 ++ riscv); }; -} +}) From a4e49326e724949b9678eb467d623ee503260b78 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 8 Nov 2024 20:58:08 +0800 Subject: [PATCH 2/5] clanlib: 4.1.0 -> 4.2.0 --- pkgs/by-name/cl/clanlib/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clanlib/package.nix b/pkgs/by-name/cl/clanlib/package.nix index 7ad09a7458ec..d3053408815a 100644 --- a/pkgs/by-name/cl/clanlib/package.nix +++ b/pkgs/by-name/cl/clanlib/package.nix @@ -12,18 +12,19 @@ fontconfig, alsa-lib, libXrender, + libXinerama, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "clanlib"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { repo = "ClanLib"; owner = "sphair"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-SVsLWcTP+PCIGDWLkadMpJPj4coLK9dJrW4sc2+HotE="; + hash = "sha256-sRHRkT8NiKVfa9YgP6DYV9WzCZoH7f0phHpoYMnCk98="; }; nativeBuildInputs = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { fontconfig alsa-lib libXrender + libXinerama ]; passthru.updateScript = nix-update-script { }; From 53a761ab825cee8348aecc2be095fbd3f9d02a61 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 9 Nov 2024 12:34:04 +0800 Subject: [PATCH 3/5] methane: nixfmt --- pkgs/by-name/me/methane/package.nix | 41 +++++++++++++++-------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/me/methane/package.nix b/pkgs/by-name/me/methane/package.nix index b3c8fbf34a4b..9464343b9ca1 100644 --- a/pkgs/by-name/me/methane/package.nix +++ b/pkgs/by-name/me/methane/package.nix @@ -1,22 +1,23 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, SDL2 -, SDL2_image -, SDL2_mixer -, fontconfig -, freealut -, libglut -, gettext -, libGL -, libGLU -, openal -, quesoglc -, clanlib -, libXrender -, libmikmod -, alsa-lib +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + SDL2, + SDL2_image, + SDL2_mixer, + fontconfig, + freealut, + libglut, + gettext, + libGL, + libGLU, + openal, + quesoglc, + clanlib, + libXrender, + libmikmod, + alsa-lib, }: stdenv.mkDerivation rec { @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { alsa-lib ]; - installPhase = '' + installPhase = '' runHook preInstall mkdir -p $out/bin/ $out/share/methane/ $out/share/docs/ cp methane $out/bin From 1bdfbcd3e849900cb2b266f0e052a5c7ff65c24b Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 9 Nov 2024 12:35:06 +0800 Subject: [PATCH 4/5] methane: add passthru.updateScript --- pkgs/by-name/me/methane/package.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/me/methane/package.nix b/pkgs/by-name/me/methane/package.nix index 9464343b9ca1..3e41cad96afd 100644 --- a/pkgs/by-name/me/methane/package.nix +++ b/pkgs/by-name/me/methane/package.nix @@ -18,23 +18,25 @@ libXrender, libmikmod, alsa-lib, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs:{ pname = "methane"; version = "2.0.1"; src = fetchFromGitHub { repo = "methane"; owner = "rombust"; - rev = "v${version}"; - sha256 = "sha256-STS2+wfZ8E1jpr0PYQOBQsztxhJU0Dt3IhWBE3sjdWE="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-STS2+wfZ8E1jpr0PYQOBQsztxhJU0Dt3IhWBE3sjdWE="; }; nativeBuildInputs = [ gettext pkg-config ]; + buildInputs = [ SDL2 SDL2_image @@ -61,12 +63,14 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://github.com/rombust/methane"; description = "Clone of Taito's Bubble Bobble arcade game released for Amiga in 1993 by Apache Software"; mainProgram = "methane"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ nixinator ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ nixinator ]; platforms = [ "x86_64-linux" ]; }; -} +}) From c327b0c60d9b807e816c12e9f894244ed03558a3 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 9 Nov 2024 12:36:38 +0800 Subject: [PATCH 5/5] methane: 2.0.1 -> 2.1.0 --- pkgs/by-name/me/methane/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/methane/package.nix b/pkgs/by-name/me/methane/package.nix index 3e41cad96afd..e1590859837f 100644 --- a/pkgs/by-name/me/methane/package.nix +++ b/pkgs/by-name/me/methane/package.nix @@ -19,17 +19,18 @@ libmikmod, alsa-lib, nix-update-script, + libXinerama, }: stdenv.mkDerivation (finalAttrs:{ pname = "methane"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { repo = "methane"; owner = "rombust"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-STS2+wfZ8E1jpr0PYQOBQsztxhJU0Dt3IhWBE3sjdWE="; + hash = "sha256-rByJqkhYsRuv0gTug+vP2qgkRY8TnX+Qx4/MbAmPTOU="; }; nativeBuildInputs = [ @@ -50,6 +51,7 @@ stdenv.mkDerivation (finalAttrs:{ quesoglc clanlib libXrender + libXinerama libmikmod alsa-lib ];