pyrox.dev
GNU mcron 1.0.6.
svn path=/nixpkgs/trunk/; revision=22464
+4
-2
pkgs/tools/system/mcron/default.nix
+4
-2
pkgs/tools/system/mcron/default.nix
···
1
1
{ fetchurl, stdenv, guile, which, ed }:
2
2
3
3
stdenv.mkDerivation rec {
4
-
name = "mcron-1.0.4";
4
+
name = "mcron-1.0.6";
5
5
6
6
src = fetchurl {
7
7
url = "mirror://gnu/mcron/${name}.tar.gz";
8
-
sha256 = "0wrpi9qj50a8wfslapnkmsr6d3qx40hfw57a022m1z1syiljq4xl";
8
+
sha256 = "0yvrfzzdy2m7fbqkr61fw01wd9r2jpnbyabxhcsfivgxywknl0fy";
9
9
};
10
10
11
11
patches = [ ./install-vixie-programs.patch ];
12
12
13
13
buildInputs = [ guile which ed ];
14
+
15
+
doCheck = true;
14
16
15
17
meta = {
16
18
description = "GNU mcron, a flexible implementation of `cron' in Guile";
+17
-16
pkgs/tools/system/mcron/install-vixie-programs.patch
+17
-16
pkgs/tools/system/mcron/install-vixie-programs.patch
···
1
1
This patch allows us to install the Vixie-compatible binaries as
2
-
non-root.
2
+
non-root without creating /var/run, etc.
3
3
4
-
--- mcron-1.0.4/makefile.in 2008-02-21 20:55:24.000000000 +0100
5
-
+++ mcron-1.0.4/makefile.in 2009-04-03 20:18:44.000000000 +0200
6
-
@@ -872,15 +872,11 @@ mcron.c : main.scm crontab.scm makefile.
4
+
--- mcron-1.0.6/makefile.in 2010-06-19 20:44:17.000000000 +0200
5
+
+++ mcron-1.0.6/makefile.in 2010-07-04 16:16:25.000000000 +0200
6
+
@@ -1004,15 +1004,11 @@ mcron.c : main.scm crontab.scm makefile.
7
7
@rm -f mcron.escaped.scm > /dev/null 2>&1
8
8
9
9
install-exec-hook:
10
-
- @if [ "`id -u`" -eq "0" ]; then \
11
-
+ @if true; then \
12
-
rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \
13
-
$(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \
14
-
rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \
15
-
$(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \
16
-
- ./mkinstalldirs -m 'u=rwx' /var/cron; \
17
-
- ./mkinstalldirs -m 'u=rwx,og=rx' /var/run; \
18
-
- ./mkinstalldirs -m 'u=rwx,og=rx' @GUILE_SITE@; \
19
-
- ./mkinstalldirs -m 'u=rwx,og=rx' @GUILE_SITE@/mcron; \
10
+
- @if [ "x@NO_VIXIE_CLOBBER@" != "xyes" -a "`id -u`" -eq "0" ]; then \
11
+
+ @if [ "x@NO_VIXIE_CLOBBER@" != "xyes" ]; then \
12
+
rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \
13
+
$(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \
14
+
rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \
15
+
$(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \
16
+
- $(INSTALL) -d --mode='u=rwx' $(DESTDIR)/var/cron; \
17
+
- $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)/var/run; \
18
+
- $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@; \
19
+
- $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@/mcron; \
20
+
elif [ "x@NO_VIXIE_CLOBBER@" = "xyes" ]; then \
21
+
echo "Not installing Vixie-style programs"; \
20
22
else \
21
-
echo "+++ WARNING: NON-ROOT INSTALL: ONLY mcron WILL BE INSTALLED, NOT ANY OF THE VIXIE REPLACEMENT PROGRAMS"; \
22
-
fi
23
+