From 6d75bf842bd89fb531412a83b31c93af2a10d428 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Aug 2016 11:36:07 +0200 Subject: [PATCH] mercurial: pass in pythonPackages --- pkgs/applications/version-management/mercurial/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 682f4cfc6ba..d3f5f39dde0 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich -, guiSupport ? false, tk ? null, curses +{ stdenv, fetchurl, pythonPackages, makeWrapper, docutils, unzip +, guiSupport ? false, tk ? null , ApplicationServices, cf-private }: let # if you bump version, update pkgs.tortoisehg too or ping maintainer version = "3.8.2"; name = "mercurial-${version}"; + inherit (pythonPackages) curses docutils hg-git dulwich python; in stdenv.mkDerivation { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 796400d3568..2f1ba2aafba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13856,7 +13856,6 @@ in mendeley = callPackage ../applications/office/mendeley { }; mercurial = callPackage ../applications/version-management/mercurial { - inherit (pythonPackages) curses docutils hg-git dulwich; inherit (darwin.apple_sdk.frameworks) ApplicationServices; inherit (darwin) cf-private; guiSupport = false; # use mercurialFull to get hgk GUI