pyrox.dev
dpkg 1.16.9 -> 1.17.25
-15
pkgs/tools/package-management/dpkg/cache-arch.patch
-15
pkgs/tools/package-management/dpkg/cache-arch.patch
···
1
-
Don't invoke "dpkg --print-architecture" for every call to
2
-
Dpkg::Arch::get_raw_build_arch().
3
-
4
-
diff -ru -x '*~' dpkg-1.16.9/scripts/Dpkg/Arch.pm dpkg-1.16.9-new/scripts/Dpkg/Arch.pm
5
-
--- dpkg-1.16.9/scripts/Dpkg/Arch.pm 2012-10-20 06:34:17.000000000 +0200
6
-
+++ dpkg-1.16.9-new/scripts/Dpkg/Arch.pm 2012-12-04 19:42:20.451002537 +0100
7
-
@@ -59,7 +59,7 @@
8
-
# dpkg-architecture itself, by avoiding computing the DEB_BUILD_
9
-
# variables when they are not requested.
10
-
11
-
- my $build_arch = `dpkg --print-architecture`;
12
-
+ $build_arch = `dpkg --print-architecture`;
13
-
syserr("dpkg --print-architecture failed") if $? >> 8;
14
-
15
-
chomp $build_arch;
+14
-5
pkgs/tools/package-management/dpkg/default.nix
+14
-5
pkgs/tools/package-management/dpkg/default.nix
···
1
1
{ stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }:
2
2
3
-
let version = "1.16.9"; in
3
+
let version = "1.17.25"; in
4
4
5
5
stdenv.mkDerivation {
6
6
name = "dpkg-${version}";
7
7
8
8
src = fetchurl {
9
9
url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
10
-
sha256 = "0ykby9x4x2zb7rfj30lfjcsrq2q32z2lnsrl8pbdvb2l9sx7zkbk";
10
+
sha256 = "1akblsdfblih7879gi5qagqpgy6zz866kcyvg5y11ywqmqw9s087";
11
11
};
12
12
13
-
patches = [ ./cache-arch.patch ];
13
+
postPatch = ''
14
+
# dpkg tries to force some dependents like debian_devscripts to use
15
+
# -fstack-protector-strong - not (yet?) a good idea. Disable for now:
16
+
substituteInPlace scripts/Dpkg/Vendor/Debian.pm \
17
+
--replace "stackprotectorstrong => 1" "stackprotectorstrong => 0"
18
+
'';
14
19
15
20
configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg PERL_LIBDIR=$(out)/${perl.libPrefix}";
16
21
···
36
41
if head -n 1 $i | grep -q perl; then
37
42
wrapProgram $i --prefix PERL5LIB : $out/${perl.libPrefix}
38
43
fi
39
-
done # */
44
+
done
45
+
46
+
mkdir -p $out/etc/dpkg
47
+
cp -r scripts/t/origins $out/etc/dpkg
40
48
'';
41
49
42
50
meta = with stdenv.lib; {
43
51
description = "The Debian package manager";
44
52
homepage = http://wiki.debian.org/Teams/Dpkg;
53
+
license = with licenses; gpl2Plus;
45
54
platforms = platforms.linux;
46
-
maintainers = [ maintainers.mornfall ];
55
+
maintainers = with maintainers; [ mornfall nckx ];
47
56
};
48
57
}