direwolf: refactor; direwolf-unstable: init at 1.7-unstable-2025-04-29 #406106

Pandapip1 · 2025-05-11T08:05:05Z

~~versionCheckHook was not added due to the lack of a --version subcommand. See wb2osz/direwolf#570~~ A workaround was found

Things done

Add a 👍 reaction to pull requests you find important.

pkgs/by-name/di/direwolf/package.nix

Pandapip1 · 2025-05-11T08:06:32Z

pkgs/by-name/di/direwolf/package.nix

-        --replace 'Terminal=false' 'Terminal=true' \
-        --replace 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf'
-      substituteInPlace src/dwgpsd.c \
-        --replace 'GPSD_API_MAJOR_VERSION > 11' 'GPSD_API_MAJOR_VERSION > 14'


This substituteInPlace doesn't match anything anymore. I assume this was to handle an incorrect version check, but I lack the context. Regardless, this should be safe to remove since it wasn't doing anything before anyway.

SigmaSquadron

versionCheckHook should just work because direwolf will always display its version when calling for --help (which versionCheckHook already does) or getting the help menu after passing an invalid flag.

You can also set versionCheckProgramArg to version, which is a command in direwolf, but that shouldn't be necessary either.

pkgs/by-name/di/direwolf-unstable/package.nix

SigmaSquadron · 2025-05-11T12:33:39Z

pkgs/by-name/di/direwolf-unstable/package.nix

