From 5487d466d0d9b596b054c545b499aecbbe56b5aa Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 16 Sep 2018 01:46:46 +0200
Subject: [PATCH] nix-writers: 5d79992 -> 3.0.0
---
krebs/3modules/setuid.nix | 2 +-
krebs/5pkgs/simple/krebspaste/default.nix | 2 +-
lass/2configs/websites/lassulus.nix | 2 +-
submodules/nix-writers | 2 +-
4 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/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
index 5d7999226..c27a9416e 160000
--- a/submodules/nix-writers
+++ b/submodules/nix-writers
@@ -1 +1 @@
-Subproject commit 5d79992262e8f16a3efa985375be74abea3bb392
+Subproject commit c27a9416e8ee04d708b11b48f8cf1a055c0cc079