Skip to content
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

relibc: fix for nix 3.0 #101057

Merged
merged 2 commits into from Oct 20, 2020
Merged

relibc: fix for nix 3.0 #101057

merged 2 commits into from Oct 20, 2020

Conversation

@aaronjanse
Copy link
Member

@aaronjanse aaronjanse commented Oct 19, 2020

Motivation for this change

Fixes error when using Nix 3.0:

[nix-shell:~/redoxpkgs]$ nix-build . -A redox-vm
error: --- Error ------------------------------------------------------------------------------------------------------------------------------------- nix-build
tarball 'https://www.dropbox.com/s/33r92en0t47l1ei/redox-rust-toolchain-bin.tar.gz?dl=1' contains an unexpected number of top-level files
(use '--show-trace' to show detailed location information)

Ping for @jD91mZM2 who spotted this.

P.S. I love the new Nix error reporting features!

Things done

The toolchain tarball now extracts to one folder with all of the original folders inside of that. Note that the sha256 sum has not changed.

Once this and #95542 are merged, official nixpkgs plus overlay will be enough to build an entire Redox OS image that boots with Nixpkgs packages pre-installed into the $PATH.

Next step after that is hosting this bootstrapping binary toolchain somewhere more official.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Oct 19, 2020

I believe the actual fix is you should use fetchzip instead of the builtin fetchTarball, as we don't want hydra to have to download this at eval time.

@aaronjanse
Copy link
Member Author

@aaronjanse aaronjanse commented Oct 20, 2020

Done. I also kept the new tarball file structure because the previous structure created a ton of folders when unzipped unlike most tarballs.

@Ericson2314 Ericson2314 merged commit 76b3bfb into NixOS:master Oct 20, 2020
16 checks passed
16 checks passed
@github-actions
tests
Details
@github-actions
action
Details
@ofborg
Evaluation Performance Report Evaluator Performance Report
Details
@github-actions
Wait for ofborg
Details
@ofborg
grahamcofborg-eval ^.^!
Details
@ofborg
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
@ofborg
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="99176c0"; rev="99176c09555cf94c66184c0953e9e85b9317feba"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
@ofborg
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="99176c0"; rev="99176c09555cf94c66184c0953e9e85b9317feba"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="99176c0"; rev="99176c09555cf94c66184c0953e9e85b9317feba"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="99176c0"; rev="99176c09555cf94c66184c0953e9e85b9317feba"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="99176c0"; rev="99176c09555cf94c66184c0953e9e85b9317feba"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="99176c0"; rev="99176c09555cf94c66184c0953e9e85b9317feba"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="99176c0"; rev="99176c09555cf94c66184c0953e9e85b9317feba"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
@ofborg
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants