From 118de162d50b69a08048c8c4d6579e603a4964e3 Mon Sep 17 00:00:00 2001 From: Rampoina Date: Sat, 1 Apr 2023 19:21:13 +0200 Subject: [PATCH 1/2] maintainers: add rampoina --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ab30cecaa46..faf0f316043 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12728,6 +12728,13 @@ githubId = 14829269; name = "Ram Kromberg"; }; + rampoina = { + email = "rampoina@protonmail.com"; + matrix = "@rampoina:matrix.org"; + github = "Rampoina"; + githubId = 5653911; + name = "Rampoina"; + }; ranfdev = { email = "ranfdev@gmail.com"; name = "Lorenzo Miglietta"; From 8c0bb7730ea7b544091ce8f93712c153ca70f5ec Mon Sep 17 00:00:00 2001 From: Rampoina Date: Sat, 1 Apr 2023 19:16:25 +0200 Subject: [PATCH 2/2] hex-a-hop: init at 1.1.0 Co-authored-by: Atemu Co-authored-by: Sandro --- pkgs/games/hex-a-hop/default.nix | 45 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/games/hex-a-hop/default.nix diff --git a/pkgs/games/hex-a-hop/default.nix b/pkgs/games/hex-a-hop/default.nix new file mode 100644 index 00000000000..c6eaed57a9c --- /dev/null +++ b/pkgs/games/hex-a-hop/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchurl, fetchzip, SDL, SDL_mixer, SDL_ttf }: + +stdenv.mkDerivation rec { + pname = "hex-a-hop"; + version = "1.1.0"; + + src = fetchzip { + url = "https://downloads.sourceforge.net/project/hexahop/${version}/hex-a-hop-${version}.tar.gz"; + sha256 = "sha256-fBSvNtgNR0aNofbvoYpM1e8ww4ARlXIvrQUvJqVGLlY="; + }; + + icon = fetchurl { + # Fetched from dfa365a90be5c52ef21235a9e90a865b04da3ad4, remove in the next version when the file is included + url = "https://sourceforge.net/p/hexahop/code/ci/dfa365a90be5c52ef21235a9e90a865b04da3ad4/tree/data/hex-a-hop.png?format=raw"; + sha256 = "sha256-Vh/1wwRmC2eSD/+mk1Oqt7EX4a4k++nUAbWQD2P2hNA="; + }; + + desktop = fetchurl { + # Fetched from e67385078e4f248a3877ee1066613d231c0d0eee, remove in the next version when the file is included + url = "https://sourceforge.net/p/hexahop/code/ci/e67385078e4f248a3877ee1066613d231c0d0eee/tree/data/hex-a-hop.desktop?format=raw"; + sha256 = "sha256-j6gKRq+8b1NDwP1WcCaScfmwNxAl78CfK6pemROrRak="; + }; + + buildInputs = [ SDL SDL_mixer SDL_ttf ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + install -Dm644 ${icon} $out/share/icons/${pname}.png + install -Dm644 ${desktop} $out/share/applications/${pname}.desktop + ''; + + meta = { + description = "A puzzle game based on hexagonal tiles"; + homepage = "http://hexahop.sourceforge.net"; + license = with lib.licenses; [ + gpl2Plus # Main code + cc-by-30 # Assets + lgpl2Plus # i18n + lgpl3Plus # source files from Lips of Suna + ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ rampoina ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 261872100c7..3448fc95c3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30737,6 +30737,8 @@ with pkgs; herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; + hex-a-hop = callPackage ../games/hex-a-hop { }; + hexchat = callPackage ../applications/networking/irc/hexchat { }; hexcurse = callPackage ../applications/editors/hexcurse { };