aboutsummaryrefslogtreecommitdiff
path: root/default.nix
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-25 01:34:35 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-25 01:34:35 +0200
commit78e25e2ac542eceb33aa0d292397d5236dbb9df8 (patch)
tree1cb9cac067533926145461af6c2ec893693600c1 /default.nix
parent9df76627240b567f8cbb00d1b429aa3541243558 (diff)
downloadNix-78e25e2ac542eceb33aa0d292397d5236dbb9df8.tar.gz
Nix-78e25e2ac542eceb33aa0d292397d5236dbb9df8.tar.zst
Nix-78e25e2ac542eceb33aa0d292397d5236dbb9df8.zip
Fix nixops: allow keyFile to be a string in deployments
Diffstat (limited to 'default.nix')
-rw-r--r--default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/default.nix b/default.nix
index 579dfae..51ebcc2 100644
--- a/default.nix
+++ b/default.nix
@@ -616,6 +616,11 @@ let
616 ''; 616 '';
617 }); 617 });
618 618
619 mypkgs.nixops = nixops.overrideAttrs (old: {
620 preConfigure = (old.preConfigure or "") + ''
621 sed -i -e "/'keyFile'/s/'path'/'string'/" nixops/backends/__init__.py
622 '';
623 });
619 mypkgs.flrn = let 624 mypkgs.flrn = let
620 slang = stdenv.mkDerivation rec { 625 slang = stdenv.mkDerivation rec {
621 name = "slang-debian-patched-${version}"; 626 name = "slang-debian-patched-${version}";
@@ -691,7 +696,6 @@ in
691 inherit keybase; 696 inherit keybase;
692 inherit bogofilter; 697 inherit bogofilter;
693 inherit mtr; 698 inherit mtr;
694 inherit nixops;
695 inherit urlview; 699 inherit urlview;
696 inherit rr; 700 inherit rr;
697 inherit nix-zsh-completions; 701 inherit nix-zsh-completions;