lol

Merge pull request #271462 from yaxitech/fakeroot_1.32.2

fakeroot: 1.29 -> 1.32.2

authored by

Martin Weinelt and committed by
GitHub
ebcc625c dc305bbc

+19 -11
+1
pkgs/development/perl-modules/Po4a/default.nix
··· 101 101 ./Build install 102 102 for f in $out/bin/*; do 103 103 substituteInPlace $f --replace "#! /usr/bin/env perl" "#!${perl}/bin/perl" 104 + substituteInPlace $f --replace "exec perl" "exec ${perl}/bin/perl" 104 105 done 105 106 ''; 106 107
+18 -11
pkgs/tools/system/fakeroot/default.nix
··· 1 1 { lib 2 2 , coreutils 3 3 , stdenv 4 - , fetchurl 4 + , fetchFromGitLab 5 5 , fetchpatch 6 6 , getopt 7 7 , libcap 8 8 , gnused 9 9 , nixosTests 10 10 , testers 11 + , autoreconfHook 12 + , po4a 11 13 }: 12 14 13 15 stdenv.mkDerivation (finalAttrs: { 14 - version = "1.29"; 16 + version = "1.32.2"; 15 17 pname = "fakeroot"; 16 18 17 - src = fetchurl { 18 - url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${finalAttrs.version}.orig.tar.gz"; 19 - sha256 = "sha256-j7uvt4DJFz46zkoEr7wdkA8zfzIWiDk59cfbNDG+fCA="; 19 + src = fetchFromGitLab { 20 + owner = "clint"; 21 + repo = "fakeroot"; 22 + rev = "upstream/${finalAttrs.version}"; 23 + domain = "salsa.debian.org"; 24 + hash = "sha256-j1qSMPNCtAxClqYqWkRNQmtxkitYi7g/9KtQ5XqcX3w="; 20 25 }; 21 26 22 27 patches = lib.optionals stdenv.isLinux [ 23 28 ./einval.patch 24 - (fetchpatch { 25 - name = "also-wrap-stat-library-call.patch"; 26 - url = "https://sources.debian.org/data/main/f/fakeroot/1.29-1/debian/patches/also-wrap-stat-library-call.patch"; 27 - sha256 = "0p7lq6m31k3rqsnjbi06a8ykdqa3cp4y5ngsjyk3q1269gx59x8b"; 28 - }) 29 29 30 30 # patches needed for musl libc, borrowed from alpine packaging. 31 31 # it is applied regardless of the environment to prevent patchrot ··· 41 41 }) 42 42 ]; 43 43 44 + nativeBuildInputs = [ autoreconfHook po4a ]; 44 45 buildInputs = lib.optional (!stdenv.isDarwin) libcap; 45 46 46 47 postUnpack = '' ··· 50 51 -e 's@kill@${coreutils}/bin/kill@g' \ 51 52 -e 's@/bin/ls@${coreutils}/bin/ls@g' \ 52 53 -e 's@cut@${coreutils}/bin/cut@g' \ 53 - fakeroot-${finalAttrs.version}/scripts/fakeroot.in 54 + source/scripts/fakeroot.in 55 + ''; 56 + 57 + postConfigure = '' 58 + pushd doc 59 + po4a -k 0 --variable "srcdir=../doc/" po4a/po4a.cfg 60 + popd 54 61 ''; 55 62 56 63 passthru = {