diff options
| author | Felix Buehler <account@buehler.rocks> | 2022-04-06 16:35:11 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2022-04-06 17:40:39 +0200 |
| commit | 7eb1a32324f039230261195ee8f913bfb4617f91 (patch) | |
| tree | b7df3d163033e13a119717d8100ee8218c1f167e | |
| parent | 0e296508984008888697fbdc3a173ed3c1b44678 (diff) | |
| download | nixpkgs-7eb1a32324f039230261195ee8f913bfb4617f91.tar nixpkgs-7eb1a32324f039230261195ee8f913bfb4617f91.tar.gz nixpkgs-7eb1a32324f039230261195ee8f913bfb4617f91.tar.bz2 nixpkgs-7eb1a32324f039230261195ee8f913bfb4617f91.tar.lz nixpkgs-7eb1a32324f039230261195ee8f913bfb4617f91.tar.xz nixpkgs-7eb1a32324f039230261195ee8f913bfb4617f91.tar.zst nixpkgs-7eb1a32324f039230261195ee8f913bfb4617f91.zip | |
subversion-client: remove appendToName to have a consistent package name for repology
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 4789d654ae6..0f88a18a478 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -22,10 +22,10 @@ let common = { version, sha256, extraPatches ? [ ] }: stdenv.mkDerivation (rec { inherit version; - pname = "subversion"; + pname = "subversion${lib.optionalString (!bdbSupport && perlBindings && pythonBindings) "-client"}"; src = fetchurl { - url = "mirror://apache/subversion/${pname}-${version}.tar.bz2"; + url = "mirror://apache/subversion/subversion-${version}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e69fa48b8fe..539761165cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29273,11 +29273,11 @@ with pkgs; inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) subversion_1_10 subversion; - subversionClient = appendToName "client" (subversion.override { + subversionClient = subversion.override { bdbSupport = false; perlBindings = true; pythonBindings = true; - }); + }; sublime-music = callPackage ../applications/audio/sublime-music { }; |