1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Commit graph

312 commits

Author SHA1 Message Date
Eelco Dolstra 5446934b41
nix: 1.11.10 -> 1.11.11
(cherry picked from commit 7b1e936b24)
2017-06-19 19:03:39 +02:00
Eelco Dolstra 0bffe03828
nix: 1.11.9 -> 1.11.10 2017-06-12 20:13:27 +02:00
Eelco Dolstra 3d4a8e1f84 nixUnstable: 1.12pre5350_7689181e -> 1.12pre5413_b4b1f452 2017-06-06 15:06:42 +02:00
Andrew R. M a114eaaec7 nix: add "man" to meta.outputsToInstall 2017-05-25 06:34:31 -04:00
Dmitry Kalinkin 467a91d9ee
nixStable: remove old patches
773313591f
ad9e6037a4
2017-05-23 17:32:30 -04:00
Eelco Dolstra 234cdc02eb
nixUnstable: 1.12pre5344_eba840c8 -> 1.12pre5350_7689181e 2017-05-08 16:50:58 +02:00
Eelco Dolstra d53540dd32
nixUnstable: 1.12pre5308_2f21d522 -> 1.12pre5344_eba840c8 2017-05-04 20:45:20 +02:00
Jörg Thalheim f556d94527 Merge pull request #25484 from l2dy/nix-confdir
nix: add confDir argument
2017-05-03 21:52:01 +01:00
Eelco Dolstra 20d846bcdd
nixUnstable.perlBindings: Fix Nix::Config generation
The configure script calls nix-instantiate, which fails if /nix/var
doesn't exist (e.g. in a sandbox). This caused a bogus Nix::Config
module to be generated, causing issues in Hydra.
2017-05-03 17:39:43 +02:00
Zero King 8bb7328300 nix: add confDir argument 2017-05-03 13:04:52 +00:00
Eelco Dolstra e042db5e41
nixUnstable: 1.12pre5152_915f62fa -> 1.12pre5308_2f21d522 2017-04-28 17:55:53 +02:00
Shea Levy 5aa936d0ee nix perl-bindings: Fix Config.pm 2017-04-25 20:36:04 -04:00
Eelco Dolstra e4190943c8
nix: 1.11.8 -> 1.11.9 2017-04-25 17:19:10 +02:00
Dan Peebles d990aa7163 Refactor nixos-install to separate out filesystem build logic
The key distinction I'm drawing is that there's a component that deals
with the store of the machine being built, and another component for
the store building it. The inner part of it assumes nothing from the
builder (doesn't need chroot or root powers) so it can run comfortably
inside a Nix build, as well as nixos-rebuild. I have some upcoming work
that will use that to significantly speed up and streamline image builds
for NixOS, especially on virtualized hosts like EC2, but it's also a
reasonable speedup on native hosts.
2017-04-16 16:09:41 +00:00
Eelco Dolstra 29b415dcdb
Add nixUnstable.perl-bindings 2017-04-11 15:36:51 +02:00
Eelco Dolstra 3dd66ec6e9
nix: 1.12pre5122_c60715e -> 1.12pre152_915f62fa 2017-04-11 15:02:45 +02:00
Dan Peebles ec674a6372 nix: fix evaluation
Sorry!
2017-04-08 21:15:21 -04:00
Dan Peebles fbdc4616ab nix: fix on LLVM 4.0 2017-04-08 16:54:16 -04:00
Rob Vermaas 3139993740
nixUnstable: update to 1.12pre5122_c60715e
(cherry picked from commit 4da11d7c9b)
2017-03-28 11:32:17 +00:00
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 fce036d164)
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 bb6d3c16d3)
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