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

qownnotes: 24.8.5 -> 24.8.6 #336920

Closed
wants to merge 2 commits into from
Closed

Conversation

r-ryantm
Copy link
Contributor

Automatic update generated by nixpkgs-update tools. This update was made based on information from https://github.com/pbek/QOwnNotes/releases.

meta.description for qownnotes is: Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration

meta.homepage for qownnotes is: https://www.qownnotes.org/

meta.changelog for qownnotes is: https://www.qownnotes.org/changelog.html

Updates performed
  • Version update
To inspect upstream changes
Impact

Checks done


  • built on NixOS
  • The tests defined in passthru.tests, if any, passed
  • found 24.8.6 with grep in /nix/store/fhkhw9f5znsjdzjjg7azm7d1lmxn8ckm-qownnotes-24.8.6
  • found 24.8.6 in filename of file in /nix/store/fhkhw9f5znsjdzjjg7azm7d1lmxn8ckm-qownnotes-24.8.6

Rebuild report (if merged into master) (click to expand)
2 total rebuild path(s)

2 package rebuild(s)

First fifty rebuilds by attrpath

qownnotes
Instructions to test this update (click to expand)

Either download from Cachix:

nix-store -r /nix/store/fhkhw9f5znsjdzjjg7azm7d1lmxn8ckm-qownnotes-24.8.6 \
  --option binary-caches 'https://cache.nixos.org/ https://nix-community.cachix.org/' \
  --option trusted-public-keys '
  nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
  cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
  '

(The Cachix cache is only trusted for this store-path realization.)
For the Cachix download to work, your user must be in the trusted-users list or you can use sudo since root is effectively trusted.

Or, build yourself:

nix-build -A qownnotes https://github.com/r-ryantm/nixpkgs/archive/8dd14b167b11af50b6b9498619489bf3f4cd0d0c.tar.gz

Or:

nix build github:r-ryantm/nixpkgs/8dd14b167b11af50b6b9498619489bf3f4cd0d0c#qownnotes

After you've downloaded or built it, look at the files and if there are any, run the binaries:

ls -la /nix/store/fhkhw9f5znsjdzjjg7azm7d1lmxn8ckm-qownnotes-24.8.6
ls -la /nix/store/fhkhw9f5znsjdzjjg7azm7d1lmxn8ckm-qownnotes-24.8.6/bin


Pre-merge build results

We have automatically built all packages that will get rebuilt due to
this change.

This gives evidence on whether the upgrade will break dependent packages.
Note sometimes packages show up as failed to build independent of the
change, simply because they are already broken on the target branch.

Result of nixpkgs-review run on x86_64-linux 1

1 package built:
  • qownnotes

Maintainer pings

cc @pbek @totoroot for testing.

Tip

