JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
228,855 Commits 2 Branches 0 Tags 13 GiB
c86af902f4
Commit Graph

443 Commits

Author SHA1 Message Date
Domen Kožar
99632d5466
Nix, Hydra: bump to 2017-03-21 2017-03-25 13:00:49 +01:00
Eelco Dolstra
2cb25f8b59
nix: 1.11.7 -> 1.11.8 2017-03-21 14:49:23 +01:00
Rob Vermaas
8784b0582e
Update nixUnstable 
(cherry picked from commit fce036d16443b8b9f5f02a9d2bcadc5976044dbc)
 2017-03-06 13:32:56 +00:00
Shea Levy
4da420709d nixUnstable: Add s3 support on darwin 2017-03-05 07:39:23 -05:00
Eelco Dolstra
f5e53aea5d
nixUnstable: 1.12pre4997_1351b0d -> 1.12pre5060_fa125b9 2017-03-01 18:04:18 +01:00
Eelco Dolstra
8e1fa01f3a
nix: 1.11.6 -> 1.11.7 2017-02-24 12:53:53 +01:00
Eelco Dolstra
dea81956fc nixUnstable: 1.12pre4911_b30d1e7 -> 1.12pre4997_1351b0d 2017-02-03 14:47:05 +01:00
Eelco Dolstra
96b6968950
nix: 1.11.5 -> 1.11.6 2017-01-13 11:38:09 +01:00
Eelco Dolstra
0108c31e22
nix: 1.11.4 -> 1.11.5 2017-01-03 11:25:38 +01:00
Eelco Dolstra
c94454a45a nixUnstable: 1.12pre4523_3b81b26 -> 1.12pre4911_b30d1e7 2016-12-09 11:21:06 +01:00
Eelco Dolstra
6a9fb8b9e0 nix: Enable install check 
Looks like this got disabled accidentally in
ec5b66eb4a.
 2016-09-12 23:34:08 +02:00
Eelco Dolstra
f2ddf2a9be nix: 1.11.3 -> 1.11.4 2016-09-06 16:15:22 +02:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master 
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
 2016-09-01 13:27:27 +03:00
Vladimír Čunát
3996aa8953 nix: maintenance 1.11.2 -> 1.11.3 
Fixes #17804.
 2016-08-29 22:44:01 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +03:00
Aneesh Agrawal
e2ddcc938f nix: remove unused unstable.nix file 2016-08-18 23:14:07 -04:00
Eelco Dolstra
21a2f2ba3b nix: Add a "dev" output 
This gets rid of boehm-dev in the closure (as well as Nix's own
headers).
 2016-04-18 21:13:18 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Domen Kožar
d7034e6d5f nixUnstable: bump 
(cherry picked from commit bb6d3c16d3a851c646c0d1fc6976b546c766a227)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-03-27 20:24:43 +01:00
Domen Kožar
8e398a88a1 nixUnstable: point to latest 1.12pre 2016-03-17 13:03:36 +00:00
Vladimír Čunát
2cbe6bb3f0 nix: split man output from doc 2016-03-08 09:59:31 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Eelco Dolstra
e674356c46 nix: Fix indentation 2016-02-12 16:10:59 +01:00
Eelco Dolstra
aa31d99d29 nix: 1.11.1 -> 1.11.2 2016-02-12 15:20:27 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Eelco Dolstra
42e53ba62c nix: 1.10 -> 1.11.1 2016-01-26 17:00:15 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Eelco Dolstra
320f1b4e3c nix: 1.11pre4345_b8258a4 -> 1.11pre4379_786046c 2016-01-14 13:20:49 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Eelco Dolstra
63bf2a551e nixUnstable: 1.11pre4334_7431932 -> 1.11pre4345_b8258a4 2015-12-29 17:54:58 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Eelco Dolstra
2de76b2753 nixUnstable: 1.11pre4273_71039be -> 1.11pre4334_7431932 2015-12-10 15:25:48 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Eelco Dolstra
58f9896a43 nixUnstable: Update to 1.11pre4273_71039be 2015-10-31 00:22:32 +01:00
Eelco Dolstra
d9d5c98c56 Add option environment.enableDebugInfo 
This makes the debug outputs of packages that have them available to
programs like gdb.
 2015-10-30 15:21:16 +01:00
