Skip to content

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

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
emilylange merged 1 commit into from
Jun 7, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions pkgs/applications/networking/browsers/chromium/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,6 @@ let
url = "https://gn.googlesource.com/gn";
inherit (upstream-info.deps.gn) rev hash;
};

# Relax hardening as otherwise gn unstable 2024-06-06 and later fail with:
# cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
hardeningDisable = [ "format" ];

# At the time of writing, gn is at v2024-05-13 and has a backported patch.
# This patch appears to be already present in v2024-09-09 (from M130), which
# results in the patch not applying and thus failing the build.
# As a work around until gn is updated again, we filter specifically that patch out.
patches = lib.filter (e: lib.getName e != "LFS64.patch") oldAttrs.patches;
});
});

Expand Down
12 changes: 3 additions & 9 deletions pkgs/by-name/gn/gn/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,6 @@ stdenv.mkDerivation {
inherit rev sha256;
};

patches = [
(fetchpatch {
name = "LFS64.patch";
url = "https://gn.googlesource.com/gn/+/b5ff50936a726ff3c8d4dfe2a0ae120e6ce1350d%5E%21/?format=TEXT";
decode = "base64 -d";
hash = "sha256-/kh8t/Ip1EG2OIhydS//st/C80KJ4P31vGx7j8QpFh0=";
})
];

nativeBuildInputs = [
ninja
python3
Expand All @@ -69,6 +60,9 @@ stdenv.mkDerivation {
);

env.NIX_CFLAGS_COMPILE = "-Wno-error";
# Relax hardening as otherwise gn unstable 2024-06-06 and later fail with:
# cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
hardeningDisable = [ "format" ];

buildPhase = ''
python build/gen.py --no-last-commit-position
Expand Down
12 changes: 6 additions & 6 deletions pkgs/by-name/gn/gn/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ callPackage, ... }@args:

callPackage ./generic.nix args {
# Note: Please use the recommended version for Chromium stabe, i.e. from
# <nixpkgs>/pkgs/applications/networking/browsers/chromium/upstream-info.nix
rev = "df98b86690c83b81aedc909ded18857296406159";
revNum = "2168"; # git describe $rev --match initial-commit | cut -d- -f3
version = "2024-05-13";
sha256 = "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw=";
# Note: Please use the recommended version for Chromium stable, i.e. from
# <nixpkgs>/pkgs/applications/networking/browsers/chromium/info.json
rev = "85cc21e94af590a267c1c7a47020d9b420f8a033";
revNum = "2233"; # git describe $rev --match initial-commit | cut -d- -f3
version = "2025-04-28";
sha256 = "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI=";
}