Skip to content

Fix build with GCC15 #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tm-drtina merged 3 commits into from
Jan 12, 2026
Merged

Fix build with GCC15 #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f3085b
Set CPP-Options to "-std=c99"
tm-drtina-arista Jan 7, 2026
2c17024
bump nixpkgs
tm-drtina-arista Jan 7, 2026
5d5c40d
haskellPackages.vcr: don't test on Darwin
tm-drtina-arista Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/grpc-haskell-core.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,10 @@ library
hs-source-dirs: src
default-extensions: CPP
CC-Options: -std=c99
CPP-Options: -std=c99
if flag(debug)
CPP-Options: -DDEBUG
CC-Options: -DGRPC_HASKELL_DEBUG -std=c99
CC-Options: -DGRPC_HASKELL_DEBUG

test-suite tests
import: common
Expand Down
6 changes: 3 additions & 3 deletions nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# The SHA256 will be printed as the last line of stdout.

import (builtins.fetchTarball {
# "nixos-unstable" as on 2025-11-27
url = "https://github.com/NixOS/nixpkgs/archive/5ae3b07d8d6527c42f17c876e404993199144b6a.tar.gz";
sha256 = "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=";
# "nixos-unstable" as on 2026-01-06
url = "https://github.com/NixOS/nixpkgs/archive/9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5.tar.gz";
sha256 = "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=";
})
6 changes: 5 additions & 1 deletion release.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ let

haskellPackages = pkgsOld.haskell.packages.${ghc}.override {
overrides = haskellPackagesNew: haskellPackagesOld: {
vcr = pkgsNew.lib.pipe haskellPackagesOld.vcr [
(pkgsNew.haskell.lib.compose.dontCheckIf pkgsNew.stdenv.hostPlatform.isDarwin)
];

proto3-wire =
haskellPackagesNew.callPackage ./nix/proto3-wire.nix { };

Expand Down Expand Up @@ -211,7 +215,7 @@ let

nixpkgs = import ./nixpkgs.nix;
linuxPkgs = nixpkgs { inherit config overlays; system = "x86_64-linux" ; };
darwinPkgs = nixpkgs { inherit config overlays; system = "x86_64-darwin"; };
darwinPkgs = nixpkgs { inherit config overlays; system = "aarch64-darwin"; };
pkgs = nixpkgs { inherit config overlays; };

in
Expand Down