Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								8c79100839 
								
							 
						 
						
							
							
								
								Merge branch 'master' into no-manifests  
							
							 
							
							
							
						 
						
							2012-07-26 15:14:33 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Shea Levy 
								
							 
						 
						
							
							
							
							
								
							
							
								1ef2d5765b 
								
							 
						 
						
							
							
								
								Turn tests back on  
							
							 
							
							
							
						 
						
							2012-07-25 09:30:17 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Shea Levy 
								
							 
						 
						
							
							
							
							
								
							
							
								566a30c007 
								
							 
						 
						
							
							
								
								Disable tests temporarily  
							
							 
							
							
							
						 
						
							2012-07-25 09:30:17 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								98193bb440 
								
							 
						 
						
							
							
								
								Remove RPM builds that don't evaluate  
							
							 
							
							
							
						 
						
							2012-07-18 16:50:56 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								ae72be1b8b 
								
							 
						 
						
							
							
								
								Add WWW::Curl as a dependency  
							
							 
							
							
							
						 
						
							2012-07-09 13:11:37 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								02fb6323e0 
								
							 
						 
						
							
							
								
								Add Emacs to the disk image  
							
							 
							
							
							
						 
						
							2012-05-31 09:50:58 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								0301525e6c 
								
							 
						 
						
							
							
								
								Fix owner/group in tar invocation  
							
							 
							
							
							
						 
						
							2012-05-22 19:40:40 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								6814b1dfa1 
								
							 
						 
						
							
							
								
								Generate binary tarballs for installing Nix  
							
							 
							
							... 
							
							
							
							For several platforms we don't currently have "native" Nix packages
(e.g. Mac OS X and FreeBSD).  This provides the next best thing: a
tarball containing the closure of Nix, plus a simple script
"nix-finish-install" that initialises the Nix database, registers the
paths in the closure as valid, and runs "nix-env -i /path/to/nix" to
initialise the user profile.
The tarball must be unpacked in the root directory.  It creates
/nix/store/... and /usr/bin/nix-finish-install.  Typical installation
is as follows:
  $ cd /
  $ tar xvf /path/to/nix-1.1pre1234_abcdef-x86_64-linux.tar.bz2
  $ nix-finish-install
  (if necessary add ~/.nix-profile/etc/profile.d/nix.sh to the shell
  login scripts)
After this, /usr/bin/nix-finish-install can be deleted, if desired.
The downside to the binary tarball is that it's pretty big (~55 MiB
for x86_64-linux). 
							
						 
						
							2012-05-22 18:36:54 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc6a43b72 
								
							 
						 
						
							
							
								
								Fix the install check  
							
							 
							
							
							
						 
						
							2012-05-11 23:30:47 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								58d1de08d9 
								
							 
						 
						
							
							
								
								Use perl.libPrefix to (hopefully) fix the Cygwin build  
							
							 
							
							... 
							
							
							
							http://hydra.nixos.org/build/2602599  
							
						 
						
							2012-05-11 09:41:39 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								37fa47908b 
								
							 
						 
						
							
							
								
								Build Ubuntu 12.04 packages  
							
							 
							
							
							
						 
						
							2012-05-10 22:12:20 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								56c82f3d9d 
								
							 
						 
						
							
							
								
								Don't build for old Debian/Ubuntu releases that don't have a sufficiently new SQLite  
							
							 
							
							
							
						 
						
							2012-05-04 17:45:21 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								373e875ac2 
								
							 
						 
						
							
							
								
								Don't build for old Fedora releases that don't have a sufficiently new SQLite  
							
							 
							
							
							
						 
						
							2012-05-04 17:25:25 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								e19fb7ebed 
								
							 
						 
						
							
							
								
								Do "make installcheck" for RPM builds  
							
							 
							
							
							
						 
						
							2012-05-01 16:31:56 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								e145ac30e3 
								
							 
						 
						
							
							
								
								Do "make installcheck" for Debian builds  
							
							 
							
							
							
						 
						
							2012-05-01 15:48:17 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								00c98a6bef 
								
							 
						 
						
							
							
								
								Use Bison 2.5  
							
							 
							
							
							
						 
						
							2012-04-13 14:28:26 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								cb79e91ec3 
								
							 
						 
						
							
							
								
								Fix the coverage build  
							
							 
							
							
							
						 
						
							2012-03-19 17:05:42 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								457dd55962 
								
							 
						 
						
							
							
								
								Fix the Deb builds  
							
							 
							
							
							
						 
						
							2012-03-19 15:11:22 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								4b83483142 
								
							 
						 
						
							
							
								
								Fix the RPM  
							
							 
							
							
							
						 
						
							2012-03-19 14:30:59 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								ea402a255f 
								
							 
						 
						
							
							
								
								Replace "make check" with "make installcheck"  
							
							 
							
							... 
							
							
							
							Ensuring that the tests work from the build tree requires a growing
number of nasty hacks.  The tests also don't verify that the installed
Nix actually works.  Thus, the tests now require "make install" to
have been run. 
							
						 
						
							2012-03-19 01:20:02 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								b006a31d52 
								
							 
						 
						
							
							
								
								Drop the externals directory  
							
							 
							
							... 
							
							
							
							Nix now requires SQLite and bzip2 to be pre-installed.  SQLite is
