Merge branch 'master2' of https://github.com/gnidorah/nixpkgs into staging

Changed files
+50 -4
nixos
modules
services
misc
pkgs
os-specific
linux
util-linux
+1
nixos/modules/module-list.nix
···
./services/misc/etcd.nix
./services/misc/felix.nix
./services/misc/folding-at-home.nix
+
./services/misc/fstrim.nix
./services/misc/gammu-smsd.nix
./services/misc/geoip-updater.nix
#./services/misc/gitit.nix
+45
nixos/modules/services/misc/fstrim.nix
···
+
{ config, lib, pkgs, ... }:
+
+
with lib;
+
+
let
+
+
cfg = config.services.fstrim;
+
+
in {
+
+
options = {
+
+
services.fstrim = {
+
enable = mkEnableOption "periodic SSD TRIM of mounted partitions in background";
+
+
interval = mkOption {
+
type = types.string;
+
default = "weekly";
+
description = ''
+
How often we run fstrim. For most desktop and server systems
+
a sufficient trimming frequency is once a week.
+
+
The format is described in
+
<citerefentry><refentrytitle>systemd.time</refentrytitle>
+
<manvolnum>7</manvolnum></citerefentry>.
+
'';
+
};
+
};
+
+
};
+
+
config = mkIf cfg.enable {
+
+
systemd.packages = [ pkgs.utillinux ];
+
+
systemd.timers.fstrim = {
+
timerConfig = {
+
OnCalendar = cfg.interval;
+
};
+
wantedBy = [ "timers.target" ];
+
};
+
+
};
+
+
}
+4 -4
pkgs/os-specific/linux/util-linux/default.nix
···
preConfigure = "export scanf_cv_type_modifier=ms";
};
+
preConfigure = lib.optionalString (systemd != null) ''
+
configureFlags+="--with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/"
+
'';
+
# !!! It would be better to obtain the path to the mount helpers
# (/sbin/mount.*) through an environment variable, but that's
# somewhat risky because we have to consider that mount can setuid
···
--disable-use-tty-group
--enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin
${if ncurses == null then "--without-ncurses" else ""}
-
${if systemd == null then "" else ''
-
--with-systemd
-
--with-systemdsystemunitdir=$out/lib/systemd/system/
-
''}
'';
makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin";