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

liana: 6.0 -> 8.0 #343429

Merged
merged 2 commits into from
Dec 2, 2024
Merged

liana: 6.0 -> 8.0 #343429

merged 2 commits into from
Dec 2, 2024

Conversation

dunxen
Copy link
Contributor

@dunxen dunxen commented Sep 21, 2024

Description of changes

Release Notes:
https://github.com/wizardsardine/liana/releases/tag/v7.0
https://github.com/wizardsardine/liana/releases/tag/v8.0

Changes: wizardsardine/liana@v6.0...v8.0

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Sep 21, 2024
@dunxen dunxen requested a review from plebhash September 21, 2024 12:26
@dunxen
Copy link
Contributor Author

dunxen commented Sep 21, 2024

lianad can get updated in a separate PR @plebhash

@dunxen dunxen added needs_reviewer (old Marvin label, do not use) needs_merger (old Marvin label, do not use) labels Oct 24, 2024
@dunxen dunxen removed the request for review from plebhash October 24, 2024 07:47
@dunxen
Copy link
Contributor Author

dunxen commented Nov 7, 2024

Hey @plebhash, would you be able to give a quick test of this and approval if happy? I see that v8.0rc1 is already out so we're probably going to get v8 soon. :)

@dunxen dunxen requested a review from plebhash November 10, 2024 17:20
@dunxen dunxen force-pushed the 2024-09-updatelianaV7 branch from edf9e57 to 8a422d9 Compare November 10, 2024 17:25
@dunxen dunxen changed the title liana: 6.0 -> 7.0 liana: 6.0 -> 8.0 Nov 10, 2024
Copy link
Contributor

@plebhash plebhash left a comment

Choose a reason for hiding this comment

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

tACK

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 11, 2024
@jurraca
Copy link
Contributor

jurraca commented Nov 29, 2024

tACK. tested on x86_64-linux.

@misuzu
Copy link
Contributor

misuzu commented Dec 1, 2024

It's now possible to get rid of the lock file using useFetchCargoVendor option. See #349360

@dunxen
Copy link
Contributor Author

dunxen commented Dec 1, 2024

It's now possible to get rid of the lock file using useFetchCargoVendor option. See #349360

Great! I'll update this PR when I get the chance.

@dunxen
Copy link
Contributor Author

dunxen commented Dec 1, 2024

Ah, looks like that's not possible for liana as git dependencies are not supported for the fetcher yet:

error: builder for '/nix/store/si0cp83fqvn5bqr6s31rw293k0x133kd-liana-8.0-vendor.tar.gz.drv' failed with exit code 1;
       last 18 log lines:
       > Running phase: unpackPhase
       > unpacking source archive /nix/store/r2gzm78h1077irfv5yl5xw65daxpqb3f-source
       > source root is source/gui
       > Running phase: patchPhase
       > Running phase: updateAutotoolsGnuConfigScriptsPhase
       > Running phase: configurePhase
       > no configure script, doing nothing
       > Running phase: buildPhase
       > source = "git+https://github.com/edouardparis/iced?branch=patch-0.12.3#459c8eb3da2ae21461ee56baea8a1b10d38ff6e0"
       > source = "git+https://github.com/edouardparis/iced?branch=patch-0.12.3#459c8eb3da2ae21461ee56baea8a1b10d38ff6e0"
       > source = "git+https://github.com/edouardparis/iced?branch=patch-0.12.3#459c8eb3da2ae21461ee56baea8a1b10d38ff6e0"
       > source = "git+https://github.com/wizardsardine/liana?branch=8.x#749b111afac5aaa991622318738462d2857af713"
       >
       > ERROR: The Cargo.lock contains git dependencies
       >
       > This is currently not supported in the fixed-output derivation fetcher.
       > Use cargoLock.lockFile / importCargoLock instead.

@misuzu
Copy link
Contributor

misuzu commented Dec 1, 2024

Ah, looks like that's not possible for liana as git dependencies are not supported for the fetcher yet:

It was designed specifically to handle git dependencies, you just need to rebase your PR.

@dunxen
Copy link
Contributor Author

dunxen commented Dec 1, 2024

It was designed specifically to handle git dependencies, you just need to rebase your PR.

Yeah you're right, pulled master and didn't actually rebase this branch 🤦‍♂️

Edit: And I would have realised this mistake if I had actually used fetchCargoVendor when trying... sigh.

@misuzu misuzu merged commit ad8c928 into NixOS:master Dec 2, 2024
15 of 16 checks passed
@dunxen dunxen deleted the 2024-09-updatelianaV7 branch January 17, 2025 06:29
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 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person needs_merger (old Marvin label, do not use) needs_reviewer (old Marvin label, do not use)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants