From d1951974df1846c9f4c61620a9b0ce06d97cff1c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 10 Aug 2016 19:21:06 +0200
Subject: [PATCH] golly: 2.7 -> 2.8

---
 pkgs/applications/science/misc/golly/default.nix     | 12 ++++++------
 .../applications/science/misc/golly/default.upstream |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix
index bf6eabef909e..40d23cc7e8a4 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -1,16 +1,16 @@
-{stdenv, fetchurl, wxGTK, perl, python, zlib}:
+{stdenv, fetchurl, wxGTK, perl, python, zlib, mesa, libX11}:
 let
   s = # Generated upstream information
   rec {
     baseName="golly";
-    version="2.7";
+    version="2.8";
     name="${baseName}-${version}";
-    hash="0wfr9dhdbwg2cbcl7g2s1h9pmsm1lkjncbs9m0df82bcw516xs2f";
-    url="mirror://sourceforge/project/golly/golly/golly-2.7/golly-2.7-src.tar.gz";
-    sha256="0wfr9dhdbwg2cbcl7g2s1h9pmsm1lkjncbs9m0df82bcw516xs2f";
+    hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
+    url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz";
+    sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
   };
   buildInputs = [
-    wxGTK perl python zlib
+    wxGTK perl python zlib mesa libX11
   ];
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/misc/golly/default.upstream b/pkgs/applications/science/misc/golly/default.upstream
index 57881e5de355..24032de56684 100644
--- a/pkgs/applications/science/misc/golly/default.upstream
+++ b/pkgs/applications/science/misc/golly/default.upstream
@@ -1,4 +1,4 @@
 url http://sourceforge.net/projects/golly/files/golly/
 version_link '[-][0-9.]+/$'
-SF_version_tarball
+SF_version_tarball 'src'
 SF_redirect