Upgrade home-manager

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index 05ac857855c0b620f31850825f1d64ab308986e3..c2e317be2aaffc0efe844cceac2689936cf8cb57 100644 (file)
--- a/environments/immae-eu.nix
+++ b/environments/immae-eu.nix
@@ -18,7 +18,7 @@ let
 
     # cryptocurrencies
     cardano cardano-cli sia monero
-    xmr-stak
+    # failing xmr-stak
     solc
     iota-cli-app
 
@@ -55,7 +55,7 @@ let
     cnagios mtop pg_activity nagios-cli mtr
     iftop htop iotop iperf bonfire
     goaccess tcpdump tshark tcpflow
-    # failing mitmproxy
+    mitmproxy
     # nagnu
 
     # messaging/forums/news

diff --git a/nix/sources.json b/nix/sources.json
index 016b8c47be7bffa84c81fe3b064f3252bda0f710..265552fa231b21121a3509bd23f5643a0615d573 100644 (file)
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -63,10 +63,10 @@
         "homepage": "https://rycee.gitlab.io/home-manager/",
         "owner": "rycee",
         "repo": "home-manager",
-        "rev": "223e3c38a13fb45726c7a9d97e2612ae53ab4f98",
-        "sha256": "10svwspmsf46rijzsh0h9nmz1mq2998wcml8yp36mwksgi8695pc",
+        "rev": "6cf6b587b575493e7718bf08b209013d7dcf4d58",
+        "sha256": "0666ayxazbphjn5xcrczv8m7k2q62k224fvf0kz1lx9qjn93wkvr",
         "type": "tarball",
-        "url": "https://github.com/rycee/home-manager/archive/223e3c38a13fb45726c7a9d97e2612ae53ab4f98.tar.gz",
+        "url": "https://github.com/rycee/home-manager/archive/6cf6b587b575493e7718bf08b209013d7dcf4d58.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
@@ -99,10 +99,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs-channels",
-        "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742",
-        "sha256": "14q3kvnmgz19pgwyq52gxx0cs90ddf24pnplmq33pdddbb6c51zn",
+        "rev": "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38",
+        "sha256": "1ak7jqx94fjhc68xh1lh35kh3w3ndbadprrb762qgvcfb8351x8v",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs-channels/archive/840c782d507d60aaa49aa9e3f6d0b0e780912742.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs-channels/archive/c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-nixops": {

diff --git a/overlays/default.nix b/overlays/default.nix
index b87589921c93b0571d029e68288a790b77f5f996..0c7c738857ccf6c737dfe7bbe5d3d6c86c74e9fa 100644 (file)
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -31,5 +31,6 @@
   ympd = import ./ympd;
   doing = import ./doing;
   khal = import ./khal;
+  nix-direnv = import ./nix-direnv;
 }
 // import ./python-packages

diff --git a/overlays/nix-direnv/default.nix b/overlays/nix-direnv/default.nix
new file mode 100644 (file)
index 0000000..c4c96e2
--- /dev/null
+++ b/overlays/nix-direnv/default.nix
@@ -0,0 +1,7 @@
+self: super: {
+  nix-direnv = super.nix-direnv.overrideAttrs (old: {
+    postPatch = old.postPatch + ''
+      sed -i -e 's/TEMPDIR "$old_tmp"/TEMPDIR "$old_tmpdir"/' direnvrc
+      '';
+  });
+}