diff options
| author | Will Dietz <w@wdtz.org> | 2022-02-01 21:12:06 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-01 22:12:06 -0500 |
| commit | b17c1821d1c21632606fdea8165b6114a5404a42 (patch) | |
| tree | 5cde372afcac7101bc56f02fdc3cf657c45b6087 /pkgs/tools/system | |
| parent | c613c25b22ced15a357e3982e5fb12d511b8228e (diff) | |
| download | nixpkgs-b17c1821d1c21632606fdea8165b6114a5404a42.tar nixpkgs-b17c1821d1c21632606fdea8165b6114a5404a42.tar.gz nixpkgs-b17c1821d1c21632606fdea8165b6114a5404a42.tar.bz2 nixpkgs-b17c1821d1c21632606fdea8165b6114a5404a42.tar.lz nixpkgs-b17c1821d1c21632606fdea8165b6114a5404a42.tar.xz nixpkgs-b17c1821d1c21632606fdea8165b6114a5404a42.tar.zst nixpkgs-b17c1821d1c21632606fdea8165b6114a5404a42.zip | |
proot: 5.2.0 -> 5.3.0 (#157582)
https://github.com/proot-me/proot/releases/tag/v5.3.0 Drop python patch, PR was merged.
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/proot/default.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index cf5a845827f..d11cd8382c9 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , talloc , pkg-config , libarchive @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "proot"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { repo = "proot"; owner = "proot-me"; rev = "v${version}"; - sha256 = "1ir3a7rp9rvpv9i8gjrkr383sqadgl7f9nflcrfg7q05bxapwiws"; + sha256 = "sha256-89d1a5QBusra0vd3Ph0lQalXrblBwogi6bNgvvpQL+Q="; }; postPatch = '' @@ -26,13 +26,6 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libarchive talloc ] ++ lib.optional enablePython python3; nativeBuildInputs = [ pkg-config docutils ] ++ lib.optional enablePython swig; - patches = [ - # without this patch the package does not build with python>3.7 - (fetchpatch { - url = "https://github.com/proot-me/proot/pull/285.patch"; - sha256= "1vncq36pr4v0h63fijga6zrwlsb0vb4pj25zxf1ni15ndxv63pxj"; - }) - ]; enableParallelBuilding = true; |