diff options
| author | lassulus <lassulus@lassul.us> | 2020-11-23 11:33:43 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-11-23 11:33:43 +0100 |
| commit | 064b97b7f9e2fbb38ab293055032e7943cc7e4b5 (patch) | |
| tree | e47c4018e57a83ef6b643e874610d1b3d8dd833a | |
| parent | 1b4d1c4aaba003f42a542ce1cf442a4983f50194 (diff) | |
| parent | e86bc24926f346ae1b0489e8f5cfbe770421c7a4 (diff) | |
Merge remote-tracking branch 'ni/master' into master
| -rw-r--r-- | krebs/5pkgs/haskell/email-header.nix | 5 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/krebs/5pkgs/haskell/email-header.nix b/krebs/5pkgs/haskell/email-header.nix index b1e8e1153..94b33e28b 100644 --- a/krebs/5pkgs/haskell/email-header.nix +++ b/krebs/5pkgs/haskell/email-header.nix @@ -10,6 +10,11 @@ with import <stockholm/lib>; rev = "7b179bd31192ead8afe7a0b6e34bcad4039deaa8"; sha256 = "12j2n3sbvzjnw99gga7kkdygm8n3qx2lh8q26ad6a53xm5whnz59"; }; + "20.03" = { + version = "0.4.1-tv1"; + rev = "refs/tags/v${cfg.version}"; + sha256 = "11xjivpj495r2ss9aqljnpzzycb57cm4sr7yzmf939rzwsd3ib0x"; + }; }.${versions.majorMinor version} or { version = "0.4.1-tv2"; rev = "refs/tags/v${cfg.version}"; diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 975266f6f..87a5c2e18 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -92,7 +92,7 @@ with import <stockholm/lib>; services.cron.enable = false; services.nscd.enable = # Since 20.09 nscd doesn't cache anymore. - versionOlder version "20.09"; + versionAtLeast (versions.majorMinor version) "20.09"; services.ntp.enable = false; services.timesyncd.enable = true; } |