Merge branch 'master' of git://github.com/ip1981/nixpkgs

Added quilt-0.63

3 files changed, 36 insertions, 1 deletions

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 92e9ba01b500..b9e62355a01c 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -127,7 +127,7 @@ rec {
     ftp://mirror.csclub.uwaterloo.ca/nongnu/
     ftp://mirror.publicns.net/pub/nongnu/
     ftp://savannah.c3sl.ufpr.br/
-    http://download.savannah.gnu.org/
+    http://download.savannah.gnu.org/releases/
     http://ftp.cc.uoc.gr/mirrors/nongnu.org/
     http://ftp.twaren.net/Unix/NonGNU/
     http://mirror.csclub.uwaterloo.ca/nongnu/
diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix
new file mode 100644
index 000000000000..7ac4f6d39b7d
--- /dev/null
+++ b/pkgs/development/tools/quilt/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgs}:
+
+with pkgs;
+
+stdenv.mkDerivation rec {
+  name = "quilt-0.63";
+
+  src = fetchurl {
+    url = "mirror://savannah/quilt/${name}.tar.gz";
+    sha256 = "2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52";
+  };
+
+  buildInputs = [ makeWrapper perl bash diffutils patch findutils diffstat ];
+
+  postInstall = ''
+    wrapProgram $out/bin/quilt --prefix PATH : \
+      ${perl}/bin:${bash}/bin:${diffstat}/bin:${diffutils}/bin:${findutils}/bin:${patch}/bin
+  '';
+
+  meta = {
+    homepage = http://savannah.nongnu.org/projects/quilt;
+    description = "Easily manage large numbers of patches";
+
+    longDescription = ''
+      Quilt allows you to easily manage large numbers of
+      patches by keeping track of the changes each patch
+      makes. Patches can be applied, un-applied, refreshed,
+      and more.
+    '';
+
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5edd597f29be..bb704094fb32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1909,6 +1909,8 @@ let
 
   qshowdiff = callPackage ../tools/text/qshowdiff { };
 
+  quilt = callPackage ../development/tools/quilt { };
+
   radvd = callPackage ../tools/networking/radvd { };
 
   ranger = callPackage ../applications/misc/ranger { };