From fc3f1aa6793cc3493c244100f542ec5f15da442a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 11 Dec 2021 11:57:47 +0100
Subject: [PATCH] dpkg: switch to ubuntu version
The ubuntu version now supports zstd compression, which was not yet
added to upstream. This is a problem when we want to unpack newer
archives from ubuntu because they switched to zstd by default.
Upstream discussions:
https://www.mail-archive.com/debian-dpkg-bugs@lists.debian.org/msg18552.html
---
pkgs/tools/package-management/dpkg/default.nix | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index a4e9ef41fc96..ad55c6b88b47 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }:
+{ lib, stdenv, fetchurl, perl, zlib, bzip2, xz, zstd
+, makeWrapper, coreutils, autoreconfHook, pkg-config
+}:
stdenv.mkDerivation rec {
pname = "dpkg";
- version = "1.20.9";
+ version = "1.20.9ubuntu2";
src = fetchurl {
- url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
- sha256 = "sha256-XOJCgw8hO1Yg8I5sQYOtse9Nydoo0xmIonyHxx/lNM4=";
+ url = "mirror://ubuntu/pool/main/d/dpkg/dpkg_${version}.tar.xz";
+ sha256 = "sha256-BuCofGpi9R0cyhvkZqu9IxupqZvZhbE2J/B4wgUqMQw=";
};
configureFlags = [
@@ -17,6 +19,8 @@ stdenv.mkDerivation rec {
(lib.optionalString stdenv.isDarwin "--disable-start-stop-daemon")
];
+ enableParallelBuilding = true;
+
preConfigure = ''
# Nice: dpkg has a circular dependency on itself. Its configure
# script calls scripts/dpkg-architecture, which calls "dpkg" in
@@ -49,8 +53,8 @@ stdenv.mkDerivation rec {
--replace '"diff"' \"${coreutils}/bin/diff\"
'';
- buildInputs = [ perl zlib bzip2 xz ];
- nativeBuildInputs = [ makeWrapper perl ];
+ buildInputs = [ perl zlib bzip2 xz zstd ];
+ nativeBuildInputs = [ makeWrapper perl autoreconfHook pkg-config ];
postInstall =
''