lianad: init at 6.0 #323696

plebhash · 2024-07-01T02:41:04Z

Description of changes

the liana package currently only supports the liana-gui executable, while it is desired to also support headless use-cases

this PR adds a withGui attribute, which is used to choose between:

provide liana-gui executable if withGui is true
provide lianad + liana-cli executables if withGui is false (plus a $out/etc/liana/config.toml based on lianad_config_example.toml)

cc @dunxen

Things done

Add a 👍 reaction to pull requests you find important.

dunxen

Thanks for opening this!

Left some comments, and it seems that only lianad gets built without liana-cli when withGui is false.

pkgs/by-name/li/liana/default.nix

pkgs/top-level/all-packages.nix

pkgs/by-name/li/liana/default.nix

pkgs/top-level/all-packages.nix

pkgs/by-name/li/liana/default.nix

dunxen · 2024-07-01T16:48:14Z

it seems that only lianad gets built without liana-cli when withGui is false

@dunxen are you sure? this is what I get here:
$ nix-build -A lianad
/nix/store/jjldm51jm0jss2lnac841v4725hbjcg1-lianad-5.0
$ tree result        
result
├── bin
│   ├── liana-cli
│   └── lianad
└── etc
    └── liana
        └── config.toml

4 directories, 3 files

You are correct. I mischecked the result.

dunxen

Oops. Didn't see the PR title (I cannot edit it). Should be:

lianad: init at 5.0

dunxen

LGTM. Thanks!

Aleksanaa

it looks a bit weird because you are effectively making two derivation (which are different except for version and source.) into one. This may not be a good idea.

Good idea:

Use callPackages to declare multiple packages.
Just build them separately, and add a comment to remind keeping version the same
Same to 2 but add assert to keep version the same. This may break r-ryantm, however

dunxen · 2024-07-02T14:23:40Z

it looks a bit weird because you are effectively making two derivation (which are different except for version and source.) into one. This may not be a good idea.

Good idea:
1. Use callPackages to declare multiple packages.

2. Just build them separately, and add a comment to remind keeping version the same

3. Same to 2 but add assert to keep version the same. This may break r-ryantm, however

I agree in the current state it is not as discoverable / clear in the source what's going on, but I'm not sure which of those options more closely aligns to other packages that are in the same situation (see for example lshw vs bitcoin and a few others). Seems there are a few different methods.

I'm unfortunately unaware of any documentation around this practice, but would love to keep consistent and still have this maintainable without breaking r-ryantm.

Either way, if this should be a separate package declaration, I'll help if we need to keep them in sync manually without an assert (i.e. Option 2)

Aleksanaa · 2024-07-02T14:30:11Z

see for example lshw vs bitcoin and a few others

That's withGui, just an option to decide whether to include gui or not, and is often passed as an argument to build tools. The withGui in this package is actually building another package. They have different sourceRoots and different dependencies. Calling it withGui is quite misleading.

Yes, there are more cursed examples, see catppuccin (although I do want to remove that stuff for a long time)

dunxen · 2024-07-02T14:37:28Z

That's withGui, just an option to decide whether to include gui or not, and is often passed as an argument to build tools. The withGui in this package is actually building another package. They have different sourceRoots and different dependencies. Calling it withGui is quite misleading.

Yes, there are more cursed examples, see catppuccin (although I do want to remove that stuff for a long time)

Right, got it. Thanks @Aleksanaa for clearing that up! So let's not add to the cursed list then :)

I'm inclined to go with Option 2 and have a separate package declaration in pkgs/by-name/li/lianad/package.nix. @plebhash, is this alright with you? You can add me and yourself as maintainers there. Then you can just drop the diff in all-packages.nix :)

We can investigate option 3 at some later stage.

dunxen

Just changing the approval status to make it clear we're splitting this package.

pkgs/by-name/li/lianad/package.nix

Aleksanaa · 2024-07-26T03:33:00Z

pkgs/by-name/li/lianad/package.nix

+    hash = "sha256-RkZ2HSN7IjwN3tD0UhpMeQeqkb+Y79kSWnjJZ5KPbQk=";
+  };
+
+  cargoSha256 = "sha256-6r8G4sO/aDO5VyJbmbdFz3W2b8ZmulXJZtnz8IAwcaU=";


