From 58a1c542ca0c1b74383167969cb3657c5f1f3e68 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 15 Mar 2019 22:56:18 +0000 Subject: [PATCH] gitAndTools.git-remote-hg: 0.2-e716a9e1a9e460a45663694ba4e9e8894a8452b2 -> 1.0.0 The current version no longer works with our packaged Mecurial.[1] The original repository appears to no longer be maintained, but there is a maintained fork, which is now used for the Debian package. [1]: https://github.com/felipec/git-remote-hg/issues/72 --- .../git-and-tools/git-remote-hg/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index f30813cf1201..a93682f0c2e8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchgit, mercurial, makeWrapper, - asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2 +{ stdenv, lib, fetchFromGitHub, mercurial, makeWrapper +, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2 }: stdenv.mkDerivation rec { - rev = "e716a9e1a9e460a45663694ba4e9e8894a8452b2"; - version = "0.2-${rev}"; - name = "git-remote-hg-${version}"; + pname = "git-remote-hg"; + version = "1.0.0"; - src = fetchgit { - inherit rev; - url = "git://github.com/fingolfin/git-remote-hg.git"; - sha256 = "0cmlfdxfabrs3x10mfjfap8wz67s8xk2pjn2wlcj9k2v84gji60m"; + src = fetchFromGitHub { + owner = "mnauw"; + repo = "git-remote-hg"; + rev = "v${version}"; + sha256 = "0anl054zdi5rg5m4bm1n763kbdjkpdws3c89c8w8m5gq1ifsbd4d"; }; buildInputs = [ mercurial.python mercurial makeWrapper @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages or []}" ''; - meta = with stdenv.lib; { - homepage = https://github.com/felipec/git-remote-hg; - description = "Semi-official Mercurial bridge from Git project, once installed, it allows you to clone, fetch and push to and from Mercurial repositories as if they were Git ones"; + meta = with lib; { + homepage = https://github.com/mnauw/git-remote-hg; + description = "Semi-official Mercurial bridge from Git project"; license = licenses.gpl2; maintainers = [ maintainers.garbas ]; platforms = platforms.unix;