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

Avoid double wrapping #123

Merged
merged 2 commits into from
Sep 13, 2024
Merged

Conversation

jonringer
Copy link
Contributor

buildPythonPackage already accepts makeWrapperArgs which then get applied as part of the wrap python scripts shell hook

Cleans up the bin directory a bit:

# After
[23:20:01] jringer@jringer-5560-nixos ~/work/sbomnix (avoid-double-wrapping)
$ ls -a ./result/bin/
.nix_outdated-wrapped  .provenance-wrapped    .sbomnix-wrapped    nixgraph    repology_cli  vulnxscan
.nixgraph-wrapped      .repology_cli-wrapped  .vulnxscan-wrapped  nixmeta     repology_cve  
.nixmeta-wrapped       .repology_cve-wrapped  nix_outdated        provenance  sbomnix   

# Before
[23:20:55] jringer@jringer-5560-nixos ~/work/sbomnix (main)
$ ls -a ./result/bin/
..nix_outdated-wrapped-wrapped  .nix_outdated-wrapped  .repology_cve-wrapped  nixmeta       vulnxscan
..nixgraph-wrapped-wrapped      .nixgraph-wrapped      .sbomnix-wrapped       provenance    
..provenance-wrapped-wrapped    .nixmeta-wrapped       .vulnxscan-wrapped     repology_cli  
..sbomnix-wrapped-wrapped       .provenance-wrapped    nix_outdated           repology_cve  
..vulnxscan-wrapped-wrapped     .repology_cli-wrapped  nixgraph               sbomnix 

Signed-off-by: Jonathan Ringer <[email protected]>
Signed-off-by: Jonathan Ringer <[email protected]>
@henrirosten
Copy link
Collaborator

Thanks @jonringer

@henrirosten henrirosten merged commit 3eb3f1c into tiiuae:main Sep 13, 2024
3 checks passed
@jonringer jonringer deleted the avoid-double-wrapping branch September 13, 2024 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants