[Git][ghc/ghc][wip/ghc-9.10.2-submodules] 15 commits: gitlab-ci: Bump aarch64-darwin boostrap compiler to 9.6.4
Ben Gamari (@bgamari)
gitlab at gitlab.haskell.org
Fri Jan 31 14:20:51 UTC 2025
Ben Gamari pushed to branch wip/ghc-9.10.2-submodules at Glasgow Haskell Compiler / GHC
Commits:
209ba1f7 by Ben Gamari at 2025-01-31T09:20:26-05:00
gitlab-ci: Bump aarch64-darwin boostrap compiler to 9.6.4
Bringing it into alignment with the other platforms.
- - - - -
c5ca2145 by Ben Gamari at 2025-01-31T09:20:26-05:00
Cabal: Bump to 3.12.1.0
- - - - -
15b69820 by Ben Gamari at 2025-01-31T09:20:26-05:00
bytestring: Bump to 0.12.2.0
- - - - -
5cca5010 by Ben Gamari at 2025-01-31T09:20:26-05:00
binary: Bump to 0.8.9.3
- - - - -
35b0d21d by Ben Gamari at 2025-01-31T09:20:26-05:00
array: Bump to 0.5.8.0
- - - - -
4c6ac1db by Ben Gamari at 2025-01-31T09:20:26-05:00
filepath: Bump to 1.5.4.0
- - - - -
8c168a25 by Ben Gamari at 2025-01-31T09:20:26-05:00
hpc: Bump to 0.7.0.2
- - - - -
d5de9bfc by Ben Gamari at 2025-01-31T09:20:26-05:00
parsec: Bump to 3.1.18.0
- - - - -
6eaba44c by Ben Gamari at 2025-01-31T09:20:26-05:00
process: Bump to 1.6.25.0
- - - - -
745ee93f by Ben Gamari at 2025-01-31T09:20:26-05:00
terminfo: Bump to 0.4.1.7
- - - - -
943600a8 by Ben Gamari at 2025-01-31T09:20:26-05:00
text: Bump to 2.1.2
- - - - -
a3ec2f52 by Ben Gamari at 2025-01-31T09:20:26-05:00
unix: Bump to 2.8.6.0
- - - - -
f9488fa7 by Ben Gamari at 2025-01-31T09:20:26-05:00
exceptions: Bump to 0.10.9
- - - - -
9a87525e by Ben Gamari at 2025-01-31T09:20:26-05:00
Win32: Bump to 2.14.1.0
- - - - -
d91e20b1 by Ben Gamari at 2025-01-31T09:20:26-05:00
directory: Bump to 1.3.8.5
- - - - -
18 changed files:
- .gitlab/darwin/nix/sources.json
- .gitlab/darwin/nix/sources.nix
- .gitlab/darwin/toolchain.nix
- hadrian/src/Settings/Warnings.hs
- libraries/Cabal
- libraries/Win32
- libraries/array
- libraries/binary
- libraries/bytestring
- libraries/directory
- libraries/exceptions
- libraries/filepath
- libraries/hpc
- libraries/parsec
- libraries/process
- libraries/terminfo
- libraries/text
- libraries/unix
Changes:
=====================================
.gitlab/darwin/nix/sources.json
=====================================
@@ -5,10 +5,10 @@
"homepage": "https://github.com/nmattia/niv",
"owner": "nmattia",
"repo": "niv",
- "rev": "e0ca65c81a2d7a4d82a189f1e23a48d59ad42070",
- "sha256": "1pq9nh1d8nn3xvbdny8fafzw87mj7gsmp6pxkdl65w2g18rmcmzx",
+ "rev": "e2f66fe558481d6b569358d27db06f7e972ed71b",
+ "sha256": "1xn822jajags6bigdr1ssxvfiyd7d3adhnmmrr9x3maphchkr0x0",
"type": "tarball",
- "url": "https://github.com/nmattia/niv/archive/e0ca65c81a2d7a4d82a189f1e23a48d59ad42070.tar.gz",
+ "url": "https://github.com/nmattia/niv/archive/e2f66fe558481d6b569358d27db06f7e972ed71b.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
@@ -17,10 +17,10 @@
"homepage": "",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
- "sha256": "1v9sy2i2dy3qksx4mf81gwzfl0jzpqccfkzq7fjxgq832f9d255i",
+ "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
+ "sha256": "0bjqgsprq9fgl5yh58dk59xmchi4dajq3sf5i447q02dbiasjsil",
"type": "tarball",
- "url": "https://github.com/nixos/nixpkgs/archive/73de017ef2d18a04ac4bfd0c02650007ccb31c2a.tar.gz",
+ "url": "https://github.com/nixos/nixpkgs/archive/9d3ae807ebd2981d593cddd0080856873139aa40.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
=====================================
.gitlab/darwin/nix/sources.nix
=====================================
@@ -10,29 +10,50 @@ let
let
name' = sanitizeName name + "-src";
in
- if spec.builtin or true then
- builtins_fetchurl { inherit (spec) url sha256; name = name'; }
- else
- pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
+ if spec.builtin or true then
+ builtins_fetchurl { inherit (spec) url sha256; name = name'; }
+ else
+ pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
fetch_tarball = pkgs: name: spec:
let
name' = sanitizeName name + "-src";
in
- if spec.builtin or true then
- builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
- else
- pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
+ if spec.builtin or true then
+ builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
+ else
+ pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
fetch_git = name: spec:
let
ref =
- if spec ? ref then spec.ref else
+ spec.ref or (
if spec ? branch then "refs/heads/${spec.branch}" else
- if spec ? tag then "refs/tags/${spec.tag}" else
- abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
+ if spec ? tag then "refs/tags/${spec.tag}" else
+ abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"
+ );
+ submodules = spec.submodules or false;
+ submoduleArg =
+ let
+ nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
+ emptyArgWithWarning =
+ if submodules
+ then
+ builtins.trace
+ (
+ "The niv input \"${name}\" uses submodules "
+ + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
+ + "does not support them"
+ )
+ { }
+ else { };
+ in
+ if nixSupportsSubmodules
+ then { inherit submodules; }
+ else emptyArgWithWarning;
in
- builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
+ builtins.fetchGit
+ ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
fetch_local = spec: spec.path;
@@ -66,16 +87,16 @@ let
hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
hasThisAsNixpkgsPath = <nixpkgs> == ./.;
in
- if builtins.hasAttr "nixpkgs" sources
- then sourcesNixpkgs
- else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
- import <nixpkgs> {}
- else
- abort
- ''
- Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
- add a package called "nixpkgs" to your sources.json.
- '';
+ if builtins.hasAttr "nixpkgs" sources
+ then sourcesNixpkgs
+ else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
+ import <nixpkgs> { }
+ else
+ abort
+ ''
+ Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
+ add a package called "nixpkgs" to your sources.json.
+ '';
# The actual fetching function.
fetch = pkgs: name: spec:
@@ -95,13 +116,13 @@ let
# the path directly as opposed to the fetched source.
replace = name: drv:
let
- saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
+ saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name;
ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
in
- if ersatz == "" then drv else
- # this turns the string into an actual Nix path (for both absolute and
- # relative paths)
- if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
+ if ersatz == "" then drv else
+ # this turns the string into an actual Nix path (for both absolute and
+ # relative paths)
+ if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
# Ports of functions for older nix versions
@@ -112,7 +133,7 @@ let
);
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
- range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
+ range = first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1);
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
@@ -123,43 +144,46 @@ let
concatStrings = builtins.concatStringsSep "";
# https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
- optionalAttrs = cond: as: if cond then as else {};
+ optionalAttrs = cond: as: if cond then as else { };
# fetchTarball version that is compatible between all the versions of Nix
builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
let
inherit (builtins) lessThan nixVersion fetchTarball;
in
- if lessThan nixVersion "1.12" then
- fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
- else
- fetchTarball attrs;
+ if lessThan nixVersion "1.12" then
+ fetchTarball ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
+ else
+ fetchTarball attrs;
# fetchurl version that is compatible between all the versions of Nix
builtins_fetchurl = { url, name ? null, sha256 }@attrs:
let
inherit (builtins) lessThan nixVersion fetchurl;
in
- if lessThan nixVersion "1.12" then
- fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
- else
- fetchurl attrs;
+ if lessThan nixVersion "1.12" then
+ fetchurl ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
+ else
+ fetchurl attrs;
# Create the final "sources" from the config
mkSources = config:
- mapAttrs (
- name: spec:
- if builtins.hasAttr "outPath" spec
- then abort
- "The values in sources.json should not have an 'outPath' attribute"
- else
- spec // { outPath = replace name (fetch config.pkgs name spec); }
- ) config.sources;
+ mapAttrs
+ (
+ name: spec:
+ if builtins.hasAttr "outPath" spec
+ then
+ abort
+ "The values in sources.json should not have an 'outPath' attribute"
+ else
+ spec // { outPath = replace name (fetch config.pkgs name spec); }
+ )
+ config.sources;
# The "config" used by the fetchers
mkConfig =
{ sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
- , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
+ , sources ? if sourcesFile == null then { } else builtins.fromJSON (builtins.readFile sourcesFile)
, system ? builtins.currentSystem
, pkgs ? mkPkgs sources system
}: rec {
@@ -171,4 +195,4 @@ let
};
in
-mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
+mkSources (mkConfig { }) // { __functor = _: settings: mkSources (mkConfig settings); }
=====================================
.gitlab/darwin/toolchain.nix
=====================================
@@ -26,8 +26,7 @@ let
};
ghc = pkgs.stdenv.mkDerivation rec {
- # Using 9.6.2 because of #24050
- version = "9.6.2";
+ version = "9.6.4";
name = "ghc";
src = ghcBindists.${pkgs.stdenv.hostPlatform.system};
configureFlags = [
=====================================
hadrian/src/Settings/Warnings.hs
=====================================
@@ -56,7 +56,7 @@ ghcWarningsArgs = do
, package primitive ? pure [ "-Wno-unused-imports"
, "-Wno-deprecations" ]
, package rts ? pure [ "-Wcpp-undef" ]
- , package text ? pure [ "-Wno-deprecations" ]
+ , package text ? pure [ "-Wno-deprecations", "-Wno-unused-imports" ]
, package terminfo ? pure [ "-Wno-unused-imports" ]
, package transformers ? pure [ "-Wno-unused-matches"
, "-Wno-unused-imports"
=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit 59fd01457fa662bca17110bc7505ea52bf162135
+Subproject commit 260ecdc3d848782d4df49e629cb0a5dc9e96ca9e
=====================================
libraries/Win32
=====================================
@@ -1 +1 @@
-Subproject commit 350ebd43f9a8d9e1ca767b0000f95bdfb42a5471
+Subproject commit 027cbcf0de25d681823ea92fb545a2604c3a6a8b
=====================================
libraries/array
=====================================
@@ -1 +1 @@
-Subproject commit a65f8a5e7c26fe9b8012b90cbbff8866f8d39113
+Subproject commit c9cb2c1e8762aa83b6e77af82c87a55e03e990e4
=====================================
libraries/binary
=====================================
@@ -1 +1 @@
-Subproject commit a501955f7ab48da81d732958c8834caaa3e470b6
+Subproject commit a625eee2eb9dfb4019c051b59d6007c9dded88aa
=====================================
libraries/bytestring
=====================================
@@ -1 +1 @@
-Subproject commit 453c1dc110720a366f90ef84dc2d75a5cd8c28e0
+Subproject commit d984ad00644c0157bad04900434b9d36f23633c5
=====================================
libraries/directory
=====================================
@@ -1 +1 @@
-Subproject commit 4b7c231d187cf253c5f446c4aed2fea26b81d5f9
+Subproject commit e8ee4d5565ec82272ca612034ba6029993e23fd0
=====================================
libraries/exceptions
=====================================
@@ -1 +1 @@
-Subproject commit d9fba07b664e3c48f011baca1a8a204292ca2722
+Subproject commit 0b6abb3ac433c7d1d5c6f6a5a45b37f7c486e33b
=====================================
libraries/filepath
=====================================
@@ -1 +1 @@
-Subproject commit 87a09e296ea6fc137a0b32edda1bd0f54332642e
+Subproject commit 65b0f8f31aac4a306135e27734988327f8eb1e6f
=====================================
libraries/hpc
=====================================
@@ -1 +1 @@
-Subproject commit 8bf6f8b08b0d72cb9231775b66ca572acc1d3197
+Subproject commit 37c56cf932e429950a199d0b1f39796677b052c5
=====================================
libraries/parsec
=====================================
@@ -1 +1 @@
-Subproject commit 9c071b05fbb077afbaf0dd2dfdab21265859ae91
+Subproject commit b87122c1c74b8240e65044a8f600f0427d4dd9c3
=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit dfbe62c7d9fc84d2550fc7e7db993dc0aa143ef5
+Subproject commit a5a3865df6ff36358fdc987d3c860d2970993c06
=====================================
libraries/terminfo
=====================================
@@ -1 +1 @@
-Subproject commit 500399a1497dfe1786ba67d6d2bfced4832f3fed
+Subproject commit 788ce671cb1cec54c3c9b3ac1c1ba189e8424819
=====================================
libraries/text
=====================================
@@ -1 +1 @@
-Subproject commit cdb9e13b39079904eed9d75cd332b66ee0cad0c0
+Subproject commit ee0a8f8b9a4bd3fdad23e9ac0db56e7f08ce35cd
=====================================
libraries/unix
=====================================
@@ -1 +1 @@
-Subproject commit 69552a5267c7dc5c46a8bceec5ec4b40d26b9463
+Subproject commit 6be36ed54cc035c0f095d24bf3a451638d45513c
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fbc803759e530c15c355387011798f6be84eb54d...d91e20b1bcd6095a34fa939cac6c82c2787ba3fa
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fbc803759e530c15c355387011798f6be84eb54d...d91e20b1bcd6095a34fa939cac6c82c2787ba3fa
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20250131/0d7e677b/attachment-0001.html>
More information about the ghc-commits
mailing list