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

subversion: drop 1.8 / 1.9.9 -> 1.9.10 / 1.11.1 -> 1.12.0 #61134

Merged
merged 3 commits into from May 8, 2019

Conversation

@c0bw3b
Copy link
Contributor

commented May 8, 2019

Motivation for this change
  • v1.8 has been EOL for some time now
  • v1.9 and v1.10 are LTS and we were not shipping the latest patch version in 1.9.x
  • v1.12 is the new regular release replacing v1.11 (now unsupported)
  • the CPPFLAGS is not needed anymore and svn build fine with current GCC

Hence the slight simplification of all attributes names declared from all-packages
This mirrors upstream release planning.

cc @NeQuissimus @lovek323

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 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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@c0bw3b

This comment has been minimized.

Copy link
Contributor Author

commented May 8, 2019

Darwin failure with lz4 is unrelated (fixed in #60849)

@GrahamcOfBorg test subversion

@edolstra edolstra merged commit 84a5165 into NixOS:master May 8, 2019

15 of 16 checks passed

subversion, subversion19 on x86_64-darwin Failure
Details
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
subversion, subversion19 on aarch64-linux Success
Details
subversion, subversion19 on x86_64-linux Success
Details

@c0bw3b c0bw3b deleted the c0bw3b:pkg/subversion branch May 8, 2019

@eadwu

This comment has been minimized.

Copy link
Contributor

commented May 8, 2019

Getting a build error:

~ took 1m 10s
➜ home-manager build
builder for '/nix/store/qch1sly7shsrzqjpjck6hca18bcvyaqq-subversion-1.12.0.drv' failed with exit code 1; last 10 log lines:
  checking for ruby2.4... no
  checking for ruby24... no
  checking swig version... 3.0.12
  configure: Configuring python swig binding
  checking for Python includes... -I/nix/store/29xfvq39h5z7af90id0zaa4a09vgpsm7-python-2.7.16/include/python2.7
  checking for compiling Python extensions... gcc -pthread -fPIC
  checking for linking Python extensions... gcc -pthread -shared -lgcc_s
  checking for linking Python libraries... -lgcc_s
  checking for apr_int64_t Python/C API format string...
  configure: error: failed to recognize APR_INT64_T_FMT on this platform
cannot build derivation '/nix/store/xwrlgdkb9zsxngknmdgidrcqy4h46cxj-git-2.21.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/a5a9v5h8p8pa0w5spphdzi9z3xpcwl6b-home-manager-path.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/4p2kf1za17arbn6yb8b54rvmmsj7bisg-home-manager-generation.drv': 1 dependencies couldn't be built
[29 built (1 failed)]
error: build of '/nix/store/4p2kf1za17arbn6yb8b54rvmmsj7bisg-home-manager-generation.drv' failed
@dtzWill

This comment has been minimized.

Copy link
Contributor

commented May 8, 2019

Getting a build error:

Same here, I think this was what the CPPFLAGS was fixing. Regardless of the original purpose, restoring the CPPFLAGS = [ "-P" ]; seems to fix building subversionClient here (as does disabling support for the python bindings).

@c0bw3b

This comment has been minimized.

Copy link
Contributor Author

commented May 9, 2019

Humm latest subversion build on Hydra succeeded, as ofBorg builds did. But subversionClient does fail with the same error.
I'll try and reproduce locally.

@c0bw3b

This comment has been minimized.

Copy link
Contributor Author

commented May 9, 2019

Fixed in ac63101

I tried several patches from upstream or Fedora but to no avail.
Gentoo does the same thing (-P flag)
https://bugs.gentoo.org/682786

@romildo

This comment has been minimized.

Copy link
Contributor

commented May 10, 2019

Getting a build error:

~ took 1m 10s
➜ home-manager build
builder for '/nix/store/qch1sly7shsrzqjpjck6hca18bcvyaqq-subversion-1.12.0.drv' failed with exit code 1; last 10 log lines:
  checking for ruby2.4... no
  checking for ruby24... no
  checking swig version... 3.0.12
  configure: Configuring python swig binding
  checking for Python includes... -I/nix/store/29xfvq39h5z7af90id0zaa4a09vgpsm7-python-2.7.16/include/python2.7
  checking for compiling Python extensions... gcc -pthread -fPIC
  checking for linking Python extensions... gcc -pthread -shared -lgcc_s
  checking for linking Python libraries... -lgcc_s
  checking for apr_int64_t Python/C API format string...
  configure: error: failed to recognize APR_INT64_T_FMT on this platform
cannot build derivation '/nix/store/xwrlgdkb9zsxngknmdgidrcqy4h46cxj-git-2.21.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/a5a9v5h8p8pa0w5spphdzi9z3xpcwl6b-home-manager-path.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/4p2kf1za17arbn6yb8b54rvmmsj7bisg-home-manager-generation.drv': 1 dependencies couldn't be built
[29 built (1 failed)]
error: build of '/nix/store/4p2kf1za17arbn6yb8b54rvmmsj7bisg-home-manager-generation.drv' failed

Same error on NixOS unstable.

@c0bw3b

This comment has been minimized.

Copy link
Contributor Author

commented May 10, 2019

The fix should reach you in the next update.
https://hydra.nixos.org/job/nixpkgs/trunk/subversionClient.x86_64-linux for example

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.