Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2019-06-18 11:07:56 +02:00
928 changed files with 2418 additions and 2149 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
{ pkgs, stdenv, libarchive, patchelf, zlib, buildFHSUserEnv, writeScript }:
{ stdenv, libarchive, patchelf, zlib, buildFHSUserEnv, writeScript }:
rec {
# Both extraction functions could be unified, but then