diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2022-12-29 19:32:54 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2022-12-29 19:32:54 +0100 |
commit | 123e5006db0a318f7d47a73ecb8ea9c7f58d6536 (patch) | |
tree | aedfd57b806515e1aa2d7c1ddfaf365329047b49 | |
parent | 1ea789d49e44c4bdbe7f02bfbfc81db2b0725614 (diff) | |
download | nixos-123e5006db0a318f7d47a73ecb8ea9c7f58d6536.tar nixos-123e5006db0a318f7d47a73ecb8ea9c7f58d6536.tar.gz nixos-123e5006db0a318f7d47a73ecb8ea9c7f58d6536.tar.bz2 nixos-123e5006db0a318f7d47a73ecb8ea9c7f58d6536.tar.xz nixos-123e5006db0a318f7d47a73ecb8ea9c7f58d6536.zip |
bump
-rw-r--r-- | _sources/generated.json | 6 | ||||
-rw-r--r-- | _sources/generated.nix | 6 | ||||
-rw-r--r-- | accounts/gkleen@sif/default.nix | 5 | ||||
-rw-r--r-- | flake.lock | 43 | ||||
-rw-r--r-- | flake.nix | 6 |
5 files changed, 45 insertions, 21 deletions
diff --git a/_sources/generated.json b/_sources/generated.json index eeb61f3e..94acb07f 100644 --- a/_sources/generated.json +++ b/_sources/generated.json | |||
@@ -201,11 +201,11 @@ | |||
201 | "pinned": false, | 201 | "pinned": false, |
202 | "src": { | 202 | "src": { |
203 | "name": null, | 203 | "name": null, |
204 | "sha256": "sha256-3vB6krsP6G25bviG27QI+9NyJN2YKOOmM5KhKUclJPc=", | 204 | "sha256": "sha256-AcWGxvXtzMiVTTWL3TmsY+tBI9vIGhRRifEjfpAGQ44=", |
205 | "type": "url", | 205 | "type": "url", |
206 | "url": "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.1.4.tar.gz" | 206 | "url": "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.1.5.tar.gz" |
207 | }, | 207 | }, |
208 | "version": "1.1.4" | 208 | "version": "1.1.5" |
209 | }, | 209 | }, |
210 | "postfwd": { | 210 | "postfwd": { |
211 | "cargoLocks": null, | 211 | "cargoLocks": null, |
diff --git a/_sources/generated.nix b/_sources/generated.nix index 564f6cc4..ccb73776 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix | |||
@@ -122,10 +122,10 @@ | |||
122 | }; | 122 | }; |
123 | postfix-mta-sts-resolver = { | 123 | postfix-mta-sts-resolver = { |
124 | pname = "postfix-mta-sts-resolver"; | 124 | pname = "postfix-mta-sts-resolver"; |
125 | version = "1.1.4"; | 125 | version = "1.1.5"; |
126 | src = fetchurl { | 126 | src = fetchurl { |
127 | url = "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.1.4.tar.gz"; | 127 | url = "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.1.5.tar.gz"; |
128 | sha256 = "sha256-3vB6krsP6G25bviG27QI+9NyJN2YKOOmM5KhKUclJPc="; | 128 | sha256 = "sha256-AcWGxvXtzMiVTTWL3TmsY+tBI9vIGhRRifEjfpAGQ44="; |
129 | }; | 129 | }; |
130 | }; | 130 | }; |
131 | postfwd = { | 131 | postfwd = { |
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index a876abd5..fd876f7c 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix | |||
@@ -4,7 +4,8 @@ with lib; | |||
4 | 4 | ||
5 | let | 5 | let |
6 | cfg = config.home-manager.users.${userName}; | 6 | cfg = config.home-manager.users.${userName}; |
7 | xmonad = import ./xmonad pkgs.haskell.packages.ghc8107; | 7 | deHaskell = flakeInputs.nixpkgs-stable.legacyPackages.x86_64-linux.haskell.packages.ghc8107; |
8 | xmonad = import ./xmonad deHaskell; | ||
8 | emacsScratch = pkgs.stdenv.mkDerivation (sources.emacs-scratch_el // rec { | 9 | emacsScratch = pkgs.stdenv.mkDerivation (sources.emacs-scratch_el // rec { |
9 | phases = [ "installPhase" ]; | 10 | phases = [ "installPhase" ]; |
10 | 11 | ||
@@ -211,7 +212,7 @@ in { | |||
211 | }; | 212 | }; |
212 | taffybar = { | 213 | taffybar = { |
213 | enable = true; | 214 | enable = true; |
214 | package = import ./taffybar { haskellPackages = pkgs.haskell.packages.ghc8107; }; | 215 | package = import ./taffybar { haskellPackages = deHaskell; }; |
215 | }; | 216 | }; |
216 | status-notifier-watcher.enable = true; | 217 | status-notifier-watcher.enable = true; |
217 | xembed-sni-proxy.enable = true; | 218 | xembed-sni-proxy.enable = true; |
@@ -80,11 +80,11 @@ | |||
80 | "utils": "utils_2" | 80 | "utils": "utils_2" |
81 | }, | 81 | }, |
82 | "locked": { | 82 | "locked": { |
83 | "lastModified": 1671335968, | 83 | "lastModified": 1671966569, |
84 | "narHash": "sha256-V7mjlh7brp70elokmml6XzHinpTilkQJjiYIGjEmSGs=", | 84 | "narHash": "sha256-jbLgfSnmLchARBNFRvCic63CFQ9LAyvlXnBpc2kwjQc=", |
85 | "owner": "nix-community", | 85 | "owner": "nix-community", |
86 | "repo": "home-manager", | 86 | "repo": "home-manager", |
87 | "rev": "37713c6b04b963d41664e03576f73a18c9b0d224", | 87 | "rev": "c55fa26ce05fee8e063db22918d05a73d430b2ea", |
88 | "type": "github" | 88 | "type": "github" |
89 | }, | 89 | }, |
90 | "original": { | 90 | "original": { |
@@ -133,11 +133,11 @@ | |||
133 | }, | 133 | }, |
134 | "nixpkgs": { | 134 | "nixpkgs": { |
135 | "locked": { | 135 | "locked": { |
136 | "lastModified": 1671400963, | 136 | "lastModified": 1672233103, |
137 | "narHash": "sha256-mJGp4Ys5lfxZkoxsiCgp97Atvplr1V5o+aLd19tE1WE=", | 137 | "narHash": "sha256-n7pu3chKPZyW3kCwbT/3ReyTiWJ5v/N1ggNarP57OWg=", |
138 | "owner": "NixOS", | 138 | "owner": "NixOS", |
139 | "repo": "nixpkgs", | 139 | "repo": "nixpkgs", |
140 | "rev": "ba46d30d1f9a636f46fb7877008140984f5e7b75", | 140 | "rev": "9aa77715b71b7dd9cfbe14828eb82ae281af806c", |
141 | "type": "github" | 141 | "type": "github" |
142 | }, | 142 | }, |
143 | "original": { | 143 | "original": { |
@@ -149,11 +149,27 @@ | |||
149 | }, | 149 | }, |
150 | "nixpkgs-stable": { | 150 | "nixpkgs-stable": { |
151 | "locked": { | 151 | "locked": { |
152 | "lastModified": 1670146390, | 152 | "lastModified": 1669833724, |
153 | "narHash": "sha256-XrEoDpuloRHHbUkbPnhF2bQ0uwHllXq3NHxtuVe/QK4=", | 153 | "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=", |
154 | "owner": "NixOS", | 154 | "owner": "NixOS", |
155 | "repo": "nixpkgs", | 155 | "repo": "nixpkgs", |
156 | "rev": "86370507cb20c905800527539fc049a2bf09c667", | 156 | "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e", |
157 | "type": "github" | ||
158 | }, | ||
159 | "original": { | ||
160 | "owner": "NixOS", | ||
161 | "ref": "22.11", | ||
162 | "repo": "nixpkgs", | ||
163 | "type": "github" | ||
164 | } | ||
165 | }, | ||
166 | "nixpkgs-stable_2": { | ||
167 | "locked": { | ||
168 | "lastModified": 1671923641, | ||
169 | "narHash": "sha256-flPauiL5UrfRJD+1oAcEefpEIUqTqnyKScWe/UUU+lE=", | ||
170 | "owner": "NixOS", | ||
171 | "repo": "nixpkgs", | ||
172 | "rev": "939c05a176b8485971463c18c44f48e56a7801c9", | ||
157 | "type": "github" | 173 | "type": "github" |
158 | }, | 174 | }, |
159 | "original": { | 175 | "original": { |
@@ -212,6 +228,7 @@ | |||
212 | "leapseconds": "leapseconds", | 228 | "leapseconds": "leapseconds", |
213 | "mach-nix": "mach-nix", | 229 | "mach-nix": "mach-nix", |
214 | "nixpkgs": "nixpkgs", | 230 | "nixpkgs": "nixpkgs", |
231 | "nixpkgs-stable": "nixpkgs-stable", | ||
215 | "nvfetcher": "nvfetcher", | 232 | "nvfetcher": "nvfetcher", |
216 | "pypi-deps-db": "pypi-deps-db", | 233 | "pypi-deps-db": "pypi-deps-db", |
217 | "sops-nix": "sops-nix" | 234 | "sops-nix": "sops-nix" |
@@ -222,14 +239,14 @@ | |||
222 | "nixpkgs": [ | 239 | "nixpkgs": [ |
223 | "nixpkgs" | 240 | "nixpkgs" |
224 | ], | 241 | ], |
225 | "nixpkgs-stable": "nixpkgs-stable" | 242 | "nixpkgs-stable": "nixpkgs-stable_2" |
226 | }, | 243 | }, |
227 | "locked": { | 244 | "locked": { |
228 | "lastModified": 1670149631, | 245 | "lastModified": 1671937829, |
229 | "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=", | 246 | "narHash": "sha256-YtaNB+mLw0d67JFYNjRWM+/AL3JCXuD/DGlnTlyX1tY=", |
230 | "owner": "Mic92", | 247 | "owner": "Mic92", |
231 | "repo": "sops-nix", | 248 | "repo": "sops-nix", |
232 | "rev": "da98a111623101c64474a14983d83dad8f09f93d", | 249 | "rev": "855b8d51fc3991bd817978f0f093aa6ae0fae738", |
233 | "type": "github" | 250 | "type": "github" |
234 | }, | 251 | }, |
235 | "original": { | 252 | "original": { |
@@ -8,6 +8,12 @@ | |||
8 | repo = "nixpkgs"; | 8 | repo = "nixpkgs"; |
9 | ref = "master"; | 9 | ref = "master"; |
10 | }; | 10 | }; |
11 | nixpkgs-stable = { | ||
12 | type = "github"; | ||
13 | owner = "NixOS"; | ||
14 | repo = "nixpkgs"; | ||
15 | ref = "22.11"; | ||
16 | }; | ||
11 | home-manager = { | 17 | home-manager = { |
12 | type = "github"; | 18 | type = "github"; |
13 | owner = "nix-community"; | 19 | owner = "nix-community"; |