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

Merged
merged 79 commits into from Dec 15, 2019
Merged

Staging next #75452

merged 79 commits into from Dec 15, 2019

Conversation

@FRidh
Copy link
Member

@FRidh FRidh commented Dec 10, 2019

Motivation for this change

https://hydra.nixos.org/jobset/nixpkgs/staging-next

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 nix-review --run "nix-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.
Notify maintainers

cc @

samueldr and others added 30 commits Nov 9, 2019
Fixup the patch from 4f3c817 so it
applies to the current groff.

The patch was removed, but cross-compilation not validated, in #70500.
The changes in #67548 broke cross-compilation not for valgrind, but for
software relying on valgrind at build-time.
If an empty string is passed to `-idirafter`, it breaks gcc. This commit makes
the stdenv less fragile by expanding out the shell glob and ensuring no empty
arguments get passed.
* Removes an unused binding that prevents compilation with newer pango
* Adds a patch to fix a memory leak
a patch to cmake to correctly locate harfbuzz:
https://gitlab.kitware.com/cmake/cmake/issues/19531,
needed for more recent pango.
kdeFrameworks: 5.62 -> 5.64; kdeApplications: 19.08.2 -> 19.08.3
meson: 0.51.2 → 0.52.1
stdenv: Fix gcc -idirafter shell glob in cc-wrapper
- add myself as maintainer
- license is mit
Addresses:

#73624
#70086
pango, pygtk: fixing up newer pango and pygtk
libffi: 3.2.1 -> 3.3
LnL7 and others added 2 commits Dec 11, 2019
Using a function in an if condition when set -e is set doesn't seem to
break out or return false which means the workaround from 41ca861
never gets triggered.
@timokau
Copy link
Member

@timokau timokau commented Dec 14, 2019

In case somebody else is looking into it: I've tracked the ecl build failure to #74855 (comment).

@@ -76,8 +76,8 @@ stdenv.mkDerivation {
# later.
buildPhase = stdenv.lib.optionalString true ''

This comment has been minimized.

@jonringer

jonringer Dec 14, 2019
Contributor

why? the predicate is literally true, just have the string

This comment has been minimized.

@LnL7

LnL7 Dec 14, 2019
Member

that was accidental, I initially wanted to make the workaround conditional for clang 7 but that's really hard to check while the stdenv is still bootstrapping.

jtojnar and others added 7 commits Dec 14, 2019
@FRidh FRidh merged commit 08eaac6 into master Dec 15, 2019
13 checks passed
13 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
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
You can’t perform that action at this time.