From f9a16f2beeee07a0fc5c4a07fe8832d94d5b7e7f Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 02:31:33 +0200 Subject: [PATCH 1/2] _1oom: 1.8.1 -> 1.10.1 --- pkgs/games/1oom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/1oom/default.nix b/pkgs/games/1oom/default.nix index 487a08f75297..f8247fb9b311 100644 --- a/pkgs/games/1oom/default.nix +++ b/pkgs/games/1oom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "1oom"; - version = "1.8.1"; + version = "1.10.1"; src = fetchFromGitHub { owner = "1oom-fork"; repo = "1oom"; - rev = "refs/tags/f${version}"; - hash = "sha256-sBVcPR4+MDjyOLgrB4VcVy0cDyyG5MVY9vNhWwqAhBA="; + rev = "refs/tags/v${version}"; + hash = "sha256-M8UpdIOOMUMNY0e+Cxx/uoLBWKc2x7cv2d4VyLwcMng="; }; nativeBuildInputs = [ autoreconfHook ]; From a065bf03e55c78165955c6fa58f85ebac091ad4a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 02:31:57 +0200 Subject: [PATCH 2/2] _1oom: format to nixfmt-rfc-style --- pkgs/games/1oom/default.nix | 38 +++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/pkgs/games/1oom/default.nix b/pkgs/games/1oom/default.nix index f8247fb9b311..9f7b23f4cac1 100644 --- a/pkgs/games/1oom/default.nix +++ b/pkgs/games/1oom/default.nix @@ -1,4 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, gitUpdater, autoreconfHook, allegro, libsamplerate, libX11, libXext, SDL, SDL_mixer, SDL2, SDL2_mixer, readline }: +{ + lib, + stdenv, + fetchFromGitHub, + gitUpdater, + autoreconfHook, + allegro, + libsamplerate, + libX11, + libXext, + SDL, + SDL_mixer, + SDL2, + SDL2_mixer, + readline, +}: stdenv.mkDerivation rec { pname = "1oom"; @@ -12,9 +27,22 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ allegro libsamplerate libX11 libXext SDL SDL_mixer SDL2 SDL2_mixer readline ]; + buildInputs = [ + allegro + libsamplerate + libX11 + libXext + SDL + SDL_mixer + SDL2 + SDL2_mixer + readline + ]; - outputs = [ "out" "doc" ]; + outputs = [ + "out" + "doc" + ]; postInstall = '' install -d $doc/share/doc/${pname} @@ -22,9 +50,7 @@ stdenv.mkDerivation rec { HACKING NEWS PHILOSOPHY README.md doc/*.txt ''; - passthru.updateScript = gitUpdater { - rev-prefix = "f"; - }; + passthru.updateScript = gitUpdater { rev-prefix = "f"; }; meta = with lib; { homepage = "https://github.com/1oom-fork/1oom";