Skip to content

icewm: 3.7.1 -> 3.7.3#393398

Merged
doronbehar merged 3 commits intoNixOS:masterfrom
Yarny0:icewm-update-372
Apr 18, 2025
Merged

icewm: 3.7.1 -> 3.7.3#393398
doronbehar merged 3 commits intoNixOS:masterfrom
Yarny0:icewm-update-372

Conversation

@Yarny0
Copy link
Contributor

@Yarny0 Yarny0 commented Mar 26, 2025

Update IceWM to latest release. Also drop a patch (added here) which is part of the new version, and switch from rev to tag in fetchFromGitHub.

Release notes: https://github.com/ice-wm/icewm/releases/tag/3.7.3
Changes: ice-wm/icewm@3.7.1...3.7.3

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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.

More:

nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD" wants to rebuild 2k packages and was therefore skipped.


Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 26, 2025
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/5361

@Yarny0 Yarny0 force-pushed the icewm-update-372 branch from 29d4a5e to d23c330 Compare April 7, 2025 11:27
@Yarny0 Yarny0 changed the title icewm: 3.7.1 -> 3.7.2 icewm: 3.7.1 -> 3.7.3 Apr 7, 2025
@Yarny0
Copy link
Contributor Author

Yarny0 commented Apr 7, 2025

Pushed update due to new IceWM release. Also rebased onto current nixos-unstable. All "Things done" from PR text are still valid, the tests in particluar still pass.

@Yarny0 Yarny0 force-pushed the icewm-update-372 branch from d23c330 to 03b973c Compare April 7, 2025 11:49
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 7, 2025
@Yarny0 Yarny0 force-pushed the icewm-update-372 branch from 03b973c to f986dbd Compare April 9, 2025 07:26
@Yarny0
Copy link
Contributor Author

Yarny0 commented Apr 9, 2025

Rebased onto current nixos-unstable to fix the recent merge conflict caused by #396749 and #397016 . Inspired by those pull requests, I also added a commit that converts rev to tag just for IceWM.

All "Things done" from PR text are still valid, the tests in particluar still pass. Also, I ensured that fetching via tag yields the same source hashes: I changed them and then compared the "got:" hash in the error message with the original one.

@Yarny0
Copy link
Contributor Author

Yarny0 commented Apr 12, 2025

For the record: There is no merge conflict (according to Github).

I don't know how to deal with the "failing check":

ofborg-eval: Commit not found

I hope that's not a blocker for this pull request.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-in-distress/3604/103

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 18, 2025
@doronbehar
Copy link
Contributor

A simple git rebase against latest master seem to have fixed the merge conflict and other ofborg errors.

@doronbehar doronbehar merged commit 63884b6 into NixOS:master Apr 18, 2025
23 of 27 checks passed
@Yarny0
Copy link
Contributor Author

Yarny0 commented Apr 18, 2025

Thanks, @doronbehar !

@Yarny0 Yarny0 deleted the icewm-update-372 branch April 26, 2025 07:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants