Author: eelco
Date: Wed Feb 2 12:17:29 2011
New Revision: 25759
URL: https://svn.nixos.org/websvn/nix/?rev=25759&sc=1
Log:
* boehm-gc: For simplicity, use a tarball containing the CVS export
instead of fetchcvs. Then we don't need to special-case FreeBSD
either. Also, removed the Cygwin patch which no longer seems
needed.
Deleted:
nixpkgs/trunk/pkgs/development/libraries/boehm-gc/cygwin-pthread-dl.patch
Modified:
nixpkgs/trunk/pkgs/development/libraries/boehm-gc/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/boehm-gc/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/boehm-gc/default.nix Wed Feb
2 12:16:57 2011 (r25758)
+++ nixpkgs/trunk/pkgs/development/libraries/boehm-gc/default.nix Wed Feb
2 12:17:29 2011 (r25759)
@@ -1,38 +1,17 @@
-{ stdenv, fetchurl, cvsVersion ? true, fetchcvs ? null
-, autoconf ? null, automake ? null, libtool ? null }:
+{ stdenv, fetchurl }:
-let
- cvs = cvsVersion;
- version = if !cvs then "7.1" else "7.2pre20110122";
-in
-stdenv.mkDerivation ({
- name = "boehm-gc-${version}";
-
- src =
- if version == "7.1"
- then fetchurl {
- url =
"http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-${version}.tar.gz";;
- sha256 = "0c5zrsdw0rsli06lahcqwwz0prgah340fhfg7ggfgvz3iw1gdkp3";
- /* else if version == "7.2alpha4" then
- "1ya9hr1wbx0hrx29q5zy2k51ml71k9mhqzqs7f505qr9s6jsfh0b" */
- }
-
- /* Use the CVS version for now since it contains many, many fixes
- compared to 7.1 and even 7.2alpha4 (e.g., interception of
- `pthread_exit', dated 2010-08-14, which fixes possible deadlocks
- on GNU/Linux.) */
- else fetchcvs {
- cvsRoot = ":pserver:[email protected]:/cvsroot/bdwgc";
- module = "bdwgc";
- date = "20110121";
- sha256 =
"00f7aed82fa02211db93692c24b74e15010aff545f97691c5e362432a7ae283a";
- };
+stdenv.mkDerivation rec {
+ name = "boehm-gc-7.2pre20110122";
- patches = stdenv.lib.optional (stdenv.isCygwin && !cvs)
- ./cygwin-pthread-dl.patch;
+ src = fetchurl {
+ url = "http://nixos.org/tarballs/${name}.tar.bz2";;
+ sha256 = "06nf60flq6344pgic3bz83jh6pvj4k42apm3x4xwxc4d2is457ly";
+ };
doCheck = true;
+ configureFlags = stdenv.lib.optionalString (stdenv.system ==
"x86_64-darwin") "CPPFLAGS=-D_XOPEN_SOURCE";
+
meta = {
description = "The Boehm-Demers-Weiser conservative garbage collector for
C and C++";
@@ -62,19 +41,3 @@
platforms = stdenv.lib.platforms.all;
};
}
-
-//
-
-(if cvs
- then {
- buildInputs = [ autoconf automake libtool ];
- preConfigure = "autoreconf -vfi";
- }
- else { })
-
-//
-
-(if stdenv.system == "x86_64-darwin"
- # Fix "#error ucontext routines are deprecated, and require _XOPEN_SOURCE to
be defined".
- then { configureFlags = "CPPFLAGS=-D_XOPEN_SOURCE"; }
- else {}))
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Feb 2 12:16:57
2011 (r25758)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Feb 2 12:17:29
2011 (r25759)
@@ -2774,19 +2774,7 @@
beecrypt = callPackage ../development/libraries/beecrypt { };
- boehmgc_7_1 = callPackage ../development/libraries/boehm-gc {
- cvsVersion = false;
- };
-
- boehmgc_cvs = callPackage ../development/libraries/boehm-gc { };
-
- # There are good reasons to use CVS instead of 7.1 or 7.2alpha4.
- # See `default.nix' for details.
- boehmgc =
- # XXX: `fetchcvs' doesn't work on FreeBSD ("cp: illegal option -- d").
- if stdenv.system == "i686-freebsd"
- then boehmgc_7_1
- else boehmgc_cvs;
+ boehmgc = callPackage ../development/libraries/boehm-gc { };
boolstuff = callPackage ../development/libraries/boolstuff { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
