Channels i686: build nixos-unstable-small with tests but not nixpkgs-unstable-(small) #27731
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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. |
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR modifies three channels:
will also be blockers.
These changes will also have effect on 17.09 stable.