Eelco Dolstra
1286435499 nixUnstable: Update to 1.11pre4244_133a421 2015-10-09 14:44:27 +02:00
Eelco Dolstra
24483ebe47 nixUnstable: Update to 1.11pre4243_2075ec8 2015-10-08 15:57:29 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +02:00
Eelco Dolstra
2a28bc6691 separateDebugInfo: Assert Linux 
Also remove some unintended setting of separateDebugInfo.
 2015-09-22 20:21:10 +02:00
Eelco Dolstra
ec5b66eb4a Enable separate debug info 
You can now pass

  separateDebugInfo = true;

to mkDerivation. This causes debug info to be separated from ELF
binaries and stored in the "debug" output. The advantage is that it
enables installing lean binaries, while still having the ability to
make sense of core dumps, etc.
 2015-09-17 15:56:33 +02:00
Eric Seidel
1d5a96c3c6 Merge pull request #9309 from acowley/nix-darwin 
nix: use libsodium on darwin
 2015-09-14 15:12:33 -07:00
Eelco Dolstra
86eaeb4c0a Nix: Update to 1.10 2015-09-04 10:40:08 +02:00
Eelco Dolstra
fa67a2d301 nixUnstable: Update 2015-08-24 18:58:45 +02:00
Anthony Cowley
7dbea7aa78 Nix darwin use libsodium 2015-08-17 18:09:19 -04:00
Eelco Dolstra
8a5000cc78 nixUnstable: Update to 1.10pre4200_76cc8e9 
Also unify the nixStable and nixUnstable expressions.
 2015-07-30 12:08:20 +02:00
Eelco Dolstra
f98c7f2976 More docs in separate outputs 2015-07-26 22:46:45 +02:00
Eelco Dolstra
192d20e820 nix: Update to 1.9 2015-06-12 13:19:48 +02:00
Eelco Dolstra
a70d0275e2 nixUnstable: Bump 
This should fix the NixOS installer tests.
 2015-06-05 13:53:49 +02:00
William A. Kennington III
f51d38214d nixUnstable: Bump 2015-05-29 11:48:58 -07:00
Vladimír Čunát
375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Edward Tjörnhammar
87b0558101 nixUnstable: Update to 1.9pre4100_4bbcfaf 2015-04-23 13:52:44 +02:00
Vladimír Čunát
e36dd5acf8 nix: fix paths to bzip outputs 2015-04-18 21:37:00 +02:00
William A. Kennington III
493f526eef nixUnstable: Bump 2015-04-07 14:00:26 -07:00
Eelco Dolstra
f713e7033e nixUnstable: Update to 1.9pre4087 2015-04-03 11:40:12 +02:00
Eelco Dolstra
5cc05f6cf2 nixUnstable: Update to 1.9pre4083_5114a07 2015-03-24 14:42:37 +01:00
Eelco Dolstra
e02d926ca9 nixUnstable: Update to 1.9pre4074_e659978 2015-03-09 11:27:22 +01:00
Eelco Dolstra
d6c88eaeb8 Apply upstream fix for Nix on XFS 
Fixes #6424.
 2015-02-18 10:41:39 +01:00
Eelco Dolstra
cbab474cea nixUnstable: Update 2015-02-18 10:39:47 +01:00
Eelco Dolstra
038a837f02 nixUnstable: Update to 1.9pre4028_0d1dafa 2015-02-04 14:22:34 +01:00
Daniel Peebles
ea5594679c Bump nixUnstable build 2015-01-21 22:13:51 -05:00
Daniel Peebles
65522d05d4 Turn nixUnstable back on 2015-01-15 22:47:47 -05:00
Eelco Dolstra
e115bdecd8 nix: Update to 1.8 2014-12-14 05:29:24 +01:00
Shea Levy
fcaf268d54 nixUnstable: bump 2014-12-03 22:22:18 -05:00
Shea Levy
97f35cf29a nixUnstable: bump 
Bug fixed in b0c5c2a was giving me segfaults...
 2014-11-21 08:36:02 -05:00
