Fix AArch64 materialized nix files for bootstrap (#1210)

See #1207
This commit is contained in:
Hamish Mackenzie 2021-08-24 18:36:02 +12:00 committed by GitHub
parent 5a9ef26537
commit e4e860cf11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 111 additions and 55 deletions

View File

@ -150,7 +150,7 @@
(hsPkgs."process" or (errorHandler.buildDepError "process"))
];
build-tools = [
(hsPkgs.buildPackages.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex")))
(hsPkgs.buildPackages.alex.components.exes.alex or (pkgs.buildPackages.alex or (errorHandler.buildToolDepError "alex:alex")))
];
buildable = true;
mainPath = [ "test.hs" ];

View File

@ -3,36 +3,36 @@
{
packages = {
"ghc-prim".revision = (((hackage."ghc-prim")."0.5.3").revisions).default;
"unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
"rts".revision = (((hackage."rts")."1.0").revisions).default;
"deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;
"directory".revision = (((hackage."directory")."1.3.4.0").revisions).default;
"containers".revision = (((hackage."containers")."0.6.2.1").revisions).default;
"bytestring".revision = (((hackage."bytestring")."0.10.10.0").revisions).default;
"base".revision = (((hackage."base")."4.13.0.0").revisions).default;
"time".revision = (((hackage."time")."1.9.3").revisions).default;
"filepath".revision = (((hackage."filepath")."1.4.2.1").revisions).default;
"process".revision = (((hackage."process")."1.6.7.0").revisions).default;
"array".revision = (((hackage."array")."0.5.4.0").revisions).default;
"integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
"process".revision = (((hackage."process")."1.6.7.0").revisions).default;
"base".revision = (((hackage."base")."4.13.0.0").revisions).default;
"rts".revision = (((hackage."rts")."1.0").revisions).default;
"time".revision = (((hackage."time")."1.9.3").revisions).default;
"unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
"bytestring".revision = (((hackage."bytestring")."0.10.10.0").revisions).default;
"containers".revision = (((hackage."containers")."0.6.2.1").revisions).default;
"directory".revision = (((hackage."directory")."1.3.4.0").revisions).default;
"filepath".revision = (((hackage."filepath")."1.4.2.1").revisions).default;
"deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;
};
compiler = {
version = "8.8.2";
nix-name = "ghc882";
packages = {
"ghc-prim" = "0.5.3";
"unix" = "2.7.2.2";
"rts" = "1.0";
"deepseq" = "1.4.4.0";
"directory" = "1.3.4.0";
"containers" = "0.6.2.1";
"bytestring" = "0.10.10.0";
"base" = "4.13.0.0";
"time" = "1.9.3";
"filepath" = "1.4.2.1";
"process" = "1.6.7.0";
"array" = "0.5.4.0";
"integer-gmp" = "1.0.2.0";
"process" = "1.6.7.0";
"base" = "4.13.0.0";
"rts" = "1.0";
"time" = "1.9.3";
"unix" = "2.7.2.2";
"bytestring" = "0.10.10.0";
"containers" = "0.6.2.1";
"directory" = "1.3.4.0";
"filepath" = "1.4.2.1";
"deepseq" = "1.4.4.0";
};
};
};
@ -45,5 +45,25 @@
"alex" = { flags = { "small_base" = lib.mkOverride 900 true; }; };
};
})
({ lib, ... }:
{
packages = {
"containers".components.library.planned = lib.mkOverride 900 true;
"ghc-prim".components.library.planned = lib.mkOverride 900 true;
"process".components.library.planned = lib.mkOverride 900 true;
"integer-gmp".components.library.planned = lib.mkOverride 900 true;
"array".components.library.planned = lib.mkOverride 900 true;
"bytestring".components.library.planned = lib.mkOverride 900 true;
"unix".components.library.planned = lib.mkOverride 900 true;
"alex".components.exes."alex".planned = lib.mkOverride 900 true;
"base".components.library.planned = lib.mkOverride 900 true;
"rts".components.library.planned = lib.mkOverride 900 true;
"time".components.library.planned = lib.mkOverride 900 true;
"deepseq".components.library.planned = lib.mkOverride 900 true;
"filepath".components.library.planned = lib.mkOverride 900 true;
"directory".components.library.planned = lib.mkOverride 900 true;
"alex".components.tests."tests".planned = lib.mkOverride 900 true;
};
})
];
}

View File

