colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mcron: 1.0.6 -> 1.2.1 (#206300)

Browse Source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Patrick Nuckolls 2023-01-08 14:50:47 -08:00 committed by GitHub
parent 7bd0c509f2
commit 16212c03f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/system/mcron/default.nix
View File

@ -1,22 +1,21 @@
{ fetchurl, lib, stdenv, guile, which, ed, libtool }:
{ fetchurl, lib, stdenv, guile, pkg-config }:
stdenv.mkDerivation rec {
pname = "mcron";
version = "1.0.6";
version = "1.2.1";
src = fetchurl {
url = "mirror://gnu/mcron/mcron-${version}.tar.gz";
sha256 = "0yvrfzzdy2m7fbqkr61fw01wd9r2jpnbyabxhcsfivgxywknl0fy";
sha256 = "0bkn235g2ia4f7ispr9d55c7bc18282r3qd8ldhh5q2kiin75zi0";
};
patches = [ ./install-vixie-programs.patch ];
# don't attempt to chmod +s files in the nix store
postPatch = ''
substituteInPlace makefile.in --replace "rwxs" "rwx"
sed -E -i '/chmod u\+s/d' Makefile.in
'';
buildInputs = [ guile which ed libtool ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ guile ];
doCheck = true;

23
pkgs/tools/system/mcron/install-vixie-programs.patch
View File

@ -1,23 +0,0 @@
This patch allows us to install the Vixie-compatible binaries as
non-root without creating /var/run, etc.
--- mcron-1.0.6/makefile.in 2010-06-19 20:44:17.000000000 +0200
+++ mcron-1.0.6/makefile.in 2010-07-04 16:16:25.000000000 +0200
@@ -1004,15 +1004,11 @@ mcron.c : main.scm crontab.scm makefile.
@rm -f mcron.escaped.scm > /dev/null 2>&1
install-exec-hook:
- @if [ "x@NO_VIXIE_CLOBBER@" != "xyes" -a "`id -u`" -eq "0" ]; then \
+ @if [ "x@NO_VIXIE_CLOBBER@" != "xyes" ]; then \
rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \
$(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \
rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \
$(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \
- $(INSTALL) -d --mode='u=rwx' $(DESTDIR)/var/cron; \
- $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)/var/run; \
- $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@; \
- $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@/mcron; \
elif [ "x@NO_VIXIE_CLOBBER@" = "xyes" ]; then \
echo "Not installing Vixie-style programs"; \
else \

4
pkgs/top-level/all-packages.nix
View File

@ -9509,9 +9509,7 @@ with pkgs;
mcabber = callPackage ../applications/networking/instant-messengers/mcabber { };
mcron = callPackage ../tools/system/mcron {
guile = guile_1_8;
};
mcron = callPackage ../tools/system/mcron { };
mcstatus = with python3Packages; toPythonApplication mcstatus;