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
This commit is contained in:
toastal 2023-02-18 20:33:42 +07:00 committed by Alyssa Ross
parent 6f80f6ef83
commit 06365ba454

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison, fetchpatch { stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison
, less , less
, buildPackages , buildPackages
, x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkg-config, qt5 , x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkg-config, qt5
@ -19,23 +19,14 @@ let
binPath = lib.makeBinPath [ coreutils less ]; binPath = lib.makeBinPath [ coreutils less ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "3.6.6"; version = "3.6.7";
pname = if x11Mode then "nethack-x11" pname = if x11Mode then "nethack-x11"
else if qtMode then "nethack-qt" else if qtMode then "nethack-qt"
else "nethack"; 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 { src = fetchurl {
url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz"; url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz";
sha256 = "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng"; sha256 = "sha256-mM9n323r+WaKYXRaqEwJvKs2Ll0z9blE7FFV1E0qrLI=";
}; };
buildInputs = [ ncurses ] buildInputs = [ ncurses ]