Upgrade environment and freeze home-manager/nixpkgs version

2 files changed, 10 insertions, 2 deletions

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; }