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

Merge staging into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2021-03-08 19:20:18 +01:00
parent 6ba8f344c6 042adf08d1
commit 277d488026
374 changed files with 3871 additions and 2493 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/mercurial/4.9.nix
+2 -2
View File
@@ -21,8 +21,8 @@ in python2Packages.buildPythonApplication {
inherit python; # pass it so that the same version can be used in hg2git
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ docutils unzip ]
nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ docutils ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
propagatedBuildInputs = [ hg-git dulwich ];
pkgs/applications/version-management/mercurial/default.nix
+2 -2
View File
@@ -19,8 +19,8 @@ in python3Packages.buildPythonApplication rec {
passthru = { inherit python; }; # pass it so that the same version can be used in hg2git
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ docutils unzip ]
nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ docutils ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
makeFlags = [ "PREFIX=$(out)" ];