swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-18 19:54:15 +02:00
Code Issues Packages Projects Releases Wiki Activity
115884 commits 5 branches 0 tags 31 GiB
Commit graph

73 commits

Author SHA1 Message Date
Franz Pletz 3ab45f4b36
treewide: use boolToString function 2017-04-11 18:18:53 +02:00
Eelco Dolstra 78bb734452
nix-daemon.nix: Make the 1.12 check less strict 2017-03-21 18:48:35 +01:00
Robin Gloster c808801937
nix-daemon: fix autoOptimiseStore option 2017-03-21 02:17:09 +01:00
Philipp Steinpass 68c6d90417 Added option and description for nix store auto-optimisation. 2017-03-20 19:09:19 +01:00
Bjørn Forsman 316e7d6764 nixos/nix-daemon: doc: use literalExample 
Makes the example more readable by not squashed everything onto one
single line.
 2017-03-05 14:07:23 +01:00
Eelco Dolstra 3971876585
nix-daemon: Remove a bunch of unnecessary environment variables 2017-03-03 16:50:37 +01:00
Eelco Dolstra 3070c88798
Fix incorrect $NIX_BUILD_HOOK on Nix 1.12 2017-03-03 16:50:26 +01:00
Graham Christensen 7483ba0932
Revert "nix-daemon: default useSandbox to true" 
This reverts commit d0a086770a.
 2017-02-14 14:13:39 -05:00
Graham Christensen d0a086770a
nix-daemon: default useSandbox to true 2017-02-13 18:06:01 -05:00
Chris Martin 6a7664e6cd Add some more details about useSandbox 2017-01-03 14:24:49 -05:00
Michael Stapelberg 9cbf8a0652 Fix buildMachines example: use lists, not string (#20361) 
Using the example before this commit resulted in the following error:

```
error: value is a string while a list was expected, at /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/services/misc/nix-daemon.nix:349:37
```
 2016-11-15 07:04:32 +01:00
Eelco Dolstra 2755bcfa7c In $NIX_PATH, use nixpkgs=... 
This is required by the "nix" command to find Nixpkgs.
 2016-08-29 17:50:25 +02:00
Joachim Fasting f3ef4383c6
nix-daemon service: fix unbalanced parens in description 2016-08-23 13:06:25 +02:00
Tuomas Tynkkynen 1d4b21ef42 treewide: Use correct output of config.nix.package in non-string contexts 2016-04-25 16:44:38 +02:00
Tuomas Tynkkynen 70f5c840af nix-daemon service: Don't have the output in the `nix.package' option 
1) It unnecessarily exposes implementation details.
2) It breaks all existing configs that have e.g.
   `nix.package = pkgs.nixUnstable;`.
 2016-04-25 16:44:37 +02:00
Vladimír Čunát 7cf8daa2bb nixos: rename chroot* to sandbox* 
On Nix side this was done months ago:
https://github.com/NixOS/nix/pull/682
 2016-04-25 11:04:08 +02: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 7a89a85622 nix.useChroot: allow 'relaxed' as a value 2016-03-25 12:50:39 +00:00
Vladimír Čunát 09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Al Zohali a227bd4e3b nix.requireSignedBinaryCaches: description fix 2016-03-07 23:24:35 +03:00
zimbatm b73c5ae291 Merge pull request #10546 from aszlig/nixops-issue-350 
Fixes for NixOps issue #350
 2016-02-26 00:33:49 +00: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 bfebc7342e Fix some references to deprecated /etc/ssl/certs/ca-bundle.crt 2016-01-29 02:32:05 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Thomas Strobel a04a7272aa Add missing 'type', 'defaultText' and 'literalExample' in module definitions 
- add missing types in module definitions
- add missing 'defaultText' in module definitions
- wrap example with 'literalExample' where necessary in module definitions
 2016-01-17 19:41:23 +01:00
aszlig 80fb17b251
nixos/nix-daemon: Require .mount for /nix/store. 
Also related to NixOS/nixops#350, because while switching to the new
configuration, depending on /nix/store also propagates to the mount
points for /nix/.ro-store and /nix/.rw-store and we don't get an error
while trying to unmount them (because nix-daemon needs to be stopped for
unmounting these paths).

While Nix does have the option to set a different store path, I've found
only hardcoded references in nix-daemon.nix, so I'm using a hardcoded
reference here as well, because after all customizing the store path
will probably only make sense on non-NixOS systems.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-10-22 19:50:12 +02:00
Tuomas Tynkkynen c856b13067 nixos/nix-daemon: Reference correct output of openssl 2015-10-03 14:08:53 +02:00
Eelco Dolstra b3d8d750de Remove /etc/nixos/nixpkgs from $NIX_PATH 
NixOS hasn't used /etc/nixos/nixpkgs for a long time, so it's time to
get rid of it.
 2015-08-05 14:34:33 +02:00
