Skip to content

gradle: fix update-deps.sh to use Nix bash#329272

Merged
emilytrau merged 2 commits intoNixOS:masterfrom
vringar:fix/ghidra-extensions
Aug 3, 2024
Merged

gradle: fix update-deps.sh to use Nix bash#329272
emilytrau merged 2 commits intoNixOS:masterfrom
vringar:fix/ghidra-extensions

Conversation

@vringar
Copy link
Contributor

@vringar vringar commented Jul 22, 2024

Description of changes

Fixes two issues I had with the gradle refactor and my external Ghidra plugins.

Things done

I only checked that this works for my specific use case. I didn't update all Gradle packages to see if this change somehow breaks something.

  • 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.11 Release Notes (or backporting 23.11 and 24.05 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.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 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 Jul 23, 2024
Copy link
Contributor

@chayleaf chayleaf left a comment

Choose a reason for hiding this comment

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

LGTM other than a nit

@vringar vringar force-pushed the fix/ghidra-extensions branch from 3067b1e to c6222b6 Compare July 23, 2024 09:50
@vringar
Copy link
Contributor Author

vringar commented Jul 23, 2024

Nit is addressed :) Thanks for the review

@chayleaf
Copy link
Contributor

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

1 package failed to build:
  • ghidra-extensions.gnudisassembler
2 packages built:
  • ghidra-extensions.machinelearning
  • ghidra-extensions.sleighdevtools

@vringar vringar force-pushed the fix/ghidra-extensions branch from c6222b6 to 2f2724e Compare July 26, 2024 15:10
@vringar vringar force-pushed the fix/ghidra-extensions branch from 2f2724e to c526be6 Compare July 29, 2024 17:45
@vringar vringar requested a review from chayleaf July 29, 2024 17:45
@chayleaf
Copy link
Contributor

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

1 package failed to build:
  • ghidra-extensions.gnudisassembler
2 packages built:
  • ghidra-extensions.machinelearning
  • ghidra-extensions.sleighdevtools

@vringar vringar force-pushed the fix/ghidra-extensions branch from c526be6 to ab8a524 Compare July 30, 2024 15:51
@vringar vringar requested a review from chayleaf July 30, 2024 16:55
@vringar
Copy link
Contributor Author

vringar commented Jul 30, 2024

nixpkgs-review pr 329272 is passing again

Copy link
Contributor

@chayleaf chayleaf left a comment

Choose a reason for hiding this comment

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

LGTM

@vringar vringar force-pushed the fix/ghidra-extensions branch from d61380e to aac69e0 Compare August 2, 2024 10:43
vringar added 2 commits August 2, 2024 13:10
This fixes an issue on non NixOS Linux distributions
where their system bash might be outside of
/tmp, /nix, and /run.

Thanks to @puckipedia for the suggestion
This is required as Ghidra plugins don't have a consistent
layout and have to be widely configurable
@vringar vringar force-pushed the fix/ghidra-extensions branch from aac69e0 to 5c354f1 Compare August 2, 2024 11:11
@vringar vringar requested a review from emilytrau August 2, 2024 11:11
@emilytrau emilytrau changed the title Fix/ghidra extensions gradle: fix update-deps.sh to use Nix bash Aug 2, 2024
@emilytrau
Copy link
Member

Result of nixpkgs-review pr 329272 run on aarch64-linux 1

3 packages built:
  • ghidra-extensions.gnudisassembler
  • ghidra-extensions.machinelearning
  • ghidra-extensions.sleighdevtools

@emilytrau emilytrau merged commit f10aad8 into NixOS:master Aug 3, 2024
@vringar vringar deleted the fix/ghidra-extensions branch August 3, 2024 08:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants