Merge branch 'master' into unused5

2018-07-21 15:41:22 +01:00
parent cd6e2c9642 e85db6863a
commit 218298b30f
203 changed files with 1655 additions and 627 deletions
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...} @pkgs:
+{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...}:

 let
  i686    = pkgsi686Linux.callPackage ./vms.nix {};