Merge remote-tracking branch 'upstream/master' into circuithub

Author: TeofilC

ci.nix

@@ -86,7 +86,7 @@
     inherit (lib.systems.examples) ghcjs;
   } // lib.optionalAttrs (
          (__match ".*llvm" compiler-nix-name == null)
-      && ((system == "x86_64-linux"  && !builtins.elem compiler-nix-name ["ghc884"])
+      && ((system == "x86_64-linux"  && !builtins.elem compiler-nix-name ["ghc884" "ghc91120240620"]) # Including GHC HEAD here because the patches for rts/RtsSymbols.c no longer apply and mingwW64 GHC build fails without them
        || (system == "x86_64-darwin" && builtins.elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
     inherit (lib.systems.examples) mingwW64;
   } // lib.optionalAttrs (nixpkgsName == "unstable"

flake.lock

@@ -14,14 +14,6 @@
     # And later it breaks in th-dll due to some change in the windows libs. We should probably
     # drop unsable.
     nixpkgs-unstable = { url = "github:NixOS/nixpkgs?rev=47585496bcb13fb72e4a90daeea2f434e2501998"; }; # nixpkgs-unstable };
-    ghc910X = {
-      flake = false;
-      url = "git+https://gitlab.haskell.org/ghc/ghc?ref=ghc-9.10&submodules=1";
-    };
-    ghc911 = {
-      flake = false;
-      url = "git+https://gitlab.haskell.org/ghc/ghc?submodules=1";
-    };
     flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
     "hls-1.10" = { url = "github:haskell/haskell-language-server/1.10.0.0"; flake = false; };
     "hls-2.0" = { url = "github:haskell/haskell-language-server/2.0.0.1"; flake = false; };

flake.nix

@@ -0,0 +1,36 @@
+final: prev:
+let
+  callFlake = import prev.haskell-nix.sources.flake-compat;
+in {
+  haskell-nix = prev.haskell-nix // {
+    sources = prev.haskell-nix.sources // {
+      inherit ((callFlake { pkgs = final; src = ./ghc8107; }).defaultNix) ghc8107;
+      inherit ((callFlake { pkgs = final; src = ./ghc901; }).defaultNix) ghc901;
+      inherit ((callFlake { pkgs = final; src = ./ghc902; }).defaultNix) ghc902;
+      inherit ((callFlake { pkgs = final; src = ./ghc921; }).defaultNix) ghc921;
+      inherit ((callFlake { pkgs = final; src = ./ghc922; }).defaultNix) ghc922;
+      inherit ((callFlake { pkgs = final; src = ./ghc923; }).defaultNix) ghc923;
+      inherit ((callFlake { pkgs = final; src = ./ghc924; }).defaultNix) ghc924;
+      inherit ((callFlake { pkgs = final; src = ./ghc925; }).defaultNix) ghc925;
+      inherit ((callFlake { pkgs = final; src = ./ghc926; }).defaultNix) ghc926;
+      inherit ((callFlake { pkgs = final; src = ./ghc927; }).defaultNix) ghc927;
+      inherit ((callFlake { pkgs = final; src = ./ghc928; }).defaultNix) ghc928;
+      inherit ((callFlake { pkgs = final; src = ./ghc941; }).defaultNix) ghc941;
+      inherit ((callFlake { pkgs = final; src = ./ghc942; }).defaultNix) ghc942;
+      inherit ((callFlake { pkgs = final; src = ./ghc943; }).defaultNix) ghc943;
+      inherit ((callFlake { pkgs = final; src = ./ghc944; }).defaultNix) ghc944;
+      inherit ((callFlake { pkgs = final; src = ./ghc945; }).defaultNix) ghc945;
+      inherit ((callFlake { pkgs = final; src = ./ghc946; }).defaultNix) ghc946;
+      inherit ((callFlake { pkgs = final; src = ./ghc947; }).defaultNix) ghc947;
+      inherit ((callFlake { pkgs = final; src = ./ghc948; }).defaultNix) ghc948;
+      inherit ((callFlake { pkgs = final; src = ./ghc961; }).defaultNix) ghc961;
+      inherit ((callFlake { pkgs = final; src = ./ghc962; }).defaultNix) ghc962;
+      inherit ((callFlake { pkgs = final; src = ./ghc963; }).defaultNix) ghc963;
+      inherit ((callFlake { pkgs = final; src = ./ghc964; }).defaultNix) ghc964;
+      inherit ((callFlake { pkgs = final; src = ./ghc965; }).defaultNix) ghc965;
+      inherit ((callFlake { pkgs = final; src = ./ghc981; }).defaultNix) ghc981;
+      inherit ((callFlake { pkgs = final; src = ./ghc982; }).defaultNix) ghc982;
+      inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
+    };
+  };
+}

lazy-inputs/default.nix

@@ -0,0 +1,12 @@
+{
+  description = "Lazy Input for Haskell.nix";
+
+  inputs = {
+    ghc8107 = {
+      flake = false;
+      url = "git+https://github.com/stable-haskell/ghc?ref=ghc-8.10.7-iog&submodules=1";
+    };
+  };
+
+  outputs = inputs: inputs;
+}

lazy-inputs/ghc8107/flake.lock

@@ -0,0 +1,12 @@
+{
+  description = "Lazy Input for Haskell.nix";
+
+  inputs = {
+    ghc901 = {
+      flake = false;
+      url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.0.1-iog&submodules=1";
+    };
+  };
+
+  outputs = inputs: inputs;
+}

lazy-inputs/ghc8107/flake.nix

@@ -0,0 +1,12 @@
+{
+  description = "Lazy Input for Haskell.nix";
+
+  inputs = {
+    ghc902 = {
+      flake = false;
+      url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.0.2-iog&submodules=1";
+    };
+  };
+
+  outputs = inputs: inputs;
+}

lazy-inputs/ghc901/flake.lock

@@ -0,0 +1,12 @@
+{
+  description = "Lazy Input for Haskell.nix";
+
+  inputs = {
+    ghc9101 = {
+      flake = false;
+      url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.10.1-iog&submodules=1";
+    };
+  };
+
+  outputs = inputs: inputs;
+}

lazy-inputs/ghc901/flake.nix

@@ -0,0 +1,12 @@
+{
+  description = "Lazy Input for Haskell.nix";
+
+  inputs = {
+    ghc911 = {
+      flake = false;
+      url = "git+https://gitlab.haskell.org/ghc/ghc?submodules=1";
+    };
+  };
+
+  outputs = inputs: inputs;
+}