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

qdmr: init at 0.11.2, added janik as maintainer #209733

Merged
merged 4 commits into from
Feb 2, 2023
Merged

qdmr: init at 0.11.2, added janik as maintainer #209733

merged 4 commits into from
Feb 2, 2023

Conversation

Janik-Haag
Copy link
Member

@Janik-Haag Janik-Haag commented Jan 8, 2023

Description of changes

Added qdmr to nixpkgs
Closes #191508

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 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 Jan 8, 2023
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 10, 2023
nixos/modules/programs/qdmr.nix Outdated Show resolved Hide resolved
nixos/modules/programs/qdmr.nix Outdated Show resolved Hide resolved
@Janik-Haag
Copy link
Member Author

If no one has anything else to improve on I think it's ready to be merged, the package was tested with hardware and is working as expected.

@Janik-Haag
Copy link
Member Author

Just changed the order of the phases to match the wiki

@Janik-Haag
Copy link
Member Author

Tested and pushed the 0.11.1 hotfix if no one has anything to improve anymore we can now finally merge

@Janik-Haag Janik-Haag changed the title qdmr: init at 0.10.4, added janik as maintainer qdmr: init at 0.11.1, added janik as maintainer Jan 13, 2023
@ofborg ofborg bot requested a review from 0x4A6F January 13, 2023 21:38
@0x4A6F
Copy link
Member

0x4A6F commented Jan 13, 2023

Result of nixpkgs-review pr 209733 run on x86_64-linux 1

1 package blacklisted:
  • nixos-install-tools
1 package built:
  • qdmr

nixos/modules/programs/qdmr.nix Outdated Show resolved Hide resolved
pkgs/applications/radio/qdmr/default.nix Show resolved Hide resolved
pkgs/applications/radio/qdmr/default.nix Outdated Show resolved Hide resolved
nixos/modules/module-list.nix Show resolved Hide resolved
nixos/modules/programs/qdmr.nix Outdated Show resolved Hide resolved
nixos/modules/programs/qdmr.nix Show resolved Hide resolved
nixos/modules/programs/qdmr.nix Outdated Show resolved Hide resolved
pkgs/applications/radio/qdmr/default.nix Outdated Show resolved Hide resolved
@AndersonTorres
Copy link
Member

Failing on darwin

@Janik-Haag
Copy link
Member Author

Janik-Haag commented Jan 17, 2023

Edit: Pateched the docbook file, and got manpages working now 🎉

Original Message:
Please don't merge yet, I kind off forgot about the manpages im going to look at that tomorrow. (I can't just copy them since they are generated with docbook if a specific cmake option is set. So it will probably take more then five minuets to figure that out)

pkgs/applications/radio/qdmr/default.nix Outdated Show resolved Hide resolved
pkgs/applications/radio/qdmr/default.nix Outdated Show resolved Hide resolved
nixos/modules/programs/qdmr.nix Outdated Show resolved Hide resolved
nixos/modules/programs/qdmr.nix Outdated Show resolved Hide resolved
nixos/modules/programs/qdmr.nix Outdated Show resolved Hide resolved
@Janik-Haag Janik-Haag changed the title qdmr: init at 0.11.1, added janik as maintainer qdmr: init at 0.11.2, added janik as maintainer Feb 1, 2023
Copy link
Member

@0x4A6F 0x4A6F left a comment

Choose a reason for hiding this comment

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

LGTM, could be merged without darwin support

pkgs/applications/radio/qdmr/default.nix Show resolved Hide resolved
@ofborg ofborg bot requested a review from 0x4A6F February 1, 2023 18:17
@github-actions github-actions bot added 8.has: changelog 8.has: documentation This PR adds or changes documentation labels Feb 1, 2023
@0x4A6F 0x4A6F merged commit 3215888 into NixOS:master Feb 2, 2023
Comment on lines +1 to +17
{
lib,
stdenv,
fetchFromGitHub,
installShellFiles,
writeText,
cmake,
libxslt,
docbook_xsl_ns,
wrapQtAppsHook,
libusb1,
libyamlcpp,
qtlocation,
qtserialport,
qttools,
qtbase,
}:
Copy link
Member

Choose a reason for hiding this comment

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

We don't format things with alejandra. Use either nixfmt or nixpkgs-fmt.

Copy link
Member

Choose a reason for hiding this comment

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

Aha, what makes you say that these two are okay, but alejandra isn't? Apparently I've missed the memo about allowed and forbidden formatters in nixpkgs.

Copy link
Member

Choose a reason for hiding this comment

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

@SuperSandro2000 This has not been decided yet, but the actively-discussed RFC 101 is about this. Contrary to what you're saying though, the shepherd team (which I'm part of) is tending towards alejandra, not away from it. So until the RFC is over, please don't tell people what formatter they should use.

Copy link
Member

@SuperSandro2000 SuperSandro2000 Feb 7, 2023

Choose a reason for hiding this comment

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

If we are actively using two contradicting formatters it will be a complete mess.

Also the rfc is now almost open for almost 20 months and lost itself in endless, unproductive discussion also known as bikesheeding.
We are saying it will be there for many months but it is not really feeling like it is coming in the next month(s).

Copy link
Member

Choose a reason for hiding this comment

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

It literally just had a meeting today -- there is momentum.

Copy link
Member Author

Choose a reason for hiding this comment

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

Since there currently is no specified formatting that has to be used I will leave it with the current formatting.

Copy link
Member

@alyssais alyssais Feb 13, 2023

Choose a reason for hiding this comment

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

We haven't standardised on a single formatting program, but there actually is a specified formatting in this case, in the Nixpkgs manual:

  • Function formal arguments are written as:

    { arg1, arg2, arg3 }:

    but if they don't fit on one line they're written as:

    { arg1, arg2, arg3
    , arg4, ...
    , # Some comment...
      argN
    }:

Comment on lines +19 to +22
let
inherit (stdenv) isLinux;
in

Copy link
Member

Choose a reason for hiding this comment

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

stdenv can just be written next to isLinux.

@Janik-Haag Janik-Haag added 12. first-time contribution This PR is the author's first one; please be gentle! and removed 12. first-time contribution This PR is the author's first one; please be gentle! labels Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: clean-up 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 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. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

QDMR