Update nixpkgs-unstable channel
Eelco Dolstra committed
Mar 7, 2016 at 13:30 UTC
9a2b341fb34f6005274eccc2b4afffcde5db6da5
1 file changed
+15
-14
nixos-org/hydra-mirror.nix
+15
-14
@@ -4,23 +4,23 @@ with lib;
4
5
let
6
7
- makeUpdateChannel = channelName: jobset:
8
- { timers."update-nixos-${channelName}" =
7
+ makeUpdateChannel = channelName: mainJob:
8
+ { timers."update-${channelName}" =
9
{ wantedBy = [ "timers.target" ];
10
timerConfig.OnUnitInactiveSec = 600;
11
timerConfig.OnBootSec = 900;
12
timerConfig.AccuracySec = 300;
13
};
14
15
- services."update-nixos-${channelName}" =
16
- { description = "Update Channel nixos-${channelName}";
15
+ services."update-${channelName}" =
16
+ { description = "Update Channel ${channelName}";
17
after = [ "networking.target" ];
18
script =
19
''
20
source /etc/profile
21
- rm -rf /data/releases/nixos/${channelName}/*-tmp || true
21
cd /home/hydra-mirror/nixos-channel-scripts
23
- exec ./mirror-nixos-branch.pl ${channelName} ${jobset}
22
+ exec ./mirror-nixos-branch.pl ${channelName} http://hydra.nixos.org/job/${mainJob}/latest-finished \
23
+ ${optionalString (channelName == "15.09") "1"}
24
''; # */
25
serviceConfig.User = "hydra-mirror";
26
};
@@ -63,14 +63,15 @@ in
63
64
systemd =
65
fold recursiveUpdate {}
66
- [ (makeUpdateChannel "16.03" "release-16.03")
67
- (makeUpdateChannel "16.03-small" "release-16.03-small")
68
- (makeUpdateChannel "15.09" "release-15.09")
69
- (makeUpdateChannel "15.09-small" "release-15.09-small")
70
- (makeUpdateChannel "14.12" "release-14.12")
71
- (makeUpdateChannel "14.12-small" "release-14.12-small")
72
- (makeUpdateChannel "unstable" "trunk-combined")
73
- (makeUpdateChannel "unstable-small" "unstable-small")
66
+ [ (makeUpdateChannel "nixos-16.03" "nixos/release-16.03/tested")
67
+ (makeUpdateChannel "nixos-16.03-small" "nixos/release-16.03-small/tested")
68
+ (makeUpdateChannel "nixos-15.09" "nixos/release-15.09/tested")
69
+ (makeUpdateChannel "nixos-15.09-small" "nixos/release-15.09-small/tested")
70
+ (makeUpdateChannel "nixos-14.12" "nixos/release-14.12/tested")
71
+ (makeUpdateChannel "nixos-14.12-small" "nixos/release-14.12-small/tested")
72
+ (makeUpdateChannel "nixos-unstable" "nixos/trunk-combined/tested")
73
+ (makeUpdateChannel "nixos-unstable-small" "nixos/unstable-small/tested")
74
+ (makeUpdateChannel "nixpkgs-unstable" "nixpkgs/trunk/unstable")
75
];
76
77
}