Skip to content

Commit

Permalink
apt: 1.4.6 -> 1.8.4
Browse files Browse the repository at this point in the history
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
  • Loading branch information
georgyo authored and c0bw3b committed Nov 17, 2019
1 parent e1e381f commit 6c45ecf
Showing 1 changed file with 18 additions and 19 deletions.
37 changes: 18 additions & 19 deletions pkgs/tools/package-management/apt/default.nix
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 ];
Expand Down

0 comments on commit 6c45ecf

Please sign in to comment.