Eelco Dolstra
8be7b23cb3 nixUnstable: Update to 1.8pre3899_8299aaf 2014-11-19 18:26:07 +01:00
Shea Levy
8b9b0d95a0 nixUnstable: bump 2014-11-17 00:59:31 -05:00
Eelco Dolstra
ca441636f1 Merge branch 'staging' 2014-11-14 16:00:23 +01:00
Eelco Dolstra
03d828a976 nixUnstable: Update to 1.8pre3890_8cfe939 2014-11-14 16:00:00 +01:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging 
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
 2014-11-04 14:30:43 +01:00
Shea Levy
2ac3c2e462 nixUnstable: Bump 2014-10-23 09:21:12 -04:00
Shea Levy
eff15260d4 nixUnstable: bump 
Some memory and speed improvements
 2014-10-17 21:56:13 -04:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 
Conflicts:
	pkgs/tools/security/gnupg/default.nix
 2014-10-09 10:57:57 +02:00
Shea Levy
aa847f4772 Update nixUnstable 2014-10-04 16:11:27 -04:00
Eelco Dolstra
ee7a54df0c nix: Revert meta attribute removal 2014-09-24 19:00:35 +02:00
Eelco Dolstra
d3d889eaef nixUnstable: Update to 1.8pre3823_53b044c 2014-09-23 10:56:22 +02:00
Joel Taylor
fa9b1f9cda build nix head successfully 2014-09-09 13:54:57 -07:00
Joel Taylor
6f949b2e87 get rid of nasty CC stuff 2014-09-09 13:54:26 -07:00
Joel Taylor
f3f6acc9f8 mark nixUnstable as broken on darwin 2014-09-09 13:54:25 -07:00
Joel Taylor
7da056233f wip libc++ 2014-09-09 13:54:25 -07:00
Eelco Dolstra
364bdc2a95 nixUnstable: Update to 1.8pre3782_d2d5543 2014-09-05 16:05:50 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Eelco Dolstra
07e1301085 nixUnstable: Update to 1.8pre3766_809ca33 2014-08-21 18:04:56 +02:00
Rickard Nilsson
c5c1a243fa nixUnstable: Update to nix-1.8pre3748_02843ba 2014-08-18 16:44:51 +02:00
Eelco Dolstra
b8866772d8 nixUnstable: Update to 1.8pre3746_c160ead 2014-08-17 21:50:22 +02:00
Eelco Dolstra
a9a4cdd3d0 nixUnstable: Update to 1.8pre3718_51485dc 2014-08-04 14:00:41 +02:00
Eelco Dolstra
6a5b365689 nixUnstable: Update to 1.8pre3711_45f9a91 2014-07-30 13:18:33 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
7acfec9e47 nixUnstable: Update to 1.8pre3705_71a20d4 2014-07-25 14:51:50 +02:00
Eelco Dolstra
2b2ba8bdf4 nixUnstable: Update to 1.8pre3679_f609eec 2014-07-18 00:22:08 +02:00
Eelco Dolstra
c49afcc84a nixUnstable: Update to 1.8pre3666_5bcb982 2014-07-14 17:34:40 +02:00
Shea Levy
662ecd277a nix: propagate boehmgc 2014-06-27 18:15:05 -04:00
Shea Levy
52aa2afdcd nixUnstable: bump 2014-06-16 10:44:02 -04:00
Eelco Dolstra
2da09363bf nix: Update to 1.7 2014-04-11 12:24:48 +02:00
Eelco Dolstra
95272dc61a nixUnstable: Update to 1.7pre3576_2b6c8ef 2014-04-08 18:14:46 +02:00
Vladimír Čunát
5d26659bb9 nixUnstable: update to avoid the funny --c||es bug :-) 2014-03-29 18:38:46 +01:00
Eelco Dolstra
5605b256a7 nixUnstable: Update to 1.7pre3522_f7e077a 2014-03-05 15:23:30 +01:00
Eelco Dolstra
19350fac66 nixUnstable: Update to 1.7pre3520_1017bd6 2014-02-28 11:05:47 +01:00
Eelco Dolstra
8ad41b92cf nixUnstable: Update to 1.7pre3327_0e2ca26 
Also fixes disappeared tarball.
 2014-01-21 09:59:50 +01:00
