aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2019-06-13 11:16:31 -0300
committerEuAndreh <eu@euandre.org>2019-06-13 11:16:31 -0300
commit9873dba2f4e773e28e9bb812d52a6b8fb56a172d (patch)
tree50dc729722da8974929f14741fa8c77ff916aea4
parentAdd 1 git-crypt collaborator (diff)
downloadserver-9873dba2f4e773e28e9bb812d52a6b8fb56a172d.tar.gz
server-9873dba2f4e773e28e9bb812d52a6b8fb56a172d.tar.xz
utils.nix: Fix shell derivation function helpers
-rw-r--r--utils.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/utils.nix b/utils.nix
index 438a5d8..ac49ac2 100644
--- a/utils.nix
+++ b/utils.nix
@@ -90,11 +90,10 @@ in rec {
'';
});
shellEnvironment = shellBuildInputs:
- baseTask.overrideAttrs (baseAttrs:
- pkgs.mkshell {
- name = "${baseAttrs.name}-shell";
+ pkgs.mkShell {
+ name = "${baseName}-shell";
buildInputs = shellBuildInputs;
- });
+ };
overwritingPublishScript = { docsDerivation, overwrite ? true }:
pkgs.writeShellScriptBin "publish.sh" ''
set -euo pipefail