Fix nixops: allow keyFile to be a string in deployments

[perso/Immae/Config/Nix.git] / default.nix

diff --git a/default.nix b/default.nix
index abf6237fe689665c7ce918429c0debcd9f5ffaa4..51ebcc23e646c0cb4b3f63703261d9d314ffc24c 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -3,12 +3,6 @@ with import ./libs.nix { nixpkgs = import <nixpkgs> {}; };
 let
   mypkgs = {};
 
-  mypkgs.ledger = (ledger.override { boost = boost166; }).overrideAttrs (_old:
-    fetchedGithub ./fetched/ledger.json // {
-      postInstall = "";
-    }
-  );
-
   mypkgs.taskwarrior = taskwarrior.overrideAttrs (old: rec {
     postInstall = ''${old.postInstall}
       mkdir -p "$out/share/vim/vimfiles/ftdetect"
@@ -29,6 +23,11 @@ let
   mypkgs.weboob = (pythonPackages.weboob.overridePythonAttrs {
       setupPyBuildFlags = [ "--no-qt" "--xdg" ];
     }).overrideAttrs (old: rec {
+      version = "1.5";
+      src = fetchurl {
+        url = "https://git.weboob.org/weboob/weboob/-/archive/${version}/${old.pname}-${version}.tar.gz";
+        sha256 = "0l6q5nm5g0zn6gmf809059kddrbds27wgygxsfkqja9blks5vq7z";
+      };
       postInstall = ''${old.postInstall or ""}
         mkdir -p $out/share/bash-completion/completions/
         cp tools/weboob_bash_completion $out/share/bash-completion/completions/weboob
@@ -617,6 +616,11 @@ let
       '';
   });
 
+  mypkgs.nixops = nixops.overrideAttrs (old: {
+    preConfigure = (old.preConfigure or "") + ''
+      sed -i -e "/'keyFile'/s/'path'/'string'/" nixops/backends/__init__.py
+      '';
+  });
   mypkgs.flrn = let
     slang = stdenv.mkDerivation rec {
       name = "slang-debian-patched-${version}";
@@ -692,7 +696,6 @@ in
     inherit keybase;
     inherit bogofilter;
     inherit mtr;
-    inherit nixops;
     inherit urlview;
     inherit rr;
     inherit nix-zsh-completions;
@@ -721,4 +724,6 @@ in
     inherit poppler_utils;
     inherit tmux;
     inherit netcat-gnu;
+    inherit ledger;
+    inherit ffmpeg libxslt;
   }