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 #45941

Merged
merged 74 commits into from Sep 23, 2018
Merged

Staging next #45941

merged 74 commits into from Sep 23, 2018

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Sep 2, 2018

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

Mic92 and others added 30 commits April 6, 2018 00:21
this fixes gvfs in caia (mate desktop)
libinput builds some executables which are useful for debugging or
unusual configurations, but not necessary in normal use of the library.
(See libinput(1) and the other referenced man pages.)

Some of these programs require Python, which makes the closure
significantly larger. Splitting /libexec/ and /bin/ to a separate "bin"
output allows systems that don't need these utilities to avoid the
substantial size hit.
`ps` can show various systemd-related information, like a unit to
which a process belongs. But when it's not compiled it, it shows only
'?' in such fields.

Can be tested with:

    ps -o unit= ax
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libuv/versions.
Fixes compilation on non-glibc at minor cost since these are only
used to guard the use of pragmas selectively disabling warnings
based on the GCC version used.
e2fsprogs: fix w/musl, __GNUC_PREREQ is glibc-ism
`tool --version` now gets additional line:
Packaged by https://NixOS.org
- default coreutils is stripped of /share/ (11 -> 2 MiB)
- coreutils-full retains /share/ and adds openssl for faster *sum tools
- NixOS systemPackages contains coreutils-full
- *Support parameter defaults are moved inside
  (it seemed confusing to have `? false` and "at once" with `? isLinux`)

Closure considerations:
+ typical build-time closure will get lighter by ~9 MiB
- typical closure of NixOS installation will grow by ~2 MiB,
  due to referring to both versions.  I think it would be possible to
  re-use most of the utils between the two versions, but the expression
  would get much more complex.

I considered having stdenv with minimal coreutils and the default
`coreutils` attribute being full, but it turned out there were too many
trivial references in nixpkgs, so it didn't seem easy to keep rebuild
impact of openssl from growing significantly.
currently only used for texlive
This reverts a part of the changes made in #40826.
Fixed-output derivations save time and space on rebuilds.
build failed on Darwin
Patch by @veprbl
2.11 is the version used in TexLive 2018
Fixes a horrendous bug that crashes IRC clients, text editors, terminal
emulators that receive invalid Unicode sequence.
This reverts commit edc13ba, reversing
changes made to 90464f6.
Bootstrap tools generation is broken, and I don't know why yet.
@FRidh FRidh requested a review from vcunat September 6, 2018 16:55
@xeji
Copy link
Contributor

xeji commented Sep 14, 2018

Compare to master: ?compare=1478563

@timokau
Copy link
Member

timokau commented Sep 15, 2018

The included texlive upgrade breaks zathura: #45432 (comment)

@xeji
Copy link
Contributor

xeji commented Sep 15, 2018

@timokau zathura was fixed by #46376 , which is in staging (but not staging-next).

@xeji
Copy link
Contributor

xeji commented Sep 16, 2018

Unfortunately this isn't making any progress on Hydra due to low priority: https://hydra.nixos.org/eval/1478706. >6000 queued builds, all on Darwin, and no build run at all for a day now.
How are we going to get this in shape to be merged?

@timokau
Copy link
Member

timokau commented Sep 17, 2018

Also should the zathura fix maybe be cherry-picked to staging-next? Its a fix after all. But it would cause a lot of rebuilds.

@xeji
Copy link
Contributor

xeji commented Sep 17, 2018

@timokau it would cause another ~13k rebuilds and delay this iteration for several days - just to fix one package. The point of staging-next is exactly to avoid that and stabilize the build without starting over each time a commit is added...

@timokau
Copy link
Member

timokau commented Sep 17, 2018

Well the point of staging-next is also to stabilize and include fixes. Texlive is on the line since it is a mass-rebuild, but also a fix for staging-next. I agree that it may not be worth it however if its really just that one package (even though I consider it an important one). Just wanted to discuss that.

@globin
Copy link
Member

globin commented Sep 18, 2018

FYI, added ce6e72a to staging, follow-up to the first texlive fix, if that should be considered to be cherry-picked in.

@xeji
Copy link
Contributor

xeji commented Sep 22, 2018

Current comparison: https://hydra.nixos.org/eval/1479929?compare=1479402

@xeji
Copy link
Contributor

xeji commented Sep 22, 2018

A large portion of the new failures are timeouts (kernels and libreoffice) that shouldn't concern us.

@FRidh FRidh merged commit 56853dc into master Sep 23, 2018
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