From a50f8ee4331598d431eedcc2fe0b29ae47e45b9e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 17:38:51 +0100 Subject: [PATCH] mercurialFull: remove appendToName to have a consistent package name for repology --- pkgs/applications/version-management/mercurial/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 80c2679d05cf..e413ca0efe08 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -20,7 +20,7 @@ let inherit (python3Packages) docutils python fb-re2 pygit2 pygments; self = python3Packages.buildPythonApplication rec { - pname = "mercurial"; + pname = "mercurial${lib.optionalString fullBuild "-full"}"; version = "6.0.3"; src = fetchurl { @@ -34,9 +34,9 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; - name = "${pname}-${version}"; + name = "mercurial-${version}"; sha256 = "sha256-i4WROxezeqLX4hTdcPrqsf6dBqsNZz6fFAPzItYuklE="; - sourceRoot = "${pname}-${version}/rust"; + sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b85db5723c0a..4d42e17033d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27309,7 +27309,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - mercurialFull = appendToName "full" (mercurial.override { fullBuild = true; }); + mercurialFull = mercurial.override { fullBuild = true; }; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };