3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

267 commits

Author SHA1 Message Date
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
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
Sander van der Burg d0a0f22c76 Updated Disnix packages and added disnixos
svn path=/nixpkgs/trunk/; revision=25181
2010-12-17 18:42:02 +00:00
Eelco Dolstra 229b94b30c svn path=/nixpkgs/trunk/; revision=25165 2010-12-17 08:56:53 +00:00
Eelco Dolstra f14bafc04b * Bump nixSqlite.
svn path=/nixpkgs/trunk/; revision=25118
2010-12-14 10:56:25 +00:00
Eelco Dolstra 97d4a54698 * nixSqlite: bump. Also, go back to using SQLite 3.7 because 3.6 also
gives random "database image is malformed" errors.

svn path=/nixpkgs/trunk/; revision=25050
2010-12-10 10:22:23 +00:00
Eelco Dolstra 7236f87bed * Bump.
svn path=/nixpkgs/trunk/; revision=25025
2010-12-07 13:16:11 +00:00
Eelco Dolstra f088bd4791 * nixUnstable updated, now with garbage collector.
svn path=/nixpkgs/trunk/; revision=24943
2010-11-30 18:32:23 +00:00
Eelco Dolstra 165a3df7f5 * Update nixSqlite.
svn path=/nixpkgs/trunk/; revision=24764
2010-11-19 10:39:48 +00:00
Sander van der Burg 76e26dd7a1 - Renamed DisnixService => DisnixWebService
- Updated to latest unstable version


svn path=/nixpkgs/trunk/; revision=24559
2010-11-01 17:33:24 +00:00
Michael Raskin 9a6c3e6fe9 Nix trunk requires pkgconfig
svn path=/nixpkgs/trunk/; revision=24541
2010-10-30 12:01:02 +00:00
Michael Raskin 9af1c42473 Pass BoehmGC to Nix
svn path=/nixpkgs/trunk/; revision=24540
2010-10-30 11:21:06 +00:00
Lluís Batlle i Rossell 71b6bc2be5 Updating nixUnstable. I'll propagate it to stdenv-updates, so it gets the
latest fixes that allow it to build in x86_64 gcc 4.5.1 (related to troubles
with a stack overflow).

svn path=/nixpkgs/trunk/; revision=24204
2010-10-10 14:42:55 +00:00
Ludovic Courtès 2739c3aa1e Update Nix unstable.
svn path=/nixpkgs/trunk/; revision=23832
2010-09-17 15:56:15 +00:00
Eelco Dolstra 1d236b4dcc svn path=/nixpkgs/trunk/; revision=23562 2010-08-31 13:18:12 +00:00
Eelco Dolstra 1417d5f300 * Updated the Sqlite Nix.
svn path=/nixpkgs/trunk/; revision=23475
2010-08-27 08:43:51 +00:00
Eelco Dolstra f5f32a5b4b * Nix 0.16.
svn path=/nixpkgs/trunk/; revision=23208
2010-08-17 15:21:42 +00:00
Eelco Dolstra eecae4f36a svn path=/nixpkgs/trunk/; revision=22980 2010-08-05 22:09:41 +00:00
Andres Löh 5f8328c461 Preparing for the upcoming Haskell Platform release.
svn path=/nixpkgs/trunk/; revision=22620
2010-07-17 13:23:48 +00:00
Peter Simons 9db8a17ce3 pkgs/tools/package-management/nix/unstable.nix: updated to latest version
svn path=/nixpkgs/trunk/; revision=22612
2010-07-15 14:55:19 +00:00
Michael Raskin a07f75cefa Update nixUnstable to latest
svn path=/nixpkgs/trunk/; revision=22578
2010-07-13 14:14:33 +00:00
Eelco Dolstra e4a9bdd834 svn path=/nixpkgs/trunk/; revision=22472 2010-07-05 08:28:15 +00:00
Eelco Dolstra b1ffc3abd9 svn path=/nixpkgs/trunk/; revision=22353 2010-06-21 08:38:45 +00:00
Eelco Dolstra 1b5f7622b7 * dpkg updated to 1.4.29.
svn path=/nixpkgs/trunk/; revision=22292
2010-06-16 11:50:06 +00:00
Sander van der Burg 3e958eea23 Upgraded Nix unstable to version 0.16pre22206
svn path=/nixpkgs/trunk/; revision=22207
2010-06-10 10:48:30 +00:00
Rob Vermaas 8827df79dd updating nixSqlite
svn path=/nixpkgs/trunk/; revision=22116
2010-06-03 08:09:54 +00:00
Eelco Dolstra e316a95859 svn path=/nixpkgs/trunk/; revision=21924 2010-05-20 13:49:54 +00:00
Eelco Dolstra b93b157771 svn path=/nixpkgs/trunk/; revision=21918 2010-05-20 12:23:16 +00:00
Lluís Batlle i Rossell e283f86174 Making nixUnstable ready to cross build.
That requires bzip2 to cross build properly, and this is done only in stdenv-updates.

