Merge remote-tracking branch 'origin/master' into staging-next

2021-10-15 23:10:08 +02:00
parent 5957e9f064 2a42aa9029
commit a415d5dd2e
137 changed files with 11072 additions and 1381 deletions
@@ -5,7 +5,6 @@
 , stdenv
 , zlib
 , xz
-, ncompress
 , gzip
 , bzip2
 , gnutar
@@ -45,7 +44,7 @@ buildPythonPackage rec {
    })
  ];

-  propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ]
+  propagatedBuildInputs = [ zlib xz gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ]
  ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ]
  ++ lib.optionals (!stdenv.isDarwin) [ cramfsprogs cramfsswap sasquatch ];