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

python-pysqlite: fix darwin build #35021

Merged
merged 212 commits into from Feb 16, 2018
Merged

python-pysqlite: fix darwin build #35021

merged 212 commits into from Feb 16, 2018

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Feb 15, 2018

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
  • 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/)
  • Fits CONTRIBUTING.md.

dtzWill and others added 30 commits February 1, 2018 08:51
…os-in-openssh

openssh: Document default Kerberos support
busybox: bump copybuf, disable utmp/wtmp when not supported (musl)
pythonPackages.testtools: clean up dependencies
Note this doesn't actually provide musl support yet,
just improves our "system" code to understand
musl-based triples and non-glibc linux configurations.
gnu "abi" doesn't mean glibc (mingw, apparently).
Co-Authored-By: Florian Klink <flokli@flokli.de>
Co-Authored-By: Andreas Rammhold <andreas@rammhold.de>
Conflicts:
	pkgs/development/libraries/libclc/default.nix
	pkgs/top-level/all-packages.nix
dtzWill and others added 20 commits February 13, 2018 11:27
Note that currently getent is explicitly taken from "glibc.bin",
regardless of build configuration which this preserves for now.
(on non-musl anyway)
reviewer feedback + minor other things I noticed
while revisiting.
Workaround for building "from" the bfd directory but needing
to update files a level above.

This needs to be done *after* autoreconf since autoreconf
will replace these itself, apparently.
Fixes cross build by removing false dependency.

If this is needed again, be careful about *which* "groff" is needed.
(which in terms of build vs host)
musl-cross, native-musl, cross fixes, oh my!
I also saw NixOS#33946, though I'm not sure what to make of it...
There's also 4.0.0, but I'd leave that for later.
This used to be the case before commit 531e4b8 which seems to
have dropped it by accident.

Removes one unnecessary build of pkgconfig during stdenv bootstrapping.
It's not actually needed, and AFAICT has never been. Or at least
Buildroot can build kernel headers as old as 3.2 without running the
config phase.

While at it, set ARCH unconditionally.
Nothing actually needs this.
After the systemd 237 upgrade, radvd wouldn't start anymore because the
PID file cannot be written. It seems that directories in /run has to be
explicitely defined as RuntimeDirectory now. The PID file isn't needed
due to systemd, though, so it was removed along with forking and loggia
via syslog.

This fixes the ipv6 NixOS test.
@LnL7 LnL7 requested a review from FRidh as a code owner February 15, 2018 23:04
@LnL7 LnL7 removed the request for review from FRidh February 15, 2018 23:38
@vcunat vcunat self-assigned this Feb 15, 2018
@vcunat vcunat changed the base branch from staging to master February 16, 2018 08:12
@vcunat vcunat merged commit 2b851d1 into NixOS:master Feb 16, 2018
vcunat added a commit that referenced this pull request Feb 16, 2018
It's the last staging commit (mostly) built on Hydra,
and a minimal fix for Darwin regression in pysqlite.
@LnL7 LnL7 deleted the darwin-pysqlite branch February 26, 2018 15:59
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