From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Fri, 8 Mar 2019 23:22:07 +0000 (+0100)
Subject: Add some packages and prepare upgrade for nixops
X-Git-Tag: nur_publish~213
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=f8dbac307b48e7ff4baea2b78ec08fa569b44e9d;hp=eb190677ac9a4fc77afb5543417255119600fb01;p=perso%2FImmae%2FConfig%2FNix.git

Add some packages and prepare upgrade for nixops
---

diff --git a/default.nix b/default.nix
index 0c7cd7b..c8d8c8b 100644
--- 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 561bf6e..2d61ed5 100755
--- 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 "$@"