Merge branch 'staging-next' into staging

2021-04-06 16:25:41 +02:00
parent 52cd3538ff c04a14edd6
commit 70babe5bcf
485 changed files with 4663 additions and 2031 deletions
@@ -9,7 +9,7 @@
 , rWrapper
 , rPackages
 , pcre
-, lzma
+, xz
 , bzip2
 , zlib
 , icu
@@ -35,7 +35,7 @@ buildPythonPackage rec {
      readline
      R
      pcre
-      lzma
+      xz
      bzip2
      zlib
      icu
@@ -7,7 +7,7 @@
 , rWrapper
 , rPackages
 , pcre
-, lzma
+, xz
 , bzip2
 , zlib
 , icu
@@ -46,7 +46,7 @@ buildPythonPackage rec {

    buildInputs = [
      pcre
-      lzma
+      xz
      bzip2
      zlib
      icu