dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #146451 from pacien/mercurial-6.0

Browse Source 
mercurial: 5.9.3 -> 6.0.1, enable check phase
This commit is contained in:
Luke Granger-Brown 2022-01-06 09:51:33 +00:00 committed by GitHub
commit 30e656ba0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,12 @@
, guiSupport ? fullBuild, tk , guiSupport ? fullBuild, tk
, highlightSupport ? fullBuild , highlightSupport ? fullBuild
, ApplicationServices , ApplicationServices
# test dependencies
, unzip
, which
, sqlite
, git
, gnupg
}: }:
let let
@ -13,11 +19,11 @@ let
self = python3Packages.buildPythonApplication rec { self = python3Packages.buildPythonApplication rec {
pname = "mercurial"; pname = "mercurial";
version = "5.9.3"; version = "6.0.1";
src = fetchurl { src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "sha256-O0P2iXetD6dap/HlyPCoO6k1YhqyOWEpq7SY5W0b4I4="; sha256 = "sha256-Bf0LSAOJyWVH9abHaekO4A8dE/esDUZeQKOBxs86VuI=";
}; };
format = "other"; format = "other";
@ -27,11 +33,20 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
sha256 = "sha256:1d911jaawdrcv2mdhlp2ylr10791zj7dhb69aiw5yy7vn7gry82n"; sha256 = "sha256-leyLb6RqntiuEhmJSUkZRUuO8ah0BZI5OhKkGbWRjxs=";
sourceRoot = "${pname}-${version}/rust"; sourceRoot = "${pname}-${version}/rust";
} else null; } else null;
cargoRoot = if rustSupport then "rust" else null; cargoRoot = if rustSupport then "rust" else null;
postPatch = ''
patchShebangs .
for f in **/*.{py,c,t}; do
# not only used in shebangs
substituteAllInPlace "$f" '/bin/sh' '${stdenv.shell}'
done
'';
propagatedBuildInputs = lib.optional re2Support fb-re2 propagatedBuildInputs = lib.optional re2Support fb-re2
++ lib.optional gitSupport pygit2 ++ lib.optional gitSupport pygit2
++ lib.optional highlightSupport pygments; ++ lib.optional highlightSupport pygments;
@ -47,6 +62,26 @@ let
makeFlags = [ "PREFIX=$(out)" ] makeFlags = [ "PREFIX=$(out)" ]
++ lib.optional rustSupport "PURE=--rust"; ++ lib.optional rustSupport "PURE=--rust";
doCheck = stdenv.isLinux; # tests seem unstable on Darwin
checkInputs = [
unzip
which
sqlite
git
gnupg
];
checkPhase = ''
cat << EOF > tests/blacklists/nix
# tests enforcing "/usr/bin/env" shebangs, which are patched for nix
test-run-tests.t
test-check-shbang.t
EOF
# extended timeout necessary for tests to pass on the busy CI workers
export HGTESTFLAGS="--blacklist blacklists/nix --timeout 600"
make check
'';
postInstall = (lib.optionalString guiSupport '' postInstall = (lib.optionalString guiSupport ''
mkdir -p $out/etc/mercurial mkdir -p $out/etc/mercurial
cp contrib/hgk $out/bin cp contrib/hgk $out/bin