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

pythonPackages.pkgconfig: 1.1.0 -> 1.3.1 #36434

Closed
wants to merge 2 commits into from
Closed

Conversation

catern
Copy link
Contributor

@catern catern commented Mar 7, 2018

Motivation for this change

The new version has a number of bugfixes and useful features. It also now includes the tests in the distribution.

It may cause breakage, though:

Version 1.2.0
Released on November 30th 2016.

Potential break: switch from result set to list

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
    • 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/)
  • Fits CONTRIBUTING.md.

@catern catern requested a review from FRidh as a code owner March 7, 2018 17:07
@catern
Copy link
Contributor Author

catern commented Mar 7, 2018

See changelog here
https://pypi.python.org/pypi/pkgconfig

@timokau
Copy link
Member

timokau commented Mar 7, 2018

If the tests are included now, we should probably remove the comment:

    # Note that the distributed archive does not actually contain any tests.
    # https://github.com/matze/pkgconfig/issues/9

@FRidh
Copy link
Member

FRidh commented Mar 10, 2018

Unless we get to have a Hydra job to test this change, I think we should not backport to 18.03 anymore.

@timokau
Copy link
Member

timokau commented Mar 10, 2018

I think its pretty likely that the "potential breaking change" breaks some things. I tried to test it myself with nox-review, but it ran out of memory.

Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind moving this out of python-packages.nix?

@dotlambda
Copy link
Member

dotlambda commented Apr 26, 2018

@GrahamcOfBorg build python2.pkgs.pkgconfig python3.pkgs.pkgconfig

@FRidh Please merge into staging if there are no objections. Alternatively, we could include this in the next python package set update.

@dotlambda dotlambda changed the base branch from master to staging April 26, 2018 14:42
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python2.pkgs.pkgconfig, python3.pkgs.pkgconfig

Partial log (click to expand)


OK
running install tests
.......
----------------------------------------------------------------------
Ran 7 tests in 0.402s

OK
/nix/store/50i47m2jk79awgcqndfj4yjypsl89sng-python2.7-pkgconfig-1.3.1
/nix/store/c12x8cbra81sygk3h30bb5c1n0b3zkkq-python3.6-pkgconfig-1.3.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python2.pkgs.pkgconfig, python3.pkgs.pkgconfig

Partial log (click to expand)

patching script interpreter paths in /nix/store/6dkzj9ww15x1ycfnnm8dxl5w2pdmrn3w-python2.7-pkgconfig-1.3.1
checking for references to /build in /nix/store/6dkzj9ww15x1ycfnnm8dxl5w2pdmrn3w-python2.7-pkgconfig-1.3.1...
running install tests
.......
----------------------------------------------------------------------
Ran 7 tests in 0.402s

OK
/nix/store/6dkzj9ww15x1ycfnnm8dxl5w2pdmrn3w-python2.7-pkgconfig-1.3.1
/nix/store/acq3flni71vmllb06z187yr17iqg40hh-python3.6-pkgconfig-1.3.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python2.pkgs.pkgconfig, python3.pkgs.pkgconfig

Partial log (click to expand)

no Makefile, doing nothing
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/w3hwsnlxi4a7lq5xrp9qmz3gd41zsixx-python3.6-bootstrapped-pip-9.0.3
strip is /nix/store/i3k26ygq416sr5ng9f87041f3zcid9di-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/w3hwsnlxi4a7lq5xrp9qmz3gd41zsixx-python3.6-bootstrapped-pip-9.0.3/lib  /nix/store/w3hwsnlxi4a7lq5xrp9qmz3gd41zsixx-python3.6-bootstrapped-pip-9.0.3/bin
patching script interpreter paths in /nix/store/w3hwsnlxi4a7lq5xrp9qmz3gd41zsixx-python3.6-bootstrapped-pip-9.0.3
checking for references to /build in /nix/store/w3hwsnlxi4a7lq5xrp9qmz3gd41zsixx-python3.6-bootstrapped-pip-9.0.3...
/nix/store/6dkzj9ww15x1ycfnnm8dxl5w2pdmrn3w-python2.7-pkgconfig-1.3.1
/nix/store/acq3flni71vmllb06z187yr17iqg40hh-python3.6-pkgconfig-1.3.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python2.pkgs.pkgconfig, python3.pkgs.pkgconfig

Partial log (click to expand)

patching script interpreter paths in /nix/store/i5ra7q40lldbmim50dqi9sabd34mij37-python3.6-pkgconfig-1.3.1
checking for references to /build in /nix/store/i5ra7q40lldbmim50dqi9sabd34mij37-python3.6-pkgconfig-1.3.1...
running install tests
.......
----------------------------------------------------------------------
Ran 7 tests in 0.093s

OK
/nix/store/hincx7jz3cww00g8q5va79590rwk1pnc-python2.7-pkgconfig-1.3.1
/nix/store/i5ra7q40lldbmim50dqi9sabd34mij37-python3.6-pkgconfig-1.3.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python2.pkgs.pkgconfig, python3.pkgs.pkgconfig

Partial log (click to expand)

patching script interpreter paths in /nix/store/5i6kv2iwsa3jqaf98sapaigr3v6h9d35-python3.6-pkgconfig-1.3.1
checking for references to /build in /nix/store/5i6kv2iwsa3jqaf98sapaigr3v6h9d35-python3.6-pkgconfig-1.3.1...
running install tests
.......
----------------------------------------------------------------------
Ran 7 tests in 0.089s

OK
/nix/store/h1c2qksh3la8zva6q8wagf1b7ziar89y-python2.7-pkgconfig-1.3.1
/nix/store/5i6kv2iwsa3jqaf98sapaigr3v6h9d35-python3.6-pkgconfig-1.3.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python2.pkgs.pkgconfig, python3.pkgs.pkgconfig

Partial log (click to expand)

patching script interpreter paths in /nix/store/h1c2qksh3la8zva6q8wagf1b7ziar89y-python2.7-pkgconfig-1.3.1
checking for references to /build in /nix/store/h1c2qksh3la8zva6q8wagf1b7ziar89y-python2.7-pkgconfig-1.3.1...
running install tests
.......
----------------------------------------------------------------------
Ran 7 tests in 0.104s

OK
/nix/store/h1c2qksh3la8zva6q8wagf1b7ziar89y-python2.7-pkgconfig-1.3.1
/nix/store/5i6kv2iwsa3jqaf98sapaigr3v6h9d35-python3.6-pkgconfig-1.3.1

@dotlambda
Copy link
Member

ping @FRidh

@catern
Copy link
Contributor Author

catern commented Jun 10, 2018

ping @FRidh

The changes in this pkgconfig version allow me to delete some copy-pasted code in every one of my build scripts, so I'm looking forward to it.

@FRidh FRidh self-assigned this Jun 10, 2018
@timokau
Copy link
Member

timokau commented Jun 12, 2018

Is there anything left to be done before this can be merged into staging? This blocks the sage PR (#39981).

@FRidh
Copy link
Member

FRidh commented Jun 12, 2018

I've included the change in #41894.

@FRidh FRidh closed this Jun 12, 2018
@timokau
Copy link
Member

timokau commented Jun 12, 2018

Thanks
I think that's a typo though, #36434 is this pr

@FRidh
Copy link
Member

FRidh commented Jun 12, 2018

@timokau fixed, thanks.

@catern catern deleted the pkgconfig branch February 13, 2019 18:29
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

5 participants