Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 136126ceaeb8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2274611acb59
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 10, 2019

  1. proot: 5.1.0.20181214 -> 5.1.0.20190305 

    proot-me/proot@11972c0...ff61c86
    @dtzWill
    dtzWill committed Mar 10, 2019
    Copy the full SHA
    cd14717 View commit details

  2. proot: cleanup (single version, make python optional, add maintainer)

    @dtzWill
    dtzWill committed Mar 10, 2019
    Copy the full SHA
    3e635ea View commit details

Commits on Mar 11, 2019

  1. Merge pull request #57195 from dtzWill/update/proot-5.1.0.20190305 

    proot: update, consolidate, python extension support
    @veprbl
    veprbl authored Mar 11, 2019
    Copy the full SHA
    2274611 View commit details
Showing with 17 additions and 29 deletions.
  1. +17 −29 pkgs/tools/system/proot/default.nix
46 changes: 17 additions & 29 deletions pkgs/tools/system/proot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,34 @@
{ stdenv, fetchFromGitHub, fetchpatch
, talloc, docutils }:
{ stdenv, fetchFromGitHub
, talloc, docutils, swig, python, coreutils, enablePython ? true }:

({ version, rev, sha256, patches }: stdenv.mkDerivation {
name = "proot-${version}";
inherit version;
stdenv.mkDerivation rec {
pname = "proot";
version = "5.1.0.20190305";

src = fetchFromGitHub {
inherit rev sha256;
repo = "proot";
owner = "proot-me";
rev = "ff61c86cb26f71c06af22574d9d4cc3a77292781";
sha256 = "0qink34bjv0lshf3c8997w39r8yxgbhxpjbxw47l5xkvimlpc0dl";
};

buildInputs = [ talloc ];
nativeBuildInputs = [ docutils ];
postPatch = ''
substituteInPlace src/GNUmakefile \
--replace /bin/echo ${coreutils}/bin/echo
'';

enableParallelBuilding = true;
buildInputs = [ talloc ] ++ stdenv.lib.optional enablePython python;
nativeBuildInputs = [ docutils ] ++ stdenv.lib.optional enablePython swig;

inherit patches;
enableParallelBuilding = true;

makeFlags = [ "-C src" ];

postBuild = ''
make -C doc proot/man.1
'';

installFlags = [ "PREFIX=$(out)" ];
installFlags = [ "PREFIX=${placeholder "out"}" ];

postInstall = ''
install -Dm644 doc/proot/man.1 $out/share/man/man1/proot.1
@@ -35,22 +39,6 @@
description = "User-space implementation of chroot, mount --bind and binfmt_misc";
platforms = platforms.linux;
license = licenses.gpl2;
maintainers = with maintainers; [ ianwookim makefu veprbl ];
maintainers = with maintainers; [ ianwookim makefu veprbl dtzWill ];
};
})
(if stdenv.isAarch64 then rec {
version = "5.1.0";
sha256 = "0azsqis99gxldmbcg43girch85ysg4hwzf0h1b44bmapnsm89fbz";
rev = "v${version}";
patches = [
(fetchpatch { # debian patch for aarch64 build
sha256 = "18milpzjkbfy5ab789ia3m4pyjyr9mfzbw6kbjhkj4vx9jc39svv";
url = "https://sources.debian.net/data/main/p/proot/5.1.0-1.2/debian/patches/arm64.patch";
})
];
} else {
version = "5.1.0.20181214";
sha256 = "07g1gfyjq7rypjdwxw495sk8k1y2i3y3nsm1rh9kgx3z47z28aah";
rev = "11972c0dab34e088c55c16a94d26c399ca7a26d8";
patches = [];
})
}