Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b1bfe9d3db71
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a45821e7a849
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 15, 2017

  1. nixos/atd: unbreak after new security.wrappers 

    * convert list -> attrset
* 'atd' doesn't exist, 'at' does
    @bjornfor
    bjornfor committed Feb 15, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    aaac02f View commit details

  2. nixos/cron: unbreak since new security.wrapper

    @bjornfor
    bjornfor committed Feb 15, 2017
    Copy the full SHA
    a45821e View commit details
Showing with 5 additions and 4 deletions.
  1. +4 −3 nixos/modules/services/scheduling/atd.nix
  2. +1 −1 nixos/modules/services/scheduling/cron.nix
7 changes: 4 additions & 3 deletions nixos/modules/services/scheduling/atd.nix
View file
Original file line number Diff line number Diff line change
@@ -42,13 +42,14 @@ in

config = mkIf cfg.enable {

security.wrappers = map (program: {"${program}" = {
source = "${pkgs.atd}/bin/${program}";
security.wrappers = builtins.listToAttrs (
map (program: { name = "${program}"; value = {
source = "${at}/bin/${program}";
owner = "atd";
group = "atd";
setuid = true;
setgid = true;
};}) [ "at" "atq" "atrm" "batch" ];
};}) [ "at" "atq" "atrm" "batch" ]);

environment.systemPackages = [ at ];

2 changes: 1 addition & 1 deletion nixos/modules/services/scheduling/cron.nix
View file
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ in

{ services.cron.enable = mkDefault (allFiles != []); }
(mkIf (config.services.cron.enable) {
security.wrappers.crontab.source = "${pkgs.cronNixosPkg.out}/bin/crontab";
security.wrappers.crontab.source = "${cronNixosPkg}/bin/crontab";
environment.systemPackages = [ cronNixosPkg ];
environment.etc.crontab =
{ source = pkgs.runCommand "crontabs" { inherit allFiles; preferLocalBuild = true; }