about summary refs log tree commit diff
path: root/pkgs/games/nethack
diff options
context:
space:
mode:
authortoastal <toastal@posteo.net>2023-02-18 20:33:42 +0700
committerAlyssa Ross <hi@alyssa.is>2023-02-18 23:39:43 +0000
commit06365ba4549654b7ce58c33365c1282800e83a9e (patch)
treeb83f0356b2a3ef6ba8925c00411f1cb1ebeaf25c /pkgs/games/nethack
parent6f80f6ef833dc845d4add833adee68e51be9b08b (diff)
nethack: 3.6.6 → 3.6.7
Release notes: https://www.nethack.org/v367/release.html

> This release primarily corrects a security issue present in NetHack versions 3.6.2, 3.6.3, 3.6.4, 3.6.5, and 3.6.6

More info: https://www.nethack.org/security/CVE-2023-24809.html
Diffstat (limited to 'pkgs/games/nethack')
-rw-r--r--pkgs/games/nethack/default.nix15
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index f6de3d57c1304..08599cccb212a 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison, fetchpatch
+{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison
 , less
 , buildPackages
 , x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkg-config, qt5
@@ -19,23 +19,14 @@ let
   binPath = lib.makeBinPath [ coreutils less ];
 
 in stdenv.mkDerivation rec {
-  version = "3.6.6";
+  version = "3.6.7";
   pname = if x11Mode then "nethack-x11"
          else if qtMode then "nethack-qt"
          else "nethack";
 
-  patches = [
-    # Don't unset `__warn_unused_result__`, breaks on glibc-2.34
-    (fetchpatch {
-      url = "https://github.com/NetHack/NetHack/commit/81d73ce417dda6a98e2e918e06922e68b67c53f7.patch";
-      sha256 = "sha256-PX9XtJTEE3K1yg/IwIzEIT+EZWi02gU+9msrsG9ZWQY=";
-      revert = true;
-    })
-  ];
-
   src = fetchurl {
     url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz";
-    sha256 = "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng";
+    sha256 = "sha256-mM9n323r+WaKYXRaqEwJvKs2Ll0z9blE7FFV1E0qrLI=";
   };
 
   buildInputs = [ ncurses ]