colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #62698 from dtzWill/update/fakechroot-2.20.1

Browse Source 
fakechroot: 2.19 -> 2.20.1, prefer patch and official source over "fork"
This commit is contained in:
Jaka Hudoklin 2019-07-13 21:40:56 +02:00 committed by GitHub
commit 1ad6989655
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/tools/system/fakechroot/default.nix
View File

@ -1,17 +1,28 @@
{ stdenv, fetchFromGitHub, autoreconfHook, perl }:
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, perl }:
stdenv.mkDerivation rec {
name = "fakechroot-${version}";
version = "2.19";
pname = "fakechroot";
version = "2.20.1";
# TODO: move back to mainline once https://github.com/dex4er/fakechroot/pull/46 is merged
src = fetchFromGitHub {
owner = "copumpkin";
repo = "fakechroot";
rev = "dcc0cfe3941e328538f9e62b2c0b15430d393ec1";
sha256 = "1ls3y97qqfcfd3z0balz94xq1gskfk04pg85x6b7wjw8dm4030qd";
owner = "dex4er";
repo = pname;
rev = version;
sha256 = "0xgnwazrmrg4gm30xjxdn6sx3lhqvxahrh6gmy3yfswxc30pmg86";
};
# Use patch from https://github.com/dex4er/fakechroot/pull/46 , remove once merged!
# Courtesy of one of our own, @copumpkin!
patches = [
(fetchpatch {
url = "https://github.com/dex4er/fakechroot/pull/46/commits/dcc0cfe3941e328538f9e62b2c0b15430d393ec1.patch";
sha256 = "1mk8j2njd94s7vf2wggi08xxxzx8dxrvdricl9cbspvkyp715w2m";
# Don't bother trying to reconcile conflicts for NEWS entries, as they will continue to occur
# and are uninteresting as well as unimportant for our purposes (since NEWS never leaves the build env).
excludes = [ "NEWS.md" ];
})
];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ perl ];