BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sysstat: Update to 11.0.1 and install systemd units

Browse source
This commit is contained in:
Eelco Dolstra 2014-09-23 11:51:34 +02:00
parent dad7623758
commit cae28df8fa
2 changed files with 15 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/os-specific/linux/sysstat/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, gettext }: { stdenv, fetchurl, gettext, bzip2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sysstat-10.1.1"; name = "sysstat-11.0.1";
src = fetchurl { src = fetchurl {
url = "http://perso.orange.fr/sebastien.godard/${name}.tar.bz2"; url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz";
sha256 = "1ig6k4yjkkazddjr90hykiapl30s9r9c1gy1h8hqzn2c3xgkm7p3"; sha256 = "1cwgsxvs7jkr3il6r344mw46502yjnhrsbcp4217vh4b7xv6czaq";
}; };
buildInputs = [ gettext ]; buildInputs = [ gettext ];
@ -13,10 +13,17 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
export PATH_CP=$(type -tp cp) export PATH_CP=$(type -tp cp)
export PATH_CHKCONFIG=/no-such-program export PATH_CHKCONFIG=/no-such-program
makeFlagsArray=(SA_DIR=/var/log/sa SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y) export BZIP=${bzip2}/bin/bzip2
export SYSTEMCTL=systemctl
makeFlagsArray=(SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y CHOWN=true)
installFlagsArray=(SA_DIR=$TMPDIR/dummy)
# Note: --enable-install-cron actually installs systemd units.
configureFlagsArray+=(--with-systemdsystemunitdir=$out/lib/systemd/system --enable-install-cron)
''; '';
patches = [ ./no-install-statedir.patch ]; preInstall = ''
mkdir -p $out/lib/systemd/system
'';
meta = { meta = {
homepage = http://sebastien.godard.pagesperso-orange.fr/; homepage = http://sebastien.godard.pagesperso-orange.fr/;

37
pkgs/os-specific/linux/sysstat/no-install-statedir.patch
View file

@ -1,37 +0,0 @@
diff -rc sysstat-10.1.1/Makefile.in sysstat-10.1.1-new/Makefile.in
*** sysstat-10.1.1/Makefile.in 2012-01-02 14:36:00.000000000 +0100
--- sysstat-10.1.1-new/Makefile.in 2012-08-14 14:11:17.676124739 +0200
***************
*** 309,315 ****
install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \
contrib/isag/isag
mkdir -p $(DESTDIR)$(SA_LIB_DIR)
! mkdir -p $(DESTDIR)$(SA_DIR)
ifeq ($(CLEAN_SA_DIR),y)
find $(DESTDIR)$(SA_DIR) \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \
-exec rm -f {} \;
--- 309,315 ----
install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \
contrib/isag/isag
mkdir -p $(DESTDIR)$(SA_LIB_DIR)
! #mkdir -p $(DESTDIR)$(SA_DIR)
ifeq ($(CLEAN_SA_DIR),y)
find $(DESTDIR)$(SA_DIR) \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \
-exec rm -f {} \;
***************
*** 344,350 ****
install_all: install_base cron/crontab sysstat \
cron/sysstat.crond cron/sysstat.cron.daily cron/sysstat.cron.hourly
! $(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR)
if [ -d $(DESTDIR)/etc/cron.d ]; then \
$(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
--- 344,350 ----
install_all: install_base cron/crontab sysstat \
cron/sysstat.crond cron/sysstat.cron.daily cron/sysstat.cron.hourly
! #$(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR)
if [ -d $(DESTDIR)/etc/cron.d ]; then \
$(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \