diff --git a/release.nix b/release.nix index fccc855..a6739cd 100644 --- a/release.nix +++ b/release.nix @@ -89,26 +89,41 @@ in let in nixpkgs; -in { - - # Tweak the nixos make-channel code to include the upstream channel. + # jobs - The jobs hydra is to run. # - # 1. Replace the git repo nixpkgs with a copy of the unpacked nixpkgs channel. - # - channel = - ( import (nixpkgsGit + /nixos/lib/make-channel.nix) { - inherit pkgs version versionSuffix; - nixpkgs = ccpkgsGit; - } ).overrideAttrs ( original: { - name = "ccpkgs-channel"; - distPhase = - '' - rm -fr upstream - cp -rd ${nixpkgs}/nixos-${version} upstream - '' + original.distPhase; - } ); + jobs = { + # Tweak the nixos make-channel code to include the upstream channel. + # + # 1. Replace the git repo nixpkgs with a copy of the unpacked nixpkgs channel. + # + channel = + ( import (nixpkgsGit + /nixos/lib/make-channel.nix) { + inherit pkgs version versionSuffix; + nixpkgs = ccpkgsGit; + } ).overrideAttrs ( original: { + name = "ccpkgs-channel"; + distPhase = + '' + rm -fr upstream + cp -rd ${nixpkgs}/nixos-${version} upstream + '' + original.distPhase; + } ); + + # tested - Aggregate package set required to built for automatic channel release + # + tested = pkgs.lib.hydraJob (pkgs.releaseTools.aggregate { + name = "ccpkgs-${version}"; + + constituents = + builtins.attrValues jobs.pkgs + ++ builtins.attrValues jobs.temporary; + + meta = { + description = "Release-critical builds for the ccpkgs channel"; + maintainers = with pkgs.lib.maintainers; [ ]; + }; + }); - overlays = { # pkgs - Attribute set of overlayed pkgs. # pkgs = @@ -123,4 +138,5 @@ in { ( map ( name: { inherit name; value = pkgs.${name}; } ) ( builtins.attrNames ( import ./temporary/all-temporary.nix { } { } ) ) ); }; -} + +in jobs