aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--environments/immae-eu.nix2
-rw-r--r--modules/private/system/dilion.nix4
-rw-r--r--nix/sources.json24
-rw-r--r--overlays/bonfire/default.nix10
-rw-r--r--overlays/python-packages/default.nix2
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
84 rtorrent 84 rtorrent
85 ldapvi 85 ldapvi
86 fzf 86 fzf
87 buku 87 #buku # broken
88 vimPlugins.vim-plug 88 vimPlugins.vim-plug
89 (vim_configurable.override { python = python3; }) 89 (vim_configurable.override { python = python3; })
90 mailcap 90 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 @@
103 103
104 # This is equivalent to setting environment.sessionVariables.NIX_PATH 104 # This is equivalent to setting environment.sessionVariables.NIX_PATH
105 nix.nixPath = [ 105 nix.nixPath = [
106 "home-manager=https://github.com/rycee/home-manager/archive/master.tar.gz" 106 "home-manager=${pkgs.sources.home-manager.url}"
107 "nixpkgs=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz" 107 "nixpkgs=${pkgs.sources.nixpkgs-home-manager.url}"
108 ]; 108 ];
109 nix.binaryCaches = [ "https://hydra.iohk.io" "https://cache.nixos.org" ]; 109 nix.binaryCaches = [ "https://hydra.iohk.io" "https://cache.nixos.org" ];
110 nix.binaryCachePublicKeys = [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ]; 110 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 @@
45 "type": "git", 45 "type": "git",
46 "version": "f1d42ba-master" 46 "version": "f1d42ba-master"
47 }, 47 },
48 "home-manager": {
49 "branch": "master",
50 "description": "Manage a user environment using Nix",
51 "homepage": "https://rycee.gitlab.io/home-manager/",
52 "owner": "rycee",
53 "repo": "home-manager",
54 "rev": "a94c8b072e08b11bd9a2462b741f8d3b673ec690",
55 "sha256": "1yv2wrx84qifysxybdaq5wq7w6zg0hcak2hapm0v1wz1mc7wq915",
56 "type": "tarball",
57 "url": "https://github.com/rycee/home-manager/archive/a94c8b072e08b11bd9a2462b741f8d3b673ec690.tar.gz",
58 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
59 },
48 "niv": { 60 "niv": {
49 "branch": "master", 61 "branch": "master",
50 "description": "Easy dependency management for Nix projects", 62 "description": "Easy dependency management for Nix projects",
@@ -69,6 +81,18 @@
69 "url": "https://github.com/NixOS/nixpkgs-channels/archive/fce7562cf46727fdaf801b232116bc9ce0512049.tar.gz", 81 "url": "https://github.com/NixOS/nixpkgs-channels/archive/fce7562cf46727fdaf801b232116bc9ce0512049.tar.gz",
70 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" 82 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
71 }, 83 },
84 "nixpkgs-home-manager": {
85 "branch": "nixos-unstable",
86 "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
87 "homepage": "https://github.com/NixOS/nixpkgs",
88 "owner": "NixOS",
89 "repo": "nixpkgs-channels",
90 "rev": "",
91 "sha256": "22a81aa5fc15b2d41b12f7160a71cd4a9f3c3fa1",
92 "type": "tarball",
93 "url": "https://github.com/NixOS/nixpkgs-channels/archive/22a81aa5fc15b2d41b12f7160a71cd4a9f3c3fa1.tar.gz",
94 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
95 },
72 "nixpkgs-nixops": { 96 "nixpkgs-nixops": {
73 "branch": "nixos-unstable", 97 "branch": "nixos-unstable",
74 "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", 98 "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: {
12 ''; 12 '';
13 doCheck = false; 13 doCheck = false;
14 }); 14 });
15 keyring = self.python3Packages.keyring.overridePythonAttrs(old: rec {
16 version = "20.0.1";
17 src = self.python3Packages.fetchPypi {
18 pname = "keyring";
19 inherit version;
20 sha256 = "963bfa7f090269d30bdc5e25589e5fd9dad2cf2a7c6f176a7f2386910e5d0d8d";
21 };
22 });
15 in 23 in
16 super.bonfire.overridePythonAttrs(old: { 24 super.bonfire.overridePythonAttrs(old: {
17 version = "0.0.8"; 25 version = "0.0.8";
@@ -22,7 +30,7 @@ self: super: {
22 sha256 = "1y2r537ibghhmk6jngw0zwvh1vn2bihqcvji50ffh1j0qc6q3x6x"; 30 sha256 = "1y2r537ibghhmk6jngw0zwvh1vn2bihqcvji50ffh1j0qc6q3x6x";
23 }; 31 };
24 postPatch = ""; 32 postPatch = "";
25 propagatedBuildInputs = self.lib.remove self.python3Packages.click old.propagatedBuildInputs ++ [ click ]; 33 propagatedBuildInputs = self.lib.subtractLists [ self.python3Packages.click self.python3Packages.keyring ] old.propagatedBuildInputs ++ [ click keyring ];
26 meta.broken = false; 34 meta.broken = false;
27 }); 35 });
28} 36}
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
10 # needs to come before all other in alphabetical order (or make use of 10 # needs to come before all other in alphabetical order (or make use of
11 # lib.mkBefore) 11 # lib.mkBefore)
12 __pythonOverlayFix = self: super: let 12 __pythonOverlayFix = self: super: let
13 pyNames = [ "python3" "python36" "python37" ]; 13 pyNames = [ "python3" "python36" "python37" "python38" ];
14 overriddenPython = name: [ 14 overriddenPython = name: [
15 { inherit name; value = super.${name}.override { packageOverrides = self.pythonOverrides; }; } 15 { inherit name; value = super.${name}.override { packageOverrides = self.pythonOverrides; }; }
16 { name = "${name}Packages"; value = self.recurseIntoAttrs self.${name}.pkgs; } 16 { name = "${name}Packages"; value = self.recurseIntoAttrs self.${name}.pkgs; }