Author: raskin
Date: Tue Dec 13 21:00:42 2011
New Revision: 30874
URL: https://nixos.org/websvn/nix/?rev=30874&sc=1
Log:
Update Golly
Deleted:
nixpkgs/trunk/pkgs/applications/science/misc/golly/make-install.make
Modified:
nixpkgs/trunk/pkgs/applications/science/misc/golly/default.nix
nixpkgs/trunk/pkgs/applications/science/misc/golly/src-for-default.nix
nixpkgs/trunk/pkgs/applications/science/misc/golly/src-info-for-default.nix
Modified: nixpkgs/trunk/pkgs/applications/science/misc/golly/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/misc/golly/default.nix Tue Dec
13 21:00:26 2011 (r30873)
+++ nixpkgs/trunk/pkgs/applications/science/misc/golly/default.nix Tue Dec
13 21:00:42 2011 (r30874)
@@ -17,7 +17,7 @@
inherit buildInputs;
/* doConfigure should be removed if not needed */
- phaseNames = ["setVars" "doMake" "doDeploy"];
+ 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)"
@@ -26,14 +26,6 @@
export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib"
echo "Flags: $NIX_LDFLAGS"
'';
- goSrcDir = ''cd */'';
- makeFlags = [
- "-f makefile-gtk"
- ];
- doDeploy = a.fullDepEntry ''
- cat < ${./make-install.make} >> makefile-gtk
- make -f makefile-gtk out="$out" install
- '' ["minInit" "doMake" "defEnsureDir"];
meta = {
description = "Cellular automata simulation program";
Modified: nixpkgs/trunk/pkgs/applications/science/misc/golly/src-for-default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/misc/golly/src-for-default.nix
Tue Dec 13 21:00:26 2011 (r30873)
+++ nixpkgs/trunk/pkgs/applications/science/misc/golly/src-for-default.nix
Tue Dec 13 21:00:42 2011 (r30874)
@@ -1,9 +1,9 @@
rec {
- version="2.1-src";
- name="golly-2.1-src";
- hash="0m9sz0b7pwsxpgvscdvab2q8qnncr337gg3anzgzw83z5zyn3rdz";
-
url="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz";;
-
advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz";;
+ version="2.3-src";
+ name="golly-2.3-src";
+ hash="12r1lrrn4c1kafzvz5mmfq3750smqv5dwl1xpj3753h0rl9a9gx1";
+
url="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz";;
+
advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz";;
}
Modified:
nixpkgs/trunk/pkgs/applications/science/misc/golly/src-info-for-default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/misc/golly/src-info-for-default.nix
Tue Dec 13 21:00:26 2011 (r30873)
+++ nixpkgs/trunk/pkgs/applications/science/misc/golly/src-info-for-default.nix
Tue Dec 13 21:00:42 2011 (r30874)
@@ -1,4 +1,5 @@
{
- downloadPage = "http://sourceforge.net/projects/golly/files/";;
- method="fetchSF";
+ downloadPage = "http://sourceforge.net/projects/golly/files/golly";;
+ method="fetchSFdirs";
+ fileSuffix="-src.tar.gz";
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
