Commit Graph

214 Commits

Author SHA1 Message Date
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
Sander van der Burg
e2897bdd52 Bumped versions of disnix and disnixos to deal with recent NixOS changes
svn path=/nixpkgs/trunk/; revision=27248
2011-05-13 13:23:13 +00:00
Michael Raskin
3827d28f27 Update nixCustom for all the dependencies of latest SVN Nix
svn path=/nixpkgs/trunk/; revision=27084
2011-05-02 08:29:01 +00:00
Eelco Dolstra
03ef305478 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=26851
2011-04-15 13:39:44 +00:00
Andres Löh
3e0ac9b040 Major Haskell packages overhaul.
Several changes, some highlights:

  * Structure of haskell-packages.nix updated. It's now easier to
    select different default versions of packages for different
    versions of GHC.

  * GHC 7.0.2 is now default.

  * Haskell Platform 2011.2.0.0 has been added and is now default.

  * Several packages have been updated
    (gtk2hs, gitit, xmonad, darcs, ...).

  * Some old packages have been removed.

svn path=/nixpkgs/trunk/; revision=26288
2011-03-12 17:28:15 +00:00
Sander van der Burg
293caf43c4 Updated Disnix to use disnix-0.2 release packages
svn path=/nixpkgs/trunk/; revision=26027
2011-02-18 15:58:08 +00:00
Eelco Dolstra
0970ed2f9b * Bump.
svn path=/nixpkgs/trunk/; revision=26016
2011-02-17 15:25:54 +00:00
Eelco Dolstra
1062dbd1b0 * Bump.
svn path=/nixpkgs/trunk/; revision=26012
2011-02-17 13:37:48 +00:00
Sander van der Burg
cd2df27b1c Bumped Disnix versions and added them to release.nix
svn path=/nixpkgs/trunk/; revision=25899
2011-02-11 12:53:23 +00:00
Eelco Dolstra
6ca6fd8fc6 * Use Nix with SQLite in NixOS by default. Cross fingers.
svn path=/nixpkgs/trunk/; revision=25898
2011-02-11 12:45:19 +00:00
Michael Raskin
9a9d97642a Pass SQLite to nix-custom
svn path=/nixpkgs/trunk/; revision=25887
2011-02-10 17:13:48 +00:00
Sander van der Burg
45f6a2587f bump disnixos
svn path=/nixpkgs/trunk/; revision=25629
2011-01-19 13:46:13 +00:00
Sander van der Burg
a4877e2d33 Bumped disnix activation scripts
svn path=/nixpkgs/trunk/; revision=25620
2011-01-18 23:08:40 +00:00
Sander van der Burg
a9db6a68c2 Bumped versions of Disnix packages, which all have less technical debt
svn path=/nixpkgs/trunk/; revision=25607
2011-01-17 22:32:43 +00:00
Sander van der Burg
a8bfe3a9b1 Bumped disnix again
svn path=/nixpkgs/trunk/; revision=25295
2010-12-27 16:00:29 +00:00
Sander van der Burg
8e81fd9ee8 Bumped versions of disnix and disnixos
svn path=/nixpkgs/trunk/; revision=25262
2010-12-23 17:35:09 +00:00
Sander van der Burg
80af0654fb Bumped activation scripts so that postgresql and subversion types are supported
svn path=/nixpkgs/trunk/; revision=25234
2010-12-22 13:31:25 +00:00
Eelco Dolstra
6c790bbbab * Bump.
svn path=/nixpkgs/trunk/; revision=25228
2010-12-21 16:29:01 +00:00
Sander van der Burg
c93a60d7a3 Bumped version of disnixos again
svn path=/nixpkgs/trunk/; revision=25201
2010-12-19 15:28:11 +00:00
Sander van der Burg
56032641f4 Updated disnixos
svn path=/nixpkgs/trunk/; revision=25199
2010-12-19 14:59:26 +00:00