diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index b727f2fb634..cba4d0561b0 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -103,8 +103,8 @@ command displays the complete list of available compilers: $ nix-env -f "" -qaP -A haskell.compiler haskell.compiler.ghc8101 ghc-8.10.1 haskell.compiler.integer-simple.ghc8101 ghc-8.10.1 -haskell.compiler.ghcHEAD ghc-8.11.20200403 -haskell.compiler.integer-simple.ghcHEAD ghc-8.11.20200403 +haskell.compiler.ghcHEAD ghc-8.11.20200505 +haskell.compiler.integer-simple.ghcHEAD ghc-8.11.20200505 haskell.compiler.ghc822Binary ghc-8.2.2-binary haskell.compiler.ghc844 ghc-8.4.4 haskell.compiler.ghc863Binary ghc-8.6.3-binary diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 426aad99b45..ed92fb88a1f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4019,12 +4019,6 @@ fingerprint = "8992 44FC D291 5CA2 0A97 802C 156C 88A5 B0A0 4B2A"; }]; }; - kjuvi = { - email = "quentin.vaucher@pm.me"; - github = "kjuvi"; - githubId = 17534323; - name = "Quentin Vaucher"; - }; kkallio = { email = "tierpluspluslists@gmail.com"; name = "Karn Kallio"; @@ -7688,12 +7682,24 @@ githubId = 7709; name = "Thomaz Leite"; }; + thomasdesr = { + email = "git@hive.pw"; + github = "thomasdesr"; + githubId = 681004; + name = "Thomas Desrosiers"; + }; ThomasMader = { email = "thomas.mader@gmail.com"; github = "ThomasMader"; githubId = 678511; name = "Thomas Mader"; }; + thomasjm = { + email = "tom@codedown.io"; + github = "thomasjm"; + githubId = 1634990; + name = "Tom McLaughlin"; + }; thoughtpolice = { email = "aseipp@pobox.com"; github = "thoughtpolice"; @@ -8349,6 +8355,12 @@ githubId = 1297598; name = "Konrad Borowski"; }; + xiorcale = { + email = "quentin.vaucher@pm.me"; + github = "xiorcale"; + githubId = 17534323; + name = "Quentin Vaucher"; + }; xnaveira = { email = "xnaveira@gmail.com"; github = "xnaveira"; diff --git a/nixos/lib/test-driver/log2html.xsl b/nixos/lib/test-driver/log2html.xsl deleted file mode 100644 index 0485412b4c8..00000000000 --- a/nixos/lib/test-driver/log2html.xsl +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - -