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

sasquatch: 4.3 -> 4.4 #119996

Merged
merged 1 commit into from
Apr 23, 2021
Merged

sasquatch: 4.3 -> 4.4 #119996

merged 1 commit into from
Apr 23, 2021

Conversation

cole-h
Copy link
Member

@cole-h cole-h commented Apr 20, 2021

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from Pamplemousse April 20, 2021 23:04
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Apr 20, 2021
@r-rmcgibbo
Copy link

r-rmcgibbo commented Apr 20, 2021

Result of nixpkgs-review pr 119996 at ccd4be6e run on aarch64-linux 1

5 packages built successfully:
  • python38Packages.binwalk
  • python38Packages.binwalk-full
  • python39Packages.binwalk
  • python39Packages.binwalk-full
  • sasquatch

Result of nixpkgs-review pr 119996 at ccd4be6e run on x86_64-linux 1

5 packages built successfully:
  • python38Packages.binwalk
  • python38Packages.binwalk-full
  • python39Packages.binwalk
  • python39Packages.binwalk-full
  • sasquatch
1 suggestion:
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/filesystems/sasquatch/default.nix:44:15:

       |
    44 |   patches = [ patch ];
       |               ^
    

pkgs/tools/filesystems/sasquatch/default.nix Outdated Show resolved Hide resolved
pkgs/tools/filesystems/sasquatch/default.nix Outdated Show resolved Hide resolved
pkgs/tools/filesystems/sasquatch/default.nix Show resolved Hide resolved
pkgs/tools/filesystems/sasquatch/default.nix Show resolved Hide resolved
pkgs/tools/filesystems/sasquatch/default.nix Outdated Show resolved Hide resolved
pkgs/tools/filesystems/sasquatch/default.nix Outdated Show resolved Hide resolved
pkgs/tools/filesystems/sasquatch/default.nix Outdated Show resolved Hide resolved
@Pamplemousse
Copy link
Member

Hey @SuperSandro2000,

Question about the lz4 ? null becoming lz4 (and the related assert... removal):

  • Why? What's the point of including lz4 if lz4Support is False?
  • Was that superfluous before? Why?

Thanks 🙂

@cole-h
Copy link
Member Author

cole-h commented Apr 21, 2021

lz4 ? null is unnecessary because, if it's unused, it won't be included in the output / closure. Nix is lazy, so any unused variables (packages) won't be evaluated / built / etc.

@cole-h cole-h requested a review from SuperSandro2000 April 22, 2021 01:17
@cole-h
Copy link
Member Author

cole-h commented Apr 23, 2021

@Pamplemousse Do you perchance have any test cases for this? I want to make sure that I didn't break unsquashing LZMA / etc when I went the easy route of just incrementing the #defines (devttys0/sasquatch#33 (comment)).

@Pamplemousse
Copy link
Member

@cole-h Unfortunately no. I haven't used this since I packaged it, and it was a "one-off" need...

Comment on lines +16 to +17
# NOTE: This uses my personal fork for now, until
# https://github.com/devttys0/sasquatch/pull/40 is merged.
Copy link
Member

Choose a reason for hiding this comment

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

For posterity sake I also replicated it here: https://github.com/DeterminateSystems/sasquatch

@grahamc grahamc merged commit 5259a2e into NixOS:master Apr 23, 2021
@grahamc grahamc deleted the sasquatch branch April 23, 2021 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants