Add some packages and prepare upgrade for nixops

diff --git a/default.nix b/default.nix
index 0c7cd7bc5fe200b1e29aba1cb9ab07b519a4f86d..c8d8c8bbae41df630442ed6185bde9de47441f5a 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -545,7 +545,7 @@ in
     inherit pdftk;
     inherit googler;
     inherit jrnl;
-    inherit apg;
+    inherit apg pwgen;
     inherit newsboat;
     inherit vcsh;
     inherit xmr-stak;
@@ -579,6 +579,7 @@ in
     inherit monero;
     inherit nextcloud-client;
     inherit feh imagemagick;
+    inherit lftp;
     stgit = gitAndTools.stgit;
     # todo: lx* ?, unrar, unzip, zeromq?
     #inherit nextcloud-client;

diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index 561bf6e814bef24514948ff2155d3332a01a5d0a..2d61ed5ee5d599ab0a4da00f71173c60fec5d521 100755 (executable)
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -28,5 +28,5 @@ for file in $files; do
 done
 nixops set-args --argstr privateFiles "$TEMP"
 
-export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$HOME/.nix-defexpr/channels/immaeNixpkgs"
+export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$HOME/.nix-defexpr/channels/immaeNixpkgs:immaeNixpkgsNext=$HOME/.nix-defexpr/channels/immaeNixpkgsNext"
 nixops "$@"