gn: 2168 -> 2233 (2024-05-03 -> 2025-04-28) (#403859)

authored by Emily and committed by GitHub 2a923be0 ba2d364b

+9 -25
-10
pkgs/applications/networking/browsers/chromium/default.nix
··· 85 85 url = "https://gn.googlesource.com/gn"; 86 86 inherit (upstream-info.deps.gn) rev hash; 87 87 }; 88 - 89 - # Relax hardening as otherwise gn unstable 2024-06-06 and later fail with: 90 - # cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] 91 - hardeningDisable = [ "format" ]; 92 - 93 - # At the time of writing, gn is at v2024-05-13 and has a backported patch. 94 - # This patch appears to be already present in v2024-09-09 (from M130), which 95 - # results in the patch not applying and thus failing the build. 96 - # As a work around until gn is updated again, we filter specifically that patch out. 97 - patches = lib.filter (e: lib.getName e != "LFS64.patch") oldAttrs.patches; 98 88 }); 99 89 }); 100 90
+3 -9
pkgs/by-name/gn/gn/generic.nix
··· 40 40 inherit rev sha256; 41 41 }; 42 42 43 - patches = [ 44 - (fetchpatch { 45 - name = "LFS64.patch"; 46 - url = "https://gn.googlesource.com/gn/+/b5ff50936a726ff3c8d4dfe2a0ae120e6ce1350d%5E%21/?format=TEXT"; 47 - decode = "base64 -d"; 48 - hash = "sha256-/kh8t/Ip1EG2OIhydS//st/C80KJ4P31vGx7j8QpFh0="; 49 - }) 50 - ]; 51 - 52 43 nativeBuildInputs = [ 53 44 ninja 54 45 python3 ··· 58 49 ]; 59 50 60 51 env.NIX_CFLAGS_COMPILE = "-Wno-error"; 52 + # Relax hardening as otherwise gn unstable 2024-06-06 and later fail with: 53 + # cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] 54 + hardeningDisable = [ "format" ]; 61 55 62 56 buildPhase = '' 63 57 python build/gen.py --no-last-commit-position
+6 -6
pkgs/by-name/gn/gn/package.nix
··· 1 1 { callPackage, ... }@args: 2 2 3 3 callPackage ./generic.nix args { 4 - # Note: Please use the recommended version for Chromium stabe, i.e. from 5 - # <nixpkgs>/pkgs/applications/networking/browsers/chromium/upstream-info.nix 6 - rev = "df98b86690c83b81aedc909ded18857296406159"; 7 - revNum = "2168"; # git describe $rev --match initial-commit | cut -d- -f3 8 - version = "2024-05-13"; 9 - sha256 = "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw="; 4 + # Note: Please use the recommended version for Chromium stable, i.e. from 5 + # <nixpkgs>/pkgs/applications/networking/browsers/chromium/info.json 6 + rev = "85cc21e94af590a267c1c7a47020d9b420f8a033"; 7 + revNum = "2233"; # git describe $rev --match initial-commit | cut -d- -f3 8 + version = "2025-04-28"; 9 + sha256 = "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI="; 10 10 }