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: 25.1.5 -> 25.1.6 #377623

Merged
merged 4 commits into from
Jan 29, 2025
Merged

qownnotes: 25.1.5 -> 25.1.6 #377623

merged 4 commits into from
Jan 29, 2025

Conversation

liberodark
Copy link
Contributor

@liberodark liberodark commented Jan 28, 2025

Fix : #377621

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.

Add a 👍 reaction to pull requests you find important.

@liberodark
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 377623


x86_64-linux

✅ 1 package built:
  • qownnotes

Copy link
Contributor

@pbek pbek left a comment

Choose a reason for hiding this comment

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

Looks good to me!
Thank you for the update script!

Copy link
Contributor

@matthiasbeyer matthiasbeyer left a comment

Choose a reason for hiding this comment

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

There are several changes in here:

  • Version update
  • Rewriting to use the finalAttrs pattern instead of a let ... in
  • Change of the meta attribute to not use the with lib; pattern
  • Adding of the update script

Please split your commit into several commits, each doing one change at a time.
Normally I wouldn't mind a bit of change next to a version update, but this is simply too much, sorry.

Either way, thanks in advance for your effort!

@pbek
Copy link
Contributor

pbek commented Jan 29, 2025

I hope this PR gets merged in the next few hours so I can test it with a new release. 😁

@matthiasbeyer
Copy link
Contributor

Not sure whether we should wait for the tests... 🤔

@pbek
Copy link
Contributor

pbek commented Jan 29, 2025

I'm running the commit before the commit split on 3 machines (x86_64). ️But I don't know about darwin. 🤷🏻

@GaetanLepage
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 377623


x86_64-linux

✅ 1 package built:
  • qownnotes

aarch64-linux

✅ 1 package built:
  • qownnotes

x86_64-darwin

❌ 1 package failed to build:
  • qownnotes

aarch64-darwin

❌ 1 package failed to build:
  • qownnotes

@GaetanLepage
Copy link
Contributor

Logs for darwin:

