From fe9371671bf8fbc3541f259dd7e485b984a5209a Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Sun, 24 Dec 2023 11:45:19 +0000 Subject: [PATCH 1/3] maintainers: add cybershadow --- maintainers/maintainer-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8f0dca78eada..901a46596a0e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4118,6 +4118,17 @@ githubId = 16950437; name = "cwyc"; }; + cybershadow = { + name = "Vladimir Panteleev"; + email = "nixpkgs@cy.md"; + matrix = "@cybershadow:cy.md"; + github = "CyberShadow"; + githubId = 160894; + + keys = [{ + fingerprint = "BBED 1B08 8CED 7F95 8917 FBE8 5004 F0FA D051 576D"; + }]; + }; cynerd = { name = "Karel Kočí"; email = "cynerd@email.cz"; From 681f7a7e6a5bc4fe7a1168a68bc262076dcdebbc Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Sun, 31 Mar 2024 10:47:00 +0000 Subject: [PATCH 2/3] snipes: 20180930 -> 20240317 Diff: https://github.com/DavideByZero/Snipes/compare/594af45108e07aa4159c3babc9b5e53609c3fd6e...caa2ce036a9f6461ccdb7ef8306edbd126dd4081 --- pkgs/games/snipes/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix index 17a848402a51..8eb140de0910 100644 --- a/pkgs/games/snipes/default.nix +++ b/pkgs/games/snipes/default.nix @@ -8,20 +8,18 @@ let in stdenv.mkDerivation { pname = "snipes"; - version = "20180930"; + version = "20240317"; src = fetchFromGitHub { owner = "Davidebyzero"; repo = "Snipes"; - rev = "594af45108e07aa4159c3babc9b5e53609c3fd6e"; - sha256 = "0gmh38swm74jmljy0bq27ipqzb4h8y9rzwc1j6harbd9qqz5knac"; + rev = "caa2ce036a9f6461ccdb7ef8306edbd126dd4081"; + sha256 = "sha256-iIoh5odCziX1cKs5qf4hJdXpUhy9kdht0YMLLfhvKZA="; }; postPatch = '' substitute config-sample.h config.h \ --replace SnipesConsole.ttf $out/share/snipes/SnipesConsole.ttf - substituteInPlace GNUmakefile \ - --replace 'CFLAGS=-Werror -Wall' 'CFLAGS=-Wall' ''; enableParallelBuilding = true; @@ -43,6 +41,6 @@ in stdenv.mkDerivation { mainProgram = "snipes"; homepage = "https://www.vogons.org/viewtopic.php?f=7&t=49073"; license = licenses.free; # This reverse-engineered source code is released with the original authors' permission. - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg cybershadow ]; }; } From ff2abcc9b7972092587889265b44b51b3de79120 Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Fri, 5 Apr 2024 22:10:41 +0000 Subject: [PATCH 3/3] snipes: mark as broken on Darwin --- pkgs/games/snipes/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix index 8eb140de0910..f978a1b71d7b 100644 --- a/pkgs/games/snipes/default.nix +++ b/pkgs/games/snipes/default.nix @@ -42,5 +42,6 @@ in stdenv.mkDerivation { homepage = "https://www.vogons.org/viewtopic.php?f=7&t=49073"; license = licenses.free; # This reverse-engineered source code is released with the original authors' permission. maintainers = with maintainers; [ peterhoeg cybershadow ]; + broken = stdenv.isDarwin; # not supported upstream - https://github.com/Davidebyzero/Snipes/issues/8#issuecomment-433720046 }; }