-
-
Notifications
You must be signed in to change notification settings - Fork 12.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Channels i686: build nixos-unstable-small with tests but not nixpkgs-unstable-(small) #27731
Conversation
…unstable-(small) This PR modifies three channels: - nixos-unstable-small will provide binaries for i686. Failing tests will also be blockers. - nixpkgs-unstable(-small) no longer provides binaries for i686. These changes will also have effect on 17.09 stable.
@FRidh, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @domenkozar and @grahamc to be potential reviewers. |
Related discussion on mailing list: https://groups.google.com/forum/#!topic/nix-devel/m7ikFjor24Y |
As outlined in my email I don't love the idea of having nixos-unstable-small being blocked by i686, as I don't want a limited-support arch blocking our fast moving channels. |
what do y'all think of this? I'm not certain how it'll interact with hydra... diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ecbd317cb9a..36b27d8c0d5 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -4,7 +4,8 @@
{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
, stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
+, supportedSystems ? [ "x86_64-linux" ]
+, limitedSupportedSystems ? [ "i686-linux" ]
}:
let
@@ -19,10 +20,16 @@ let
else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set
else set;
+ allSupportedNixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
+ supportedSystems = supportedSystems ++ limitedSupportedSystems;
+ nixpkgs = nixpkgsSrc;
+ })) [ "unstable" ];
+
in rec {
nixos = removeMaintainers (import ./release.nix {
- inherit stableBranch supportedSystems;
+ inherit stableBranch;
+ supportedSystems = supportedSystems ++ limitedSupportedSystems;
nixpkgs = nixpkgsSrc;
});
@@ -38,7 +45,7 @@ in rec {
maintainers = [ pkgs.lib.maintainers.eelco ];
};
constituents =
- let all = x: map (system: x.${system}) supportedSystems; in
+ let all = x: map (system: x.${system}) (supportedSystems ++ limitedSupportedSystems); in
[ nixos.channel
(all nixos.dummy)
(all nixos.manual)
@@ -106,8 +113,8 @@ in rec {
(all nixos.tests.xfce)
nixpkgs.tarball
- (all nixpkgs.emacs)
- (all nixpkgs.jdk)
+ (all allSupportedNixpkgs.emacs)
+ (all allSupportedNixpkgs.jdk)
];
}); |
@grahamc looks good to me. |
@grahamc could you mention your proposal/changes on the mailing list? It would be nice to move this forward. |
Yeah, I'll start by making a separate PR. |
This PR modifies three channels:
will also be blockers.
These changes will also have effect on 17.09 stable.