diff options
| author | lassulus <lass@blue.r> | 2018-09-16 21:55:28 +0200 |
|---|---|---|
| committer | lassulus <lass@blue.r> | 2018-09-16 21:55:28 +0200 |
| commit | 1662e21c330506f17bf37c08cf50ad594637be94 (patch) | |
| tree | 7300632e875b69686489a88452103c385e3795c1 | |
| parent | fca8903d5bea7be12f3f1f46b3cd2f5b9803e30c (diff) | |
| parent | 45c39cddad6d8d2d65b3a145648611c1e9c78737 (diff) | |
Merge remote-tracking branch 'ni/master'
| -rw-r--r-- | krebs/3modules/setuid.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/krebspaste/default.nix | 2 | ||||
| -rw-r--r-- | krebs/krops.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/websites/lassulus.nix | 2 | ||||
| m--------- | submodules/nix-writers | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/krebs/3modules/setuid.nix b/krebs/3modules/setuid.nix index 02176ec4a..3ba598a45 100644 --- a/krebs/3modules/setuid.nix +++ b/krebs/3modules/setuid.nix @@ -58,7 +58,7 @@ let }; }; config.activate = let - src = pkgs.execve config.name { + src = pkgs.exec config.name { inherit (config) envp filename; }; dst = "${wrapperDir}/${config.name}"; diff --git a/krebs/5pkgs/simple/krebspaste/default.nix b/krebs/5pkgs/simple/krebspaste/default.nix index 31ad12780..a11c8c90a 100644 --- a/krebs/5pkgs/simple/krebspaste/default.nix +++ b/krebs/5pkgs/simple/krebspaste/default.nix @@ -1,6 +1,6 @@ { writeDashBin, bepasty-client-cli }: -# TODO use `execve` instead? +# TODO use `pkgs.exec` instead? writeDashBin "krebspaste" '' exec ${bepasty-client-cli}/bin/bepasty-cli -L 1m --url http://paste.r "$@" | sed '$ s/$/\/+inline/g' '' diff --git a/krebs/krops.nix b/krebs/krops.nix index e5013ad08..864cc8066 100644 --- a/krebs/krops.nix +++ b/krebs/krops.nix @@ -2,7 +2,7 @@ krops = builtins.fetchGit { url = https://cgit.krebsco.de/krops/; - rev = "4e466eaf05861b47365c5ef46a31a188b70f3615"; + rev = "c46166d407c7d246112f13346621a3fbdb25889e"; }; lib = import "${krops}/lib"; diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix index 8f24fb212..4c29831a2 100644 --- a/lass/2configs/websites/lassulus.nix +++ b/lass/2configs/websites/lassulus.nix @@ -91,7 +91,7 @@ in { script = pkgs.writeBash "test" '' echo "hello world" ''; - #script = pkgs.execve "ddate-wrapper" { + #script = pkgs.exec "ddate-wrapper" { # filename = "${pkgs.ddate}/bin/ddate"; # argv = []; #}; diff --git a/submodules/nix-writers b/submodules/nix-writers -Subproject 5d79992262e8f16a3efa985375be74abea3bb39 +Subproject c27a9416e8ee04d708b11b48f8cf1a055c0cc07 |