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.

Sign up for GitHub

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

Jump to bottom

[staging] libzip: 1.6.1 -> 1.7.3 #106699

Merged
merged 1 commit into from Jan 25, 2021
Merged

[staging] libzip: 1.6.1 -> 1.7.3 #106699

merged 1 commit into from Jan 25, 2021

Conversation

r-burns
Copy link
Contributor

@r-burns r-burns commented Dec 12, 2020 •
edited

libzip's pkgconfig paths are now fixed on git master and the patch backports cleanly.

See previous auto-update attempt #90610

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

@r-burns
Copy link
Contributor Author

r-burns commented Dec 12, 2020

Result of nixpkgs-review 1

16 packages marked as broken and skipped:
  • fileshelter
  • gimpPlugins.exposureBlend
  • gimpPlugins.texturize
  • gimpPlugins.ufraw
  • hhvm
  • libsForQt512.elisa
  • libsForQt512.khotkeys
  • libsForQt512.kmenuedit
  • php73Packages.phpmd
  • python37Packages.cntk
  • python38Packages.cntk
  • python39Packages.cntk
  • qgis
  • qgis-unwrapped
  • sit
  • ufraw
5 packages failed to build:
  • cntk
  • python37Packages.r2pipe
  • python38Packages.r2pipe
  • python39Packages.r2pipe
  • vcv-rack
194 packages built:
  • PPSSPP (ppsspp)
  • adminer
  • ahoviewer
  • arcanist
  • ark (kdeApplications.ark ,libsForQt5.ark)
  • calligra
  • collectd
  • collectd-data
  • deadbeef
  • deadbeef-mpris2-plugin
  • deadbeef-with-plugins
  • digikam (digikam5)
  • dolphin (kdeApplications.dolphin ,libsForQt5.dolphin)
  • dragon (kdeApplications.dragon ,libsForQt5.dragon)
  • drush
  • dsview
  • ebook_tools
  • elisa (kdeApplications.elisa ,libsForQt5.elisa)
  • freedink
  • gImageReader
  • gimp
  • gimp-with-plugins
  • gimpPlugins.fourier
  • gimpPlugins.gap
  • gimpPlugins.gimplensfun
  • gimpPlugins.gmic
  • gimpPlugins.lightning
  • gimpPlugins.lqrPlugin
  • gimpPlugins.resynthesizer
  • gimpPlugins.waveletSharpen
  • gwenview (kdeApplications.gwenview ,libsForQt5.gwenview)
  • gwyddion
  • horizon-eda
  • icingaweb2
  • ideviceinstaller
  • idevicerestore
  • k3b (kdeApplications.k3b ,libsForQt5.k3b)
  • katago
  • katagoCPU
  • katagoWithCuda
  • kcachegrind (kdeApplications.kcachegrind ,libsForQt5.kcachegrind)
  • kde-cli-tools (libsForQt5.kde-cli-tools ,plasma5.kde-cli-tools)
  • kdeApplications.baloo-widgets
  • kdeApplications.dolphin-plugins
  • kdenlive (kdeApplications.kdenlive ,libsForQt5.kdenlive)
  • kfind (kdeApplications.kfind ,libsForQt5.kfind)
  • okular (libsForQt5.okular)
  • libsForQt5.baloo (kdeFrameworks.baloo)
  • libsForQt5.kfilemetadata (kdeFrameworks.kfilemetadata)
  • kdeplasma-addons (libsForQt5.kdeplasma-addons ,plasma5.kdeplasma-addons)
  • kdev-php
  • kdev-python
  • kdevelop
  • kdevelop-unwrapped
  • kile
  • kmenuedit (libsForQt5.kmenuedit ,plasma5.kmenuedit)
  • krohnkite (libsForQt5.krohnkite)
  • kwin-dynamic-workspaces (libsForQt5.kwin-dynamic-workspaces)
  • kwin-tiling (libsForQt5.kwin-tiling)
  • libretro.ppsspp
  • plasma5.khotkeys (libsForQt5.khotkeys)
  • plasma-browser-integration (libsForQt5.plasma-browser-integration ,plasma5.plasma-browser-integration)
  • plasma-desktop (libsForQt5.plasma-desktop ,plasma5.plasma-desktop)
  • plasma-workspace (libsForQt5.plasma-workspace ,plasma5.plasma-workspace)
  • powerdevil (plasma5.powerdevil)
  • systemsettings (plasma5.systemsettings)
  • libsForQt512.ark
  • libsForQt512.baloo
  • libsForQt512.dolphin
  • libsForQt512.dragon
  • libsForQt512.gwenview
  • libsForQt512.k3b
  • libsForQt512.kcachegrind
  • libsForQt512.kde-cli-tools
  • libsForQt512.kdenlive
  • libsForQt512.kdeplasma-addons
  • libsForQt512.kfilemetadata
  • libsForQt512.kfind
  • libsForQt512.krohnkite
  • libsForQt512.kwin-dynamic-workspaces
  • libsForQt512.kwin-tiling
  • libsForQt512.okular
  • libsForQt512.plasma-browser-integration
  • libsForQt512.plasma-desktop
  • libsForQt512.plasma-workspace
  • libsForQt512.powerdevil
  • libsForQt512.systemsettings
  • libsForQt514.ark
  • libsForQt514.baloo
  • libsForQt514.dolphin
  • libsForQt514.dragon
  • libsForQt514.elisa
  • libsForQt514.gwenview
  • libsForQt514.k3b
  • libsForQt514.kcachegrind
  • libsForQt514.kde-cli-tools
  • libsForQt514.kdenlive
  • libsForQt514.kdeplasma-addons
  • libsForQt514.kfilemetadata
  • libsForQt514.kfind
  • libsForQt514.khotkeys
  • libsForQt514.kmenuedit
  • libsForQt514.krohnkite
  • libsForQt514.kwin-dynamic-workspaces
  • libsForQt514.kwin-tiling
  • libsForQt514.okular
  • libsForQt514.plasma-browser-integration
  • libsForQt514.plasma-desktop
  • libsForQt514.plasma-workspace
  • libsForQt514.powerdevil
  • libsForQt514.systemsettings
  • libsigrok
  • libsigrok-0-3-0
  • libsigrok4dsl
  • libsigrokdecode
  • libykneomgr
  • libzip
  • lsp-plugins
  • lutris
  • lutris-free
  • piwik (matomo)
  • matomo-beta
  • mgba
  • mudlet
  • mysqlWorkbench (mysql-workbench)
  • nagios
  • nextcloud-news-updater
  • nxpmicro-mfgtools
  • openlierox
  • openrct2
  • openscad
  • osrm-backend
  • peruse
  • pgloader
  • phoronix-test-suite
  • php
  • php73
  • php73Extensions.zip
  • php73Packages.box
  • php73Packages.composer
  • php73Packages.composer2
  • php73Packages.php-cs-fixer
  • php73Packages.php-parallel-lint
  • php73Packages.phpcbf
  • php73Packages.phpcs
  • php73Packages.phpstan
  • php73Packages.psalm
  • php73Packages.psysh
  • php74Extensions.zip
  • php74Packages.box
  • php74Packages.composer
  • php74Packages.composer2
  • php74Packages.php-cs-fixer
  • php74Packages.php-parallel-lint
  • php74Packages.phpcbf
  • php74Packages.phpcs
  • php74Packages.phpmd
  • php74Packages.phpstan
  • php74Packages.psalm
  • php74Packages.psysh
  • php80
  • php80Extensions.zip
  • php80Packages.box
  • php80Packages.composer
  • php80Packages.composer2
  • php80Packages.php-cs-fixer
  • php80Packages.php-parallel-lint
  • php80Packages.phpcbf
  • php80Packages.phpcs
  • php80Packages.phpmd
  • php80Packages.phpstan
  • php80Packages.psalm
  • php80Packages.psysh
  • powerline-rs
  • pulseeffects
  • pulseview
  • qcachegrind
  • radare2 (r2-for-cutter)
  • radare2-cutter
  • runzip
  • scim (sc-im)
  • sigrok-cli
  • sogo
  • subsurface
  • taisei
  • tellico
  • tev
  • tiscamera
  • tldr
  • unit
  • wacomtablet
  • wp-cli
  • xournalpp
  • yle-dl

