diff options
| -rw-r--r-- | nixos/release-combined.nix | 13 | ||||
| -rw-r--r-- | nixos/release.nix | 10 |
2 files changed, 19 insertions, 4 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index debdccf7e54..ca7ca2afb65 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) diff --git a/nixos/release.nix b/nixos/release.nix index 0a12aa765be..7337ad7e3f4 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -186,6 +186,16 @@ in rec { ); + # Ensure that all packages used by the minimal NixOS config end up in the channel. + dummy = forAllSystems (system: pkgs.runCommand "dummy" + { propagatedBuildInputs = (import lib/eval-config.nix { + inherit system; + modules = lib.singleton ({ config, pkgs, ... }: { }); + }).config.environment.systemPackages; + } + "mkdir $out; fixupPhase"); + + # Provide a tarball that can be unpacked into an SD card, and easily # boot that system from uboot (like for the sheevaplug). # The pc variant helps preparing the expression for the system tarball |