From 54313579bb0f5b6b5f3657ee776479d2229a03f0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 28 Nov 2024 00:25:43 +0100 Subject: [PATCH] protobuf: format --- pkgs/development/libraries/protobuf/21.nix | 13 ++-- pkgs/development/libraries/protobuf/23.nix | 13 ++-- pkgs/development/libraries/protobuf/24.nix | 13 ++-- pkgs/development/libraries/protobuf/25.nix | 13 ++-- pkgs/development/libraries/protobuf/26.nix | 13 ++-- pkgs/development/libraries/protobuf/27.nix | 13 ++-- .../libraries/protobuf/generic.nix | 71 ++++++++++--------- 7 files changed, 86 insertions(+), 63 deletions(-) diff --git a/pkgs/development/libraries/protobuf/21.nix b/pkgs/development/libraries/protobuf/21.nix index 09a8c81b3d13..919e943d56d8 100644 --- a/pkgs/development/libraries/protobuf/21.nix +++ b/pkgs/development/libraries/protobuf/21.nix @@ -1,6 +1,9 @@ -{ callPackage, ... } @ args: +{ callPackage, ... }@args: -callPackage ./generic.nix ({ - version = "21.12"; - hash = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; -} // args) +callPackage ./generic.nix ( + { + version = "21.12"; + hash = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; + } + // args +) diff --git a/pkgs/development/libraries/protobuf/23.nix b/pkgs/development/libraries/protobuf/23.nix index abb2cc2f4460..e92e418c3186 100644 --- a/pkgs/development/libraries/protobuf/23.nix +++ b/pkgs/development/libraries/protobuf/23.nix @@ -1,6 +1,9 @@ -{ callPackage, ... } @ args: +{ callPackage, ... }@args: -callPackage ./generic.nix ({ - version = "23.4"; - hash = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; -} // args) +callPackage ./generic.nix ( + { + version = "23.4"; + hash = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; + } + // args +) diff --git a/pkgs/development/libraries/protobuf/24.nix b/pkgs/development/libraries/protobuf/24.nix index 6741b8afe52e..ad808810ad63 100644 --- a/pkgs/development/libraries/protobuf/24.nix +++ b/pkgs/development/libraries/protobuf/24.nix @@ -1,6 +1,9 @@ -{ callPackage, ... } @ args: +{ callPackage, ... }@args: -callPackage ./generic.nix ({ - version = "24.4"; - hash = "sha256-I+Xtq4GOs++f/RlVff9MZuolXrMLmrZ2z6mkBayqQ2s="; -} // args) +callPackage ./generic.nix ( + { + version = "24.4"; + hash = "sha256-I+Xtq4GOs++f/RlVff9MZuolXrMLmrZ2z6mkBayqQ2s="; + } + // args +) diff --git a/pkgs/development/libraries/protobuf/25.nix b/pkgs/development/libraries/protobuf/25.nix index 5a22c869ed0e..d5569ec3ce20 100644 --- a/pkgs/development/libraries/protobuf/25.nix +++ b/pkgs/development/libraries/protobuf/25.nix @@ -1,6 +1,9 @@ -{ callPackage, ... } @ args: +{ callPackage, ... }@args: -callPackage ./generic.nix ({ - version = "25.5"; - hash = "sha256-DFLlk4T8ODo3lmvrANlkIsrmDXZHmqMPTYxDWaz56qA="; -} // args) +callPackage ./generic.nix ( + { + version = "25.5"; + hash = "sha256-DFLlk4T8ODo3lmvrANlkIsrmDXZHmqMPTYxDWaz56qA="; + } + // args +) diff --git a/pkgs/development/libraries/protobuf/26.nix b/pkgs/development/libraries/protobuf/26.nix index 7f7c3625699f..5751ef7c3217 100644 --- a/pkgs/development/libraries/protobuf/26.nix +++ b/pkgs/development/libraries/protobuf/26.nix @@ -1,6 +1,9 @@ -{ callPackage, ... } @ args: +{ callPackage, ... }@args: -callPackage ./generic.nix ({ - version = "26.1"; - hash = "sha256-9sA+MYeDqRZl1v6HV4mpy60vqTbVTtinp9er6zkg/Ng="; -} // args) +callPackage ./generic.nix ( + { + version = "26.1"; + hash = "sha256-9sA+MYeDqRZl1v6HV4mpy60vqTbVTtinp9er6zkg/Ng="; + } + // args +) diff --git a/pkgs/development/libraries/protobuf/27.nix b/pkgs/development/libraries/protobuf/27.nix index 8e93e443b18e..cfb6ec390ac6 100644 --- a/pkgs/development/libraries/protobuf/27.nix +++ b/pkgs/development/libraries/protobuf/27.nix @@ -1,6 +1,9 @@ -{ callPackage, ... } @ args: +{ callPackage, ... }@args: -callPackage ./generic.nix ({ - version = "27.5"; - hash = "sha256-wUXvdlz19VYpFGU9o0pap/PrwE2AkopLZJVUqfEpJVI="; -} // args) +callPackage ./generic.nix ( + { + version = "27.5"; + hash = "sha256-wUXvdlz19VYpFGU9o0pap/PrwE2AkopLZJVUqfEpJVI="; + } + // args +) diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 5e212e7f6f54..447202dff539 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -1,26 +1,27 @@ # The cmake version of this build is meant to enable both cmake and .pc being exported # this is important because grpc exports a .cmake file which also expects for protobuf # to have been exported through cmake as well. -{ lib -, stdenv -, abseil-cpp -, buildPackages -, cmake -, fetchFromGitHub -, fetchpatch -, gtest -, zlib -, version -, hash +{ + lib, + stdenv, + abseil-cpp, + buildPackages, + cmake, + fetchFromGitHub, + fetchpatch, + gtest, + zlib, + version, + hash, # downstream dependencies -, python3 -, grpc -, enableShared ? !stdenv.hostPlatform.isStatic + python3, + grpc, + enableShared ? !stdenv.hostPlatform.isStatic, -, testers -, protobuf -, ... + testers, + protobuf, + ... }: stdenv.mkDerivation (finalAttrs: { @@ -48,13 +49,15 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ - cmake - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # protoc of the same version must be available for build. For non-cross builds, it's able to - # re-use the executable generated as part of the build - buildPackages."protobuf_${lib.versions.major version}" - ]; + nativeBuildInputs = + [ + cmake + ] + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # protoc of the same version must be available for build. For non-cross builds, it's able to + # re-use the executable generated as part of the build + buildPackages."protobuf_${lib.versions.major version}" + ]; buildInputs = [ gtest @@ -68,15 +71,17 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; cmakeDir = if lib.versionOlder version "22" then "../cmake" else null; - cmakeFlags = [ - "-Dprotobuf_USE_EXTERNAL_GTEST=ON" - "-Dprotobuf_ABSL_PROVIDER=package" - ] ++ lib.optionals enableShared [ - "-Dprotobuf_BUILD_SHARED_LIBS=ON" - ] - ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ - "-Dprotobuf_BUILD_TESTS=OFF" - ]; + cmakeFlags = + [ + "-Dprotobuf_USE_EXTERNAL_GTEST=ON" + "-Dprotobuf_ABSL_PROVIDER=package" + ] + ++ lib.optionals enableShared [ + "-Dprotobuf_BUILD_SHARED_LIBS=ON" + ] + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ + "-Dprotobuf_BUILD_TESTS=OFF" + ]; doCheck = # FIXME: investigate. 24.x and 23.x have different errors.