diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-24 08:27:04 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-24 08:27:04 +0200 |
| commit | 32389de159a0983f4daf7de446da6439a92a29a2 (patch) | |
| tree | d670ccdd2e24a6a6f0dee7ff3c252b593377deb4 /nixos/modules | |
| parent | 09c9a2de7e75191bebfb3397364809f94195224c (diff) | |
| parent | 7044058ef779e8050aa4684a8f73114fdf39b849 (diff) | |
| download | nixpkgs-32389de159a0983f4daf7de446da6439a92a29a2.tar nixpkgs-32389de159a0983f4daf7de446da6439a92a29a2.tar.gz nixpkgs-32389de159a0983f4daf7de446da6439a92a29a2.tar.bz2 nixpkgs-32389de159a0983f4daf7de446da6439a92a29a2.tar.lz nixpkgs-32389de159a0983f4daf7de446da6439a92a29a2.tar.xz nixpkgs-32389de159a0983f4daf7de446da6439a92a29a2.tar.zst nixpkgs-32389de159a0983f4daf7de446da6439a92a29a2.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/config/users-groups.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/networking/smokeping.nix | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index ba79bd3d6ec..ae3bdeb00e6 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -251,7 +251,7 @@ let default = []; example = literalExample "[ pkgs.firefox pkgs.thunderbird ]"; description = '' - The set of packages that should be made availabe to the user. + The set of packages that should be made available to the user. This is in contrast to <option>environment.systemPackages</option>, which adds packages to all users. ''; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index c1754c0e0ec..dcec4d4fc6c 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -61,7 +61,7 @@ let '' else '' echo "Checking that Nix can read nix.conf..." ln -s $out ./nix.conf - NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config ${optionalString isNix23 "--no-net"} >/dev/null + NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config ${optionalString isNix23 "--no-net --option experimental-features nix-command"} >/dev/null '') ); diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index d4d0594a9cd..b48b0b3a9d6 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -299,7 +299,8 @@ in mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data rm -f ${smokepingHome}/cropper ln -s ${cfg.package}/htdocs/cropper ${smokepingHome}/cropper - cp ${cgiHome} ${smokepingHome}/smokeping.fcgi + rm -f ${smokepingHome}/smokeping.fcgi + ln -s ${cgiHome} ${smokepingHome}/smokeping.fcgi ${cfg.package}/bin/smokeping --check --config=${configPath} ${cfg.package}/bin/smokeping --static --config=${configPath} ''; @@ -314,5 +315,7 @@ in serviceConfig.Restart = "always"; }; }; + + meta.maintainers = with lib.maintainers; [ erictapen ]; } |