detected using pkg-config.  We required DBD::SQLite anyway, so
depending on SQLite is not a big problem.
The --with-bzip2, --with-openssl and --with-sqlite flags are gone. 
							
						 
						
							2012-03-18 23:54:57 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								2e0322efd1 
								
							 
						 
						
							
							
								
								Clean up when building from a working tree  
							
							 
							
							
							
						 
						
							2012-03-18 22:10:59 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								b461721f17 
								
							 
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2012-03-12 21:41:45 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								fb95455c02 
								
							 
						 
						
							
							
								
								Set the versionSuffix to include the Git shortrev  
							
							 
							
							
							
						 
						
							2012-02-08 12:31:14 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								67444f5e54 
								
							 
						 
						
							
							
								
								* Build Nix for the latest Fedora and Ubuntu releases (and drop some  
							
							 
							
							... 
							
							
							
							old ones). 
							
						 
						
							2012-02-07 13:18:20 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								66c99b0cf5 
								
							 
						 
						
							
							
								
								* ‘--disable-shared’ is no longer supported.  Fortunately it's not  
							
							 
							
							... 
							
							
							
							needed for the coverage analysis. 
							
						 
						
							2011-12-22 10:58:27 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								d43a148204 
								
							 
						 
						
							
							
								
								* Add a test for nix-copy-closure.  
							
							 
							
							
							
						 
						
							2011-10-11 13:58:47 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								2492914fbc 
								
							 
						 
						
							
							
								
								* Move the remote building test from the NixOS tree to the Nix tree.  
							
							 
							
							
							
						 
						
							2011-10-11 13:06:59 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								659c427caa 
								
							 
						 
						
							
							
								
								* Hopefully perl-devel contains the required headers (untested).  
							
							 
							
							
							
						 
						
							2011-10-10 18:58:49 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								76e0029f7a 
								
							 
						 
						
							
							
								
								* Add perl-DBD-SQLite as a dependency of the RPM builds.  
							
							 
							
							
							
						 
						
							2011-08-08 14:06:10 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								d374be551d 
								
							 
						 
						
							
							
								
								* Add DBD-SQLite as a dependency to the Debian/Ubuntu builds.  
							
							 
							
							... 
							
							
							
							* Drop some old Fedora/Debian/Ubuntu releases. 
							
						 
						
							2011-08-08 13:19:00 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								b2c11b9ed0 
								
							 
						 
						
							
							
								
								 
							
							 
							
							
							
						 
						
							2011-04-11 10:23:15 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								c3cee5395b 
								
							 
						 
						
							
							
								
								* Build for Ubuntu 10.04.  
							
							 
							
							
							
						 
						
							2011-02-14 14:56:02 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								1876ab764f 
								
							 
						 
						
							
							
								
								* A better fix.  $boehmgc isn't set anywhere, we should use the flags  
							
							 
							
							... 
							
							
							
							returned by pkg-config. 
							
						 
						
							2011-02-09 14:13:09 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc4117e90 
								
							 
						 
						
							
							
								
								* The GC library can't be found on Solaris  
							
							 
							
							... 
							
							
							
							(http://hydra.nixos.org/build/890714 ), so don't build with GC
  support for now. 
							
						 
						
							2011-02-09 14:08:32 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								fb9368b5a0 
								
							 
						 
						
							
							
								
								* Sync with the trunk.  
							
							 
							
							
							
						 
						
							2010-11-16 12:49:47 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								3d71c8013e 
								
							 
						 
						
							
							
								
								* Use pkgconfig to locate the Boehm GC (as suggested by Ludo), if  
							
							 
							
							... 
							
							
							
							--enable-gc is given. 
							
						 
						
							2010-10-29 14:00:47 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								11ccd44e95 
								
							 
						 
						
							
							
								
								* We need Bison 2.4 now.  
							
							 
							
							
							
						 
						
							2010-10-24 21:48:59 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								955d11aae7 
								
							 
						 
						
							
							
								
								* Sync with the trunk.  
							
							 
							
							
							
						 
						
							2010-08-24 09:56:28 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								ed133e6e64 
								
							 
						 
						
							
							
								
								* rpmBuild already includes the disk image in the output name.  
							
							 
							
							
							
						 
						
							2010-08-17 14:08:44 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								8ec6594d6d 
								
							 
						 
						
							
							
								
								* Remove the "tarball" jobset argument.  
							
							 
							
							
							
						 
						
							2010-08-16 13:01:31 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								aa45027818 
								
							 
						 
						
							
							
								
								* Sync with the trunk.  
							
							 
							
							
							
						 
						
							2010-05-12 22:13:09 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								f3b8833a48 
								
							 
						 
						
							
							
								
								* Drop the dependency on the ATerm library.  
							
							 
							
							
							
						 
						
							2010-04-19 14:51:58 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								03afc34805 
								
							 
						 
						
							
							
								
								* Simplify.  
							
							 
							
							
							
						 
						
							2010-03-10 13:07:37 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								8520de4720 
								
							 
						 
						
							
							
								
								* Include the sqlite tarball in the Nix tarball.  
							
							 
							
							
							
						 
						
							2010-02-24 10:48:57 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								dc6d1ec67e 
								
							 
						 
						
							
							
								
								 
							
							 
							
							
							
						 
						
							2010-02-23 23:24:49 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								7db2831d3a 
								
							 
						 
						
							
							
								
								* Use ATerm 2.5.  
							
							 
							
							
							
						 
						
							2010-02-23 16:17:21 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								d8a5dc02fc 
								
							 
						 
						
							
							
								
								* Build on Fedora 12.  
							
							 
							
							
							
						 
						
							2009-12-10 13:14:22 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								327a232c85 
								
							 
						 
						
							
							
								
								* Remove support for old (before Nix 0.12pre12020) databases.  
							
							 
							
							
							
						 
						
							2009-11-06 01:15:44 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eelco Dolstra 
								
							 
						 
						
							
							
							
							
								
							
							
								e8bad77c7c 
								
							 
						 
						
							
							
								
								 
							
							 
							
							
							
						 
						
							2009-11-05 15:20:19 +00:00