Unverified Commit 0f4fcf2a authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #267518 from seirl/patool_update_1_15 

patool: 1.12 -> 2.0.0
parents df81f74e 4b31fbec

pkgs/development/python-modules/patool/default.nix

+4 −20
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
, lzip

, zpaq

, gnutar

, unar  # Free alternative to unrar

, gnugrep

, diffutils

, file
@@ -17,13 +18,11 @@ 
, xz

}:



# unrar is unfree, as well as 7z with unrar support, not including it (patool doesn't support unar)

# it will still use unrar if present in the path



let

  compression-utilities = [

    p7zip

    gnutar

    unar

    cabextract

    zip

    lzip
@@ -38,7 +37,7 @@ let 
in

buildPythonPackage rec {

  pname = "patool";

  version = "1.12";

  version = "2.0.0";

  format = "setuptools";



  #pypi doesn't have test data
@@ -46,24 +45,9 @@ buildPythonPackage rec { 
    owner = "wummel";

    repo = pname;

    rev = "upstream/${version}";

    hash = "sha256-Xv4aCUnLi+b1T29tuKRADTIWwK2dO8iDP/D7UfU5mWw=";

    hash = "sha256-Hjpifsi5Q1eoe/MFWuQBDyjoXi/aUG4VN84yNMkAZaE=";

  };



  patches = [

    # https://github.com/wummel/patool/pull/63

    (fetchpatch {

      name = "apk-sometimes-has-mime-jar.patch";

      url = "https://github.com/wummel/patool/commit/a9f3ee3d639a1065be024001e89c0b153511b16b.patch";

      hash = "sha256-a4aWqHHc/cBs5T2QKZ08ky1K1tqKZEgqVmTmV11aTVE=";

    })

    # https://github.com/wummel/patool/pull/130

    (fetchpatch {

      name = "apk-sometimes-has-mime-android-package.patch";

      url = "https://github.com/wummel/patool/commit/e8a1eea1d273b278a1b6f5029d2e21cb18bc9ffd.patch";

      hash = "sha256-AVooVdU4FNIixUfwyrn39N2SDFHNs4CUYzS5Eey+DrU=";

    })

  ];



  postPatch = ''

    substituteInPlace patoolib/util.py \

      --replace "path = None" 'path = os.environ["PATH"] + ":${lib.makeBinPath compression-utilities}"'