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

squashfsTools: 4.5.1 -> 4.6 #221855

Merged
merged 2 commits into from
Apr 16, 2023
Merged

squashfsTools: 4.5.1 -> 4.6 #221855

merged 2 commits into from
Apr 16, 2023

Conversation

ruuda
Copy link
Contributor

@ruuda ruuda commented Mar 18, 2023

Description of changes
  • Update squashfs-tools to 4.6. Changelog.
  • I had to rebase the 4k alignment patch for this, but the conflicts were easy to resolve, only due to context changes, nothing substantial.
  • I confirmed that passing -4k-align can still be used and produces a valid squashfs, I did not confirm whether it is actually 4k aligned.
  • As far as I can tell there are no breaking changes, so I don’t think an entry in the release notes is needed.
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

This is a copy of #221836 but now targeted at staging.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500 labels Mar 18, 2023
Copy link
Contributor

@raphaelr raphaelr left a comment

Choose a reason for hiding this comment

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

Tested against master, pureref fails because it uses a requireFile. The systemd-portabled test works as well.

Result of nixpkgs-review run on x86_64-linux 1

1 package blacklisted:
  • appimage-run-tests
1 package failed to build:
  • pureref
107 packages built:
  • Sylk
  • altair
  • anytype
  • appimage-run
  • appimagekit
  • apptainer
  • apptainer-overriden-nixos
  • authy
  • beekeeper-studio
  • betterdiscord-installer
  • binwalk (python310Packages.binwalk)
  • blockbench-electron
  • bloomrpc
  • bootstrap-studio
  • buttercup-desktop
  • caprine-bin
  • chrysalis
  • cider
  • cozy-drive
  • crypto-org-wallet
  • devdocs-desktop
  • diffoscope
  • diffoscopeMinimal
  • distrobuilder
  • dracut
  • electron-mail
  • electronplayer
  • firefly-desktop
  • flexoptix-app
  • fluent-reader
  • framesh
  • freetube
  • fspy
  • irccloud
  • jetbrains-toolbox
  • jitsi-meet-electron
  • joplin-desktop
  • keet
  • lbry
  • ldtk
  • ledger-live-desktop
  • lens
  • localsend
  • logseq
  • losslesscut-bin
  • lunar-client
  • lxd
  • marktext
  • mathpix-snipping-tool
  • mendeley
  • mobilecoin-wallet
  • molotov
  • motrix
  • museeks
  • mycrypto
  • neo4j-desktop
  • notable
  • notion-app-enhanced
  • nuclear
  • octant-desktop
  • openlens
  • osu-lazer-bin
  • p3x-onenote
  • passky-desktop
  • pcloud
  • plexamp
  • polypane
  • protonup-qt
  • python310Packages.binwalk-full
  • python311Packages.binwalk
  • python311Packages.binwalk-full
  • radicle-upstream
  • rambox
  • raven-reader
  • remnote
  • ripcord
  • saleae-logic-2
  • session-desktop
  • singularity
  • singularity-overriden-nixos
  • sonixd
  • soulseekqt
  • spotify
  • spotifywm
  • squashfsTools
  • ssb-patchwork
  • standardnotes
  • station
  • steam-rom-manager
  • super-productivity
  • termius
  • timeular
  • todoist-electron
  • trezor-suite
  • tusk
  • udocker
  • uhk-agent
  • uhk-udev-rules
  • unityhub
  • via
  • vial
  • wootility
  • youtube-music
  • ytmdesktop
  • zecwallet-lite
  • zettlr
  • zulip

@ruuda
Copy link
Contributor Author

ruuda commented Mar 26, 2023

https://github.com/plougher/squashfs-tools/releases/tag/4.6.1 has been released already, I’ll add it to this PR shortly. Edit: done in f9ce837; also rebased on top of the latest staging.

ruuda added 2 commits March 27, 2023 19:58
I had to rebase the 4k alignment patch for this, but the conflicts were
easy to resolve, only due to context changes, nothing substantial.
@ruuda ruuda force-pushed the squashfstools-46 branch from a134cd0 to f9ce837 Compare March 27, 2023 18:57
@ajs124
Copy link
Member

ajs124 commented Mar 30, 2023

does this actually need to go through staging? seems like it's <500 rebuilds, so it can probably go straight to master.

@ruuda
Copy link
Contributor Author

ruuda commented Mar 31, 2023

Hmm, I asked @arianvp previously and he thought it would be better to target staging, but I can retarget it to master if you like. Is there a clear threshold for how many rebuilds is too much for master?

@vcunat vcunat merged commit d4ae355 into NixOS:staging Apr 16, 2023
@ruuda ruuda deleted the squashfstools-46 branch April 16, 2023 20:47
@vcunat
Copy link
Member

vcunat commented Apr 26, 2023

The darwin.patch no longer applies. /cc PR #226795

@ruuda
Copy link
Contributor Author

ruuda commented Apr 28, 2023

It was fixed in #228584.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants