about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeder Bergebakken Sundt <pbsds@hotmail.com>2024-04-06 02:43:23 +0200
committerGitHub <noreply@github.com>2024-04-06 02:43:23 +0200
commita53adda0fecf2a31e2106f35fa74fb0945e005c7 (patch)
treead3fd142e50da20df3f4743f36afa02a838ba45a
parentc1b88e17288065ae8f3a5750f58f9c59f9d78091 (diff)
parentff2abcc9b7972092587889265b44b51b3de79120 (diff)
Merge pull request #300456 from CyberShadow/pull-20240331-104807
snipes: 20180930 -> 20240317
-rw-r--r--maintainers/maintainer-list.nix11
-rw-r--r--pkgs/games/snipes/default.nix11
2 files changed, 16 insertions, 6 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2226eff5baeac..80ec595554f5c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4156,6 +4156,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";
diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix
index 17a848402a517..f978a1b71d7b7 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,7 @@ 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 ];
+    broken      = stdenv.isDarwin; # not supported upstream - https://github.com/Davidebyzero/Snipes/issues/8#issuecomment-433720046
   };
 }