Skip to content

subsurface: 5.0.2 -> 5.0.10#202145

Merged
peterhoeg merged 2 commits intoNixOS:masterfrom
peterhoeg:qt5_subsurface
Nov 23, 2022
Merged

subsurface: 5.0.2 -> 5.0.10#202145
peterhoeg merged 2 commits intoNixOS:masterfrom
peterhoeg:qt5_subsurface

Conversation

@peterhoeg
Copy link
Copy Markdown
Member

@peterhoeg peterhoeg commented Nov 21, 2022

Description of changes

Also build against 5.15

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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@peterhoeg peterhoeg mentioned this pull request Nov 21, 2022
Closed
31 tasks
@ofborg ofborg bot requested review from adisbladis and mguentner November 21, 2022 05:59
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package 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. labels Nov 21, 2022
@viraptor
Copy link
Copy Markdown
Contributor

viraptor commented Nov 22, 2022 •
edited
Loading

It looks like the version detection in https://github.com/subsurface/subsurface/blob/b5889f0f3c614ffbeae36e05eddc4b4466c27ac6/cmake/Modules/version.cmake and https://github.com/subsurface/subsurface/blob/b5889f0f3c614ffbeae36e05eddc4b4466c27ac6/scripts/get-version doesn't quite work with the nix build process.
Any chance you could hardcode that one in cmake instaed? Otherwise the app says it's running a development version at startup and:

/results/subsurface/bin/subsurface --version
Subsurface v,

@peterhoeg
Copy link
Copy Markdown
Member Author

peterhoeg commented Nov 23, 2022

Indeed, thanks for the find. I have overridden the version detection instead now.

viraptor
viraptor approved these changes Nov 23, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@viraptor viraptor left a comment

Choose a reason for hiding this comment

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

Not sure how to fully verify it, but it seems to work.

@peterhoeg peterhoeg merged commit 689f590 into NixOS:master Nov 23, 2022
@peterhoeg peterhoeg deleted the qt5_subsurface branch November 23, 2022 12:37
@schmittlauch schmittlauch mentioned this pull request Dec 2, 2022
Merged
13 tasks
vcunat pushed a commit that referenced this pull request Dec 19, 2022
@peterhoeg @schmittlauch
subsurface: 5.0.2 -> 5.0.10 (#202145)
db7a359 
* subsurface: 5.0.2 -> 5.0.10

* override version detection

(cherry picked from commit 689f590)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@viraptor viraptor viraptor approved these changes

@mguentner mguentner Awaiting requested review from mguentner

@adisbladis adisbladis Awaiting requested review from adisbladis

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@peterhoeg @viraptor