Unverified Commit 16212c03 authored by Patrick Nuckolls's avatar Patrick Nuckolls Committed by GitHub
Browse files

mcron: 1.0.6 -> 1.2.1 (#206300)



Co-authored-by: default avatarSandro <sandro.jaeckel@gmail.com>
parent 7bd0c509
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
{ 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;

+0 −23
Original line number Diff line number Diff line
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 \
+1 −3
Original line number Diff line number Diff line
@@ -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;