···4141 currentConfigTokenFilename = ".current-token";42424343 workDir = if cfg.workDir == null then runtimeDir else cfg.workDir;4444- # Support old github-runner versions which don't have the `nodeRuntimes` arg yet.4545- package = cfg.package.override (4646- old: lib.optionalAttrs (lib.hasAttr "nodeRuntimes" old) { inherit (cfg) nodeRuntimes; }4747- );4844 in4945 lib.nameValuePair svcName {5046 description = "GitHub Actions runner";···73777478 serviceConfig = lib.mkMerge [7579 {7676- ExecStart = "${package}/bin/Runner.Listener run --startuptype service";8080+ ExecStart = "${cfg.package}/bin/Runner.Listener run --startuptype service";77817882 # Does the following, sequentially:7983 # - If the module configuration or the token has changed, purge the state directory,···192196 else193197 args+=(--token "$token")194198 fi195195- ${package}/bin/Runner.Listener configure "''${args[@]}"199199+ ${cfg.package}/bin/Runner.Listener configure "''${args[@]}"196200 # Move the automatically created _diag dir to the logs dir197201 mkdir -p "$STATE_DIRECTORY/_diag"198202 cp -r "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/"
+1
nixos/modules/services/display-managers/sddm.nix
···257257 theme = mkOption {258258 type = types.str;259259 default = "";260260+ example = lib.literalExpression "\"\${pkgs.where-is-my-sddm-theme.override { variants = [ \"qt5\" ]; }}/share/sddm/themes/where_is_my_sddm_theme_qt5\"";260261 description = ''261262 Greeter theme to use.262263 '';
···439439 # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed):440440 ./patches/no-build-timestamps.patch441441 ]442442- ++ lib.optionals (!chromiumVersionAtLeast "136") [443443- # Fix build with Pipewire 1.4444444- # Submitted upstream: https://webrtc-review.googlesource.com/c/src/+/380500445445- # Got merged, started shipping with M136+.446446- ./patches/webrtc-pipewire-1.4.patch447447- ]448442 ++ lib.optionals (packageName == "chromium") [449443 # This patch is limited to chromium and ungoogled-chromium because electron-source sets450444 # enable_widevine to false.···478484 # allowing us to use our rustc and our clang.479485 ./patches/chromium-129-rust.patch480486 ]481481- ++ lib.optionals (chromiumVersionAtLeast "140") [487487+ ++ lib.optionals (versionRange "140" "141") [482488 # Rebased variant of the patch above due to483489 # https://chromium-review.googlesource.com/c/chromium/src/+/6665907484490 ./patches/chromium-140-rust.patch485491 ]486486- ++ lib.optionals (!ungoogled && !chromiumVersionAtLeast "136") [487487- # Note: We since use LLVM v19.1+ on unstable *and* release-24.11 for all version and as such488488- # no longer need this patch. We opt to arbitrarily limit it to versions prior to M136 just489489- # because that's when this revert stopped applying cleanly and defer fully dropping it for490490- # the next cleanup to bundle rebuilding all of chromium and electron.491491- #492492- # Our rustc.llvmPackages is too old for std::hardware_destructive_interference_size493493- # and std::hardware_constructive_interference_size.494494- # So let's revert the change for now and hope that our rustc.llvmPackages and495495- # nixpkgs-stable catch up sooner than later.496496- # https://groups.google.com/a/chromium.org/g/cxx/c/cwktrFxxUY4497497- # https://chromium-review.googlesource.com/c/chromium/src/+/5767325498498- # Note: We exclude the changes made to the partition_allocator (PA), as the revert499499- # would otherwise not apply because upstream reverted those changes to PA already500500- # in https://chromium-review.googlesource.com/c/chromium/src/+/5841144501501- # Note: ungoogled-chromium already reverts this as part of its patchset.502502- (githubPatch {503503- commit = "fc838e8cc887adbe95110045d146b9d5885bf2a9";504504- hash = "sha256-NNKzIp6NYdeZaqBLWDW/qNxiDB1VFRz7msjMXuMOrZ8=";505505- excludes = [ "base/allocator/partition_allocator/src/partition_alloc/*" ];506506- revert = true;507507- })492492+ ++ lib.optionals (chromiumVersionAtLeast "141") [493493+ # Rebased variant of the patch above due to494494+ # https://chromium-review.googlesource.com/c/chromium/src/+/6897026495495+ ./patches/chromium-141-rust.patch508496 ]509497 ++ lib.optionals stdenv.hostPlatform.isAarch64 [510498 # Reverts decommit pooled pages which causes random crashes of tabs on systems···504528 hash = "sha256-PuinMLhJ2W4KPXI5K0ujw85ENTB1wG7Hv785SZ55xnY=";505529 })506530 ]507507- ++ lib.optionals (chromiumVersionAtLeast "136") [531531+ ++ [508532 # Modify the nodejs version check added in https://chromium-review.googlesource.com/c/chromium/src/+/6334038509533 # to look for the minimal version, not the exact version (major.minor.patch). The linked CL makes a case for510534 # preventing compilations of chromium with versions below their intended version, not about running the very···528552 # Rebased variant of the patch above for529553 # electron 35 (M134) and 36 (M136)530554 ./patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch555555+ ]556556+ ++ lib.optionals (chromiumVersionAtLeast "141") [557557+ (fetchpatch {558558+ # Fix "invalid application of 'sizeof' to an incomplete type 'blink::CSSStyleSheet'"559559+ # by reverting https://chromium-review.googlesource.com/c/chromium/src/+/6892157560560+ name = "chromium-141-Revert-Remove-unnecessary-include-in-tree_scope.h.patch";561561+ url = "https://chromium.googlesource.com/chromium/src/+/0fc0e71aa1ca0419fae6d14255025543980d2cba^!?format=TEXT";562562+ decode = "base64 -d";563563+ revert = true;564564+ hash = "sha256-pnEus2NHpNWZ6ZSXLgdTn+it7oy1MPZPbD8SOAKLWbw=";565565+ })531566 ];532567533568 postPatch =···549562 chmod u+w build/config/gclient_args.gni550563 echo 'checkout_mutter = false' >> build/config/gclient_args.gni551564 echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni552552- ''553553- + lib.optionalString (!isElectron && chromiumVersionAtLeast "140") ''554565 echo 'checkout_clusterfuzz_data = false' >> build/config/gclient_args.gni555566 ''556567 + lib.optionalString (!isElectron) ''···752767 # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):753768 chrome_pgo_phase = 0;754769 clang_base_path = "${llvmCcAndBintools}";755755-756756- use_qt5 = false;757757- use_qt6 = false;758770 }759759- // lib.optionalAttrs (chromiumVersionAtLeast "136") {760760- # LLVM < v21 does not support --warning-suppression-mappings yet:761761- clang_warning_suppression_file = "";771771+ // lib.optionalAttrs (chromiumVersionAtLeast "141") {772772+ # TODO: remove opt-out of https://chromium.googlesource.com/chromium/src/+/main/docs/modules.md773773+ use_clang_modules = false;762774 }763775 // {776776+ use_qt5 = false;777777+ use_qt6 = false;778778+779779+ # LLVM < v21 does not support --warning-suppression-mappings yet:780780+ clang_warning_suppression_file = "";781781+764782 # To fix the build as we don't provide libffi_pic.a765783 # (ld.lld: error: unable to find library -l:libffi_pic.a):766784 use_system_libffi = true;767785 # Use nixpkgs Rust compiler instead of the one shipped by Chromium.768786 rust_sysroot_absolute = "${buildPackages.rustc}";769787 rust_bindgen_root = "${buildPackages.rust-bindgen}";770770- }771771- // {772788 enable_rust = true;773789 # While we technically don't need the cache-invalidation rustc_version provides, rustc_version774790 # is still used in some scripts (e.g. build/rust/std/find_std_rlibs.py).···827841 # Mute some warnings that are enabled by default. This is useful because828842 # our Clang is always older than Chromium's and the build logs have a size829843 # of approx. 25 MB without this option (and this saves e.g. 66 %).830830- env.NIX_CFLAGS_COMPILE =831831- "-Wno-unknown-warning-option"832832- + lib.optionalString (chromiumVersionAtLeast "135") " -Wno-unused-command-line-argument -Wno-shadow";844844+ env.NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option -Wno-unused-command-line-argument -Wno-shadow";833845 env.BUILD_CC = "$CC_FOR_BUILD";834846 env.BUILD_CXX = "$CXX_FOR_BUILD";835847 env.BUILD_AR = "$AR_FOR_BUILD";
···11+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn22+index 516f7d85fc5718a26707d988389081cd86da49bd..f4b5284ad90591a57cb803353bbe57fd4e213159 10064433+--- a/build/config/compiler/BUILD.gn44++++ b/build/config/compiler/BUILD.gn55+@@ -1911,16 +1911,6 @@ config("runtime_library") {66+ configs += [ "//build/config/c++:runtime_library" ]77+ }88+99+- # Rust and C++ both provide intrinsics for LLVM to call for math operations. We1010+- # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins1111+- # library. The Rust symbols are marked as weak, so that they can be replaced by1212+- # the C++ symbols. This config ensures the C++ symbols exist and are strong in1313+- # order to cause that replacement to occur by explicitly linking in clang's1414+- # compiler-rt library.1515+- if (is_clang && !(is_a_target_toolchain && is_cronet_build)) {1616+- configs += [ "//build/config/clang:compiler_builtins" ]1717+- }1818+-1919+ # TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia2020+ # configuration.2121+ if (is_posix || is_fuchsia) {