diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index c3af8fe72dd0d..33386b79dc0a7 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -1,4 +1,4 @@ -{ callPackage, ... } @ args: +{ callPackage, ... }@args: callPackage ./generic.nix args { # Note: Please use the recommended version for Chromium stabe, i.e. from diff --git a/pkgs/development/tools/build-managers/gn/generic.nix b/pkgs/development/tools/build-managers/gn/generic.nix index 4fc2fd6b53b8a..218a46d3fb98f 100644 --- a/pkgs/development/tools/build-managers/gn/generic.nix +++ b/pkgs/development/tools/build-managers/gn/generic.nix @@ -1,9 +1,22 @@ -{ stdenv, lib, fetchgit, fetchpatch, cctools, darwin, writeText -, ninja, python3 -, ... +{ + stdenv, + lib, + fetchgit, + fetchpatch, + cctools, + darwin, + writeText, + ninja, + python3, + ... }: -{ rev, revNum, version, sha256 }: +{ + rev, + revNum, + version, + sha256, +}: let revShort = builtins.substring 0 7 rev; @@ -17,7 +30,8 @@ let #endif // OUT_LAST_COMMIT_POSITION_H_ ''; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "gn-unstable"; inherit version; @@ -36,16 +50,23 @@ in stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ ninja python3 ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin; with apple_sdk.frameworks; [ - libobjc - cctools + nativeBuildInputs = [ + ninja + python3 + ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin; + with apple_sdk.frameworks; + [ + libobjc + cctools - # frameworks - ApplicationServices - Foundation - AppKit - ]); + # frameworks + ApplicationServices + Foundation + AppKit + ] + ); env.NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -67,6 +88,10 @@ in stdenv.mkDerivation { homepage = "https://gn.googlesource.com/gn"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ stesie matthewbauer primeos ]; + maintainers = with maintainers; [ + stesie + matthewbauer + primeos + ]; }; } diff --git a/pkgs/development/tools/build-managers/gn/rev1924.nix b/pkgs/development/tools/build-managers/gn/rev1924.nix deleted file mode 100644 index 1b17328f2e095..0000000000000 --- a/pkgs/development/tools/build-managers/gn/rev1924.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix args { - rev = "24e2f7df92641de0351a96096fb2c490b2436bb8"; - revNum = "1924"; # git describe HEAD --match initial-commit | cut -d- -f3 - version = "2021-08-08"; - sha256 = "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl"; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f655cc081273f..150181838abaf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -472,6 +472,7 @@ mapAliases { gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 + gn1924 = throw "gn1924 has been removed because it was broken and no longer used by envoy."; # Added 2024-11-03 gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17 gradle_6 = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30 gradle_6-unwrapped = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96c62fffb4191..b74526cb589a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17886,7 +17886,6 @@ with pkgs; nimbo = with python3Packages; callPackage ../applications/misc/nimbo { }; gn = callPackage ../development/tools/build-managers/gn { }; - gn1924 = callPackage ../development/tools/build-managers/gn/rev1924.nix { }; nixbang = callPackage ../development/tools/misc/nixbang { pythonPackages = python3Packages;