diff options
author | George Shammas <georgyo@gmail.com> | 2019-11-17 10:53:34 -0500 |
---|---|---|
committer | Renaud <c0bw3b@users.noreply.github.com> | 2019-11-17 16:53:34 +0100 |
commit | 6c45ecfdbee86ed80f858717901b20b90ec31dbc (patch) | |
tree | fc0da52248182aea3da9d0109d2ed191bc6b516a /pkgs/tools/package-management | |
parent | e1e381f02f436e15aa89e787f19d739c2273472d (diff) | |
download | nixlib-6c45ecfdbee86ed80f858717901b20b90ec31dbc.tar nixlib-6c45ecfdbee86ed80f858717901b20b90ec31dbc.tar.gz nixlib-6c45ecfdbee86ed80f858717901b20b90ec31dbc.tar.bz2 nixlib-6c45ecfdbee86ed80f858717901b20b90ec31dbc.tar.lz nixlib-6c45ecfdbee86ed80f858717901b20b90ec31dbc.tar.xz nixlib-6c45ecfdbee86ed80f858717901b20b90ec31dbc.tar.zst nixlib-6c45ecfdbee86ed80f858717901b20b90ec31dbc.zip |
apt: 1.4.6 -> 1.8.4
apt: 1.4.6 -> 1.8.4 (#69571) apt: cleanup * add meta.description and point meta.homepage to Debian team * use nix cmakeFlags array * fetch from Debian mirrors * move gtest and xsltproc to nativeBuildInputs apt: produce usable binaries * remove ninja from native build inputs and build with plain cmake * add libtasn1 to dependencies as gnutls needs it
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/apt/default.nix | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index cbb4ad4591e9..0438e340b212 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchzip, pkgconfig, cmake, perlPackages, curl, gtest, lzma, bzip2, lz4 +{ stdenv, lib, fetchurl, pkgconfig, cmake, perlPackages, curl, gtest +, gnutls, libtasn1, lzma, bzip2, lz4, zstd, libseccomp, udev , db, dpkg, libxslt, docbook_xsl, docbook_xml_dtd_45 # used when WITH_DOC=ON @@ -15,39 +16,37 @@ stdenv.mkDerivation rec { pname = "apt"; + version = "1.8.4"; - version = "1.4.6"; - - src = fetchzip { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/apt_${version}.tar.xz"; - sha256 = "0ahwhmscrmnpvl1r732wg93dzkhv8c1sph2yrqgsrhr73c1616ix"; + src = fetchurl { + url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz"; + sha256 = "0gn4srqaaym85gc8nldqkv01477kdwr136an2nlpbdrsbx3y83zl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig cmake gtest libxslt.bin ]; buildInputs = [ - cmake perlPackages.perl curl gtest lzma bzip2 lz4 db dpkg libxslt.bin + perlPackages.perl curl gnutls libtasn1 lzma bzip2 lz4 zstd libseccomp udev db dpkg ] ++ lib.optionals withDocs [ doxygen perlPackages.Po4a w3m docbook_xml_dtd_45 ] ++ lib.optionals withNLS [ gettext ]; - preConfigure = '' - cmakeFlagsArray+=( - -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include - -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl - -DROOT_GROUP=root - -DWITH_DOC=${if withDocs then "ON" else "OFF"} - -DUSE_NLS=${if withNLS then "ON" else "OFF"} - ) - ''; + cmakeFlags = [ + "-DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include" + "-DGNUTLS_INCLUDE_DIR=${gnutls.dev}/include" + "-DDOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl" + "-DROOT_GROUP=root" + "-DWITH_DOC=${if withDocs then "ON" else "OFF"}" + "-DUSE_NLS=${if withNLS then "ON" else "OFF"}" + ]; enableParallelBuilding = true; meta = with lib; { - description = ""; - homepage = https://launchpad.net/ubuntu/+source/apt; + description = "Command-line package management tools used on Debian-based systems"; + homepage = https://salsa.debian.org/apt-team/apt; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; |