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

Merge pull request #93298 from alyssais/git-remote-hg

Browse Source 
git-remote-hg: fix; refactor
This commit is contained in:
worldofpeace 2020-08-19 19:08:47 -04:00 committed by GitHub
commit ab77cf8930
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
View File

@ -1,36 +1,32 @@
{ stdenv, lib, fetchFromGitHub, mercurial, makeWrapper { stdenv, lib, fetchFromGitHub, python3Packages
, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2 , asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2
}: }:
stdenv.mkDerivation rec { python3Packages.buildPythonApplication rec {
pname = "git-remote-hg"; pname = "git-remote-hg";
version = "1.0.1"; version = "unstable-2020-06-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mnauw"; owner = "mnauw";
repo = "git-remote-hg"; repo = "git-remote-hg";
rev = "v${version}"; rev = "28ed63b707919734d230cb13bff7d231dfeee8fc";
sha256 = "1by5ygqvq9ww990kdrjndaqsssyf2jc4n380f9pfh2avsr7871wc"; sha256 = "0dw48vbnk7pp0w6fzgl29mq8fyn52pacbya2w14z9c6jfvh5sha1";
}; };
buildInputs = [ mercurial.python mercurial makeWrapper nativeBuildInputs = [
asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt libxml2 asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt libxml2
]; ];
propagatedBuildInputs = with python3Packages; [ mercurial ];
doCheck = false;
installFlags = [ "HOME=\${out}" "install-doc" ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/git-remote-hg \ make install-doc prefix=$out
--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 lib; { meta = with lib; {
homepage = "https://github.com/mnauw/git-remote-hg"; homepage = "https://github.com/mnauw/git-remote-hg";
description = "Semi-official Mercurial bridge from Git project"; description = "Semi-official Mercurial bridge from Git project";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ ]; maintainers = with maintainers; [ qyliss ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

4
pkgs/top-level/python-packages.nix
View File

@ -3371,6 +3371,10 @@ in {
measurement = callPackage ../development/python-modules/measurement {}; measurement = callPackage ../development/python-modules/measurement {};
mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override {
python3Packages = self;
}));
midiutil = callPackage ../development/python-modules/midiutil {}; midiutil = callPackage ../development/python-modules/midiutil {};
mido = callPackage ../development/python-modules/mido { }; mido = callPackage ../development/python-modules/mido { };