summary refs log tree commit diff
path: root/nixos/modules/services/misc/nix-daemon.nix
Commit message (Collapse)AuthorAge
* nixos: set nixos in nixPathMatthew Bauer2018-09-23
| | | | | | | | | This makes using the nixos channel work out of the box with the new Nix commands. For example: $ nix run nixos.firefox -c firefox Fixes #46536
* Merge pull request #44880 from srghma/build-max-jobs-autoSilvan Mosberger2018-08-18
|\ | | | | nixos/nix-daemon: build-max-jobs, add support to auto
| * nixos/nix-daemon: build-max-jobs, add support to autosrghma2018-08-18
| |
* | nixos/nix-daemon: default `nix.useSandbox` to `true`.Andreas Rammhold2018-07-29
|/
* nixos/modules: users.(extraUsers|extraGroup->users|group)Florian Klink2018-06-30
|
* nixos/sandbox: improve documentation.Brandon Elam Barker2018-06-07
| | | | This was put together based on feedback from LnL on IRC.
* Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-05-22
|\
| * Stop requiring the nixpkgs symlink in NixOS channel tarballsDaniel Peebles2018-05-21
| | | | | | Ideally I'd like the whole `nixos`/`nixpkgs` channel distinction to disappear, but this is a step along that path. After a while being in this state, we can stop creating the magic `nixpkgs -> .` symlink inside our `nixos` channel tarballs and simplify that whole mess a bit.
* | Merge branch 'staging' into fix-ncurses-darwin-extensionsMatthew Justin Bauer2018-05-02
|\ \ | |/ |/|
| * nixos/nix-daemon: optionally (on by default) check nix.conf can be readWill Dietz2018-04-24
| | | | | | | | | | | | | | | | | | | | | | | | * checks using package providing the nix-daemon that we'll be using * made optional (unlike some other config checks) "just in case": since this requires running the new Nix on the builder, this won't work in a few (AFAIK very uncommon) situations such as cross-compiling NixOS or using `include` directives in nix.conf This does rely on Nix2 but not by the builder. Since we only offer Nix2+ in-tree this should be fine, and may otherwise be required anyway.
* | Merge pull request #38351 from grahamc/user-channelsGraham Christensen2018-05-01
|\ \ | |/ |/| Add user channels to the default nix path
| * Add user channels to the default nix pathGraham Christensen2018-05-01
| |
* | mkdir -> install -dEelco Dolstra2018-04-04
|/ | | | Fixes #38421.
* Remove obsolete /nix/var/nix/{manifests,channel-cache}Eelco Dolstra2018-03-20
|
* Merge branch 'master' into stagingJan Malakhovski2018-03-10
|\ | | | | | | | | | | | | | | | | | | | | Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix
| * CleanupEelco Dolstra2018-02-27
| |
* | nixos: Move uses of stdenv.shell to runtimeShell.Shea Levy2018-03-01
|/
* nix-daemon.nix: Updates for Nix 2.0Eelco Dolstra2018-01-31
| | | | | | | | | * The environment variables NIX_CONF_DIR, NIX_BUILD_HOOK and NIX_REMOTE are no longer needed. * A /bin/sh (from busybox) is provided by default in sandboxes. * Various options were renamed.
* nix-daemon: mention speedFactor in exampleFrank Doepper2017-10-10
|
* nix-daemon: Bump the default number of build usersEelco Dolstra2017-09-27
| | | | | While it's annoying to pollute the user database with a lot of nixbld* users, 10 users is really too low for many modern systems.
* treewide: use boolToString functionFranz Pletz2017-04-11
|
* nix-daemon.nix: Make the 1.12 check less strictEelco Dolstra2017-03-21
|
* nix-daemon: fix autoOptimiseStore optionRobin Gloster2017-03-21
|
* Added option and description for nix store auto-optimisation.Philipp Steinpass2017-03-20
|
* nixos/nix-daemon: doc: use literalExampleBjørn Forsman2017-03-05
| | | | | Makes the example more readable by not squashed everything onto one single line.
* nix-daemon: Remove a bunch of unnecessary environment variablesEelco Dolstra2017-03-03
|
* Fix incorrect $NIX_BUILD_HOOK on Nix 1.12Eelco Dolstra2017-03-03
|
* Revert "nix-daemon: default useSandbox to true"Graham Christensen2017-02-14
| | | | This reverts commit d0a086770a1be8c1f3175c195587052c5a5bfe1c.
* nix-daemon: default useSandbox to trueGraham Christensen2017-02-13
|
* Add some more details about useSandboxChris Martin2017-01-03
|
* Fix buildMachines example: use lists, not string (#20361)Michael Stapelberg2016-11-15
| | | | | | | 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 ```
* In $NIX_PATH, use nixpkgs=...Eelco Dolstra2016-08-29
| | | | This is required by the "nix" command to find Nixpkgs.
* nix-daemon service: fix unbalanced parens in descriptionJoachim Fasting2016-08-23
|
* treewide: Use correct output of config.nix.package in non-string contextsTuomas Tynkkynen2016-04-25
|
* nix-daemon service: Don't have the output in the `nix.package' optionTuomas Tynkkynen2016-04-25
| | | | | | 1) It unnecessarily exposes implementation details. 2) It breaks all existing configs that have e.g. `nix.package = pkgs.nixUnstable;`.
* nixos: rename chroot* to sandbox*Vladimír Čunát2016-04-25
| | | | | On Nix side this was done months ago: https://github.com/NixOS/nix/pull/682
* nix: Add a "dev" outputEelco Dolstra2016-04-18
| | | | | This gets rid of boehm-dev in the closure (as well as Nix's own headers).
* Merge branch 'master' into closure-sizeVladimír Čunát2016-04-01
|\ | | | | | | | | Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
| * nix.useChroot: allow 'relaxed' as a valueDomen Kožar2016-03-25
| |
| * nix.requireSignedBinaryCaches: description fixAl Zohali2016-03-07
| |
* | Merge master into closure-sizeVladimír Čunát2016-03-08
|\| | | | | | | | | The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
| * Merge pull request #10546 from aszlig/nixops-issue-350zimbatm2016-02-26
| |\ | | | | | | Fixes for NixOps issue #350
| | * nixos/nix-daemon: Require .mount for /nix/store.aszlig2015-10-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge recent 'staging' into closure-sizeVladimír Čunát2016-02-03
|\| | | | | | | | | | | Let's get rid of those merge conflicts.
| * | Fix some references to deprecated /etc/ssl/certs/ca-bundle.crtEelco Dolstra2016-01-29
| | |
* | | Merge branch 'staging' into closure-sizeVladimír Čunát2016-01-19
|\| |
| * | Add missing 'type', 'defaultText' and 'literalExample' in module definitionsThomas Strobel2016-01-17
| |/ | | | | | | | | | | - add missing types in module definitions - add missing 'defaultText' in module definitions - wrap example with 'literalExample' where necessary in module definitions
* / nixos/nix-daemon: Reference correct output of opensslTuomas Tynkkynen2015-10-03
|/
* Remove /etc/nixos/nixpkgs from $NIX_PATHEelco Dolstra2015-08-05
| | | | | NixOS hasn't used /etc/nixos/nixpkgs for a long time, so it's time to get rid of it.
* Add an option ‘nix.nixPath’ for specifying $NIX_PATHEelco Dolstra2015-08-05
|
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-14 20:30:18 +0000