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

fetchzip, fetchgit: cleanup handling of optional features and whitespace #79581

Merged
merged 1 commit into from Mar 26, 2020

Conversation

@bhipple
Copy link
Contributor

bhipple commented Feb 9, 2020

No intended functional difference, just trying to polish to make this easier to
extend and more aligned with other nix conventions.

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.
No intended functional difference, just trying to polish to make this easier to
extend and more aligned with other nix conventions.
unpackDir="$TMPDIR/unpack"
mkdir "$unpackDir"
cd "$unpackDir"
postFetch = ''

This comment has been minimized.

Copy link
@bhipple

bhipple Feb 9, 2020

Author Contributor

This should do the same thing without any hash changes or rebuilds, as verified by doing nix-build -A <something>.src --check for a bunch of s that use various fetchers. Same for the fetchgit whitespace indentation cleanup.

@ofborg ofborg bot added the 6.topic: fetch label Feb 9, 2020
@bhipple

This comment has been minimized.

Copy link
Contributor Author

bhipple commented Feb 9, 2020

@volth
volth approved these changes Feb 9, 2020
@aanderse

This comment has been minimized.

Copy link
Contributor

aanderse commented Mar 26, 2020

(triage) ping

@bhipple bhipple merged commit 368ea2e into NixOS:master Mar 26, 2020
13 checks passed
13 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@bhipple

This comment has been minimized.

Copy link
Contributor Author

bhipple commented Mar 26, 2020

Clearly did not test well enough; I reverted the whole PR for the meantime, apologies.

@aanderse

This comment has been minimized.

Copy link
Contributor

aanderse commented Mar 26, 2020

Don't worry, it happens from time to time! 😃

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.