Upgrade environment and freeze home-manager/nixpkgs version

5 files changed, 37 insertions, 5 deletions

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index dddc1fd..1da9373 100644
--- a/environments/immae-eu.nix
+++ b/environments/immae-eu.nix
@@ -84,7 +84,7 @@ let
     rtorrent
     ldapvi
     fzf
-    buku
+    #buku # broken
     vimPlugins.vim-plug
     (vim_configurable.override { python = python3; })
     mailcap
diff --git a/modules/private/system/dilion.nix b/modules/private/system/dilion.nix
index 9afa057..379117c 100644
--- a/modules/private/system/dilion.nix
+++ b/modules/private/system/dilion.nix
@@ -103,8 +103,8 @@
 
   # This is equivalent to setting environment.sessionVariables.NIX_PATH
   nix.nixPath = [
-    "home-manager=https://github.com/rycee/home-manager/archive/master.tar.gz"
-    "nixpkgs=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz"
+    "home-manager=${pkgs.sources.home-manager.url}"
+    "nixpkgs=${pkgs.sources.nixpkgs-home-manager.url}"
   ];
   nix.binaryCaches = [ "https://hydra.iohk.io" "https://cache.nixos.org" ];
   nix.binaryCachePublicKeys = [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
diff --git a/nix/sources.json b/nix/sources.json
index af026b8..b403e62 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -45,6 +45,18 @@
         "type": "git",
         "version": "f1d42ba-master"
     },
+    "home-manager": {
+        "branch": "master",
+        "description": "Manage a user environment using Nix",
+        "homepage": "https://rycee.gitlab.io/home-manager/",
+        "owner": "rycee",
+        "repo": "home-manager",
+        "rev": "a94c8b072e08b11bd9a2462b741f8d3b673ec690",
+        "sha256": "1yv2wrx84qifysxybdaq5wq7w6zg0hcak2hapm0v1wz1mc7wq915",
+        "type": "tarball",
+        "url": "https://github.com/rycee/home-manager/archive/a94c8b072e08b11bd9a2462b741f8d3b673ec690.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "niv": {
         "branch": "master",
         "description": "Easy dependency management for Nix projects",
@@ -69,6 +81,18 @@
         "url": "https://github.com/NixOS/nixpkgs-channels/archive/fce7562cf46727fdaf801b232116bc9ce0512049.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
+    "nixpkgs-home-manager": {
+        "branch": "nixos-unstable",
+        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
+        "homepage": "https://github.com/NixOS/nixpkgs",
+        "owner": "NixOS",
+        "repo": "nixpkgs-channels",
+        "rev": "",
+        "sha256": "22a81aa5fc15b2d41b12f7160a71cd4a9f3c3fa1",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs-channels/archive/22a81aa5fc15b2d41b12f7160a71cd4a9f3c3fa1.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "nixpkgs-nixops": {
         "branch": "nixos-unstable",
         "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
diff --git a/overlays/bonfire/default.nix b/overlays/bonfire/default.nix
index a01e619..6dc1034 100644
--- a/overlays/bonfire/default.nix
+++ b/overlays/bonfire/default.nix
@@ -12,6 +12,14 @@ self: super: {
       '';
       doCheck = false;
     });
+    keyring = self.python3Packages.keyring.overridePythonAttrs(old: rec {
+      version = "20.0.1";
+      src = self.python3Packages.fetchPypi {
+        pname = "keyring";
+        inherit version;
+        sha256 = "963bfa7f090269d30bdc5e25589e5fd9dad2cf2a7c6f176a7f2386910e5d0d8d";
+      };
+    });
   in
     super.bonfire.overridePythonAttrs(old: {
       version = "0.0.8";
@@ -22,7 +30,7 @@ self: super: {
         sha256 = "1y2r537ibghhmk6jngw0zwvh1vn2bihqcvji50ffh1j0qc6q3x6x";
       };
       postPatch = "";
-      propagatedBuildInputs = self.lib.remove self.python3Packages.click old.propagatedBuildInputs ++ [ click ];
+      propagatedBuildInputs = self.lib.subtractLists [ self.python3Packages.click self.python3Packages.keyring ] old.propagatedBuildInputs ++ [ click keyring ];
       meta.broken = false;
     });
 }
diff --git a/overlays/python-packages/default.nix b/overlays/python-packages/default.nix
index 0feff55..901cd72 100644
--- a/overlays/python-packages/default.nix
+++ b/overlays/python-packages/default.nix
@@ -10,7 +10,7 @@ in
   # needs to come before all other in alphabetical order (or make use of
   # lib.mkBefore)
   __pythonOverlayFix = self: super: let
-    pyNames = [ "python3" "python36" "python37" ];
+    pyNames = [ "python3" "python36" "python37" "python38" ];
     overriddenPython = name: [
       { inherit name; value = super.${name}.override { packageOverrides = self.pythonOverrides; }; }
       { name = "${name}Packages"; value = self.recurseIntoAttrs self.${name}.pkgs; }