-- Installing: /nix/store/8x7hv75jiapg6hf9m9s02mgk3fn09rh6-qownnotes-25.1.6/share/qt6/translations/QOwnNotes_mk.qm
-- Installing: /nix/store/8x7hv75jiapg6hf9m9s02mgk3fn09rh6-qownnotes-25.1.6/share/qt6/translations/QOwnNotes_ko.qm
-- Installing: /nix/store/8x7hv75jiapg6hf9m9s02mgk3fn09rh6-qownnotes-25.1.6/share/qt6/translations/QOwnNotes_et.qm
*** Terminating app due to uncaught exception 'NSInternalInconsistencyException', reason: 'Critical error: required built-in appearance SystemAppearance not found'
*** First throw call stack:
(
        0   CoreFoundation                      0x00000001897fae80 __exceptionPreprocess + 176
        1   libobjc.A.dylib                     0x00000001892e2cd8 objc_exception_throw + 88
        2   CoreFoundation                      0x00000001897fad70 +[NSException exceptionWithName:reason:userInfo:] + 0
        3   AppKit                              0x000000018d2cd244 __33+[NSAppearance _initializeCoreUI]_block_invoke + 88
        4   libdispatch.dylib                   0x00000001894ed5b4 _dispatch_client_callout + 20
        5   libdispatch.dylib                   0x00000001894eee00 _dispatch_once_callout + 32
        6   AppKit                              0x000000018d2eddd4 +[NSAppearance _aquaAppearance] + 60
        7   AppKit                              0x000000018d2cc9b0 +[NSAppearance appearanceNamed:] + 32
        8   AppKit                              0x000000018d2edce0 -[NSDynamicSystemColor recacheColor] + 224
        9   AppKit                              0x000000018d2edaa8 -[NSDynamicSystemColor initWithSelector:tintedWithColor:] + 120
        10  AppKit                              0x000000018d331b40 +[NSColor controlTextColor] + 68
        11  libqcocoa.dylib                     0x00000001075ed660 _GLOBAL__sub_I_qcocoatheme.mm + 44
        12  dyld                                0x000000018933793c ___ZNK5dyld46Loader25findAndRunAllInitializersERNS_12RuntimeStateE_block_invoke + 592
        13  dyld                                0x0000000189375c40 ___ZNK5dyld313MachOAnalyzer18forEachInitializerER11DiagnosticsRKNS0_15VMAddrConverterEU13block_pointerFvjEPKv_block_invoke.209 + 340
        14  dyld                                0x00000001893693a8 ___ZNK5dyld39MachOFile14forEachSectionEU13block_pointerFvRKNS0_11SectionInfoEbRbE_block_invoke + 496
        15  dyld                                0x000000018931c2dc _ZNK5dyld39MachOFile18forEachLoadCommandER11DiagnosticsU13block_pointerFvPK12load_commandRbE + 300
        16  dyld                                0x000000018936833c _ZNK5dyld39MachOFile14forEachSectionEU13block_pointerFvRKNS0_11SectionInfoEbRbE + 192
        17  dyld                                0x0000000189375754 _ZNK5dyld313MachOAnalyzer18forEachInitializerER11DiagnosticsRKNS0_15VMAddrConverterEU13block_pointerFvjEPKv + 516
        18  dyld                                0x0000000189337660 _ZNK5dyld46Loader25findAndRunAllInitializersERNS_12RuntimeStateE + 176
        19  dyld                                0x000000018933ec3c _ZNK5dyld416JustInTimeLoader15runInitializersERNS_12RuntimeStateE + 36
        20  dyld                                0x0000000189337d1c _ZNK5dyld46Loader23runInitializersBottomUpERNS_12RuntimeStateERN5dyld35ArrayIPKS0_EES8_ + 312
        21  dyld                                0x000000018933c00c _ZZNK5dyld46Loader38runInitializersBottomUpPlusUpwardLinksERNS_12RuntimeStateEENK3$_0clEv + 180
        22  dyld                                0x0000000189337f0c _ZNK5dyld46Loader38runInitializersBottomUpPlusUpwardLinksERNS_12RuntimeStateE + 412
        23  dyld                                0x000000018935011c _ZN5dyld44APIs11dlopen_fromEPKciPv + 2432
        24  QtCore                              0x000000010556def8 _ZN15QLibraryPrivate8load_sysEv + 2044
        25  QtCore                              0x00000001055691dc _ZN15QLibraryPrivate4loadEv + 144
        26  QtCore                              0x0000000105568e4c _ZN15QLibraryPrivate10loadPluginEv + 92
        27  QtCore                              0x0000000105568cfc _ZN15QLibraryPrivate14pluginInstanceEv + 144
        28  QtCore                              0x0000000105350008 _ZNK14QFactoryLoader8instanceEi + 124
        29  QtGui                               0x0000000105bf92f0 _ZN27QPlatformIntegrationFactory6createERK7QStringRK5QListIS0_ERiPPcS2_ + 148
        30  QtGui                               0x0000000105bbef18 _ZL13init_platformRK7QStringS1_S1_RiPPc + 1748
        31  QtGui                               0x0000000105bbe68c _ZN22QGuiApplicationPrivate25createPlatformIntegrationEv + 1452
        32  QtGui                               0x0000000105bc08a4 _ZN22QGuiApplicationPrivate21createEventDispatcherEv + 36
        33  QtCore                              0x00000001052d0078 _ZN23QCoreApplicationPrivate4initEv + 1572
        34  QtGui                               0x0000000105bba4b8 _ZN22QGuiApplicationPrivate4initEv + 76
        35  QtWidgets                           0x0000000104ae1e14 _ZN19QApplicationPrivate4initEv + 68
        36  QtWidgets                           0x0000000104ae2024 _ZN12QApplicationC1ERiPPci + 140
        37  QOwnNotes                           0x0000000102eb7178 main + 4228
        38  dyld                                0x0000000189320274 start + 2840
)
*** Terminating app due to uncaught exception 'NSInternalInconsistencyException', reason: 'Critical error: required built-in appearance SystemAppearance not found'
*** First throw call stack:
(
        0   CoreFoundation                      0x00000001897fae80 __exceptionPreprocess + 176
        1   libobjc.A.dylib                     0x00000001892e2cd8 objc_exception_throw + 88
        2   CoreFoundation                      0x00000001897fad70 +[NSException exceptionWithName:reason:userInfo:] + 0
        3   AppKit                              0x000000018d2cd244 __33+[NSAppearance _initializeCoreUI]_block_invoke + 88
        4   libdispatch.dylib                   0x00000001894ed5b4 _dispatch_client_callout + 20
        5   libdispatch.dylib                   0x00000001894eee00 _dispatch_once_callout + 32
        6   AppKit                              0x000000018d2eddd4 +[NSAppearance _aquaAppearance] + 60
        7   AppKit                              0x000000018d2cc9b0 +[NSAppearance appearanceNamed:] + 32
        8   AppKit                              0x000000018d2edce0 -[NSDynamicSystemColor recacheColor] + 224
        9   AppKit                              0x000000018d2edaa8 -[NSDynamicSystemColor initWithSelector:tintedWithColor:] + 120
        10  AppKit                              0x000000018d331b40 +[NSColor controlTextColor] + 68
        11  libqcocoa.dylib                     0x0000000104ca9660 _GLOBAL__sub_I_qcocoatheme.mm + 44
        12  dyld                                0x000000018933793c ___ZNK5dyld46Loader25findAndRunAllInitializersERNS_12RuntimeStateE_block_invoke + 592
        13  dyld                                0x0000000189375c40 ___ZNK5dyld313MachOAnalyzer18forEachInitializerER11DiagnosticsRKNS0_15VMAddrConverterEU13block_pointerFvjEPKv_block_invoke.209 + 340
        14  dyld                                0x00000001893693a8 ___ZNK5dyld39MachOFile14forEachSectionEU13block_pointerFvRKNS0_11SectionInfoEbRbE_block_invoke + 496
        15  dyld                                0x000000018931c2dc _ZNK5dyld39MachOFile18forEachLoadCommandER11DiagnosticsU13block_pointerFvPK12load_commandRbE + 300
        16  dyld                                0x000000018936833c _ZNK5dyld39MachOFile14forEachSectionEU13block_pointerFvRKNS0_11SectionInfoEbRbE + 192
        17  dyld                                0x0000000189375754 _ZNK5dyld313MachOAnalyzer18forEachInitializerER11DiagnosticsRKNS0_15VMAddrConverterEU13block_pointerFvjEPKv + 516
        18  dyld                                0x0000000189337660 _ZNK5dyld46Loader25findAndRunAllInitializersERNS_12RuntimeStateE + 176
        19  dyld                                0x000000018933ec3c _ZNK5dyld416JustInTimeLoader15runInitializersERNS_12RuntimeStateE + 36
        20  dyld                                0x0000000189337d1c _ZNK5dyld46Loader23runInitializersBottomUpERNS_12RuntimeStateERN5dyld35ArrayIPKS0_EES8_ + 312
        21  dyld                                0x000000018933c00c _ZZNK5dyld46Loader38runInitializersBottomUpPlusUpwardLinksERNS_12RuntimeStateEENK3$_0clEv + 180
        22  dyld                                0x0000000189337f0c _ZNK5dyld46Loader38runInitializersBottomUpPlusUpwardLinksERNS_12RuntimeStateE + 412
        23  dyld                                0x000000018935011c _ZN5dyld44APIs11dlopen_fromEPKciPv + 2432
        24  QtCore                              0x0000000102d1def8 _ZN15QLibraryPrivate8load_sysEv + 2044
        25  QtCore                              0x0000000102d191dc _ZN15QLibraryPrivate4loadEv + 144
        26  QtCore                              0x0000000102d18e4c _ZN15QLibraryPrivate10loadPluginEv + 92
        27  QtCore                              0x0000000102d18cfc _ZN15QLibraryPrivate14pluginInstanceEv + 144
        28  QtCore                              0x0000000102b00008 _ZNK14QFactoryLoader8instanceEi + 124
        29  QtGui                               0x00000001033a92f0 _ZN27QPlatformIntegrationFactory6createERK7QStringRK5QListIS0_ERiPPcS2_ + 148
        30  QtGui                               0x000000010336ef18 _ZL13init_platformRK7QStringS1_S1_RiPPc + 1748
        31  QtGui                               0x000000010336e68c _ZN22QGuiApplicationPrivate25createPlatformIntegrationEv + 1452
        32  QtGui                               0x00000001033708a4 _ZN22QGuiApplicationPrivate21createEventDispatcherEv + 36
        33  QtCore                              0x0000000102a80078 _ZN23QCoreApplicationPrivate4initEv + 1572
        34  QtGui                               0x000000010336a4b8 _ZN22QGuiApplicationPrivate4initEv + 76
        35  QtWidgets                           0x0000000102291e14 _ZN19QApplicationPrivate4initEv + 68
        36  QtWidgets                           0x0000000102292024 _ZN12QApplicationC1ERiPPci + 140
        37  QOwnNotes                           0x000000010050b178 main + 4228
        38  dyld                                0x0000000189320274 start + 2840
)
libc++abi: terminating due to uncaught exception of type NSExceptionlibc++abi:
terminating due to uncaught exception of type NSException
installShellCompletion: installed shell completion file `/nix/store/8x7hv75jiapg6hf9m9s02mgk3fn09rh6-qownnotes-25.1.6/share/bash-completion/completions/qownnotes.bash' does not exist or has zero size

@pbek
Copy link
Contributor

pbek commented Jan 29, 2025

Thank you for the test! I don't think the end2end tests are working on darwin, they depend on X11.
The Linux tests ran through. So we can merge in my opinion.

@matthiasbeyer
Copy link
Contributor

Lets do it

@matthiasbeyer matthiasbeyer merged commit 3009c34 into NixOS:master Jan 29, 2025
25 of 27 checks passed
@matthiasbeyer matthiasbeyer added the backport release-24.11 Backport PR automatically label Jan 29, 2025
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 29, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-377623-to-release-24.11 origin/release-24.11
cd .worktree/backport-377623-to-release-24.11
git switch --create backport-377623-to-release-24.11
git cherry-pick -x 47082f6caae6176d8b486fcb30c7a0adc6f91e90 2db0ef3a8da472a69341aecc7a2daf241b4c414b 54ddab9dff910352aee24d2116279169aa48de43 3b92f76bc53659705dcd2e94f009a696713d5011

@matthiasbeyer
Copy link
Contributor

As this is a minor update, I guess we also want to backport this. I know that it includes a few patches that refactor the package, but I think its worth it...

@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 29, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-377623-to-release-24.11 origin/release-24.11
cd .worktree/backport-377623-to-release-24.11
git switch --create backport-377623-to-release-24.11
git cherry-pick -x 47082f6caae6176d8b486fcb30c7a0adc6f91e90 2db0ef3a8da472a69341aecc7a2daf241b4c414b 54ddab9dff910352aee24d2116279169aa48de43 3b92f76bc53659705dcd2e94f009a696713d5011

@pbek
Copy link
Contributor

pbek commented Jan 30, 2025

Hm, is there a bot for GitHub to automatically create Pull Requests or something instead of manually calling nix-shell maintainers/scripts/update.nix --argstr package qownnotes locally and then doing a PR by hand? 🤔

@GaetanLepage
Copy link
Contributor

Hm, is there a bot for GitHub to automatically create Pull Requests or something instead of manually calling nix-shell maintainers/scripts/update.nix --argstr package qownnotes locally and then doing a PR by hand? 🤔

Yes there is:

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.

Update Request: pkgs.qownnotes 25.1.5 → 25.1.6
4 participants