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

Staging next #96280

Merged
merged 442 commits into from Aug 27, 2020
Merged

Staging next #96280

merged 442 commits into from Aug 27, 2020

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Aug 25, 2020

Motivation for this change
Things done
  • 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.

@jonringer
Copy link
Contributor

merged master into staging-next to fix merge conflicts

@jonringer
Copy link
Contributor

just FYI, this will likely be the last staging-next before the branch-off on Sept 4th.

FRidh and others added 10 commits August 26, 2020 08:42
This reverts commit ff21fc4.

sphinx_rtd_theme 0.5.0 requires a significant amount of bootstrapping
with node packages, which are not trivial
parsing of POPPLER_MINOR_VERSION is broken, as it doesn't truncate
leading zeroes. Leading gcc to believe it's trying to evaluate an
octal value (e.g. 08 > 72 ). However, 8 isn't a valid octal value.

Patches from master do not apply cleanly do a series of changes
done to configure.ac. So instead, a commit from master was chosen.
@FRidh FRidh merged commit 22c23f4 into master Aug 27, 2020
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/marketing-team-can-we-present-nix-nixos-better/6249/106

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet