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.apsw: 3.22.0-r1 -> 3.29.0-r1 + sqlite fix #71711

Merged
merged 1 commit into from Oct 23, 2019

Conversation

d-goldin
Copy link
Contributor

Motivation for this change

Bumping version of apsw to be able to backport an upstream fix for
SQLite >= 3.30.0 which fixes a failing test.

Proposing this for staging, as the sqlite bump and sqlalchemy fix are on it too.

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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @FRidh @dtzWill

@jonringer
Copy link
Contributor

this package doesn't cause many rebuilds, you could probably rebase it on top of master, and change the base branch

Also staging is a little broken right now due to my bash-completion bump 😄

Bumping version of apsw to be able to backport an upstream fix for
SQLite >= 3.30.0 which fixes a failing test.
@d-goldin
Copy link
Contributor Author

@jonringer: I didn't put it on staging because of rebuilding, but because I initially thought it would be a bit odd to fix an issue on master before it happens, since the sqlite bump is still on staging. But you're right, in the end it doesn't change much.

@d-goldin d-goldin changed the base branch from staging to master October 22, 2019 21:57
@jonringer
Copy link
Contributor

oh, didn't realize this was dependent on another fix. You'll have to wait for #71672 to land for me to test then :/

@d-goldin
Copy link
Contributor Author

It is related to: #70593 - there is a brief discussion around sqlalchemy and apsw breakage upon sqlite 3.30 update. The sqlalchemy fix and the sqlite 3.30 bump are both on staging right now.

This PR by itself shouldn't cause any breakage and operate just fine with older sqlite versions.

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

nix-review passes on NixOS (21 failures on master)
diff LGTM
no regressions

[42 built (9 failed), 721 copied (5320.5 MiB), 1681.9 MiB DL]
error: build of '/nix/store/paa8xfkv98ab2yyxxg2l3n31xy0gmddj-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/71711
2 package are marked as broken and were skipped:
linuxPackages_hardkernel_4_14.wireguard linuxPackages_hardkernel_latest.wireguard

21 package failed to build:
calibre cozy deepin.dde-file-manager deepin.deepin-terminal deepin.deepin-wm gitAndTools.git-annex-metadata-gui python27Packages.apsw python27Packages.peewee python37Packages.apsw python37Packages.git-annex-adapter python37Packages.peewee python38Packages.SQLAlchemy-ImageAttach python38Packages.alot python38Packages.apsw python38Packages.git-annex-adapter python38Packages.magic-wormhole python38Packages.magic-wormhole-transit-relay python38Packages.peewee python38Packages.pip2nix s3ql sqlite-web

121 package were build:
acpica-tools acpidump-all afew alot armadillo astroid bup conkeror-unwrapped coreboot-utils cpp-hocon deepin.dde-control-center deepin.deepin-image-viewer deepin.deepin-menu deepin.deepin-screenshot deepin.deepin-shortcut-viewer deepin.qt5dxcb-plugin deepin.qt5integration dropbox dropbox-cli dumb-init elmPackages.elm-format facter firefox-bin-unwrapped firefox-esr-68-unwrapped friture gdcm giac giac-with-xcas gitAndTools.gitAnnex gitRepo gitlab-runner gmailieer gmic gnome-keysign groonga haskellPackages.notmuch health-check html-xml-utils icingaweb2 imagemagick7 imagemagick7Big imagemagick7_light intel-media-driver ipe ipv6calc janet jmol joker josm kodelife ktlint leatherman liblockfile libmesode libplacebo libwhereami linuxPackages-libre.wireguard linuxPackages.wireguard linuxPackages_4_14.wireguard linuxPackages_4_4.wireguard linuxPackages_4_9.wireguard linuxPackages_5_2.wireguard linuxPackages_5_3.wireguard linuxPackages_hardened.wireguard linuxPackages_latest-libre.wireguard linuxPackages_latest_hardened.wireguard linuxPackages_latest_xen_dom0.wireguard linuxPackages_testing_bcachefs.wireguard linuxPackages_testing_hardened.wireguard linuxPackages_xen_dom0.wireguard lockfileProgs logcheck lsp-plugins lttng-tools magic-wormhole mate.caja-dropbox monkeysphere muchsync nauty neomutt notmuch notmuch-addrlookup notmuch-mutt openmolcas openxray paperless phpPackages-unit.phpcbf phpPackages-unit.phpcs php72Packages.phpcbf php72Packages.phpcs php73Packages-unit.phpcbf php73Packages-unit.phpcs phpPackages.phpcbf phpPackages.phpcs pipenv plex plexRaw polymake postgresqlPackages.pgroonga profanity pulseeffects python27Packages.SQLAlchemy-ImageAttach python27Packages.Wand python27Packages.notmuch python27Packages.pip2nix python37Packages.SQLAlchemy-ImageAttach python37Packages.Wand python37Packages.magic-wormhole-transit-relay python37Packages.notmuch python37Packages.pip2nix python38Packages.Wand python38Packages.notmuch racket racket-minimal texmaker tflint vapoursynth vapoursynth-editor vapoursynth-mvtools waon wireguard-tools

@jonringer
Copy link
Contributor

we should off merging this until sqlite 3.30 lands...

src/apsw.c:63:2: error: #error Your SQLite version is too old. It must be at least 3.29
 #error Your SQLite version is too old.  It must be at least 3.29
  ^~~~~
In file included from /nix/store/imarc2jsq4ms73njy64v3lw7cdlah849-python-2.7.16/include/python2.7/Python.h:8,
                 from src/apsw.c:74:

@jonringer
Copy link
Contributor

otherwise LGTM

@FRidh FRidh self-assigned this Oct 23, 2019
@FRidh FRidh changed the base branch from master to staging-next October 23, 2019 07:39
@FRidh FRidh merged commit 120b6b0 into NixOS:staging-next Oct 23, 2019
@d-goldin
Copy link
Contributor Author

@jonringer: Oh, good catch. Well, then it's where it belongs now. Thanks :)

@d-goldin d-goldin deleted the bump_apsw_for_sqlite branch October 23, 2019 09:40
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

3 participants