From 12720877a31433f5946c48394eda8395323ee409 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 8 Aug 2020 16:55:42 +0200
Subject: [PATCH] Upgrade home-manager nixpkgs

---
 environments/immae-eu.nix     |  3 ++-
 nix/sources.json              | 12 ++++++------
 overlays/default.nix          |  1 -
 overlays/slrn/default.nix     |  6 ------
 overlays/xmr-stak/default.nix | 13 -------------
 5 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 overlays/xmr-stak/default.nix

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
     # monitoring
     cnagios mtop pg_activity nagios-cli mtr
     iftop htop iotop iperf bonfire
-    goaccess tcpdump tshark tcpflow mitmproxy
+    goaccess tcpdump tshark tcpflow
+    # failing mitmproxy
     # nagnu
 
     # 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 @@
         "homepage": "https://rycee.gitlab.io/home-manager/",
         "owner": "rycee",
         "repo": "home-manager",
-        "rev": "7f7348b47049e8d25fb5b98db1d6215f8f643f0d",
-        "sha256": "1s8j8h42k354xzwlqizbzxlqvsagx7yrxl20qfxgxmx522ajw63p",
+        "rev": "223e3c38a13fb45726c7a9d97e2612ae53ab4f98",
+        "sha256": "10svwspmsf46rijzsh0h9nmz1mq2998wcml8yp36mwksgi8695pc",
         "type": "tarball",
-        "url": "https://github.com/rycee/home-manager/archive/7f7348b47049e8d25fb5b98db1d6215f8f643f0d.tar.gz",
+        "url": "https://github.com/rycee/home-manager/archive/223e3c38a13fb45726c7a9d97e2612ae53ab4f98.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": "b3251e04ee470c20f81e75d5a6080ba92dc7ed3f",
-        "sha256": "0hld390gb3q055sa7j1rzxl1hzaxgagc60vrqmkk8fnfpv813g75",
+        "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742",
+        "sha256": "14q3kvnmgz19pgwyq52gxx0cs90ddf24pnplmq33pdddbb6c51zn",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs-channels/archive/b3251e04ee470c20f81e75d5a6080ba92dc7ed3f.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs-channels/archive/840c782d507d60aaa49aa9e3f6d0b0e780912742.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 9a86754..b875899 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -30,7 +30,6 @@
   weechat = import ./weechat;
   ympd = import ./ympd;
   doing = import ./doing;
-  xmr-stak = import ./xmr-stak;
   khal = import ./khal;
 }
 // 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 @@
 self: super: {
   slrn = super.slrn.overrideAttrs (old: rec {
-    version = "1.0.3a";
-    name = "slrn-${version}";
-    src = self.fetchurl {
-      url = "http://www.jedsoft.org/releases/slrn/slrn-${version}.tar.bz2";
-      sha256 = "1b1d9iikr60w0vq86y9a0l4gjl0jxhdznlrdp3r405i097as9a1v";
-    };
     configureFlags = old.configureFlags ++ [ "--with-slrnpull" ];
   });
 }
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 @@
-self: super: {
-  xmr-stak = super.xmr-stak.overrideAttrs(old: rec {
-    name = "xmr-stak-${version}";
-    version = "1.0.4-rx";
-    src = super.fetchFromGitHub {
-      owner = "fireice-uk";
-      repo = "xmr-stak";
-      rev = version;
-      sha256 = "1gsvm279i5jdcjhxsllnkyws6rq0n6qz4j9mg22fwvbgj5ms0gwp";
-    };
-    postPatch = "";
-  });
-}
-- 
2.41.0