svn path=/nixpkgs/trunk/; revision=21878
2010-05-19 15:13:46 +00:00
Eelco Dolstra fc0279c07e svn path=/nixpkgs/trunk/; revision=21811 2010-05-16 22:38:00 +00:00
Eelco Dolstra 687376f426 * Updated Nix.
svn path=/nixpkgs/trunk/; revision=21801
2010-05-16 16:48:38 +00:00
Eelco Dolstra 22d901d935 * Updated Nix.
svn path=/nixpkgs/trunk/; revision=21771
2010-05-14 08:57:16 +00:00
Ludovic Courtès 83609f6191 nixUnstable: Fix typo.
svn path=/nixpkgs/trunk/; revision=21617
2010-05-05 19:48:39 +00:00
Ludovic Courtès d2e6d7b84f Update Nix unstable.
svn path=/nixpkgs/trunk/; revision=21601
2010-05-05 09:30:42 +00:00
Eelco Dolstra 7cdad55164 * Use OpenSSL's implementation of MD5, SHA-1 and SHA-256, as they're
a bit faster.

svn path=/nixpkgs/trunk/; revision=21218
2010-04-21 20:07:26 +00:00
Sander van der Burg 4597b33ed1 Update Disnix packages to use the 0.1 release
svn path=/nixpkgs/trunk/; revision=20915
2010-04-01 14:49:05 +00:00
Andres Löh 9370225663 Haskell Platform 2010.1.0.0
svn path=/nixpkgs/trunk/; revision=20904
2010-04-01 10:56:48 +00:00
Eelco Dolstra 8396168276 * Updated Nix to 0.15.
svn path=/nixpkgs/trunk/; revision=20697
2010-03-17 12:16:03 +00:00
Eelco Dolstra 8ff6ffbb65 * Update the unstable Nix (with some GC-related bug fixes).
svn path=/nixpkgs/trunk/; revision=20652
2010-03-16 12:46:12 +00:00
Eelco Dolstra 2c44e4313c svn path=/nixpkgs/trunk/; revision=20570 2010-03-11 16:22:55 +00:00
Ludovic Courtès 9c2c2af4b2 Latest Nix from `trunk'.
svn path=/nixpkgs/trunk/; revision=20568
2010-03-11 16:10:06 +00:00
Eelco Dolstra 2745223414 * Updated nixSqlite.
svn path=/nixpkgs/trunk/; revision=20552
2010-03-11 11:36:40 +00:00
Ludovic Courtès 62a4d66a48 Fix URL of `nixUnstable'.
svn path=/nixpkgs/trunk/; revision=20551
2010-03-11 11:15:58 +00:00
Ludovic Courtès c22cc79a9e Latest Nix from `trunk'.
svn path=/nixpkgs/trunk/; revision=20549
2010-03-11 10:51:53 +00:00
Eelco Dolstra 854b22a24e * Updated nixSqlite.
svn path=/nixpkgs/trunk/; revision=20520
2010-03-10 09:58:19 +00:00
Lluís Batlle i Rossell 997723ec9b Trying to make nixUnstable cross-build.
It fails because it builds bin2c for the host system, instead of the build system.
I will wait for a fix upstream.

svn path=/nixpkgs/trunk/; revision=20445
2010-03-05 23:22:36 +00:00
Eelco Dolstra 2ae55812ef svn path=/nixpkgs/trunk/; revision=20428 2010-03-05 18:29:56 +00:00
Rob Vermaas cb4a352b3e wrong hash for nix-mysqlite 0.15
svn path=/nixpkgs/trunk/; revision=20411
2010-03-05 13:15:03 +00:00
Rob Vermaas 0723777cc7 update nixSqlite to 0.15pre20408
svn path=/nixpkgs/trunk/; revision=20410
2010-03-05 13:09:33 +00:00