Suggested change

cargoSha256 = "sha256-6r8G4sO/aDO5VyJbmbdFz3W2b8ZmulXJZtnz8IAwcaU=";

cargoHash = "sha256-6r8G4sO/aDO5VyJbmbdFz3W2b8ZmulXJZtnz8IAwcaU=";

Aleksanaa · 2024-07-26T03:33:10Z

pkgs/by-name/li/lianad/package.nix

+
+  meta = with lib; {
+    mainProgram = "lianad";
+    description = "A Bitcoin wallet leveraging on-chain timelocks for safety and recovery";


Suggested change

description = "A Bitcoin wallet leveraging on-chain timelocks for safety and recovery";

description = "Bitcoin wallet leveraging on-chain timelocks for safety and recovery";

Aleksanaa · 2024-07-26T03:33:46Z

pkgs/by-name/li/lianad/Cargo.lock

Please delete this

maintainers/maintainer-list.nix

pkgs/by-name/li/liana/package.nix

pkgs/by-name/li/lianad/package.nix

dunxen · 2024-08-03T13:12:56Z

Need to run nixfmt.

dunxen

Needs rebase and should init at 6.0 now. I had to update liana as 5.0 had build errors with rust 1.80: #333059

dunxen

Thanks! Last few comments 🤞

pkgs/by-name/li/liana/package.nix

pkgs/by-name/li/lianad/package.nix

dunxen

First commit message should be ｀lianad: init at 5.0｀

NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jul 1, 2024

ofborg bot added the 8.has: package (new) This PR adds a new package label Jul 1, 2024

ofborg bot requested a review from dunxen July 1, 2024 03:11

ofborg bot added 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 Jul 1, 2024

dunxen reviewed Jul 1, 2024

View reviewed changes

pkgs/by-name/li/liana/default.nix Outdated Show resolved Hide resolved

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved

pkgs/by-name/li/liana/default.nix Outdated Show resolved Hide resolved

pkgs/by-name/li/liana/default.nix Outdated Show resolved Hide resolved

This comment was marked as resolved.

Sign in to view

dunxen reviewed Jul 1, 2024

View reviewed changes

pkgs/by-name/li/liana/default.nix Outdated Show resolved Hide resolved

pkgs/by-name/li/liana/default.nix Outdated Show resolved Hide resolved

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved

pkgs/by-name/li/liana/default.nix Outdated Show resolved Hide resolved

plebhash force-pushed the lianad-lianacli branch 2 times, most recently from bfb4fc3 to 93de3eb Compare July 2, 2024 00:45

plebhash requested a review from dunxen July 2, 2024 00:45

plebhash force-pushed the lianad-lianacli branch 3 times, most recently from 26e0786 to 481b8c8 Compare July 2, 2024 01:03

dunxen approved these changes Jul 2, 2024

View reviewed changes

dunxen suggested changes Jul 2, 2024

View reviewed changes

plebhash changed the title ~~add lianad + liana-cli executable options to liana package~~ lianad: init at 5.0 Jul 2, 2024

plebhash requested a review from dunxen July 2, 2024 12:38

dunxen approved these changes Jul 2, 2024

View reviewed changes

dunxen added needs_merger awaiting_merger labels Jul 2, 2024

Aleksanaa reviewed Jul 2, 2024

View reviewed changes

wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Jul 2, 2024

dunxen suggested changes Jul 4, 2024

View reviewed changes

dunxen requested a review from Aleksanaa July 16, 2024 12:50

Aleksanaa reviewed Jul 26, 2024

View reviewed changes

plebhash force-pushed the lianad-lianacli branch from 0229986 to ef5ddcd Compare August 2, 2024 16:36

plebhash requested a review from Aleksanaa August 2, 2024 16:38

ofborg bot requested a review from dunxen August 2, 2024 17:50

plebhash force-pushed the lianad-lianacli branch from ef5ddcd to af7dbcc Compare August 5, 2024 22:48

dunxen approved these changes Aug 6, 2024

View reviewed changes

dunxen suggested changes Aug 14, 2024

View reviewed changes

donovanglover added the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 14, 2024

plebhash force-pushed the lianad-lianacli branch 2 times, most recently from 6916e8d to a60f686 Compare August 22, 2024 01:31

ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 22, 2024

plebhash requested a review from dunxen August 22, 2024 01:51

dunxen suggested changes Aug 22, 2024

View reviewed changes

pkgs/by-name/li/liana/package.nix Outdated Show resolved Hide resolved

pkgs/by-name/li/lianad/package.nix Outdated Show resolved Hide resolved

wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Sep 7, 2024

plebhash force-pushed the lianad-lianacli branch 2 times, most recently from f496993 to bc8b4e3 Compare September 10, 2024 01:28

plebhash requested a review from dunxen September 10, 2024 01:29

dunxen reviewed Sep 16, 2024

View reviewed changes

plebhash added 3 commits September 16, 2024 19:47

lianad: init at 6.0

194f865

maintainers: add plebhash

7ac2ec5

liana: add notice to keep version in sync with lianad

5067b8b

plebhash force-pushed the lianad-lianacli branch from bc8b4e3 to 5067b8b Compare September 16, 2024 22:48

plebhash changed the title ~~lianad: init at 5.0~~ lianad: init at 6.0 Sep 16, 2024

plebhash requested a review from dunxen September 16, 2024 22:48

dunxen approved these changes Sep 18, 2024

View reviewed changes

Aleksanaa approved these changes Sep 21, 2024

View reviewed changes

Aleksanaa merged commit d203fb0 into NixOS:master Sep 21, 2024
29 of 30 checks passed

plebhash deleted the lianad-lianacli branch September 21, 2024 01:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

lianad: init at 6.0 #323696

lianad: init at 6.0 #323696

plebhash commented Jul 1, 2024 •

edited

Loading

dunxen left a comment

This comment was marked as resolved.

dunxen commented Jul 1, 2024

dunxen left a comment •

edited

Loading

dunxen left a comment

Aleksanaa left a comment

dunxen commented Jul 2, 2024

Aleksanaa commented Jul 2, 2024

dunxen commented Jul 2, 2024

dunxen left a comment

Aleksanaa Jul 26, 2024

Aleksanaa Jul 26, 2024

Aleksanaa Jul 26, 2024

dunxen commented Aug 3, 2024

dunxen left a comment

dunxen left a comment

dunxen left a comment

	cargoSha256 = "sha256-6r8G4sO/aDO5VyJbmbdFz3W2b8ZmulXJZtnz8IAwcaU=";
	cargoHash = "sha256-6r8G4sO/aDO5VyJbmbdFz3W2b8ZmulXJZtnz8IAwcaU=";

	description = "A Bitcoin wallet leveraging on-chain timelocks for safety and recovery";
	description = "Bitcoin wallet leveraging on-chain timelocks for safety and recovery";

lianad: init at 6.0 #323696

lianad: init at 6.0 #323696

Conversation

plebhash commented Jul 1, 2024 • edited Loading

Description of changes

Things done

dunxen left a comment

Choose a reason for hiding this comment

This comment was marked as resolved.

dunxen commented Jul 1, 2024

dunxen left a comment • edited Loading

Choose a reason for hiding this comment

dunxen left a comment

Choose a reason for hiding this comment

Aleksanaa left a comment

Choose a reason for hiding this comment

dunxen commented Jul 2, 2024

Aleksanaa commented Jul 2, 2024

dunxen commented Jul 2, 2024

dunxen left a comment

Choose a reason for hiding this comment

Aleksanaa Jul 26, 2024

Choose a reason for hiding this comment

Aleksanaa Jul 26, 2024

Choose a reason for hiding this comment

Aleksanaa Jul 26, 2024

Choose a reason for hiding this comment

dunxen commented Aug 3, 2024

dunxen left a comment

Choose a reason for hiding this comment

dunxen left a comment

Choose a reason for hiding this comment

dunxen left a comment

Choose a reason for hiding this comment

plebhash commented Jul 1, 2024 •

edited

Loading

dunxen left a comment •

edited

Loading