From e507c77a7d846e1b63f6b319b130db8419fd4d20 Mon Sep 17 00:00:00 2001 From: Sage Raflik Date: Fri, 21 Aug 2020 23:06:51 -0500 Subject: [PATCH] crispy-doom: 5.8.0 -> 5.9.2 --- pkgs/games/crispy-doom/default.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index 241d9440344f..70e191fe887b 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -1,28 +1,16 @@ -{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, fetchpatch, python }: +{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python }: stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.8.0"; + version = "5.9.2"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1b6gn0dysv631jynh769whww9xcss1gms78sz3nrn855q1dsvcb4"; + sha256 = "0fkw9z66sjcz7k528wyla6mgi4impqimn93yhqmc194ycrjirraa"; }; - patches = [ - # Fixes CVE-2020-14983 - (fetchpatch { - url = "https://github.com/chocolate-doom/chocolate-doom/commit/f1a8d991aa8a14afcb605cf2f65cd15fda204c56.diff"; - sha256 = "1z6pxg9azcqq7g09hjc09d01knd803nhqilkw2kbx8648hil9mgn"; - }) - (fetchpatch { - url = "https://github.com/chocolate-doom/chocolate-doom/commit/54fb12eeaa7d527defbe65e7e00e37d5feb7c597.diff"; - sha256 = "0ww21jn02ld73rkp06f7fqy92jqv8c9q4d1mvsryag1gmvy57znj"; - }) - ]; - postPatch = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am for script in $(grep -lr '^#!/usr/bin/env python$'); do patchShebangs $script; done