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

sqlite: 3.22.0 -> 3.23.1 #40626

Merged
merged 6 commits into from May 22, 2018
Merged

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented May 17, 2018

https://sqlite.org/releaselog/3_23_1.html

(also contains notes for 3.23.0)

Adds CLI support for SQLite archive files:
https://sqlite.org/sqlar.html

Requires zlib support, so added as dep.

  • 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.

Haven't looked at fallout of this yet O:).

@dtzWill
Copy link
Member Author

dtzWill commented May 17, 2018

Was https://github.com/volth/nixpkgs/blob/master/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix updated synchronously?

whoops, updated that too. :).

@dtzWill
Copy link
Member Author

dtzWill commented May 17, 2018

@GrahamcOfBorg eval

@dtzWill
Copy link
Member Author

dtzWill commented May 17, 2018

(apparently known problem re:staging, FWIW)

@xeji
Copy link
Contributor

xeji commented May 18, 2018

staging eval is fixed now.
@GrahamcOfBorg eval

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: sqlite, sqlite3_analyzer

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/1djyqf6ymdgw0db4b8b7wwsjcyflqg17-sqlite3_analyzer-3.23.1
shrinking /nix/store/1djyqf6ymdgw0db4b8b7wwsjcyflqg17-sqlite3_analyzer-3.23.1/bin/sqlite3_analyzer
strip is /nix/store/8yfik687kfccisxnad42j19lfb7ij9b4-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/1djyqf6ymdgw0db4b8b7wwsjcyflqg17-sqlite3_analyzer-3.23.1/bin
patching script interpreter paths in /nix/store/1djyqf6ymdgw0db4b8b7wwsjcyflqg17-sqlite3_analyzer-3.23.1
checking for references to /build in /nix/store/1djyqf6ymdgw0db4b8b7wwsjcyflqg17-sqlite3_analyzer-3.23.1...
/nix/store/awas00466lywk0q69ls2fggclaf0lvka-sqlite-3.23.1-bin
/nix/store/1djyqf6ymdgw0db4b8b7wwsjcyflqg17-sqlite3_analyzer-3.23.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: sqlite, sqlite3_analyzer

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/i046ynf99apv2y8277havwfp8vdmjy4p-sqlite3_analyzer-3.23.1
shrinking /nix/store/i046ynf99apv2y8277havwfp8vdmjy4p-sqlite3_analyzer-3.23.1/bin/sqlite3_analyzer
strip is /nix/store/mgyvr3kil9qv0mywikpi0dbli061bpg4-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/i046ynf99apv2y8277havwfp8vdmjy4p-sqlite3_analyzer-3.23.1/bin
patching script interpreter paths in /nix/store/i046ynf99apv2y8277havwfp8vdmjy4p-sqlite3_analyzer-3.23.1
checking for references to /build in /nix/store/i046ynf99apv2y8277havwfp8vdmjy4p-sqlite3_analyzer-3.23.1...
/nix/store/b8rk7f8z4l32w1jfa6x6mp1yaydfki1h-sqlite-3.23.1-bin
/nix/store/i046ynf99apv2y8277havwfp8vdmjy4p-sqlite3_analyzer-3.23.1

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: sqlite, sqlite3_analyzer

Partial log (click to expand)

cannot build derivation '/nix/store/fg3w82dqpdyn6ay3izx5az161jyajwcl-openssl-1.0.2o.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/3giwidznplsmh925g36mfd8w4755crh2-pkg-config-0.29.2.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/pvpzxjmmsxllj6k5bh0q2pcs0166kmnq-libssh2-1.8.0.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/kscs6vbyxdbr31b8blij17wb4zx9cliy-nghttp2-1.24.0.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/2rfqw4fmgvma034lz54bij78xqgs2pzy-curl-7.60.0.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/0wgm5y5030kdvx5vpkl0addj19b7i219-sqlite-autoconf-3230100.tar.gz.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/91rr7vs3h65yfg1qfkdc2sphq7ljb01c-sqlite-src-3230100.zip.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/rhyf529xxrkzdvlc9dza973lrmvfw6sb-sqlite-3.23.1.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/n0ivwxidyli65pbpvrf95pgap8avlfdp-sqlite3_analyzer-3.23.1.drv': 5 dependencies couldn't be built
error: build of '/nix/store/n0ivwxidyli65pbpvrf95pgap8avlfdp-sqlite3_analyzer-3.23.1.drv', '/nix/store/rhyf529xxrkzdvlc9dza973lrmvfw6sb-sqlite-3.23.1.drv' failed

