Commit graph

233 commits

Author SHA1 Message Date
Eelco Dolstra d1cbcc3971 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=32965
2012-03-09 19:57:33 +00:00
Eelco Dolstra ed325cd1ae * We accidentally lost xz support in rpm. This broke RPM builds
(http://hydra.nixos.org/build/2230623).

svn path=/nixpkgs/trunk/; revision=32847
2012-03-07 09:47:22 +00:00
Eelco Dolstra 38615a16e9 * Fix the checkinstall build on Glibc 2.13.
svn path=/nixpkgs/trunk/; revision=32831
2012-03-06 19:06:33 +00:00
Eelco Dolstra 11d1104a88 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32731
2012-03-01 22:22:24 +00:00
Shea Levy 584ccabaac svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32569
2012-02-25 20:52:15 +00:00
Yury G. Kudryashov 79d0d410cb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
2012-02-17 13:43:31 +00:00
Eelco Dolstra a3da139c73 * Remove ext3cow, it's dead.
svn path=/nixpkgs/trunk/; revision=32340
2012-02-16 19:30:41 +00:00
Yury G. Kudryashov e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Peter Simons ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +00:00
Yury G. Kudryashov f7886ac78b svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
2012-02-13 19:47:36 +00:00
Sander van der Burg da6e4f95d4 Bumped revision of Disnix activation scripts
svn path=/nixpkgs/trunk/; revision=32234
2012-02-12 13:34:06 +00:00
Yury G. Kudryashov b31c67e24d svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
2012-01-27 16:43:39 +00:00
Eelco Dolstra 26bcec3897 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=31880
2012-01-27 13:39:47 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Sander van der Burg c0be721441 Bumped version of DisnixOS
svn path=/nixpkgs/trunk/; revision=31833
2012-01-24 22:28:40 +00:00
Sander van der Burg c436381674 Bumped versions of disnix and disnixos
svn path=/nixpkgs/trunk/; revision=31825
2012-01-24 21:13:42 +00:00
Eelco Dolstra 3ac44bde79 * Disable make check because it fails randomly due to a race.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31790
2012-01-23 12:34:07 +00:00
Eelco Dolstra bafc4ff59d * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
2012-01-20 15:29:04 +00:00
Eelco Dolstra b786ce664d * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=31738
2012-01-20 15:26:47 +00:00
Yury G. Kudryashov 84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Eelco Dolstra d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Michael Raskin faedda84ef A more correct condition for adding scripts to install
svn path=/nixpkgs/trunk/; revision=31638
2012-01-18 17:23:41 +00:00
Eelco Dolstra 48ee2523da * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
2012-01-18 15:53:12 +00:00
Eelco Dolstra bbe40d00f4 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=31619
2012-01-18 12:23:42 +00:00
Yury G. Kudryashov f77741e018 merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Eelco Dolstra cddfcd7bcc * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=31043
2011-12-22 12:30:59 +00:00
Eelco Dolstra eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Eelco Dolstra 3ea1c30846 * Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing
in its interaction with the ‘dontStrip’ attribute.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30848
2011-12-12 14:02:12 +00:00
Eelco Dolstra 8ed604d4b8 * Bump.
svn path=/nixpkgs/trunk/; revision=30740
2011-12-05 12:12:20 +00:00
Eelco Dolstra d10ed1b45b * Bump.
svn path=/nixpkgs/trunk/; revision=30630
2011-11-29 22:56:29 +00:00
Eelco Dolstra 6c02d31c68 * Bump.
svn path=/nixpkgs/trunk/; revision=30544
2011-11-23 15:59:09 +00:00
Rob Vermaas 47e2f1c820 update nixUnstable
svn path=/nixpkgs/trunk/; revision=30511
2011-11-21 15:41:19 +00:00
Eelco Dolstra 86e8dcc34b * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=30460
2011-11-17 12:05:52 +00:00
Shea Levy 10cbd00396 Allow cross-compiling configurations to explicitly give a system string when cross-building nix
svn path=/nixpkgs/trunk/; revision=30458
2011-11-16 21:04:02 +00:00
Shea Levy e895fe5e2f Use gc, dbi, and dbd-sqlite when cross-building nix
The dbi and dbd-sqlite may be hacks since they're not cross-built, I'm not certain

svn path=/nixpkgs/trunk/; revision=30455
2011-11-16 20:21:58 +00:00
Eelco Dolstra 169d5c3214 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=30319
2011-11-08 14:18:59 +00:00
Eelco Dolstra 041170f5ec * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=30078
2011-10-28 18:06:23 +00:00
Sander van der Burg 631f071df8 Bumped version of disnixos
svn path=/nixpkgs/trunk/; revision=29929
2011-10-20 11:07:47 +00:00
Sander van der Burg 4f32c23d86 Bumped some versions of Disnix tools
svn path=/nixpkgs/trunk/; revision=29890
2011-10-19 12:24:24 +00:00
Eelco Dolstra bc1298e651 * Updated nixUnstable.
svn path=/nixpkgs/trunk/; revision=29203
2011-09-12 10:02:03 +00:00
Eelco Dolstra 9c9cea35ad * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=29082
2011-09-07 16:14:42 +00:00
Peter Simons 468c5dbc5c The 'random' library is no longer a core library in GHC 7.2.1. For older
versions of the compiler, haskell-packages.nix provides a null attribute.

svn path=/nixpkgs/trunk/; revision=28500
2011-08-12 00:18:56 +00:00
Peter Simons dbce2ffd0f Generated neater meta.description strings.
svn path=/nixpkgs/trunk/; revision=28492
2011-08-11 13:03:51 +00:00
Peter Simons b1ef3e6e36 Last batch of Haskell expression updates.
* haskell-mkcabal: updated to version 1.0.0
 * haskell-ghc-syb-utils: updated to version 0.2.1.0
 * haskell-darcs: updated to version 2.5.2

svn path=/nixpkgs/trunk/; revision=28449
2011-08-10 00:35:08 +00:00
Eelco Dolstra 9049a3000d * Update nixUnstable.
svn path=/nixpkgs/trunk/; revision=28403
2011-08-08 19:55:14 +00:00
Eelco Dolstra 4cc476fa52 * Update nixUnstable.
svn path=/nixpkgs/trunk/; revision=27782
2011-07-14 17:16:00 +00:00
Sander van der Burg 84be287f40 bumped disnixos
svn path=/nixpkgs/trunk/; revision=27673
2011-07-08 14:42:13 +00:00
Ludovic Courtès e7e3bea7bf Update Nix unstable.
svn path=/nixpkgs/trunk/; revision=27596
2011-07-04 14:44:46 +00:00
Sander van der Burg 24e3b3a58b Added opkg package
svn path=/nixpkgs/trunk/; revision=27554
2011-06-28 09:45:51 +00:00
Sander van der Burg 3496c064d8 Bumped DisnixOS which has no longer issues with the new nixos-build-vms
svn path=/nixpkgs/trunk/; revision=27530
2011-06-22 22:27:42 +00:00