+}).overrideAttrs
+  (finalAttrs: {
+    # Next version is 1.8
+    version = "1.8-unstable-2025-04-29";


Suggested change

version = "1.8-unstable-2025-04-29";

version = "1.7-unstable-2025-04-29";

Please review the package versioning guidelines:

If we're tracking a commit from a repository without a version assigned, then the version attribute should be the latest upstream version preceding that commit, followed by -unstable- and the date of the fetched commit. The date must be in ISO 8601 "YYYY-MM-DD" format.

That's to say, if 1.8 isn't tagged, it can't be added here.

Huh, I missed that. I'll fix gpredict-unstable's version in a seperate PR then.

I'm not sure we should be adding unstable package versions to nixpkgs at all - this seems like a NUR thing.

Both have very slow release cycles and have some significant features that I would like to use that aren't present in the latest stable version. This shouldn't require much maintenance, considering updates are going to be, for the most part, completely automated. If there is a policy or other concrete reason against including unstable variants of packages, then fair enough, but both are, in my opinion, value added.

I do get what you mean about it maybe being a better fit for NUR. In fact, I do have a custom direwolf derivation in my own nur-packages. I feel that that shouldn't preclude it from being in nixpkgs though. Nixpkgs has a higher standard for quality than NUR does, and I believe this meets that higher standard.

Pandapip1 · 2025-05-11T21:14:07Z

versionCheckHook should just work because direwolf will always display its version when calling for --help (which versionCheckHook already does) or getting the help menu after passing an invalid flag.

There is no --help command. When calling direwolf --help (or even just direwolf on its own), the exit code is 1 (nonzero) and therefore versionCheckHook will fail.

SigmaSquadron · 2025-05-11T21:17:14Z

Seems like setting versionCheckProgramArg to version won't work either, due to the config requirement. Quite annoying.

Pandapip1 · 2025-05-12T15:46:51Z

Actually it looks like the -u unicode test pattern option could be used:

nixpkgs on  direwolf-refactor [$]
❯ result/bin/direwolf -u
Dire Wolf DEVELOPMENT version 1.8 D (Jan  1 1980)
Includes optional support for:  gpsd hamlib cm108-ptt

  UTF-8 test string: mañana ° Füße

Pandapip1 · 2025-05-12T16:15:02Z

pkgs/by-name/di/direwolf-unstable/package.nix

+        [
+          "deviceid.c"
+          "tocalls.yaml"
+          "--replace-fail /usr/lib/udev/rules.d/ ${placeholder "out"}/lib/udev/rules.d/ --replace-fail /etc/udev/rules.d/"


This is pretty ugly but I don't see an easier way

Pandapip1 · 2025-05-12T16:21:18Z

Why is the nixfmt job angry at some random python package?!

SigmaSquadron · 2025-05-12T16:22:07Z

someone might have merged a broken PR :p

Edit: yeah it was #406492

mweinelt · 2025-05-12T16:36:42Z

Spurious newline, sorry.

Fix is in #406498

Pandapip1 · 2025-05-12T16:44:06Z

Rebased

pkgs/by-name/di/direwolf-unstable/package.nix

lasandell · 2025-05-12T21:16:37Z

Haven't looked at this in depth, only added myself as maintainer because there was no one else at the time. But I was the one who added gpsd support initially, and someone else disabled it by default due to frequent breakages in the gpsd API for what that's worth. It seems like a fairly marginal feature not worth breaking the package on a regular basis IMO, unless someone is really on top of maintaining it.

SigmaSquadron

Diff wise it seems fine to me! Love to see the split commits.

sarcasticadmin · 2025-05-12T21:59:38Z

Haven't looked at this in depth, only added myself as maintainer because there was no one else at the time. But I was the one who added gpsd support initially, and someone else disabled it by default due to frequent breakages in the gpsd API for what that's worth. It seems like a fairly marginal feature not worth breaking the package on a regular basis IMO, unless someone is really on top of maintaining it.

I set gpsdSupport ? false as the default originally in: #258056

gpsd defaults to guiSupport = true:

nixpkgs/pkgs/by-name/gp/gpsd/package.nix

Line 20 in db8c5bd

guiSupport ? true,

so simply by including direwolf you end up with X11. Id like to keep this off by default since that adds a significant amount of packages which arent necessary.

Pandapip1 · 2025-05-12T22:50:05Z

Rebased and removed the commit enabling gpsd support.

sarcasticadmin

Both version build for me

Thanks for keeping the original default @Pandapip1

Pandapip1 · 2025-07-01T14:20:28Z

Rebased to fix merge conflict w/ 2c14bf9. Otherwise, no changes since the approvals. Should still be good to merge (although re-approvals would be appreciated!)

nixos-discourse · 2025-07-01T14:22:27Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/2443

Pandapip1 commented May 11, 2025

View reviewed changes

Pandapip1 requested review from sarcasticadmin and lasandell May 11, 2025 08:08

Pandapip1 force-pushed the direwolf-refactor branch from e7ebf22 to 76ae2d6 Compare May 11, 2025 08:09

github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 11, 2025

SigmaSquadron requested changes May 11, 2025

View reviewed changes

Pandapip1 force-pushed the direwolf-refactor branch from 76ae2d6 to cad686d Compare May 12, 2025 16:08

Pandapip1 requested a review from SigmaSquadron May 12, 2025 16:08

Pandapip1 force-pushed the direwolf-refactor branch from cad686d to 0b5cf01 Compare May 12, 2025 16:13

Pandapip1 changed the title ~~direwolf: refactor; direwolf-unstable: init at 1.8-unstable-2025-04-29~~ direwolf: refactor; direwolf-unstable: init at 1.7-unstable-2025-04-29 May 12, 2025

Pandapip1 commented May 12, 2025

View reviewed changes

Pandapip1 force-pushed the direwolf-refactor branch from 0b5cf01 to 30c304f Compare May 12, 2025 16:44

SigmaSquadron reviewed May 12, 2025

View reviewed changes

pkgs/by-name/di/direwolf-unstable/package.nix Show resolved Hide resolved

SigmaSquadron approved these changes May 12, 2025

View reviewed changes

Pandapip1 force-pushed the direwolf-refactor branch from 30c304f to 1bf596f Compare May 12, 2025 22:49

sarcasticadmin approved these changes May 12, 2025

View reviewed changes

sarcasticadmin added 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels May 12, 2025

Pandapip1 mentioned this pull request May 13, 2025

CONTRIBUTING: Clarify commit separation convention #400934

Open

wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 18, 2025

github-actions bot removed the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. label Jun 18, 2025

Pandapip1 added 11 commits July 1, 2025 10:16

direwolf: move to by-name

f9e713e

direwolf: use tag instead of rev

9f6fc45

direwolf: switch to finalAttrs

09a37df

direwolf: remove with lib

bad55b5

direwolf: add pandapip1 to maintainers

fcd3a1d

direwolf: add nix-update-script

e84dc86

direwolf: use placeholder "out" instead of $out

e2c4de3

direwolf: switch to replace-fail and remove unused substitute

787fcf4

direwolf: add meta.mainProgram

02c9508

direwolf: add versionCheckHook

0d7586a

direwolf-unstable: init at 1.7-unstable-2025-04-29

b2d6d27

Pandapip1 force-pushed the direwolf-refactor branch from 1bf596f to b2d6d27 Compare July 1, 2025 14:18

ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 1, 2025

nixpkgs-ci bot added the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. label Jul 1, 2025

wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 28, 2025

	version = "1.8-unstable-2025-04-29";
	version = "1.7-unstable-2025-04-29";

Uh oh!

direwolf: refactor; direwolf-unstable: init at 1.7-unstable-2025-04-29 #406106

Are you sure you want to change the base?

direwolf: refactor; direwolf-unstable: init at 1.7-unstable-2025-04-29 #406106

Uh oh!

Conversation

Pandapip1 commented May 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Things done

Uh oh!

Uh oh!

Pandapip1 May 11, 2025

Choose a reason for hiding this comment

Uh oh!

SigmaSquadron left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

SigmaSquadron May 11, 2025

Choose a reason for hiding this comment

Uh oh!

Pandapip1 May 11, 2025

Choose a reason for hiding this comment

Uh oh!

SigmaSquadron May 11, 2025

Choose a reason for hiding this comment

Uh oh!

Pandapip1 May 12, 2025

Choose a reason for hiding this comment

Uh oh!

Pandapip1 commented May 11, 2025

Uh oh!

SigmaSquadron commented May 11, 2025

Uh oh!

Pandapip1 commented May 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Pandapip1 May 12, 2025

Choose a reason for hiding this comment

Uh oh!

Pandapip1 commented May 12, 2025

Uh oh!

SigmaSquadron commented May 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mweinelt commented May 12, 2025

Uh oh!

Pandapip1 commented May 12, 2025

Uh oh!

Uh oh!

lasandell commented May 12, 2025

Uh oh!

SigmaSquadron left a comment

Choose a reason for hiding this comment

Uh oh!

sarcasticadmin commented May 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Pandapip1 commented May 12, 2025

Uh oh!

sarcasticadmin left a comment

Choose a reason for hiding this comment

Uh oh!

Pandapip1 commented Jul 1, 2025

Uh oh!

nixos-discourse commented Jul 1, 2025

Uh oh!

Uh oh!

Pandapip1 commented May 11, 2025 •

edited

Loading

Pandapip1 commented May 12, 2025 •

edited

Loading

SigmaSquadron commented May 12, 2025 •

edited

Loading

sarcasticadmin commented May 12, 2025 •

edited

Loading