48 lines
2 KiB
Diff
48 lines
2 KiB
Diff
|
From a7f3bd4bf7ad413bb4fcfe9fdb1866cc9e1fb704 Mon Sep 17 00:00:00 2001
|
||
|
|
From: pacien <pacien.trangirard@pacien.net>
|
||
|
|
Date: Fri, 7 Jan 2022 16:42:56 +0100
|
||
|
|
Subject: [PATCH 1/2] mercurial: add pacien as maintainer
|
||
|
|
|
||
|
|
---
|
||
|
|
pkgs/applications/version-management/mercurial/default.nix | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
|
||
|
|
index c3c04da3a69a6..b59bf1ff17e19 100644
|
||
|
|
--- a/pkgs/applications/version-management/mercurial/default.nix
|
||
|
|
+++ b/pkgs/applications/version-management/mercurial/default.nix
|
||
|
|
@@ -118,7 +118,7 @@ let
|
||
|
|
homepage = "https://www.mercurial-scm.org";
|
||
|
|
downloadPage = "https://www.mercurial-scm.org/release/";
|
||
|
|
license = licenses.gpl2Plus;
|
||
|
|
- maintainers = with maintainers; [ eelco lukegb ];
|
||
|
|
+ maintainers = with maintainers; [ eelco lukegb pacien ];
|
||
|
|
updateWalker = true;
|
||
|
|
platforms = platforms.unix;
|
||
|
|
};
|
||
|
|
|
||
|
|
From 416883461db4d3b8d451155dd6b6886da876f16e Mon Sep 17 00:00:00 2001
|
||
|
|
From: pacien <pacien.trangirard@pacien.net>
|
||
|
|
Date: Sat, 8 Jan 2022 13:48:04 +0100
|
||
|
|
Subject: [PATCH 2/2] mercurialFull: skip an unstable experimental test
|
||
|
|
|
||
|
|
---
|
||
|
|
pkgs/applications/version-management/mercurial/default.nix | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
|
||
|
|
index b59bf1ff17e19..cc00f68461be9 100644
|
||
|
|
--- a/pkgs/applications/version-management/mercurial/default.nix
|
||
|
|
+++ b/pkgs/applications/version-management/mercurial/default.nix
|
||
|
|
@@ -77,6 +77,10 @@ let
|
||
|
|
# tests enforcing "/usr/bin/env" shebangs, which are patched for nix
|
||
|
|
test-run-tests.t
|
||
|
|
test-check-shbang.t
|
||
|
|
+
|
||
|
|
+ # unstable experimental/unsupported features
|
||
|
|
+ # https://bz.mercurial-scm.org/show_bug.cgi?id=6633#c1
|
||
|
|
+ test-git-interop.t
|
||
|
|
EOF
|
||
|
|
|
||
|
|
# extended timeout necessary for tests to pass on the busy CI workers
|