-
-
Notifications
You must be signed in to change notification settings - Fork 18k
stdenv: add pure Linux stdenv support for powerpc64le and sparc64 #141448
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
Draft
piperswe
wants to merge
27
commits into
NixOS:master
Choose a base branch
from
piperswe:piper/bootstrap-ppc64le-and-sparc64
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
5bf36e5
stdenv: start working on adding more bootstrap tools
piperswe 6957943
lib/tests: add sparc64-linux to systems.nix
piperswe 0115834
lib: flesh out doubles
piperswe b032580
lib: clean up sparc64
piperswe 023ce07
lib: flesh out tests/systems
piperswe 6171d9e
busybox: don't use musl on risc-v and sparc
piperswe b411f7e
busybox/sandbox-shell: fix eval on sparc64
piperswe 0c54199
stdenv: re-add useMusl to busyboxMinimal
piperswe 1e31925
pcre: disable JIT on SPARC
piperswe 1a06f19
stdenv: add bootstrap tools for ppc64le and sparc64
piperswe 1e4c597
stdenv: add derivation for building seeds from scratch
piperswe 90916b3
release: build bootstrap-tools from scratch in hydra
piperswe dbe1471
lib: make qemuSerialDevice compatible with SPARC
piperswe b5d08be
release: attempt to fix eval
piperswe 0876acb
stdenv: fix building stdenv with cross-bootstrap
piperswe 6a4def6
musl: fail in eval for unsupported platforms
piperswe a2ecc8f
mips: fix powerpc eval
piperswe d80a804
musl: limit to Linux
piperswe 66c8fb2
musl: fix predicates
piperswe 9d75aeb
musl: move platforms into doubles for use elsewhere
piperswe 50a957a
musl: remove supportsMusl
piperswe 1e268db
stdenv: add new stage building hardened gcc
piperswe c303c89
stdenv: fix multi-stage bootstrap tools build
piperswe 3e84ebc
stdenv: pass bootstrapFiles more elegantly
piperswe c550f2f
stdenv: add pkgsWithTools to make-bootstrap-tools
piperswe 06a046f
stdenv: import pkgs.path instead of nixpkgs
piperswe 44cdd2c
stdenv: fix eval
piperswe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| { busybox}: | ||
| { busybox }: | ||
|
|
||
| # Minimal shell for use as basic /bin/sh in sandbox builds | ||
| busybox.override { | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { lib | ||
| , localSystem, crossSystem, config, overlays, crossOverlays ? [] | ||
| , localSystem, crossSystem, config, overlays, crossOverlays ? [], ... | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do we suddenly need to accept any input here and in the other files below? I don't think that is a good idea because it swallows mistakes like typos and makes. |
||
| }: | ||
|
|
||
| let | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| # Note: do not use Hydra as a source URL. Ask a member of the | ||
| # infrastructure team to mirror the job. | ||
| busybox = import <nix/fetchurl.nix> { | ||
| # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.powerpc64le.dist | ||
| # from build: https://hydra.nixos.org/build/155848348 | ||
| # TODO(pmc): ask infra to mirror this | ||
| # url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox"; | ||
| url = "https://nix-cache.piperswe.me/bootstrap/7znrqcmp15b93k3bz0yyczqi73dj713v-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu/on-server/busybox"; | ||
| sha256 = "sha256-nOJImyOtWg2WuXgu9SLKKHiVtmygAQxDutmec98XD9A="; | ||
| executable = true; | ||
| }; | ||
| bootstrapTools = import <nix/fetchurl.nix> { | ||
| # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv7l.dist/latest | ||
| # from build: https://hydra.nixos.org/build/114203060 | ||
| # TODO(pmc): ask infra to mirror this | ||
| # url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz"; | ||
| url = "https://nix-cache.piperswe.me/bootstrap/7znrqcmp15b93k3bz0yyczqi73dj713v-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu/on-server/bootstrap-tools.tar.xz"; | ||
| sha256 = "sha256-QsTMZZF0GUFj+YQ5aF9YxEzyDSIhIYBBFVmpNYoDPdg="; | ||
| }; | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| # Note: do not use Hydra as a source URL. Ask a member of the | ||
| # infrastructure team to mirror the job. | ||
| busybox = import <nix/fetchurl.nix> { | ||
| # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.powerpc64le.dist | ||
| # from build: https://hydra.nixos.org/build/155848348 | ||
| # TODO(pmc): ask infra to mirror this | ||
| # url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox"; | ||
| url = "https://nix-cache.piperswe.me/bootstrap/wnjkv15kl6pn4jw4dqwqy7i364w6qqvr-stdenv-bootstrap-tools-sparc64-unknown-linux-gnu/on-server/busybox"; | ||
| sha256 = "sha256-T9ak4aH9LJBtFlT1fJWaw7xaYmMZOBMstrXCwq5MK+M="; | ||
| executable = true; | ||
| }; | ||
| bootstrapTools = import <nix/fetchurl.nix> { | ||
| # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv7l.dist/latest | ||
| # from build: https://hydra.nixos.org/build/114203060 | ||
| # TODO(pmc): ask infra to mirror this | ||
| # url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz"; | ||
| url = "https://nix-cache.piperswe.me/bootstrap/wnjkv15kl6pn4jw4dqwqy7i364w6qqvr-stdenv-bootstrap-tools-sparc64-unknown-linux-gnu/on-server/bootstrap-tools.tar.xz"; | ||
| sha256 = "sha256-2z5mNuGjS8lJVA/jEyu9lq/byIYUSAmCOM44p4YWnrg="; | ||
| }; | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is basically platforms.linux? Or which platform is not supported? I can't tell. It would be way cleaner to substract the one or two not working platforms from platforms.linux or just write them into meta.broken.