diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-23 11:51:34 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-23 11:51:46 +0200 |
| commit | cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a (patch) | |
| tree | 17f37336c06c395d9745faeceb5be1ecfc4df2ef /pkgs | |
| parent | dad76237584b0a7bd29761c99989b9ce7700c573 (diff) | |
| download | nixpkgs-cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a.tar nixpkgs-cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a.tar.gz nixpkgs-cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a.tar.bz2 nixpkgs-cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a.tar.lz nixpkgs-cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a.tar.xz nixpkgs-cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a.tar.zst nixpkgs-cae28df8fa3c5d135ddfb2461c24fe0db7fb0d2a.zip | |
sysstat: Update to 11.0.1 and install systemd units
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/sysstat/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/sysstat/no-install-statedir.patch | 37 |
2 files changed, 15 insertions, 45 deletions
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index ec504bd9235..7944f612fb0 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, gettext }: - +{ stdenv, fetchurl, gettext, bzip2 }: + stdenv.mkDerivation rec { - name = "sysstat-10.1.1"; - + name = "sysstat-11.0.1"; + src = fetchurl { - url = "http://perso.orange.fr/sebastien.godard/${name}.tar.bz2"; - sha256 = "1ig6k4yjkkazddjr90hykiapl30s9r9c1gy1h8hqzn2c3xgkm7p3"; + url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz"; + sha256 = "1cwgsxvs7jkr3il6r344mw46502yjnhrsbcp4217vh4b7xv6czaq"; }; buildInputs = [ gettext ]; @@ -13,10 +13,17 @@ stdenv.mkDerivation rec { preConfigure = '' export PATH_CP=$(type -tp cp) 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 = { homepage = http://sebastien.godard.pagesperso-orange.fr/; diff --git a/pkgs/os-specific/linux/sysstat/no-install-statedir.patch b/pkgs/os-specific/linux/sysstat/no-install-statedir.patch deleted file mode 100644 index ef81f97217f..00000000000 --- a/pkgs/os-specific/linux/sysstat/no-install-statedir.patch +++ /dev/null @@ -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 \ |