Commit graph

276 commits

Author SHA1 Message Date
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