about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorFelix Buehler <account@buehler.rocks>2022-02-21 22:53:07 +0100
committerFelix Buehler <account@buehler.rocks>2022-02-28 12:45:43 +0100
commit19d43bf8f6c83e9c0601b3bbb4a9833fb318f3cf (patch)
treef5bc16405acb20736bb747cf696b4d1d8b9ba173 /pkgs
parent0d39e18c48e9cd709566400774f574dd12d2684c (diff)
davix-copy: remove appendToName to have a consistent package name for repology
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/networking/davix/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix
index 66c912b47f1e3..63fc1cffd9a59 100644
--- a/pkgs/tools/networking/davix/default.nix
+++ b/pkgs/tools/networking/davix/default.nix
@@ -30,7 +30,7 @@ let
 in
 stdenv.mkDerivation rec {
   version = "0.8.0";
-  pname = "davix";
+  pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy";
   nativeBuildInputs = [ cmake pkg-config python3 ];
   buildInputs = [
     openssl
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   # "please ignore the GitHub-generated tarballs, as they are incomplete"
   # https://github.com/cern-fts/davix/releases/tag/R_0_8_0
   src = fetchurl {
-    url = "https://github.com/cern-fts/${pname}/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz";
+    url = "https://github.com/cern-fts/davix/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/davix-${version}.tar.gz";
     sha256 = "LxCNoECKg/tbnwxoFQ02C6cz5LOg/imNRbDTLSircSQ=";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5368a4a567800..c968bad82a47c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4069,7 +4069,7 @@ with pkgs;
 
   davix = callPackage ../tools/networking/davix { };
 
-  davix-copy = appendToName "copy" (davix.override { enableThirdPartyCopy = true; });
+  davix-copy = davix.override { enableThirdPartyCopy = true; };
 
   cantata = libsForQt5.callPackage ../applications/audio/cantata { };