As a maintainer, if your package is located under pkgs/by-name/*, you can comment @NixOS/nixpkgs-merge-bot merge to automatically merge this update using the nixpkgs-merge-bot.


Add a 👍 reaction to pull requests you find important.

@wineee
Copy link
Member

wineee commented Aug 24, 2024

qownnotes build failed on aarch64-linux : https://logs.ofborg.org/?key=nixos/nixpkgs.336920&attempt_id=c693886f-dc78-4abe-9dd6-4578f5a5cdd4

-- Found WrapAtomic: TRUE
-- Checking for module 'botan-2'
--   Found botan-2, version 2.19.5
-- Found Botan2: botan-2 (found version "2.19.5")
Botan2_INCLUDE_DIRS /nix/store/xqixjxhp2pk8zsm3p4hvbl3v0yzj4608-botan-2.19.5-dev/include/botan-2
CMake Error at cmake/FindBotan2.cmake:42 (set_target_properties):
  set_target_properties called with incorrect number of arguments.
Call Stack (most recent call first):
  libraries/botan/CMakeLists.txt:21 (find_package)
Non-debug build configuration detected
CMake Deprecation Warning at libraries/qhotkey/CMakeLists.txt:1 (cmake_minimum_required):
  Compatibility with CMake < 3.5 will be removed from a future version of
  CMake.
  Update the VERSION argument <min> value or use a ...<max> suffix to tell
  CMake that the project does not need compatibility with older versions.

@pbek
Copy link
Contributor

pbek commented Aug 24, 2024

In this release? That's strange. Things changed (CMake) in the last release with pbek/QOwnNotes#3076...

@NickCao, do you have an idea to get around that?

@NickCao
Copy link
Member

NickCao commented Aug 24, 2024

Per the error message, one of the variables here is undefined: https://github.com/pbek/QOwnNotes/blob/v24.8.6/src/cmake/FindBotan2.cmake#L43-L45. But there are not cmake related changed between these two releases? And this only manifests on aarch64.

@NickCao
Copy link
Member

NickCao commented Aug 24, 2024

Botan2_INCLUDE_DIRS is set, I would assume the same for Botan2_FullLibraryPath, but maybe Botan2_LDFLAGS_OTHER should have been Botan2_LDFLAGS?

https://cmake.org/cmake/help/latest/module/FindPkgConfig.html

@pbek
Copy link
Contributor

pbek commented Aug 24, 2024

Do you care to create a pull request to be tested in the next release?

@NickCao NickCao marked this pull request as draft August 24, 2024 21:13
@ofborg ofborg bot requested a review from pbek August 24, 2024 21:48
@NickCao
Copy link
Member

NickCao commented Aug 25, 2024

So this is the difference between these two platforms. Maybe cmake is interpreting ; as a field separator?

aarch64: Botan2_LDFLAGS_OTHER -fstack-protector;-pthread
x64_64:  Botan2_LDFLAGS_OTHER -fstack-protector;-m64;-pthread

@NickCao
Copy link
Member

NickCao commented Aug 25, 2024

Quoting the variables works.

--- a/src/cmake/FindBotan2.cmake
+++ b/src/cmake/FindBotan2.cmake
@@ -40,9 +40,9 @@ if(Botan2_FOUND)
             UNKNOWN IMPORTED GLOBAL
         )
         set_target_properties(Botan2::Botan2 PROPERTIES
-            INTERFACE_INCLUDE_DIRECTORIES ${Botan2_INCLUDE_DIRS}
-            IMPORTED_LOCATION ${Botan2_FullLibraryPath}
-            LINK_FLAGS ${Botan2_LDFLAGS_OTHER}
+            INTERFACE_INCLUDE_DIRECTORIES "${Botan2_INCLUDE_DIRS}"
+            IMPORTED_LOCATION "${Botan2_FullLibraryPath}"
+            LINK_FLAGS "${Botan2_LDFLAGS_OTHER}"
         )
     endif()
 endif()

@NickCao
Copy link
Member

NickCao commented Aug 25, 2024

A better fix in pbek/QOwnNotes#3090

@pbek
Copy link
Contributor

pbek commented Aug 25, 2024

A better fix in pbek/QOwnNotes#3090

Builds fine for me (on x86_64), thank you very much!

@pbek
Copy link
Contributor

pbek commented Aug 25, 2024

Should we wait for the aarch64 check and merge this or wait for the next release with pbek/QOwnNotes#3090?

@NickCao
Copy link
Member

NickCao commented Aug 25, 2024

Since you are releasing very often (unlike some other projects...) I think waiting for the next is easier.

@pbek
Copy link
Contributor

pbek commented Aug 25, 2024

Since you are releasing very often (unlike some other projects...) I think waiting for the next is easier.

Fine with me. But I wonder if #334463 actually built on aarch64, I can't see any build results. Should we close this PR?

@NickCao
Copy link
Member

NickCao commented Aug 25, 2024

But I wonder if #334463 actually built on aarch64

Nope, same as this one: https://github.com/NixOS/nixpkgs/runs/28748442889

Should we close this PR?

Also nope, we shall keep it draft otherwise r-ryantm would promptly open a new one.

@pbek
Copy link
Contributor

pbek commented Aug 25, 2024

Thank you!

@pbek
Copy link
Contributor

pbek commented Aug 30, 2024

I'm closing this in favor of #338446.

@pbek pbek closed this Aug 30, 2024
@r-ryantm r-ryantm deleted the auto-update/qownnotes branch August 31, 2024 00:22
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.

4 participants