Browse Source

Updated Monotone to 0.43

svn path=/nixpkgs/trunk/; revision=14704
nixos-19.03
Michael Raskin 13 years ago
parent
commit
6986ddc2cf
  1. 19
      pkgs/applications/version-management/monotone/default.nix
  2. 28
      pkgs/development/libraries/botan/default.nix
  3. 8
      pkgs/top-level/all-packages.nix
  4. 3
      pkgs/top-level/builder-defs.nix

19
pkgs/applications/version-management/monotone/default.nix

@ -1,10 +1,17 @@
{stdenv, fetchurl, boost, zlib}:
{stdenv, fetchurl, boost, zlib, botan, libidn,
lua, pcre, sqlite}:
stdenv.mkDerivation {
name = "monotone-0.42";
let
version = "0.43";
in stdenv.mkDerivation {
name = "monotone-${version}";
src = fetchurl {
url = http://monotone.ca/downloads/0.42/monotone-0.42.tar.gz;
sha256 = "0i6srfx0ps8hlgdbn0y7iy9gi33a7vpiwdm5rhxjxgvhn5j9svdr";
url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.gz";
sha256 = "1vfvvk4flv6n7x1nrizjpwpsfhf3dv3b60h7cs4ysgvzb76s41mz";
};
buildInputs = [boost zlib];
buildInputs = [boost zlib botan libidn lua pcre sqlite];
preConfigure = ''
export sqlite_LIBS=-lsqlite3
export NIX_LDFLAGS="$NIX_LDFLAGS -ldl"
'';
}

28
pkgs/development/libraries/botan/default.nix

@ -0,0 +1,28 @@
a :
let
fetchurl = a.fetchurl;
version = a.lib.getAttr ["version"] "1.8.1" a;
buildInputs = with a; [
perl
];
in
rec {
src = fetchurl {
url = "http://files.randombit.net/botan/Botan-${version}.tbz";
sha256 = "1lgqkg7q0qpzh647zmzay149myrjihcx4jp3rrz6gw17rgn11v98";
};
inherit buildInputs;
configureFlags = [];
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
configureCommand = "perl ./configure.pl";
name = "botan-" + version;
meta = {
description = "Cryptographic algorithms library";
};
}

8
pkgs/top-level/all-packages.nix

@ -1914,7 +1914,9 @@ let
};
monotone = import ../applications/version-management/monotone {
inherit stdenv fetchurl boost zlib;
inherit stdenv fetchurl boost zlib botan libidn pcre
sqlite;
lua = lua5;
};
monotoneViz = builderDefsPackage (selectVersion ../applications/version-management/monotone-viz "1.0.1") {
@ -2747,6 +2749,10 @@ let
};
boost = boostVersionChoice "1.38.0";
botan = builderDefsPackage (import ../development/libraries/botan) {
inherit perl;
};
buddy = import ../development/libraries/buddy {
inherit fetchurl stdenv;
};

3
pkgs/top-level/builder-defs.nix

@ -17,7 +17,8 @@ args: with args; with stringsWithDeps; with lib;
archiveType = s:
(if hasSuffixHack ".tar" s then "tar"
else if (hasSuffixHack ".tar.gz" s) || (hasSuffixHack ".tgz" s) then "tgz"
else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) then "tbz2"
else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) ||
(hasSuffixHack ".tbz" s) then "tbz2"
else if (hasSuffixHack ".tar.lzma" s) then "tar.lzma"
else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip"
else if (hasSuffixHack "-cvs-export" s) then "cvs-dir"

Loading…
Cancel
Save