@xeji
Copy link
Contributor

xeji commented May 18, 2018

darwin looks pretty broken on staging.

@xeji
Copy link
Contributor

xeji commented May 19, 2018 via email

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: sqlite

Partial log (click to expand)

checking for references to /build in /nix/store/i8c0vx0brjy42x36vcn2y7k8c7yk1i5i-sqlite-3.23.1-dev...
separating debug info from /nix/store/jlk1gw9prcvqklpkna6cp73c5raypg30-sqlite-3.23.1/lib/libsqlite3.so.0.8.6 (build ID 6ada9c1ae5d1318e779b7f56c67be6ec8a1f7f48)
shrinking RPATHs of ELF executables and libraries in /nix/store/jlk1gw9prcvqklpkna6cp73c5raypg30-sqlite-3.23.1
shrinking /nix/store/jlk1gw9prcvqklpkna6cp73c5raypg30-sqlite-3.23.1/lib/libsqlite3.so.0.8.6
patching script interpreter paths in /nix/store/jlk1gw9prcvqklpkna6cp73c5raypg30-sqlite-3.23.1
checking for references to /build in /nix/store/jlk1gw9prcvqklpkna6cp73c5raypg30-sqlite-3.23.1...
shrinking RPATHs of ELF executables and libraries in /nix/store/f30a8szrjdgnxiiq9n440wkcl4lynn5h-sqlite-3.23.1-debug
patching script interpreter paths in /nix/store/f30a8szrjdgnxiiq9n440wkcl4lynn5h-sqlite-3.23.1-debug
checking for references to /build in /nix/store/f30a8szrjdgnxiiq9n440wkcl4lynn5h-sqlite-3.23.1-debug...
/nix/store/x4lziwjxkkrsfzrw32dnqn1q8v5ng897-sqlite-3.23.1-bin

@dtzWill
Copy link
Member Author

dtzWill commented May 22, 2018

Should the versions used in the source URL's be similarly paired?

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: sqlite

Partial log (click to expand)

cannot build derivation '/nix/store/q0q0223jhyxf3kk59wiybpsf8680lbmx-libiconv-osx-10.11.6.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/4jzzwqsqrji0cr7s4nyfgxi4nch39baa-perl-5.24.3.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/bzsnba0d8yvcm081zayjylxaly41vwfg-openssl-1.0.2o.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/srxh9ygnzlakgzln1m5g5j223l8lkfxr-pkg-config-0.29.2.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/3wwzrfrfqmmvnvdrd07zkgjd9wpfikgs-libssh2-1.8.0.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/l9xrfhzdc7j4mvjjcfn4dss8wcd54xhs-nghttp2-1.24.0.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/sbnbi7mwcj84d3j4i5vbydqi8bix93d5-curl-7.60.0.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/kdx2kl9m4vnjs4lk7xhzsmqdar8v1vxi-sqlite-autoconf-3230100.tar.gz.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/919hzd71iv9nw4j8l7lgjd31ghwq7g3p-sqlite-3.23.1.drv': 4 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/919hzd71iv9nw4j8l7lgjd31ghwq7g3p-sqlite-3.23.1.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: sqlite

Partial log (click to expand)

cannot build derivation '/nix/store/c0yw2dsf5rfchj44b3g4p3dk91ga9894-perl-5.24.3.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/wm6xlb8489wf6xq6zalshg3hqx5qxvd6-pkg-config-0.29.2.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/drqyz6n770g5khb94m0sgzsf4anfc3pm-openssl-1.0.2o.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/93nxw27mky881awx3zg86vbnl0l59mnv-libkrb5-1.15.2.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/78snbldhhp2kqjhrqb11a626nmkrc9yh-libssh2-1.8.0.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/5zmjzs7vbkbhffnz30k7i0dyxvz0wa6g-nghttp2-1.24.0.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/0jhznb9my0j4akksrzh65c1i8w9gphlq-curl-7.60.0.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/qrfxj9fj87mf3vn1grp32mrk3ahi7ypi-sqlite-autoconf-3230100.tar.gz.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/mb6l65yvn269yj8z406rkricb6r5rp2d-sqlite-3.23.1.drv': 3 dependencies couldn't be built
error: build of '/nix/store/mb6l65yvn269yj8z406rkricb6r5rp2d-sqlite-3.23.1.drv' failed

