From 4d86923c627ffef73f8f01bfd52d9cac4f5deed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 17 Feb 2008 13:44:30 +0000 Subject: [PATCH] Add GNU Arch (tla). svn path=/nixpkgs/trunk/; revision=10714 --- .../arch/configure-tmpdir.patch | 11 +++++++ .../version-management/arch/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/applications/version-management/arch/configure-tmpdir.patch create mode 100644 pkgs/applications/version-management/arch/default.nix diff --git a/pkgs/applications/version-management/arch/configure-tmpdir.patch b/pkgs/applications/version-management/arch/configure-tmpdir.patch new file mode 100644 index 00000000000..2b39322ca22 --- /dev/null +++ b/pkgs/applications/version-management/arch/configure-tmpdir.patch @@ -0,0 +1,11 @@ +--- tla-1.3.5/src/build-tools/auto-conf-lib/gnu-patch-test 2006-07-20 08:34:28.000000000 +0200 ++++ tla-1.3.5/src/build-tools/auto-conf-lib/gnu-patch-test 2008-02-17 13:00:07.000000000 +0100 +@@ -27,7 +27,7 @@ else + fi + + CMP='cmp' # we require a working 'cmp' utility +-TMPDIR="/tmp/,patch-test.$$" ++TMPDIR="${TMPDIR:-/tmp}/,patch-test.$$" + + ORIG_A="$TMPDIR/to-patch_a" + ORIG_PRISTINE_A="$TMPDIR/to-patch_a.the-original" diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/applications/version-management/arch/default.nix new file mode 100644 index 00000000000..0a54eabd595 --- /dev/null +++ b/pkgs/applications/version-management/arch/default.nix @@ -0,0 +1,29 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "tla-1.3.5"; + src = fetchurl { + url = "mirror://gnu/gnu-arch/" + name + ".tar.gz"; + sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0"; + }; + + patches = [ ./configure-tmpdir.patch ]; + + buildInputs = [which]; + propagatedBuildInputs = [diffutils gnupatch gnutar]; + + # Instead of GNU Autoconf, tla uses Tom Lord's now + # defunct `package-framework'. + buildPhase = '' + mkdir +build && cd +build && \ + ../src/configure --prefix="$out" && \ + make install + ''; + + meta = { + description = ''GNU Arch (aka. `tla'), a distributed revision + control system.''; + homepage = http://www.gnu.org/software/gnu-arch/; + license = "GPL"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3e4ef68a2e..18f5be2d273 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5263,6 +5263,10 @@ rec { inherit fetchurl stdenv alsaLib; }; + tla = import ../applications/version-management/arch { + inherit fetchurl stdenv diffutils gnutar gnupatch which; + }; + unison = import ../applications/networking/sync/unison { inherit fetchurl stdenv ocaml lablgtk makeWrapper; inherit (xorg) xset fontschumachermisc;