diff options
| author | lassulus <git@lassul.us> | 2023-06-21 16:01:33 +0200 |
|---|---|---|
| committer | lassulus <git@lassul.us> | 2023-06-21 16:01:33 +0200 |
| commit | a0c4427c0baa94603fa10c1248944e7837e72642 (patch) | |
| tree | caa4053366d62b683e6f6e746e9df0317de88c80 /krebs/2configs/cal.nix | |
| parent | c6593fdb393a585e631b9824e2bb3857ba2f90c6 (diff) | |
| parent | fdc364520238a38883d28bbfa05ac966e792ed8b (diff) | |
Merge remote-tracking branch 'ni/flakify'
Diffstat (limited to 'krebs/2configs/cal.nix')
| -rw-r--r-- | krebs/2configs/cal.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/krebs/2configs/cal.nix b/krebs/2configs/cal.nix index 15f0027b..a1fe47b5 100644 --- a/krebs/2configs/cal.nix +++ b/krebs/2configs/cal.nix @@ -1,4 +1,5 @@ { config, lib, pkgs, ... }: let + slib = import ../../lib/pure.nix { inherit lib; }; setupGit = '' export PATH=${lib.makeBinPath [ @@ -23,13 +24,13 @@ git add .gitignore ''; - pushCal = pkgs.writeDash "push_cal" '' + pushCal = pkgs.writers.writeDash "push_cal" '' ${setupGit} git fetch origin git merge --ff-only origin/master || : ''; - pushCgit = pkgs.writeDash "push_cgit" '' + pushCgit = pkgs.writers.writeDash "push_cgit" '' ${setupGit} git push origin master ''; @@ -73,7 +74,7 @@ in { cgit.settings = { root-title = "krebs repos"; }; - rules = with pkgs.stockholm.lib.git; [ + rules = with slib.git; [ { user = [ { |