Eelco Dolstra
9afd64fba8 nixUnstable: Update to 1.7pre3319_f4013b6 2014-01-09 13:20:08 +01:00
Eelco Dolstra
b9dbfe7feb nix: Backport bug fix to check NAR integrity 2014-01-09 13:07:57 +01:00
Eelco Dolstra
60f1afe199 nix: Update to 1.6.1 2013-10-29 11:30:36 +01:00
Eelco Dolstra
6f911ede89 nix: Update to 1.7pre3267_2d9bb56 2013-10-24 20:20:13 +02:00
Eelco Dolstra
ee330eaedf nixUnstable: Update to 1.7pre3252_792fd51 2013-10-17 16:06:58 +02:00
Eelco Dolstra
095fc0ebaa nix-repl: Add 2013-09-17 11:26:12 +02:00
Eelco Dolstra
b73deae714 nix: Update to 1.6 2013-09-10 17:53:29 +02:00
Eelco Dolstra
64d648e92e Update nixUnstable 2013-09-10 13:57:32 +02:00
Eelco Dolstra
692dfb6af9 Update nixUnstable 2013-09-06 11:42:11 +02:00
Eelco Dolstra
36622f5964 nixUnstable: Update to 1.6pre3187_3fb7ae0 2013-08-12 14:22:16 +02:00
Eelco Dolstra
3c35daeebe nixUnstable: Update to 1.6pre3166_15e5ac8 2013-07-19 15:19:38 +02:00
Eelco Dolstra
5bc8275075 nix: Update to 1.5.3 2013-06-18 00:56:00 +02:00
Eelco Dolstra
a0c5ff6571 nixUnstable: Update to 1.5.3pre3141_1b6ee8f 2013-06-14 13:38:36 +02:00
Eelco Dolstra
eaf98cf26e nixUnstable: Update to 1.5.3pre3134_5c06e52 2013-06-11 12:08:37 +02:00
Eelco Dolstra
fdd06dc094 nix: Update to 1.5.2 2013-05-14 00:01:38 +02:00
Eelco Dolstra
ef6fc4a345 nixUnstable: Update to 1.5.2pre3091_772b709 2013-04-30 00:17:18 +02:00
Eelco Dolstra
5262980561 nixUnstable: Bump 2013-03-26 16:00:47 +01:00
Eelco Dolstra
93a963f347 nixUnstable: Update to the latest 
This is mostly to get rid of those annoying Perl warnings in NixOS...
 2013-03-18 22:35:33 +01:00
Vladimír Čunát
26af997d41 Merge branch 'master' into stdenv-updates 
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
 2013-03-02 10:41:53 +01:00
Eelco Dolstra
1166b82fca nix: Update to 1.5.1 2013-03-01 02:03:09 +01:00
Eelco Dolstra
adef38370c nix: Update to 1.5 2013-02-28 01:20:39 +01:00
Eelco Dolstra
5847037d84 nix: Update to 1.4 2013-02-26 14:41:02 +01:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Eelco Dolstra
26dd2dc425 nixUnstable: Update to 1.4pre3056_79a3ba7 2013-02-11 15:27:18 +01:00
Lluís Batlle i Rossell
3b26ba7019 Merge remote-tracking branch 'central/master' into stdenv-updates 
Conflicts:
	pkgs/os-specific/linux/alsa-utils/default.nix
 2013-01-27 11:32:12 +01:00
Eelco Dolstra
abf2ea216a nix: Update to 1.4pre3048_99ed558 2013-01-23 14:16:00 +01:00
Eelco Dolstra
0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Eelco Dolstra
bcc0c1dc59 Update nixUnstable 2013-01-20 17:26:07 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Eelco Dolstra
e2d6154fff nix: Update to 1.3 
Also, use /etc/nix as the default configuration directory.  This way
$NIX_CONF_DIR no longer needs to be set in most cases.
 2013-01-05 18:57:33 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv 
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
 2012-12-28 19:08:19 +01:00
Eelco Dolstra
1c24391251 nix: Update to 1.2 2012-12-07 13:46:07 +01:00
Eelco Dolstra
4b48d05c58 Remove nixCustomFun 
Rationale: on the one hand, there are generic customisation facilities
like overrideDerivation; on the other hand, nixCustomFun cannot
possibly accomodate every customisation scenario, so it's easier to
just modify/copy default.nix.
 2012-11-29 13:47:40 +01:00
