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

apr: 1.6.5 -> 1.7.0 #59440

Merged
merged 1 commit into from Oct 23, 2019
Merged

apr: 1.6.5 -> 1.7.0 #59440

merged 1 commit into from Oct 23, 2019

Conversation

r-ryantm
Copy link
Contributor

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/apr/versions.

meta.description for apr is: '"The Apache Portable Runtime library"'.

Checks done (click to expand)
Rebuild report (if merged into master) (click to expand)

414 total rebuild path(s)

197 package rebuild(s)

197 x86_64-linux rebuild(s)
85 i686-linux rebuild(s)
54 x86_64-darwin rebuild(s)
78 aarch64-linux rebuild(s)

First fifty rebuilds by attrpath
apacheHttpd
apacheHttpd_2_4
apr
aprutil
arcanist
cabal2nix
chronos
dep2nix
drush
gitAndTools.gitFastExport
gitAndTools.gitFull
gitAndTools.gitSVN
gitAndTools.svn-all-fast-export
gitAndTools.svn2git
gitAndTools.svn_all_fast_export
gitFull
gitSVN
gnome3.gnome-user-share
haxe
haxePackages.hxcpp
haxePackages.hxcs
haxePackages.hxjava
haxePackages.hxnodejs_4
haxe_3_2
haxe_3_4
hhvm
hxcpp
hydra
icingaweb2
kcachegrind
kdeApplications.kcachegrind
limesurvey
log4cxx
lsp-plugins
marathon
mate.mate-user-share
matomo
mesos
mod_dnssd
mod_fastcgi
mod_python
mod_wsgi
modsecurity_standalone
muse
nagios
neko
nextcloud-news-updater
nix-prefetch-scripts
nix-prefetch-svn
nix-update-source

Instructions to test this update (click to expand)

Either download from Cachix:

nix-store -r /nix/store/mq57c49lrvl3fdhfhhgw6w95ygrzci59-apr-1.7.0 \
  --option binary-caches 'https://cache.nixos.org/ https://r-ryantm.cachix.org/' \
  --option trusted-public-keys '
  r-ryantm.cachix.org-1:gkUbLkouDAyvBdpBX0JOdIiD2/DP1ldF3Z3Y6Gqcc4c=
  cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
  '

(r-ryantm's Cachix cache is only trusted for this store-path realization.)

Or, build yourself:

nix-build -A apr https://github.com/r-ryantm/nixpkgs/archive/a162a721a9dd2c1060b2878383455702130d81fa.tar.gz

After you've downloaded or built it, look at the files and if there are any, run the binaries:

ls -la /nix/store/mq57c49lrvl3fdhfhhgw6w95ygrzci59-apr-1.7.0
ls -la /nix/store/mq57c49lrvl3fdhfhhgw6w95ygrzci59-apr-1.7.0/bin

cc @edolstra for testing.

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apr/versions
Copy link
Contributor

@matthiasbeyer matthiasbeyer left a comment

Choose a reason for hiding this comment

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

Diff looks good.

@aanderse
Copy link
Member

@matthiasbeyer did you perform any testing? Could you build this on darwin?

@matthiasbeyer
Copy link
Contributor

I don't know. As my comment tells, I looked at the diff and nothing more.

@c0bw3b
Copy link
Contributor

c0bw3b commented May 6, 2019

@GrahamcOfBorg build apr

@c0bw3b
Copy link
Contributor

c0bw3b commented May 7, 2019

So the failure on Darwin is merely a timeout during clang-7.1.0 rebuild.
Maybe one @NixOS/darwin-maintainers can test build it locally?

@aanderse
Copy link
Member

aanderse commented May 7, 2019

@c0bw3b test or build? I was hoping to get a chance to actually test this (on Linux x86_64) before a merge... I'm unsure if I'll find the time, but I'll try.

@c0bw3b
Copy link
Contributor

c0bw3b commented May 7, 2019

Well build first :)

@aanderse
Copy link
Member

aanderse commented May 7, 2019

Unfortunately no access to a mac. I'm just interested in ensuring this version bump is compatible with infrastructure I maintain.

@c0bw3b
Copy link
Contributor

c0bw3b commented May 7, 2019

By reviewing #60798 I also found:

