public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #2630: add and use fetchpatch

Browse Source 
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
This commit is contained in:
Vladimír Čunát
2014-05-17 07:27:29 +02:00
parent 4ac818601e
commit 137eae0b55
10 changed files with 131 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/haskell/BNFC/default.nix
View File

@@ -1,4 +1,4 @@
{ cabal, mtl, fetchurl, alex, happy }:
{ cabal, mtl, fetchpatch, alex, happy }:
cabal.mkDerivation (self: {
pname = "BNFC";
@@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
isExecutable = true;
buildDepends = [ mtl ];
buildTools = [ alex happy ];
patches = [ (fetchurl { url = "https://github.com/BNFC/bnfc/pull/3.patch"; sha256 = "103l04ylzswgxrmpv5zy6dd0jyr96z21mdkpgk1z4prvn8wjl624"; }) ];
patches = [ (fetchpatch { url = "https://github.com/BNFC/bnfc/pull/3.patch"; sha256 = "1i87crwva5m3v095lv3zxs38pr6nmly58krlr6sxpwnakpr0pxsp"; }) ];
patchFlags = "-p2";
preConfigure = "runhaskell Setup.lhs clean";
meta = {

4
pkgs/development/tools/parsing/alex/3.0.5.nix
View File

@@ -1,4 +1,4 @@
{ cabal, fetchurl, perl, QuickCheck }:
{ cabal, fetchpatch, perl, QuickCheck }:
cabal.mkDerivation (self: {
pname = "alex";
@@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
isExecutable = true;
buildDepends = [ QuickCheck ];
buildTools = [ perl ];
patches = [ (fetchurl { url="https://github.com/simonmar/alex/pull/21.patch"; sha256="0apv3rk00gwkf5rqw3467bg6pnamr07zdksbp9khhzzi73k9aq4f"; }) ];
patches = [ (fetchpatch { url="http://github.com/simonmar/alex/pull/21.patch"; sha256="050psfwmjlxhyxiy65jsn3v6b9rnfzy8x5q9mmhzwbirqwi0zkfm"; }) ];
meta = {
homepage = "http://www.haskell.org/alex/";
description = "Alex is a tool for generating lexical analysers in Haskell";