diff options
-rw-r--r-- | environments/immae-eu.nix | 4 | ||||
-rw-r--r-- | nix/sources.json | 12 | ||||
-rw-r--r-- | overlays/default.nix | 1 | ||||
-rw-r--r-- | overlays/nix-direnv/default.nix | 7 |
4 files changed, 16 insertions, 8 deletions
diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix index 05ac857..c2e317b 100644 --- a/environments/immae-eu.nix +++ b/environments/immae-eu.nix | |||
@@ -18,7 +18,7 @@ let | |||
18 | 18 | ||
19 | # cryptocurrencies | 19 | # cryptocurrencies |
20 | cardano cardano-cli sia monero | 20 | cardano cardano-cli sia monero |
21 | xmr-stak | 21 | # failing xmr-stak |
22 | solc | 22 | solc |
23 | iota-cli-app | 23 | iota-cli-app |
24 | 24 | ||
@@ -55,7 +55,7 @@ let | |||
55 | cnagios mtop pg_activity nagios-cli mtr | 55 | cnagios mtop pg_activity nagios-cli mtr |
56 | iftop htop iotop iperf bonfire | 56 | iftop htop iotop iperf bonfire |
57 | goaccess tcpdump tshark tcpflow | 57 | goaccess tcpdump tshark tcpflow |
58 | # failing mitmproxy | 58 | mitmproxy |
59 | # nagnu | 59 | # nagnu |
60 | 60 | ||
61 | # messaging/forums/news | 61 | # messaging/forums/news |
diff --git a/nix/sources.json b/nix/sources.json index 016b8c4..265552f 100644 --- a/nix/sources.json +++ b/nix/sources.json | |||
@@ -63,10 +63,10 @@ | |||
63 | "homepage": "https://rycee.gitlab.io/home-manager/", | 63 | "homepage": "https://rycee.gitlab.io/home-manager/", |
64 | "owner": "rycee", | 64 | "owner": "rycee", |
65 | "repo": "home-manager", | 65 | "repo": "home-manager", |
66 | "rev": "223e3c38a13fb45726c7a9d97e2612ae53ab4f98", | 66 | "rev": "6cf6b587b575493e7718bf08b209013d7dcf4d58", |
67 | "sha256": "10svwspmsf46rijzsh0h9nmz1mq2998wcml8yp36mwksgi8695pc", | 67 | "sha256": "0666ayxazbphjn5xcrczv8m7k2q62k224fvf0kz1lx9qjn93wkvr", |
68 | "type": "tarball", | 68 | "type": "tarball", |
69 | "url": "https://github.com/rycee/home-manager/archive/223e3c38a13fb45726c7a9d97e2612ae53ab4f98.tar.gz", | 69 | "url": "https://github.com/rycee/home-manager/archive/6cf6b587b575493e7718bf08b209013d7dcf4d58.tar.gz", |
70 | "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" | 70 | "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" |
71 | }, | 71 | }, |
72 | "niv": { | 72 | "niv": { |
@@ -99,10 +99,10 @@ | |||
99 | "homepage": "https://github.com/NixOS/nixpkgs", | 99 | "homepage": "https://github.com/NixOS/nixpkgs", |
100 | "owner": "NixOS", | 100 | "owner": "NixOS", |
101 | "repo": "nixpkgs-channels", | 101 | "repo": "nixpkgs-channels", |
102 | "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", | 102 | "rev": "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38", |
103 | "sha256": "14q3kvnmgz19pgwyq52gxx0cs90ddf24pnplmq33pdddbb6c51zn", | 103 | "sha256": "1ak7jqx94fjhc68xh1lh35kh3w3ndbadprrb762qgvcfb8351x8v", |
104 | "type": "tarball", | 104 | "type": "tarball", |
105 | "url": "https://github.com/NixOS/nixpkgs-channels/archive/840c782d507d60aaa49aa9e3f6d0b0e780912742.tar.gz", | 105 | "url": "https://github.com/NixOS/nixpkgs-channels/archive/c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38.tar.gz", |
106 | "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" | 106 | "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" |
107 | }, | 107 | }, |
108 | "nixpkgs-nixops": { | 108 | "nixpkgs-nixops": { |
diff --git a/overlays/default.nix b/overlays/default.nix index b875899..0c7c738 100644 --- a/overlays/default.nix +++ b/overlays/default.nix | |||
@@ -31,5 +31,6 @@ | |||
31 | ympd = import ./ympd; | 31 | ympd = import ./ympd; |
32 | doing = import ./doing; | 32 | doing = import ./doing; |
33 | khal = import ./khal; | 33 | khal = import ./khal; |
34 | nix-direnv = import ./nix-direnv; | ||
34 | } | 35 | } |
35 | // import ./python-packages | 36 | // import ./python-packages |
diff --git a/overlays/nix-direnv/default.nix b/overlays/nix-direnv/default.nix new file mode 100644 index 0000000..c4c96e2 --- /dev/null +++ b/overlays/nix-direnv/default.nix | |||
@@ -0,0 +1,7 @@ | |||
1 | self: super: { | ||
2 | nix-direnv = super.nix-direnv.overrideAttrs (old: { | ||
3 | postPatch = old.postPatch + '' | ||
4 | sed -i -e 's/TEMPDIR "$old_tmp"/TEMPDIR "$old_tmpdir"/' direnvrc | ||
5 | ''; | ||
6 | }); | ||
7 | } | ||