Subversion 1.12.0 and older cannot be built out of the box with APR-1.7.0. We expect to fix this problem in Subversion 1.12.1. This problem affects the Subversion 1.10 and Subversion 1.11 release series as well.
(from https://subversion.apache.org/docs/release-notes/1.12.html )

So this would break older Subversion

Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

darwin build succeeds and looks good

@mmahut
Copy link
Member

mmahut commented Aug 10, 2019

@GrahamcOfBorg build apr

@aanderse
Copy link
Member

On a 19.03 server I maintain which utilizes apr for some custom code I used overlays to replace apr with 1.7.0 as provided by the bot. After poking around a bit everything was functioning as expected 👍

Looks like newer subversion packages are available, so we can update to them and then rebase this. After that time to run nix-review pr 59440 I guess.

@aanderse
Copy link
Member

FYI:

~/nixpkgs> nix-review pr 59440

$ git fetch --force https://github.com/NixOS/nixpkgs staging:refs/nix-review/0 pull/59440/head:refs/nix-review/1
From https://github.com/NixOS/nixpkgs
 + 2eed7af1cb8...ba3196ee9a4 staging              -> refs/nix-review/0  (forced update)
 + 0b672bc0636...a162a721a9d refs/pull/59440/head -> refs/nix-review/1  (forced update)
$ git worktree add /home/aaron/.cache/nix-review/pr-59440/nixpkgs ba3196ee9a47b042a002e039f56e0d7c5519700d
Preparing worktree (detached HEAD ba3196ee9a4)
Checking out files: 100% (19567/19567), done.
HEAD is now at ba3196ee9a4 Merge pull request #66433 from primeos/scons
$ nix-env -f /home/aaron/.cache/nix-review/pr-59440/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit a162a721a9dd2c1060b2878383455702130d81fa
Automatic merge went well; stopped before committing as requested
$ nix-env -f /home/aaron/.cache/nix-review/pr-59440/nixpkgs -qaP --xml --out-path --show-trace --meta
$ nix build --no-link --keep-going --max-jobs 8 --option build-use-sandbox true -f /home/aaron/.cache/nix-review/pr-59440/build.nix
warning: SQLite database '/nix/var/nix/db/db.sqlite' is busy
builder for '/nix/store/3ixwys770ww6s36p608g77rc3shjpfqc-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/whb8vd9pmssdmzhqffzkc3vz6ih3q1yk-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/9r9qzclha1q1ihv16ai3kzdz1y5nnkam-perl5.30.0-SVN-Simple-0.28.drv': 1 dependencies couldn't be built
builder for '/nix/store/6v0zl67rjmwbbnyi63kffycwfdddz6a8-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/whb8vd9pmssdmzhqffzkc3vz6ih3q1yk-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/c4779hnp25fbkrpj6daqf0flvibbgg4q-git-2.22.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/5gp1h2vcrz5g0qpkng3a7hslwqyqiipk-perl5.28.2-SVN-Simple-0.28.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/4l0ykcd2qs47d57y4l6fx97kxy76mgk2-svn2git-2.4.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/h174w5j7qbckgnwvl1djjyh19qw5kpr3-git-2.22.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/sq8xl65ifqkzicdnyh136ajm9mg7qpfw-muse-sequencer-3.1pre1.drv': 1 dependencies couldn't be built
builder for '/nix/store/xyx8vxpkl0c1cl6nm0dii9kz4znh7w84-webkitgtk-2.24.3.drv' failed with exit code 1; last 10 log lines:
  with preprocessed source if appropriate.
  See <http://gcc.gnu.org/bugs.html> for instructions.
  [1912/2816] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/unified-sources/UnifiedSource-3a52ce78-33.cpp.o
  [1913/2816] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/unified-sources/UnifiedSource-3a52ce78-39.cpp.o
  [1914/2816] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/unified-sources/UnifiedSource-3a52ce78-34.cpp.o
  [1915/2816] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/unified-sources/UnifiedSource-3a52ce78-35.cpp.o
  [1916/2816] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/unified-sources/UnifiedSource-3a52ce78-36.cpp.o
  [1917/2816] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/unified-sources/UnifiedSource-3a52ce78-37.cpp.o
  [1918/2816] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/unified-sources/UnifiedSource-3a52ce78-38.cpp.o
  ninja: build stopped: subcommand failed.
cannot build derivation '/nix/store/l94hymp2yca7223rfza579ah26xng2c0-gnome-online-accounts-3.32.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/f424q1c57jf3yj8vhn038jc41vciy2gr-libgdata-0.17.10.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/dif29h22gkpi492iizjpmjr8pwqk5ini-evolution-data-server-3.32.4.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/w4v81nz8vddyfdbf4v5yrnjjka1jsfzz-tracker-miners-2.2.2.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/fypp3sxyj8d9gbs6b1ffjbhxsp5bm99h-nautilus-3.32.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/b0z48clnvsl697r0wa867qqmllqc6cgr-gnome-user-share-3.32.0.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/r1j1kklbdnsarn54198ihjwvxrfxcim9-env.drv': 8 dependencies couldn't be built
[655 built (3 failed), 502 copied (1726.6 MiB), 582.4 MiB DL]
error: build of '/nix/store/r1j1kklbdnsarn54198ihjwvxrfxcim9-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/59440
8 package failed to build:
gitAndTools.gitFull gitAndTools.gitSVN gitAndTools.svn2git gnome3.gnome-user-share muse perl528Packages.SVNSimple perl530Packages.SVNSimple subversionClient

115 package were build:
apacheHttpd apr aprutil arcanist cabal2nix dep2nix drush flightgear gitAndTools.svn-all-fast-export haxe haxePackages.hxcpp haxePackages.hxcs haxePackages.hxjava haxePackages.hxnodejs_4 haxe_3_2 hydra icingaweb2 kcachegrind log4cxx lsp-plugins marathon mate.mate-user-share piwik mesos mod_dnssd mod_fastcgi mod_python mod_wsgi modsecurity_standalone nagios neko nextcloud-news-updater nix-prefetch-scripts nix-prefetch-svn nix-update-source perl528Packages.GoferTransporthttp perl528Packages.libapreq2 perl528Packages.mod_perl2 perl530Packages.GoferTransporthttp perl530Packages.libapreq2 perl530Packages.mod_perl2 phoronix-test-suite php php72 php72Packages.apcu php72Packages.apcu_bc php72Packages.ast php72Packages.box php72Packages.composer php72Packages.couchbase php72Packages.event php72Packages.igbinary php72Packages.imagick php72Packages.mailparse php72Packages.memcached php72Packages.oci8 php72Packages.pcs php72Packages.pdo_sqlsrv php72Packages.php-cs-fixer php72Packages.php-parallel-lint php72Packages.phpcbf php72Packages.phpcs php72Packages.phpstan php72Packages.pinba php72Packages.protobuf php72Packages.redis php72Packages.sqlsrv php72Packages.xdebug php72Packages.yaml php72Packages.zmq php73Packages.apcu php73Packages.apcu_bc php73Packages.ast php73Packages.box php73Packages.composer php73Packages.couchbase php73Packages.event php73Packages.igbinary php73Packages.imagick php73Packages.mailparse php73Packages.memcached php73Packages.oci8 php73Packages.pcs php73Packages.pdo_sqlsrv php73Packages.php-cs-fixer php73Packages.php-parallel-lint php73Packages.phpcbf php73Packages.phpcs php73Packages.phpstan php73Packages.pinba php73Packages.protobuf php73Packages.redis php73Packages.sqlsrv php73Packages.xdebug php73Packages.yaml pulseeffects python27Packages.pysvn qcachegrind rabbitvcs rapidsvn serf simgear spark subversion subversion19 subversion_1_10 svnfs tomcat_connectors urjtag vcstool wp-cli xsecurelock ydiff yle-dl zkfuse

[0.0 MiB DL]
error: build log of '/nix/store/h174w5j7qbckgnwvl1djjyh19qw5kpr3-git-2.22.0.drv' is not available
[0.0 MiB DL]
error: build log of '/nix/store/c4779hnp25fbkrpj6daqf0flvibbgg4q-git-2.22.0.drv' is not available
[0.0 MiB DL]
error: build log of '/nix/store/4l0ykcd2qs47d57y4l6fx97kxy76mgk2-svn2git-2.4.0.drv' is not available
[0.0 MiB DL]
error: build log of '/nix/store/b0z48clnvsl697r0wa867qqmllqc6cgr-gnome-user-share-3.32.0.1.drv' is not available
[0.0 MiB DL]
error: build log of '/nix/store/sq8xl65ifqkzicdnyh136ajm9mg7qpfw-muse-sequencer-3.1pre1.drv' is not available
[0.0 MiB DL]
error: build log of '/nix/store/5gp1h2vcrz5g0qpkng3a7hslwqyqiipk-perl5.28.2-SVN-Simple-0.28.drv' is not available
[0.0 MiB DL]
error: build log of '/nix/store/9r9qzclha1q1ihv16ai3kzdz1y5nnkam-perl5.30.0-SVN-Simple-0.28.drv' is not available
$ nix-shell /home/aaron/.cache/nix-review/pr-59440/shell.nix
these paths will be fetched (0.42 MiB download, 2.39 MiB unpacked):
  /nix/store/1vd3r9p5227jy5fjf0dcadg6qkx2wwdc-bash-interactive-4.4-p23-info
  /nix/store/fds095wgba1cs4czsb2zz7bfv4gp5rfw-bash-interactive-4.4-p23-dev
  /nix/store/k2gf9amjbfi6ziszaqp8xb0k4imbwqh0-bash-interactive-4.4-p23-doc
copying path '/nix/store/k2gf9amjbfi6ziszaqp8xb0k4imbwqh0-bash-interactive-4.4-p23-doc' from 'https://cache.nixos.org'...
copying path '/nix/store/1vd3r9p5227jy5fjf0dcadg6qkx2wwdc-bash-interactive-4.4-p23-info' from 'https://cache.nixos.org'...
copying path '/nix/store/fds095wgba1cs4czsb2zz7bfv4gp5rfw-bash-interactive-4.4-p23-dev' from 'https://cache.nixos.org'...

@cyplo
Copy link
Contributor

cyplo commented Sep 23, 2019

Do we need anything else to be able to merge this one ? Thanks :)

@aanderse
Copy link
Member

I wasn't a big fan of the build failures this causes...

8 package failed to build:
gitAndTools.gitFull gitAndTools.gitSVN gitAndTools.svn2git gnome3.gnome-user-share muse perl528Packages.SVNSimple perl530Packages.SVNSimple subversionClient

@globin
Copy link
Member

globin commented Oct 23, 2019

Tested with current master and all failures have been fixed

@globin globin merged commit d0b3711 into NixOS:staging Oct 23, 2019
@r-ryantm r-ryantm deleted the auto-update/apr branch November 1, 2019 13:17
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

10 participants