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

Merge pull request #119875 from Emantor/topic/subversion

Browse Source 
subversion: remove extraBuildInputs
This commit is contained in:
Sandro 2021-04-19 17:47:29 +02:00 committed by GitHub
commit 4f286b947a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/version-management/subversion/default.nix
View File

@ -17,7 +17,7 @@ assert javahlBindings -> jdk != null && perl != null;
let
common = { version, sha256, extraBuildInputs ? [ ] }: stdenv.mkDerivation (rec {
common = { version, sha256 }: stdenv.mkDerivation (rec {
inherit version;
pname = "subversion";
@ -29,8 +29,7 @@ let
# Can't do separate $lib and $bin, as libs reference bins
outputs = [ "out" "dev" "man" ];
buildInputs = [ zlib apr aprutil sqlite openssl ]
++ extraBuildInputs
buildInputs = [ zlib apr aprutil sqlite openssl lz4 utf8proc ]
++ lib.optional httpSupport serf
++ lib.optional pythonBindings python
++ lib.optional perlBindings perl
@ -114,12 +113,10 @@ in {
subversion_1_10 = common {
version = "1.10.7";
sha256 = "1nhrd8z6c94sc0ryrzpyd98qdn5a5g3x0xv1kdb9da4drrk8y2ww";
extraBuildInputs = [ lz4 utf8proc ];
};
subversion = common {
version = "1.12.2";
sha256 = "0wgpw3kzsiawzqk4y0xgh1z93kllxydgv4lsviim45y5wk4bbl1v";
extraBuildInputs = [ lz4 utf8proc ];
};
}