summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Merge branch 'staging'Vladimír Čunát2018-02-03
|\ | | | | | | | | There are some Darwin regressions and a mysterious Lisp issue, but also a security update of curl...
| * Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-02-03
| |\
| * \ Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-02-03
| |\ \
| * \ \ Merge branch 'master' into stagingVladimír Čunát2018-02-01
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Haskell rebuild. Hydra: ?compare=1430378
| * \ \ \ Merge branch 'master' into stagingVladimír Čunát2018-01-30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Hydra: ?compare=1430035
| * | | | | openssh: Build with Kerberos by defaultGraham Christensen2018-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 09696e32c390c232ec7ac506df6457fb93c1f536. which reverted f596aa0f4a35f613422f85a4486e32ea20ca7739 to move it to staging
| * | | | | Revert "openssh: Build with Kerberos by default"Graham Christensen2018-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a232dd66ee0b390dc4d82858af7e15713bd60327. Moving to staging
| * | | | | openssh: Build with Kerberos by defaultAneesh Agrawal2018-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be disabled with the `withKerberos` flag if desired. Make the relevant assertions lazy, so that if an overlay is used to set kerberos to null, a later override can explicitly set `withKerberos` to false. Don't build with GSSAPI by default; the patchset is large and a bit hairy, and it is reasonable to follow upstream who has not merged it in not enabling it by default.
* | | | | | nixos/availableKernelModules: add a keyboard moduleVladimír Čunát2018-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-working keyboards during boot are quite a problem; see: https://github.com/NixOS/nixpkgs/pull/33529#issuecomment-361164997
* | | | | | home-assistant: Fix incorrect xml closing tagadisbladis2018-02-03
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #34494 from dotlambda/home-assistantFrederik Rietdijk2018-02-03
|\ \ \ \ \ | |_|_|_|/ |/| | | | home-assistant: compute extraComponents from config
| * | | | home-assistant: compute extraComponents from configRobert Schütz2018-02-02
| | | | |
* | | | | Merge pull request #33897 from rnhmjoj/digitsJörg Thalheim2018-02-02
|\ \ \ \ \ | | | | | | | | | | | | Avoid package attributes starting with a digit
| * | | | | docs: document changes regarding package attribute with a digitrnhmjoj2018-01-16
| | | | | |
| * | | | | avoid package attributes starting with a digitrnhmjoj2018-01-16
| | | | | |
* | | | | | nixos/tests/make-test.nix: Fix eval erroraszlig2018-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression introduced by 943592f69850fd07dd2422da062b1c1ebc45974d. The lib attribute isn't in scope here, so we need to use pkgs.lib instead for isFunction. Signed-off-by: aszlig <aszlig@nix.build> Cc: @shlevy
* | | | | | Merge branch 'dynamic-function-args'Shea Levy2018-02-02
|\ \ \ \ \ \
| * | | | | | Add setFunctionArgs lib function.Shea Levy2018-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Among other things, this will allow *2nix tools to output plain data while still being composable with the traditional callPackage/.override interfaces.
* | | | | | | knot-resolver: 1.5.3 -> 2.0.0 (feature update)Vladimír Čunát2018-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also split extraFeatures into a wrapper derivation. So far, no changes like user renaming nor systemd unit rework.
* | | | | | | Merge pull request #34442 from rnhmjoj/virtualJörg Thalheim2018-02-01
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Fix virtualType for network-interfaces-scripted
| * | | | | | fixrnhmjoj2018-02-01
| | | | | | |
| * | | | | | nixos/tests: add test for virtual interfacesrnhmjoj2018-01-31
| | | | | | |
| * | | | | | nixos/networking-interfaces: set default value for virtualTypernhmjoj2018-01-31
| |/ / / / /
* | | | | | Merge pull request #34188 from dotlambda/home-assistantFrederik Rietdijk2018-02-01
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | home-assistant: init at 0.62.1
| * | | | | home-assistant: add NixOS testRobert Schütz2018-01-31
| | | | | |
| * | | | | home-assistant: add NixOS moduleRobert Schütz2018-01-31
| | | | | |
* | | | | | 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.
* | | | | aria2 (nixos): actually load the modulePeter Hoeg2018-01-31
| | | | | | | | | | | | | | | | | | | | Fixes #33991
* | | | | runInLinuxVM: Use QEMU command line that works on other architecturesTuomas Tynkkynen2018-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | ... by moving the existing definition to qemu-flags.nix and reusing that.
* | | | | nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nixTuomas Tynkkynen2018-01-30
| | | | |
* | | | | nixos/qemu-flags: Take a 'pkgs' parameterTuomas Tynkkynen2018-01-30
| | | | | | | | | | | | | | | | | | | | I'm gonna use it in the next commit.
* | | | | nixos/tests: Drop unnecessary qemu-flags.nix includeTuomas Tynkkynen2018-01-30
| |_|_|/ |/| | | | | | | | | | | None of these files are using anything from there.
* | | | Merge pull request #34381 from JohnAZoidberg/lessJörg Thalheim2018-01-30
|\ \ \ \ | |/ / / |/| | | nixos/less configure less with module
| * | | nixos/less: use lesspipe package for preprocessingDaniel Schaefer2018-01-29
| | | | | | | | | | | | | | | | | | | | Rather than a custom script the less config now uses the lesspipe package config by default.
| * | | nixos/less configure less with moduleDaniel Schaefer2018-01-29
| | | |
* | | | nixos/borgbackup: add testJörg Thalheim2018-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had problems to get borg's own test suite running. This test is intended to perform a quick smoke test to see whether we have missed not any important dependency necessary to create backups with borg. tested with: $ nix-build nixos/release.nix -A tests.borgbackup.x86_64-linux
* | | | Merge pull request #33900 from jtojnar/nginx-acmeJan Tojnar2018-01-29
|\ \ \ \ | | | | | | | | | | nixos/nginx: allow using existing ACME certificate
| * | | | nixos/nginx: allow using existing ACME certificateJan Tojnar2018-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a domain has a lot of subdomains, it is quite easy to hit the rate limit: https://letsencrypt.org/docs/rate-limits/ Instead you can define the certificate manually in `security.acme.certs` and list the subdomains in the `extraDomains` option.
* | | | | Revert "openssh: Build with Kerberos by default"Graham Christensen2018-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a232dd66ee0b390dc4d82858af7e15713bd60327. Moving to staging
* | | | | openssh: Build with Kerberos by defaultAneesh Agrawal2018-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be disabled with the `withKerberos` flag if desired. Make the relevant assertions lazy, so that if an overlay is used to set kerberos to null, a later override can explicitly set `withKerberos` to false. Don't build with GSSAPI by default; the patchset is large and a bit hairy, and it is reasonable to follow upstream who has not merged it in not enabling it by default.
* | | | | nixos/powerManagement: remove duplicate definitionFranz Pletz2018-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When not set just use the kernel default. `nixos-generate-config` will pick a reasonable default. cc #34350
* | | | | Merge pull request #34350 from Ma27/fix-powermanagement-defaultFranz Pletz2018-01-28
|\ \ \ \ \ | | | | | | | | | | | | nixos/powerManagement: set `cpuFreqGovernor` with `mkOptionDefault`
| * | | | | nixos/powerManagement: set `cpuFreqGovernor` with `mkOptionDefault`Maximilian Bosch2018-01-28
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `nixos-generate-config` detects the `cpuFreqGovernor` suited best for my machine, e.g. `powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";`. However the `powerManagement` module sets a sensitive default for `cpuFreqGovernor` using `mkDefault` to avoid breackage with older setups. Since 140ac2f1 the `hardware-configuration.nix` sets the gorvernor with `mkDefault` as well which causes evaluation errors if the powermanagement module is enabled: ``` error: The unique option `powerManagement.cpuFreqGovernor' is defined multiple times, in `/home/ma27/Projects/nixos-config/hardware-configuration.nix' and `/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/config/power-management.nix'. ``` Using `mkOptionDefault` rather than `mkDefault` in the powermanagement module fixes this issue as it decreases the priority of the module and prefers the value set in `hardware-configuration.nix`. I have confirmed the change using the following VM declaration: ``` { cpuFreq = { lib, ... }: { powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.enable = true; }; } ```
* / | | | nixos/containers: Enable use of the network.useHostResolvConf option (#34354)Jesper2018-01-28
|/ / / /
* | | | samba4/sambaMaster: Modify services to align with Samba project usageLuke Adams2018-01-26
| | | |
* | | | nixos/tests: Fix statsd test evaluationTuomas Tynkkynen2018-01-26
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: error: anonymous function at nixos/tests/statsd.nix:1:25 called with unexpected argument ‘system’, at nixos/tests/make-test.nix:5:41
* | | | Merge pull request #34060 from WilliButz/fix-postfix-moduleFranz Pletz2018-01-26
|\ \ \ \ | | | | | | | | | | nixos/postfix: fix default postfix config
| * | | | release notes: mention the postfix config option fixFranz Pletz2018-01-26
| | | | | | | | | | | | | | | | | | | | cc #34060
| * | | | nixos/postfix: separate list option elements with commasFranz Pletz2018-01-26
| | | | |
| * | | | nixos/postfix: fix default postfix configWilliButz2018-01-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `services.postfix.config` is now correctly merged with the default attrset specified in the module. Some options that are lists in postfix also have to be lists in nix to be merged correctly. Other default options are now set with `mkDefault` so they can be overridden via the module system.