protobuf: format (#359703)

authored by Gaétan Lepage and committed by GitHub 2202fa53 c78d3b84

+86 -63
+8 -5
pkgs/development/libraries/protobuf/21.nix
··· 1 - { callPackage, ... } @ args: 1 + { callPackage, ... }@args: 2 2 3 - callPackage ./generic.nix ({ 4 - version = "21.12"; 5 - hash = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; 6 - } // args) 3 + callPackage ./generic.nix ( 4 + { 5 + version = "21.12"; 6 + hash = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; 7 + } 8 + // args 9 + )
+8 -5
pkgs/development/libraries/protobuf/23.nix
··· 1 - { callPackage, ... } @ args: 1 + { callPackage, ... }@args: 2 2 3 - callPackage ./generic.nix ({ 4 - version = "23.4"; 5 - hash = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; 6 - } // args) 3 + callPackage ./generic.nix ( 4 + { 5 + version = "23.4"; 6 + hash = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; 7 + } 8 + // args 9 + )
+8 -5
pkgs/development/libraries/protobuf/24.nix
··· 1 - { callPackage, ... } @ args: 1 + { callPackage, ... }@args: 2 2 3 - callPackage ./generic.nix ({ 4 - version = "24.4"; 5 - hash = "sha256-I+Xtq4GOs++f/RlVff9MZuolXrMLmrZ2z6mkBayqQ2s="; 6 - } // args) 3 + callPackage ./generic.nix ( 4 + { 5 + version = "24.4"; 6 + hash = "sha256-I+Xtq4GOs++f/RlVff9MZuolXrMLmrZ2z6mkBayqQ2s="; 7 + } 8 + // args 9 + )
+8 -5
pkgs/development/libraries/protobuf/25.nix
··· 1 - { callPackage, ... } @ args: 1 + { callPackage, ... }@args: 2 2 3 - callPackage ./generic.nix ({ 4 - version = "25.5"; 5 - hash = "sha256-DFLlk4T8ODo3lmvrANlkIsrmDXZHmqMPTYxDWaz56qA="; 6 - } // args) 3 + callPackage ./generic.nix ( 4 + { 5 + version = "25.5"; 6 + hash = "sha256-DFLlk4T8ODo3lmvrANlkIsrmDXZHmqMPTYxDWaz56qA="; 7 + } 8 + // args 9 + )
+8 -5
pkgs/development/libraries/protobuf/26.nix
··· 1 - { callPackage, ... } @ args: 1 + { callPackage, ... }@args: 2 2 3 - callPackage ./generic.nix ({ 4 - version = "26.1"; 5 - hash = "sha256-9sA+MYeDqRZl1v6HV4mpy60vqTbVTtinp9er6zkg/Ng="; 6 - } // args) 3 + callPackage ./generic.nix ( 4 + { 5 + version = "26.1"; 6 + hash = "sha256-9sA+MYeDqRZl1v6HV4mpy60vqTbVTtinp9er6zkg/Ng="; 7 + } 8 + // args 9 + )
+8 -5
pkgs/development/libraries/protobuf/27.nix
··· 1 - { callPackage, ... } @ args: 1 + { callPackage, ... }@args: 2 2 3 - callPackage ./generic.nix ({ 4 - version = "27.5"; 5 - hash = "sha256-wUXvdlz19VYpFGU9o0pap/PrwE2AkopLZJVUqfEpJVI="; 6 - } // args) 3 + callPackage ./generic.nix ( 4 + { 5 + version = "27.5"; 6 + hash = "sha256-wUXvdlz19VYpFGU9o0pap/PrwE2AkopLZJVUqfEpJVI="; 7 + } 8 + // args 9 + )
+38 -33
pkgs/development/libraries/protobuf/generic.nix
··· 1 1 # The cmake version of this build is meant to enable both cmake and .pc being exported 2 2 # this is important because grpc exports a .cmake file which also expects for protobuf 3 3 # to have been exported through cmake as well. 4 - { lib 5 - , stdenv 6 - , abseil-cpp 7 - , buildPackages 8 - , cmake 9 - , fetchFromGitHub 10 - , fetchpatch 11 - , gtest 12 - , zlib 13 - , version 14 - , hash 4 + { 5 + lib, 6 + stdenv, 7 + abseil-cpp, 8 + buildPackages, 9 + cmake, 10 + fetchFromGitHub, 11 + fetchpatch, 12 + gtest, 13 + zlib, 14 + version, 15 + hash, 15 16 16 17 # downstream dependencies 17 - , python3 18 - , grpc 19 - , enableShared ? !stdenv.hostPlatform.isStatic 18 + python3, 19 + grpc, 20 + enableShared ? !stdenv.hostPlatform.isStatic, 20 21 21 - , testers 22 - , protobuf 23 - , ... 22 + testers, 23 + protobuf, 24 + ... 24 25 }: 25 26 26 27 stdenv.mkDerivation (finalAttrs: { ··· 48 49 }) 49 50 ]; 50 51 51 - nativeBuildInputs = [ 52 - cmake 53 - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ 54 - # protoc of the same version must be available for build. For non-cross builds, it's able to 55 - # re-use the executable generated as part of the build 56 - buildPackages."protobuf_${lib.versions.major version}" 57 - ]; 52 + nativeBuildInputs = 53 + [ 54 + cmake 55 + ] 56 + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ 57 + # protoc of the same version must be available for build. For non-cross builds, it's able to 58 + # re-use the executable generated as part of the build 59 + buildPackages."protobuf_${lib.versions.major version}" 60 + ]; 58 61 59 62 buildInputs = [ 60 63 gtest ··· 68 71 strictDeps = true; 69 72 70 73 cmakeDir = if lib.versionOlder version "22" then "../cmake" else null; 71 - cmakeFlags = [ 72 - "-Dprotobuf_USE_EXTERNAL_GTEST=ON" 73 - "-Dprotobuf_ABSL_PROVIDER=package" 74 - ] ++ lib.optionals enableShared [ 75 - "-Dprotobuf_BUILD_SHARED_LIBS=ON" 76 - ] 77 - ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ 78 - "-Dprotobuf_BUILD_TESTS=OFF" 79 - ]; 74 + cmakeFlags = 75 + [ 76 + "-Dprotobuf_USE_EXTERNAL_GTEST=ON" 77 + "-Dprotobuf_ABSL_PROVIDER=package" 78 + ] 79 + ++ lib.optionals enableShared [ 80 + "-Dprotobuf_BUILD_SHARED_LIBS=ON" 81 + ] 82 + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ 83 + "-Dprotobuf_BUILD_TESTS=OFF" 84 + ]; 80 85 81 86 doCheck = 82 87 # FIXME: investigate. 24.x and 23.x have different errors.