@ -190,7 +190,7 @@
(hsPkgs."process" or (errorHandler.buildDepError "process"))
];
build-tools = [
(hsPkgs.buildPackages.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy")))
(hsPkgs.buildPackages.happy.components.exes.happy or (pkgs.buildPackages.happy or (errorHandler.buildToolDepError "happy:happy")))
];
buildable = true;
mainPath = [ "test.hs" ];

View File

@ -3,40 +3,40 @@
{
packages = {
"ghc-prim".revision = (((hackage."ghc-prim")."0.5.3").revisions).default;
"unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
"mtl".revision = (((hackage."mtl")."2.2.2").revisions).default;
"rts".revision = (((hackage."rts")."1.0").revisions).default;
"deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;
"directory".revision = (((hackage."directory")."1.3.4.0").revisions).default;
"containers".revision = (((hackage."containers")."0.6.2.1").revisions).default;
"bytestring".revision = (((hackage."bytestring")."0.10.10.0").revisions).default;
"base".revision = (((hackage."base")."4.13.0.0").revisions).default;
"time".revision = (((hackage."time")."1.9.3").revisions).default;
"transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
"filepath".revision = (((hackage."filepath")."1.4.2.1").revisions).default;
"process".revision = (((hackage."process")."1.6.7.0").revisions).default;
"array".revision = (((hackage."array")."0.5.4.0").revisions).default;
"integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
"process".revision = (((hackage."process")."1.6.7.0").revisions).default;
"base".revision = (((hackage."base")."4.13.0.0").revisions).default;
"rts".revision = (((hackage."rts")."1.0").revisions).default;
"mtl".revision = (((hackage."mtl")."2.2.2").revisions).default;
"time".revision = (((hackage."time")."1.9.3").revisions).default;
"unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
"bytestring".revision = (((hackage."bytestring")."0.10.10.0").revisions).default;
"containers".revision = (((hackage."containers")."0.6.2.1").revisions).default;
"directory".revision = (((hackage."directory")."1.3.4.0").revisions).default;
"filepath".revision = (((hackage."filepath")."1.4.2.1").revisions).default;
"deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;
"transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
};
compiler = {
version = "8.8.2";
nix-name = "ghc882";
packages = {
"ghc-prim" = "0.5.3";
"unix" = "2.7.2.2";
"mtl" = "2.2.2";
"rts" = "1.0";
"deepseq" = "1.4.4.0";
"directory" = "1.3.4.0";
"containers" = "0.6.2.1";
"bytestring" = "0.10.10.0";
"base" = "4.13.0.0";
"time" = "1.9.3";
"transformers" = "0.5.6.2";
"filepath" = "1.4.2.1";
"process" = "1.6.7.0";
"array" = "0.5.4.0";
"integer-gmp" = "1.0.2.0";
"process" = "1.6.7.0";
"base" = "4.13.0.0";
"rts" = "1.0";
"mtl" = "2.2.2";
"time" = "1.9.3";
"unix" = "2.7.2.2";
"bytestring" = "0.10.10.0";
"containers" = "0.6.2.1";
"directory" = "1.3.4.0";
"filepath" = "1.4.2.1";
"deepseq" = "1.4.4.0";
"transformers" = "0.5.6.2";
};
};
};
@ -49,5 +49,27 @@
"happy" = { flags = { "small_base" = lib.mkOverride 900 true; }; };
};
})
({ lib, ... }:
{
packages = {
"containers".components.library.planned = lib.mkOverride 900 true;
"ghc-prim".components.library.planned = lib.mkOverride 900 true;
"happy".components.exes."happy".planned = lib.mkOverride 900 true;
"transformers".components.library.planned = lib.mkOverride 900 true;
"process".components.library.planned = lib.mkOverride 900 true;
"integer-gmp".components.library.planned = lib.mkOverride 900 true;
"array".components.library.planned = lib.mkOverride 900 true;
"bytestring".components.library.planned = lib.mkOverride 900 true;
"unix".components.library.planned = lib.mkOverride 900 true;
"base".components.library.planned = lib.mkOverride 900 true;
"rts".components.library.planned = lib.mkOverride 900 true;
"mtl".components.library.planned = lib.mkOverride 900 true;
"time".components.library.planned = lib.mkOverride 900 true;
"deepseq".components.library.planned = lib.mkOverride 900 true;
"filepath".components.library.planned = lib.mkOverride 900 true;
"happy".components.tests."tests".planned = lib.mkOverride 900 true;
"directory".components.library.planned = lib.mkOverride 900 true;
};
})
];
}

View File

@ -24,7 +24,7 @@
isLocal = true;
detailLevel = "FullDetails";
licenseFiles = [ "LICENCE-LGPL" ];
dataDir = "";
dataDir = ".";
dataFiles = [ "hscolour.css" "data/rgb24-example-.hscolour" ];
extraSrcFiles = [];
extraTmpFiles = [];

View File

@ -3,24 +3,24 @@
{
packages = {
"ghc-prim".revision = (((hackage."ghc-prim")."0.5.3").revisions).default;
"rts".revision = (((hackage."rts")."1.0").revisions).default;
"deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;
"containers".revision = (((hackage."containers")."0.6.2.1").revisions).default;
"base".revision = (((hackage."base")."4.13.0.0").revisions).default;
"array".revision = (((hackage."array")."0.5.4.0").revisions).default;
"integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
"base".revision = (((hackage."base")."4.13.0.0").revisions).default;
"rts".revision = (((hackage."rts")."1.0").revisions).default;
"containers".revision = (((hackage."containers")."0.6.2.1").revisions).default;
"deepseq".revision = (((hackage."deepseq")."1.4.4.0").revisions).default;
};
compiler = {
version = "8.8.2";
nix-name = "ghc882";
packages = {
"ghc-prim" = "0.5.3";
"rts" = "1.0";
"deepseq" = "1.4.4.0";
"containers" = "0.6.2.1";
"base" = "4.13.0.0";
"array" = "0.5.4.0";
"integer-gmp" = "1.0.2.0";
"base" = "4.13.0.0";
"rts" = "1.0";
"containers" = "0.6.2.1";
"deepseq" = "1.4.4.0";
};
};
};
@ -29,5 +29,19 @@
modules = [
({ lib, ... }:
{ packages = { "hscolour" = { flags = {}; }; }; })
({ lib, ... }:
{
packages = {
"containers".components.library.planned = lib.mkOverride 900 true;
"ghc-prim".components.library.planned = lib.mkOverride 900 true;
"hscolour".components.exes."HsColour".planned = lib.mkOverride 900 true;
"hscolour".components.library.planned = lib.mkOverride 900 true;
"integer-gmp".components.library.planned = lib.mkOverride 900 true;
"array".components.library.planned = lib.mkOverride 900 true;
"base".components.library.planned = lib.mkOverride 900 true;
"rts".components.library.planned = lib.mkOverride 900 true;
"deepseq".components.library.planned = lib.mkOverride 900 true;
};
})
];
}