Update golly

pkgs/applications/science/misc/golly/default.nix

@@ -1,41 +1,33 @@
-x@{builderDefsPackage,
+{stdenv, fetchurl, wxGTK, perl, python, zlib}:
-  wxGTK, perl, python, zlib
-  , ...}:
-builderDefsPackage
-(a :
 let
-  s = import ./src-for-default.nix;
+  s = # Generated upstream information
-  helperArgNames = ["builderDefsPackage"] ++
+  rec {
-    [];
+    baseName="golly";
-  buildInputs = map (n: builtins.getAttr n x)
+    version="2.6";
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+    name="${baseName}-${version}";
-in
+    hash="1n1k3yf23ymlwq4k6p4v2g04qd29pg2rabr4l7m9bj2b2j1zkqhz";
-rec {
+    url="mirror://sourceforge/project/golly/golly/golly-2.6/golly-2.6-src.tar.gz";
-  src = a.fetchUrlFromSrcInfo s;
+    sha256="1n1k3yf23ymlwq4k6p4v2g04qd29pg2rabr4l7m9bj2b2j1zkqhz";
-
-  inherit (s) name;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
-  setVars = a.noDepEntry ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lperl -L$(echo "${perl}"/lib/perl5/5*/*/CORE)"
-    pythonLib="$(echo "${python}"/lib/libpython*.so)"
-    pythonLib="''${pythonLib##*/lib}"
-    pythonLib="''${pythonLib%%.so}"
-    export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib"
-    echo "Flags: $NIX_LDFLAGS"
-  '';
-
-  meta = {
-    description = "Cellular automata simulation program";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = with a.lib.licenses;
-      gpl2;
   };
-}) x
+  buildInputs = [
+    wxGTK perl python zlib
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  preConfigure = ''
+    cd gui-wx/configure
+  '';
+  meta = {
+    inherit (s) version;
+    description = "Cellular automata simulation program";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    downloadPage = "http://sourceforge.net/projects/golly/files/golly";
+  };
+}

pkgs/applications/science/misc/golly/default.upstream

@@ -0,0 +1,4 @@
+url http://sourceforge.net/projects/golly/files/golly/
+version_link '[-][0-9.]+/$'
+SF_version_tarball
+SF_redirect

pkgs/applications/science/misc/golly/src-for-default.nix

@@ -1,9 +0,0 @@
-rec {
-   version="2.4";
-   name="golly-2.4";
-   hash="06vajm019q4q4wfy6pc1669fbjqdb4jaxcc419bk0vzky40anl9w";
-   url="mirror://sourceforge/golly/golly-2.4-src.tar.gz";
-   advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz";
-  
-  
-}

pkgs/applications/science/misc/golly/src-info-for-default.nix

@@ -1,5 +0,0 @@
-{
-  downloadPage = "http://sourceforge.net/projects/golly/files/golly";
-  method="fetchSFdirs";
-  fileSuffix="-src.tar.gz";
-}