aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--environments/immae-eu.nix3
-rw-r--r--nix/sources.json12
-rw-r--r--overlays/default.nix1
-rw-r--r--overlays/slrn/default.nix6
-rw-r--r--overlays/xmr-stak/default.nix13
5 files changed, 8 insertions, 27 deletions
diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index bcb7df4..05ac857 100644
--- a/environments/immae-eu.nix
+++ b/environments/immae-eu.nix
@@ -54,7 +54,8 @@ let
54 # monitoring 54 # monitoring
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 mitmproxy 57 goaccess tcpdump tshark tcpflow
58 # failing mitmproxy
58 # nagnu 59 # nagnu
59 60
60 # messaging/forums/news 61 # messaging/forums/news
diff --git a/nix/sources.json b/nix/sources.json
index 1722139..34a3cee 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": "7f7348b47049e8d25fb5b98db1d6215f8f643f0d", 66 "rev": "223e3c38a13fb45726c7a9d97e2612ae53ab4f98",
67 "sha256": "1s8j8h42k354xzwlqizbzxlqvsagx7yrxl20qfxgxmx522ajw63p", 67 "sha256": "10svwspmsf46rijzsh0h9nmz1mq2998wcml8yp36mwksgi8695pc",
68 "type": "tarball", 68 "type": "tarball",
69 "url": "https://github.com/rycee/home-manager/archive/7f7348b47049e8d25fb5b98db1d6215f8f643f0d.tar.gz", 69 "url": "https://github.com/rycee/home-manager/archive/223e3c38a13fb45726c7a9d97e2612ae53ab4f98.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": "b3251e04ee470c20f81e75d5a6080ba92dc7ed3f", 102 "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742",
103 "sha256": "0hld390gb3q055sa7j1rzxl1hzaxgagc60vrqmkk8fnfpv813g75", 103 "sha256": "14q3kvnmgz19pgwyq52gxx0cs90ddf24pnplmq33pdddbb6c51zn",
104 "type": "tarball", 104 "type": "tarball",
105 "url": "https://github.com/NixOS/nixpkgs-channels/archive/b3251e04ee470c20f81e75d5a6080ba92dc7ed3f.tar.gz", 105 "url": "https://github.com/NixOS/nixpkgs-channels/archive/840c782d507d60aaa49aa9e3f6d0b0e780912742.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 9a86754..b875899 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -30,7 +30,6 @@
30 weechat = import ./weechat; 30 weechat = import ./weechat;
31 ympd = import ./ympd; 31 ympd = import ./ympd;
32 doing = import ./doing; 32 doing = import ./doing;
33 xmr-stak = import ./xmr-stak;
34 khal = import ./khal; 33 khal = import ./khal;
35} 34}
36// import ./python-packages 35// import ./python-packages
diff --git a/overlays/slrn/default.nix b/overlays/slrn/default.nix
index 6caef55..1bf5fe2 100644
--- a/overlays/slrn/default.nix
+++ b/overlays/slrn/default.nix
@@ -1,11 +1,5 @@
1self: super: { 1self: super: {
2 slrn = super.slrn.overrideAttrs (old: rec { 2 slrn = super.slrn.overrideAttrs (old: rec {
3 version = "1.0.3a";
4 name = "slrn-${version}";
5 src = self.fetchurl {
6 url = "http://www.jedsoft.org/releases/slrn/slrn-${version}.tar.bz2";
7 sha256 = "1b1d9iikr60w0vq86y9a0l4gjl0jxhdznlrdp3r405i097as9a1v";
8 };
9 configureFlags = old.configureFlags ++ [ "--with-slrnpull" ]; 3 configureFlags = old.configureFlags ++ [ "--with-slrnpull" ];
10 }); 4 });
11} 5}
diff --git a/overlays/xmr-stak/default.nix b/overlays/xmr-stak/default.nix
deleted file mode 100644
index 51201ac..0000000
--- a/overlays/xmr-stak/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
1self: super: {
2 xmr-stak = super.xmr-stak.overrideAttrs(old: rec {
3 name = "xmr-stak-${version}";
4 version = "1.0.4-rx";
5 src = super.fetchFromGitHub {
6 owner = "fireice-uk";
7 repo = "xmr-stak";
8 rev = version;
9 sha256 = "1gsvm279i5jdcjhxsllnkyws6rq0n6qz4j9mg22fwvbgj5ms0gwp";
10 };
11 postPatch = "";
12 });
13}