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

mercurial: Update to 2.6.1

Browse Source 
Also, set a default for web.cacerts so that the system certificates on
NixOS are used.
This commit is contained in:
Eelco Dolstra 2013-05-15 13:11:24 +02:00
parent 000fddd10e
commit e3c641b39a
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/version-management/mercurial/default.nix
View File

@ -2,14 +2,15 @@
, guiSupport ? false, tk ? null, curses }: , guiSupport ? false, tk ? null, curses }:
let let
name = "mercurial-2.2.3"; name = "mercurial-2.6.1";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit name; inherit name;
src = fetchurl { src = fetchurl {
url = "http://mercurial.selenic.com/release/${name}.tar.gz"; url = "http://mercurial.selenic.com/release/${name}.tar.gz";
sha256 = "0yv7kn96270fixigry910c1i3zzivimh1xjxywqjn9dshn2y6qbw"; sha256 = "0r4fg269xnqgacc82ppm3wxl9wwvvgwz8z6zi1iai4gx76iklhdn";
}; };
inherit python; # pass it so that the same version can be used in hg2git inherit python; # pass it so that the same version can be used in hg2git
@ -39,6 +40,12 @@ stdenv.mkDerivation {
$WRAP_TK $WRAP_TK
done done
mkdir -p $out/etc/mercurial
cat >> $out/etc/mercurial/hgrc << EOF
[web]
cacerts = /etc/ssl/certs/ca-bundle.crt
EOF
# copy hgweb.cgi to allow use in apache # copy hgweb.cgi to allow use in apache
mkdir -p $out/share/cgi-bin mkdir -p $out/share/cgi-bin
cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin
@ -49,5 +56,6 @@ stdenv.mkDerivation {
description = "A fast, lightweight SCM system for very large distributed projects"; description = "A fast, lightweight SCM system for very large distributed projects";
homepage = "http://www.selenic.com/mercurial/"; homepage = "http://www.selenic.com/mercurial/";
license = "GPLv2"; license = "GPLv2";
maintainers = [ stdenv.lib.maintainers.eelco ];
}; };
} }

2
pkgs/top-level/release-lib.nix
View File

@ -130,7 +130,7 @@ rec {
/* Common platform groups on which to test packages. */ /* Common platform groups on which to test packages. */
inherit (pkgs.lib.platforms) linux darwin cygwin allBut all mesaPlatforms; inherit (pkgs.lib.platforms) unix linux darwin cygwin allBut all mesaPlatforms;
/* Platform groups for specific kinds of applications. */ /* Platform groups for specific kinds of applications. */
x11Supported = linux; x11Supported = linux;

2
pkgs/top-level/release-python.nix
View File

@ -1141,8 +1141,6 @@ in
mediastreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mediastreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
mediatomb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mediatomb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
meld = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; meld = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
mercurial = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
mercurialFull = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
merkaartor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; merkaartor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
mesa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mesa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
meshlab = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; meshlab = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };

4
pkgs/top-level/release.nix
View File

@ -197,8 +197,8 @@ let
mcabber = linux; mcabber = linux;
mcron = linux; mcron = linux;
mdadm = linux; mdadm = linux;
mercurial = allBut "i686-cygwin"; mercurial = unix;
mercurialFull = allBut "i686-cygwin"; mercurialFull = linux;
mesa = mesaPlatforms; mesa = mesaPlatforms;
midori = linux; midori = linux;
mingetty = linux; mingetty = linux;