Eelco Dolstra
144b06f107 nix: Update to 1.2pre2980 2012-11-20 12:12:24 +01:00
Eelco Dolstra
ae7044a001 nix: Update to 1.2pre2950_ac238d6 2012-10-16 17:11:54 -04:00
Eelco Dolstra
4606b60dbf nixUnstable: Update to 1.2pre2910_b674665 2012-09-14 12:32:44 -04:00
Eelco Dolstra
c557db2d5c nix: Update to 1.2pre2793_d950cfe 
Necessary for systemd.
 2012-08-21 08:42:44 -04:00
Eelco Dolstra
006e3fbf46 nix: Update to latest unstable version 2012-08-18 17:54:22 -04:00
Eelco Dolstra
d077a98e77 nix: Update to 1.1 2012-07-18 21:50:41 -04:00
Eelco Dolstra
eeb09aa1bc nix: Update to 1.1pre2749_ccc52ad 2012-07-18 17:03:55 +02:00
Eelco Dolstra
be4a92ad33 nix: Update to 1.1pre2742_a7a43ad 2012-07-16 11:22:28 -04:00
Eelco Dolstra
562259efc1 nix: Update to 1.1pre2723_1aba0bf 2012-07-05 14:05:02 -04:00
Rob Vermaas
484c13cce1 nixUnstable: Updated to 1.1pre2718_8da6772 
This version brings better isolation in chroot builds (private network and SysV IPC namespace).
 2012-06-25 11:40:17 +02:00
Eelco Dolstra
d5bb10417e nixUnstable: Updated to 1.1pre2714_2f3f413 
This version brings systemd support and automatic log compression.
 2012-06-22 10:34:08 -04:00
Eelco Dolstra
8a5d68220a * Nix 1.0. 
svn path=/nixpkgs/trunk/; revision=34068
 2012-05-12 04:20:26 +00:00
Eelco Dolstra
5bdea119d4 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=33971
 2012-05-02 13:19:07 +00:00
Eelco Dolstra
be901fa8be * Add an installCheckPhase. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=33967
 2012-05-01 21:00:30 +00:00
Eelco Dolstra
83f7c6988e * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=33954
 2012-04-30 15:33:59 +00:00
Eelco Dolstra
12130aea67 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=33915
 2012-04-25 12:24:16 +00:00
Eelco Dolstra
62765a92a8 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=33817
 2012-04-17 15:56:14 +00:00
Eelco Dolstra
b3980b78f8 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=33628
 2012-04-05 16:38:03 +00:00
Eelco Dolstra
a78b508f8e * Latest nixUnstable. 
svn path=/nixpkgs/trunk/; revision=33599
 2012-04-04 22:59:16 +00:00
Ludovic Courtès
1a38734345 nixUnstable: Fix cross-compilation native/cross mismatch with bzip2. 
See <http://hydra.nixos.org/build/2345751> for the original symptom.

svn path=/nixpkgs/trunk/; revision=33515
 2012-04-01 12:08:44 +00:00
Ludovic Courtès
3363c587a4 nixUnstable: Use `postInstall' instead of a custom phase. 
svn path=/nixpkgs/trunk/; revision=33514
 2012-04-01 12:08:39 +00:00
Yury G. Kudryashov
5299c1f6fb svn merge ^/nixpkgs/trunk 
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
 2012-03-31 20:01:40 +00:00
Michael Raskin
a6b434974b Fixing how bzip2 is passed to nixCustom 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33489
 2012-03-30 10:18:25 +00:00
Eelco Dolstra
5fd376da83 * Update nixUnstable. 
svn path=/nixpkgs/trunk/; revision=33480
 2012-03-29 22:10:24 +00:00
Eelco Dolstra
d1cbcc3971 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=32965
 2012-03-09 19:57: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
b31c67e24d svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
 2012-01-27 16:43:39 +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
b786ce664d * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=31738
 2012-01-20 15:26:47 +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
bbe40d00f4 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=31619
 2012-01-18 12:23:42 +00:00
Eelco Dolstra
cddfcd7bcc * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=31043
 2011-12-22 12:30:59 +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
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
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
Ludovic Courtès
e7e3bea7bf Update Nix unstable. 
svn path=/nixpkgs/trunk/; revision=27596
 2011-07-04 14:44:46 +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
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
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
Eelco Dolstra
6c790bbbab * Bump. 
svn path=/nixpkgs/trunk/; revision=25228
 2010-12-21 16:29:01 +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
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