summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-09-16 21:55:28 +0200
committerlassulus <lass@blue.r>2018-09-16 21:55:28 +0200
commit1662e21c330506f17bf37c08cf50ad594637be94 (patch)
tree7300632e875b69686489a88452103c385e3795c1 /krebs
parentfca8903d5bea7be12f3f1f46b3cd2f5b9803e30c (diff)
parent45c39cddad6d8d2d65b3a145648611c1e9c78737 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/setuid.nix2
-rw-r--r--krebs/5pkgs/simple/krebspaste/default.nix2
-rw-r--r--krebs/krops.nix2
3 files changed, 3 insertions, 3 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";