Eelco Dolstra 3f1354a3cd Add an option ‘nix.nixPath’ for specifying $NIX_PATH 2015-08-05 14:33:15 +02:00
Tobias Geerinckx-Rice c78fd07460 nixos: nix-daemon: update maxJobs description 
I bought an X2 in 2006. It was awesome.
Use a more contemporary and model-agnostic example.
 2015-07-30 19:06:45 +02:00
Eelco Dolstra e3a5bca4ae Require signed binary caches by default 2015-07-27 20:30:09 +02:00
Luca Bruno 41cf8be412 nixos nix-daemon: lower priority is 19. Closes #8675 2015-07-07 09:49:05 +02:00
Eelco Dolstra a9b3d75e9e nix.buildMachines: Fewer required fields 2015-06-30 00:51:07 +02:00
William A. Kennington III fee9ef8659 nixos: Replace pkgs.openssh with config.programs.ssh.package 2015-06-26 17:09:58 -07:00
Eelco Dolstra 1f3f31b2a8 Add options nix.{trustedUsers,allowedUsers} 
These are just trusted-users and allowed-users in nix.conf. It's
useful to have options for them so that different modules can specify
trusted/allowed users.
 2015-06-26 18:45:27 +02:00
Eelco Dolstra fb203a34c0 nix.buildMachines: Don't require sshUser 2015-06-26 18:44:44 +02:00
Eelco Dolstra 07aa0f7f21 Revert "Use nixUnstable by default" 
This reverts commit 64a41b7a90.
 2015-06-12 13:20:18 +02:00
Eelco Dolstra 64a41b7a90 Use nixUnstable by default 2015-06-01 18:20:28 +02:00
Eelco Dolstra fdfe4b7cde Remove unnecessary symlinks in /nix/var/nix/gcroots 2015-04-01 14:45:02 +02:00
William A. Kennington III 4940e643cc nixos/display-manager: Support configurable hidden users 2015-03-09 18:10:31 -07:00
Eelco Dolstra 5762f8f95c Add options to support signed binary caches 
Typical use:

    nix.requireSignedBinaryCaches = true;
    nix.binaryCachePublicKeys = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ];

(The public key of cache.nixos.org is included by default.)

Note that this requires Nix 1.9 and that most of cache.nixos.org
hasn't been signed yet.
 2015-02-19 14:22:43 +01:00
Eelco Dolstra 5d7000df68 Automatically set nix.nrBuildUsers to at least nix.maxJobs 2015-02-16 12:02:49 +01:00
Wout Mertens d41367735d nix-daemon: Sanity check maxJobs vs nrBuildUsers 2015-02-15 15:37:30 +01:00
Peter Simons ea94a6d653 nixos/modules/services/misc/nix-daemon.nix: document meaning of '0' for the buildCores attribute 2015-01-05 15:38:08 +01:00
Eelco Dolstra faf0797c0c Use https://cache.nixos.org 2014-12-09 13:38:46 +01:00
Antoine R. Dumont e54f9ffcf4 Ensure nix-daemon sees the proxy defined options 
(Not sure about this one)

Here are the incomplete and a little contradictory discussions about
it (or at least my interpretations of them):

- https://github.com/NixOS/nixpkgs/pull/5058#discussion_r20830855
- https://github.com/NixOS/nixpkgs/pull/5058#discussion_r21043552

cc @edolstra @wmertens

What did I get wrong?
 2014-11-30 15:19:30 +01:00
Antoine R. Dumont 3c7e779602 Introduce a dedicated networking.proxy option 
Following the discussion NixOS#5021:
- obsolete the nix.proxy option
- add the networking.proxy option
- open a default no_proxy environment variable
- add a rsync option
- Manual tests ok.
- Automatic tests ok.

Amended by lethalman to simplify the option descriptions.
 2014-11-30 15:19:25 +01:00
Nikolay Amiantov e8dace201f nix-daemon: add maxCores option 2014-11-01 23:58:21 +03:00
Eelco Dolstra b35770818d In Nix chroots, provide plain bash, not bash-interactive 
This way we don't get ncurses in the chroot. Also, use a bind-mount of
/bin/sh to bash, rather than the entire /bin from the host filesystem.
 2014-08-04 16:46:39 +02:00