diff options
| author | John Ericson <mail@JohnEricson.me> | 2018-08-31 09:56:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 09:56:10 -0400 |
| commit | 2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93 (patch) | |
| tree | 46c1a6242a2243d6d6bd04d0dcb234056bc01c14 /nixos/modules/services | |
| parent | f7606a82ed6bbf93c015c01b4067c7529ab3e74e (diff) | |
| parent | 0828e2d8c369604c56219bd7085256b984087280 (diff) | |
| download | nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.gz nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.bz2 nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.lz nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.xz nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.zst nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.zip | |
Merge pull request #45820 from obsidiansystems/dont-use-obsolete-platform-aliases
treewide: Dont use obsolete platform aliases
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/misc/gitit.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/networking/vsftpd.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 0025d96bd37b..1ec030549f98 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -10,7 +10,7 @@ let toYesNo = b: if b then "yes" else "no"; - gititShared = with cfg.haskellPackages; gitit + "/share/" + pkgs.stdenv.system + "-" + ghc.name + "/" + gitit.pname + "-" + gitit.version; + gititShared = with cfg.haskellPackages; gitit + "/share/" + pkgs.stdenv.hostPlatform.system + "-" + ghc.name + "/" + gitit.pname + "-" + gitit.version; gititWithPkgs = hsPkgs: extras: hsPkgs.ghcWithPackages (self: with self; [ gitit ] ++ (extras self)); diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 1f9107c3ce9c..31e1e65fa9ca 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -99,7 +99,7 @@ let nopriv_user=vsftpd secure_chroot_dir=/var/empty syslog_enable=YES - ${optionalString (pkgs.stdenv.system == "x86_64-linux") '' + ${optionalString (pkgs.stdenv.hostPlatform.system == "x86_64-linux") '' seccomp_sandbox=NO ''} anon_umask=${cfg.anonymousUmask} |