Merge remote-tracking branch 'ni/master' into master

This commit is contained in:
lassulus 2020-11-23 11:33:43 +01:00
commit 064b97b7f9
2 changed files with 6 additions and 1 deletions

View File

@ -10,6 +10,11 @@ with import <stockholm/lib>;
rev = "7b179bd31192ead8afe7a0b6e34bcad4039deaa8"; rev = "7b179bd31192ead8afe7a0b6e34bcad4039deaa8";
sha256 = "12j2n3sbvzjnw99gga7kkdygm8n3qx2lh8q26ad6a53xm5whnz59"; sha256 = "12j2n3sbvzjnw99gga7kkdygm8n3qx2lh8q26ad6a53xm5whnz59";
}; };
"20.03" = {
version = "0.4.1-tv1";
rev = "refs/tags/v${cfg.version}";
sha256 = "11xjivpj495r2ss9aqljnpzzycb57cm4sr7yzmf939rzwsd3ib0x";
};
}.${versions.majorMinor version} or { }.${versions.majorMinor version} or {
version = "0.4.1-tv2"; version = "0.4.1-tv2";
rev = "refs/tags/v${cfg.version}"; rev = "refs/tags/v${cfg.version}";

View File

@ -92,7 +92,7 @@ with import <stockholm/lib>;
services.cron.enable = false; services.cron.enable = false;
services.nscd.enable = services.nscd.enable =
# Since 20.09 nscd doesn't cache anymore. # Since 20.09 nscd doesn't cache anymore.
versionOlder version "20.09"; versionAtLeast (versions.majorMinor version) "20.09";
services.ntp.enable = false; services.ntp.enable = false;
services.timesyncd.enable = true; services.timesyncd.enable = true;
} }