diff options
| author | lassulus <lass@aidsballs.de> | 2016-10-24 09:46:28 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-10-24 09:46:28 +0200 |
| commit | b43f47f0b30618e810c7c2c2b186acdbeaed73d6 (patch) | |
| tree | 16441373bc51cfc4b6d5ee475703e39e1f8eb2f5 /krebs | |
| parent | af206b48225abdaa6596d4974bfaf112c5fff5ab (diff) | |
| parent | 08c7671fc51270e582e16cbe49aa896f8bff7685 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/git.nix | 6 | ||||
| -rw-r--r-- | krebs/5pkgs/populate/default.nix | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix index e6b98a923..20907a3ed 100644 --- a/krebs/3modules/git.nix +++ b/krebs/3modules/git.nix @@ -389,6 +389,12 @@ let mapAttrsToList repo-to-cgitrc cfg.repos )); + environment.systemPackages = [ + (pkgs.writeDashBin "cgit-clear-cache" '' + ${pkgs.coreutils}/bin/rm -f ${cfg.cgit.settings.cache-root}/* + '') + ]; + system.activationScripts.cgit = '' mkdir -m 0700 -p ${cfg.cgit.settings.cache-root} chown ${toString cfg.cgit.fcgiwrap.user.uid}:${toString cfg.cgit.fcgiwrap.group.gid} ${cfg.cgit.settings.cache-root} diff --git a/krebs/5pkgs/populate/default.nix b/krebs/5pkgs/populate/default.nix index 09b29c6c3..dc5750bda 100644 --- a/krebs/5pkgs/populate/default.nix +++ b/krebs/5pkgs/populate/default.nix @@ -13,12 +13,12 @@ in stdenv.mkDerivation rec { name = "populate"; - version = "1.1.1"; + version = "1.2.0"; src = fetchgit { url = http://cgit.cd.krebsco.de/populate; rev = "refs/tags/v${version}"; - sha256 = "139f4lzn56lca3qgqy9g33r94m3xi1mqns9340lkb4qm6626yvqd"; + sha256 = "0q3110hkkxn9bc3a63xbx1hyd1fpzz4wrck4lng3j5a9i1y1jm07"; }; phases = [ |