jtojnar
jtojnar approved these changes Dec 14, 2020
View reviewed changes
Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

LGTM.

@r-burns r-burns changed the title libzip: 1.6.1 -> 1.7.3 [staging] libzip: 1.6.1 -> 1.7.3 Dec 31, 2020
@r-burns
Copy link
Contributor Author

r-burns commented Jan 25, 2021

Rebased, resolved conflicts, and exploded args attrset onto separate lines to mitigate future conflicts.

@r-burns
libzip: 1.6.1 -> 1.7.3
4609c36 
libzip's pkgconfig paths are now fixed on git master
and the patch backports cleanly.
@jtojnar jtojnar merged commit 069329c into NixOS:staging Jan 25, 2021
@jtojnar
Copy link
Contributor

jtojnar commented Jan 25, 2021

Thanks, and sorry it took so long to merge.

@jtojnar jtojnar added the 8.has: upstream changes reviewed Reviewer checked the changelogs/commit logs associated with the release and did not find any issues. label Jan 25, 2021
@r-burns r-burns deleted the libzip branch January 25, 2021 10:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prusnak prusnak prusnak approved these changes

@jtojnar jtojnar jtojnar approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

Assignees
No one assigned
Labels
8.has: upstream changes reviewed Reviewer checked the changelogs/commit logs associated with the release and did not find any issues. 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@r-burns @jtojnar @prusnak