diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-25 00:20:53 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-25 00:25:54 +0200 |
commit | 1cd727180eeb60e1c4f6ead96be614431624830f (patch) | |
tree | a22dbedc544a48bb7a0ab4ad023d5f76dab6e4e6 /nixos/release-combined.nix | |
parent | 0a967b926871af2eb8a5098d85a519a4922c56e7 (diff) | |
download | nixlib-1cd727180eeb60e1c4f6ead96be614431624830f.tar nixlib-1cd727180eeb60e1c4f6ead96be614431624830f.tar.gz nixlib-1cd727180eeb60e1c4f6ead96be614431624830f.tar.bz2 nixlib-1cd727180eeb60e1c4f6ead96be614431624830f.tar.lz nixlib-1cd727180eeb60e1c4f6ead96be614431624830f.tar.xz nixlib-1cd727180eeb60e1c4f6ead96be614431624830f.tar.zst nixlib-1cd727180eeb60e1c4f6ead96be614431624830f.zip |
Add all default NixOS packages to the channel
The job ‘dummy’ depends on the default contents of ‘environment.systemPackages’, thus ensuring that those packages all end up in the channel.
Diffstat (limited to 'nixos/release-combined.nix')
-rw-r--r-- | nixos/release-combined.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index debdccf7e549..ca7ca2afb65f 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -1,3 +1,7 @@ +# This jobset defines the main NixOS channels (such as nixos-unstable +# and nixos-14.04). The channel is updated every time the ‘tested’ job +# succeeds, and all other jobs have finished (they may fail). + { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false , supportedSystems ? [ "x86_64-linux" "i686-linux" ] @@ -18,7 +22,7 @@ let in rec { nixos = removeMaintainers (import ./release.nix { - inherit stableBranch; + inherit stableBranch supportedSystems; nixpkgs = nixpkgsSrc; }); @@ -30,12 +34,13 @@ in rec { tested = pkgs.releaseTools.aggregate { name = "nixos-${nixos.channel.version}"; meta = { - description = "Release-critical builds for the NixOS unstable channel"; - maintainers = [ pkgs.lib.maintainers.eelco pkgs.lib.maintainers.shlevy ]; + description = "Release-critical builds for the NixOS channel"; + maintainers = [ pkgs.lib.maintainers.eelco ]; }; constituents = - let all = x: map (p: x.${p}) supportedSystems; in + let all = x: map (system: x.${system}) supportedSystems; in [ nixos.channel + (all nixos.dummy) (all nixos.manual) (all nixos.iso_minimal) |