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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

puppet-bolt: fix pname #304886

Merged
merged 1 commit into from May 1, 2024
Merged

puppet-bolt: fix pname #304886

merged 1 commit into from May 1, 2024

Conversation

anthonyroussel
Copy link
Member

@anthonyroussel anthonyroussel commented Apr 17, 2024

Description of changes

pname should be puppet-bolt like the attribute name.

This will fix puppet-bolt been discovered as "bolt-unclassified" package on Repology: https://repology.org/project/bolt-unclassified/versions

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.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 馃憤 reaction to pull requests you find important.

@marsam
Copy link
Contributor

marsam commented Apr 18, 2024

@GrahamcOfBorg eval

@anthonyroussel
Copy link
Member Author

Too bad, currently pname (puppet-bolt) must match the main gem name (bolt).
So this cannot work.

@marsam
Copy link
Contributor

marsam commented Apr 18, 2024

I think you could do something like:

--- a/pkgs/by-name/pu/puppet-bolt/package.nix
+++ b/pkgs/by-name/pu/puppet-bolt/package.nix
@@ -7,7 +7,7 @@
   testers,
 }:
 
-bundlerApp {
+(bundlerApp {
   pname = "bolt";
 
   gemdir = ./.;
@@ -42,4 +42,6 @@ bundlerApp {
     maintainers = with lib.maintainers; [ uvnikita anthonyroussel ];
     platforms = lib.platforms.unix;
   };
-}
+}).overrideAttrs (old: {
+  name = "puppet-bolt-${(import ./gemset.nix).bolt.version}";
+})

@Aleksanaa Aleksanaa merged commit 096991a into NixOS:master May 1, 2024
31 checks passed
@anthonyroussel anthonyroussel deleted the puppet-bolt branch May 2, 2024 14:54
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.

None yet

6 participants