Skip to content

add and use fetchpatch#2630

Closed
vcunat wants to merge 5 commits intoNixOS:masterfrom
vcunat:p/fetchpatch
Closed

add and use fetchpatch#2630
vcunat wants to merge 5 commits intoNixOS:masterfrom
vcunat:p/fetchpatch

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented May 12, 2014

This is a replacement for #2570.

This not only sorts the patch but also filters out duplicate files,
currently all uses of fetchpatch lead to the same hashes so they're
already sorted.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
@aszlig
Copy link
Member

aszlig commented May 13, 2014

See vcunat#1 for sorting.

fetchpatch: Sort/filter patch by filenames.
@vcunat
Copy link
Member Author

vcunat commented May 13, 2014

Sorting+deduplication integrated.

vcunat added a commit that referenced this pull request May 17, 2014
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

Conflicts (auto-solved):
	pkgs/development/libraries/haskell/gitit/default.nix
@vcunat
Copy link
Member Author

vcunat commented May 17, 2014

Pushed. Thanks to @aszlig for help!

@vcunat vcunat closed this May 17, 2014
@vcunat vcunat deleted the p/fetchpatch branch May 17, 2014 05:32
vcunat added a commit that referenced this pull request May 24, 2014
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

(cherry picked from commit 137eae0)

Conflicts (simple, patchutils version from master):
	pkgs/development/libraries/haskell/gitit/default.nix
	pkgs/tools/text/patchutils/default.nix
adrianpk added a commit to adrianpk/nixpkgs that referenced this pull request May 31, 2024
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see NixOS#1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

(cherry picked from commit 137eae0)

Conflicts (simple, patchutils version from master):
	pkgs/development/libraries/haskell/gitit/default.nix
	pkgs/tools/text/patchutils/default.nix
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