@lukateras
Copy link
Member

lukateras commented May 22, 2018

@dtzWill I've added archiveVersion function (if you have an idea for a better name, please tell), that should handle keeping URLs in sync.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: sqlite

Partial log (click to expand)

/nix/store/x4lziwjxkkrsfzrw32dnqn1q8v5ng897-sqlite-3.23.1-bin

@dtzWill
Copy link
Member Author

dtzWill commented May 22, 2018

LGTM!

Wouldn't worry overly about the function/naming since it's just for these two.

Also, woohoo for computing the archive version automatically! 👍

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: sqlite

Partial log (click to expand)

checking for references to /build in /nix/store/5k1440bry3kywsrbnsm4nzv3iv00ynbh-sqlite-3.23.1-dev...
separating debug info from /nix/store/ainjyf88324f4g3xihq7dd5p697slmy7-sqlite-3.23.1/lib/libsqlite3.so.0.8.6 (build ID b8ce7bbf2357f13521350a3282ab795395494495)
shrinking RPATHs of ELF executables and libraries in /nix/store/ainjyf88324f4g3xihq7dd5p697slmy7-sqlite-3.23.1
shrinking /nix/store/ainjyf88324f4g3xihq7dd5p697slmy7-sqlite-3.23.1/lib/libsqlite3.so.0.8.6
patching script interpreter paths in /nix/store/ainjyf88324f4g3xihq7dd5p697slmy7-sqlite-3.23.1
checking for references to /build in /nix/store/ainjyf88324f4g3xihq7dd5p697slmy7-sqlite-3.23.1...
shrinking RPATHs of ELF executables and libraries in /nix/store/fgzib8hcfdb76dhsbbmlkyz8dajdk7ps-sqlite-3.23.1-debug
patching script interpreter paths in /nix/store/fgzib8hcfdb76dhsbbmlkyz8dajdk7ps-sqlite-3.23.1-debug
checking for references to /build in /nix/store/fgzib8hcfdb76dhsbbmlkyz8dajdk7ps-sqlite-3.23.1-debug...
/nix/store/fnnh9pzh7ajizgw9jshbagqynz4802gq-sqlite-3.23.1-bin

@lukateras lukateras merged commit eaf1c07 into NixOS:staging May 22, 2018
@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: sqlite

Partial log (click to expand)

cannot build derivation '/nix/store/gf87cms9jjalx166mb056n243v3qyzhf-hook.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/k3q5gw4j1ialk3825i5g7vvv9ymsc7rl-ICU-osx-10.10.5.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/1csmh5bs9p7xxd4nz83ln736bva4n554-cctools-binutils-darwin.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/hi0a47rqav5nrw9iyqx6ph7r3vqd9a8g-gnutar-1.30.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/wgxjr0iqids59nam08sirh4q7mrc7y6x-CF-osx-10.10.5.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/2pkfghkavb42wjppxzamy0lkw839nqnl-cctools-binutils-darwin-wrapper.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/p3a3ddiyc9cszlwxy5502kq521rvhga9-clang-wrapper-5.0.2.drv': 9 dependencies couldn't be built
cannot build derivation '/nix/store/9vk0cnhjm6lv0nghd7wwi673fwhicwri-stdenv-darwin.drv': 35 dependencies couldn't be built
cannot build derivation '/nix/store/919hzd71iv9nw4j8l7lgjd31ghwq7g3p-sqlite-3.23.1.drv': 3 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/919hzd71iv9nw4j8l7lgjd31ghwq7g3p-sqlite-3.23.1.drv' failed

vcunat pushed a commit that referenced this pull request Jun 17, 2018
https://sqlite.org/releaselog/3_23_1.html

(also contains notes for 3.23.0)

Adds CLI support for SQLite archive files:
https://sqlite.org/sqlar.html

(cherry picked from commit a6d8d54)
Fixes CVE-2018-8740; /cc #41749 and #40626.
We have 3.24 on master already, but that's rather fresh and I can't see
any serious fixes in that bump.  Also, the analyzer packages and other
changes in the expressions are left behind, as they don't seem required.
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