Specify C++14 standard for nixpkgs cc toolchain

avdv · avdv · commit dc931d1cdf7f · 2025-09-11T09:03:07.000+02:00
diff --git a/examples/WORKSPACE b/examples/WORKSPACE
@@ -39,6 +39,7 @@ load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")
 nixpkgs_cc_configure(
     # Don't override the default cc toolchain needed for bindist mode.
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 
diff --git a/examples/arm/WORKSPACE b/examples/arm/WORKSPACE
@@ -57,6 +57,7 @@ nixpkgs_cc_configure(
 nixpkgs_cc_configure(
     name = "nixpkgs_config_cc_arm",
     attribute_path = "cc-aarch64",
+    cc_std = "c++14",
     exec_constraints = [
         "@platforms//cpu:x86_64",
         "@platforms//os:linux",
diff --git a/non_module_dev_deps.bzl b/non_module_dev_deps.bzl
@@ -103,6 +103,7 @@ def repositories(*, bzlmod):
         name = "nixpkgs_config_cc",
         repository = "@nixpkgs_default",
         register = not bzlmod,
+        cc_std = "c++14",
     )
 
     nixpkgs_package(
diff --git a/rules_haskell_tests/non_module_deps_1.bzl b/rules_haskell_tests/non_module_deps_1.bzl
@@ -89,6 +89,7 @@ filegroup(
         name = "nixpkgs_config_cc",
         repository = "@nixpkgs_default",
         register = not bzlmod,
+        cc_std = "c++14",
     )
 
     rules_haskell_asterius_toolchains(
diff --git a/rules_haskell_tests/tests/ghcWithPackages_2097/test/WORKSPACE b/rules_haskell_tests/tests/ghcWithPackages_2097/test/WORKSPACE
@@ -24,6 +24,7 @@ load(
 
 nixpkgs_cc_configure(
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 
diff --git a/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_cross_library_deps_test/WORKSPACE b/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_cross_library_deps_test/WORKSPACE
@@ -40,6 +40,7 @@ load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")
 
 nixpkgs_cc_configure(
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 
diff --git a/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_test/WORKSPACE b/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_test/WORKSPACE
@@ -41,6 +41,7 @@ load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")
 
 nixpkgs_cc_configure(
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 
diff --git a/rules_haskell_tests/tests/repl-targets/hs_bin_repl_test/WORKSPACE b/rules_haskell_tests/tests/repl-targets/hs_bin_repl_test/WORKSPACE
@@ -34,6 +34,7 @@ load(
 
 nixpkgs_cc_configure(
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 
diff --git a/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE b/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE
@@ -43,6 +43,7 @@ load(
 
 nixpkgs_cc_configure(
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 
diff --git a/rules_haskell_tests/tests/stack-snapshot-deps/hs_override_stack_test/WORKSPACE b/rules_haskell_tests/tests/stack-snapshot-deps/hs_override_stack_test/WORKSPACE
@@ -34,6 +34,7 @@ load(
 
 nixpkgs_cc_configure(
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 
diff --git a/start b/start
@@ -355,6 +355,7 @@ EOF
 
 		nixpkgs_cc_configure(
 		    repository = "@nixpkgs",
+		    cc_std = "c++14",
 		)
 
 		nixpkgs_python_configure(
diff --git a/tutorial/WORKSPACE b/tutorial/WORKSPACE
@@ -37,6 +37,7 @@ load(
 nixpkgs_cc_configure(
     # Don't override the default cc toolchain needed for bindist mode.
     name = "nixpkgs_config_cc",
+    cc_std = "c++14",
     repository = "@rules_haskell//nixpkgs:default.nix",
 )
 

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")`
`39`	`39`	`nixpkgs_cc_configure(`
`40`	`40`	`# Don't override the default cc toolchain needed for bindist mode.`
`41`	`41`	`name = "nixpkgs_config_cc",`
	`42`	`+ cc_std = "c++14",`
`42`	`43`	`repository = "@rules_haskell//nixpkgs:default.nix",`
`43`	`44`	`)`
`44`	`45`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ def repositories(*, bzlmod):`
`103`	`103`	`name = "nixpkgs_config_cc",`
`104`	`104`	`repository = "@nixpkgs_default",`
`105`	`105`	`register = not bzlmod,`
	`106`	`+ cc_std = "c++14",`
`106`	`107`	`)`
`107`	`108`
`108`	`109`	`nixpkgs_package(`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ filegroup(`
`89`	`89`	`name = "nixpkgs_config_cc",`
`90`	`90`	`repository = "@nixpkgs_default",`
`91`	`91`	`register = not bzlmod,`
	`92`	`+ cc_std = "c++14",`
`92`	`93`	`)`
`93`	`94`
`94`	`95`	`rules_haskell_asterius_toolchains(`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ load(`
`24`	`24`
`25`	`25`	`nixpkgs_cc_configure(`
`26`	`26`	`name = "nixpkgs_config_cc",`
	`27`	`+ cc_std = "c++14",`
`27`	`28`	`repository = "@rules_haskell//nixpkgs:default.nix",`
`28`	`29`	`)`
`29`	`30`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")`
`40`	`40`
`41`	`41`	`nixpkgs_cc_configure(`
`42`	`42`	`name = "nixpkgs_config_cc",`
	`43`	`+ cc_std = "c++14",`
`43`	`44`	`repository = "@rules_haskell//nixpkgs:default.nix",`
`44`	`45`	`)`
`45`	`46`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")`
`41`	`41`
`42`	`42`	`nixpkgs_cc_configure(`
`43`	`43`	`name = "nixpkgs_config_cc",`
	`44`	`+ cc_std = "c++14",`
`44`	`45`	`repository = "@rules_haskell//nixpkgs:default.nix",`
`45`	`46`	`)`
`46`	`47`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ load(`
`34`	`34`
`35`	`35`	`nixpkgs_cc_configure(`
`36`	`36`	`name = "nixpkgs_config_cc",`
	`37`	`+ cc_std = "c++14",`
`37`	`38`	`repository = "@rules_haskell//nixpkgs:default.nix",`
`38`	`39`	`)`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ load(`
`43`	`43`
`44`	`44`	`nixpkgs_cc_configure(`
`45`	`45`	`name = "nixpkgs_config_cc",`
	`46`	`+ cc_std = "c++14",`
`46`	`47`	`repository = "@rules_haskell//nixpkgs:default.nix",`
`47`	`48`	`)`
`48`	`49`