gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #318793 from SuperSandro2000/abseilccp-cleanup

Browse Source
This commit is contained in:
Sandro
2024-06-25 11:12:42 +02:00
committed by GitHub
parent 51137c29f6 06fc7db29e
commit 11f1389b1d
13 changed files with 4 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/abseil-cpp/202206.nix
-41
View File
@@ -1,41 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, static ? stdenv.hostPlatform.isStatic
, cxxStandard ? null
}:
stdenv.mkDerivation rec {
pname = "abseil-cpp";
version = "20220623.2";
src = fetchFromGitHub {
owner = "abseil";
repo = "abseil-cpp";
rev = "refs/tags/${version}";
hash = "sha256-ma8QJfSySsk2XVLA0rhwYJMQx+6HxMFgub6gi5mDrLI=";
};
patches = lib.optionals stdenv.isDarwin [
# Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages
# that require a different SDK other than the default one.
./cmake-core-foundation.patch
];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
] ++ lib.optionals (cxxStandard != null) [
"-DCMAKE_CXX_STANDARD=${cxxStandard}"
];
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "Open-source collection of C++ code designed to augment the C++ standard library";
homepage = "https://abseil.io/";
license = licenses.asl20;
platforms = platforms.all;
maintainers = [ maintainers.andersk ];
};
}
pkgs/development/libraries/abseil-cpp/202308.nix
-42
View File
@@ -1,42 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, gtest
, static ? stdenv.hostPlatform.isStatic
, cxxStandard ? null
}:
stdenv.mkDerivation (finalAttrs: {
pname = "abseil-cpp";
version = "20230802.2";
src = fetchFromGitHub {
owner = "abseil";
repo = "abseil-cpp";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-wW7dCqiiHyBHiizyV0+M6p17itwTpzHv/T0/mcXyYWE=";
};
cmakeFlags = [
"-DABSL_BUILD_TEST_HELPERS=ON"
"-DABSL_USE_EXTERNAL_GOOGLETEST=ON"
"-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
] ++ lib.optionals (cxxStandard != null) [
"-DCMAKE_CXX_STANDARD=${cxxStandard}"
];
strictDeps = true;
nativeBuildInputs = [ cmake ];
buildInputs = [ gtest ];
meta = with lib; {
description = "Open-source collection of C++ code designed to augment the C++ standard library";
homepage = "https://abseil.io/";
license = licenses.asl20;
platforms = platforms.all;
maintainers = [ maintainers.andersk ];
};
})
pkgs/servers/redpanda/base64.nix
-26
View File
@@ -1,26 +0,0 @@
{ clangStdenv
, cmake
, fetchFromGitHub
, lib
}:
let
pname = "base64";
version = "0.5.0";
in
clangStdenv.mkDerivation {
inherit pname version;
src = fetchFromGitHub {
owner = "aklomp";
repo = "base64";
rev = "v${version}";
sha256 = "sha256-2HNI9ycT9f+NLwLElEuR61qmTguOsI+kNxv01ipxSqQ=";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "Fast Base64 stream encoder/decoder in C99, with SIMD acceleration";
license = licenses.bsd2;
homepage = "https://github.com/aklomp/base64";
maintainers = with maintainers; [ avakhrenev ];
platforms = platforms.unix;
};
}
pkgs/servers/redpanda/default.nix
-6
View File
@@ -1,5 +1,4 @@
{ buildGoModule
, callPackage
, doCheck ? !stdenv.isDarwin # Can't start localhost test server in MacOS sandbox.
, fetchFromGitHub
, installShellFiles
@@ -14,7 +13,6 @@ let
rev = "v${version}";
sha256 = "sha256-Eemo1NhRa6CX+fgtNT22zoQqN8Vrrl8mkqhy4zmhJHo=";
};
server = callPackage ./server.nix { inherit src version; };
in
buildGoModule rec {
pname = "redpanda-rpk";
@@ -38,10 +36,6 @@ buildGoModule rec {
done
'';
passthru = {
inherit server;
};
meta = with lib; {
description = "Redpanda client";
homepage = "https://redpanda.com/";
pkgs/servers/redpanda/hdr-histogram.nix
-28
View File
@@ -1,28 +0,0 @@
{ clangStdenv
, cmake
, fetchFromGitHub
, lib
, zlib
}:
let
pname = "HdrHistogram_c";
version = "0.11.5";
in
clangStdenv.mkDerivation {
inherit pname version;
src = fetchFromGitHub {
owner = "HdrHistogram";
repo = "HdrHistogram_c";
rev = version;
sha256 = "sha256-29if+0H8wdpQBN48lt0ylGgtUCv/tJYZnG5LzcIqXDs=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ zlib ];
meta = with lib; {
description = "C port of the HdrHistogram";
license = licenses.bsd2;
homepage = "https://github.com/HdrHistogram/HdrHistogram_c";
maintainers = with maintainers; [ avakhrenev ];
platforms = platforms.unix;
};
}
pkgs/servers/redpanda/rapidjson.nix
-32
View File
@@ -1,32 +0,0 @@
# rapidjson used in nixpkgs is too old. Although it is technically a latest release, it was made in 2016.
# Redpanda uses its own version
{ clangStdenv
, cmake
, fetchFromGitHub
, lib
, pkg-config
}:
clangStdenv.mkDerivation rec {
pname = "rapidjson";
version = "1.1.1";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "rapidjson";
rev = "27c3a8dc0e2c9218fe94986d249a12b5ed838f1d";
sha256 = "sha256-wggyCL5uEsnJDxkYAUsXOjoO1MNQBGB05E6aSpsNcl0=";
};
nativeBuildInputs = [ pkg-config cmake ];
doCheck = false;
meta = with lib; {
description = "Fast JSON parser/generator for C++ with both SAX/DOM style API";
homepage = "http://rapidjson.org/";
maintainers = with maintainers; [ avakhrenev ];
license = licenses.mit;
platforms = platforms.unix;
};
}
pkgs/servers/redpanda/redpanda.patch
-73
View File
@@ -1,73 +0,0 @@
diff --git a/cmake/main.cmake b/cmake/main.cmake
index 8c60c4214..194f33a21 100644
--- a/cmake/main.cmake
+++ b/cmake/main.cmake
@@ -15,15 +15,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_UNITY_BUILD_BATCH_SIZE 10)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-list(APPEND BASE_LD_FLAGS_LIST
- -L${REDPANDA_DEPS_INSTALL_DIR}/lib
- -L${REDPANDA_DEPS_INSTALL_DIR}/lib64
- -fuse-ld=lld)
-set(PKG_CONFIG_PATH_LIST
- ${REDPANDA_DEPS_INSTALL_DIR}/lib64/pkgconfig
- ${REDPANDA_DEPS_INSTALL_DIR}/share/pkgconfig
- ${REDPANDA_DEPS_INSTALL_DIR}/lib/pkgconfig
- )
list(APPEND BASE_CXX_FLAGS_LIST -fPIC)
list(APPEND BASE_C_FLAGS_LIST -fPIC)
diff --git a/cmake/testing.cmake b/cmake/testing.cmake
index 7f149dc82..7c57aa3dd 100644
--- a/cmake/testing.cmake
+++ b/cmake/testing.cmake
@@ -24,6 +24,7 @@ message(STATUS "RP_ENABLE_BENCHMARK_TESTS=${RP_ENABLE_BENCHMARK_TESTS}")
message(STATUS "RP_ENABLE_HONEY_BADGER_TESTS=${RP_ENABLE_HONEY_BADGER_TESTS}")
function (rp_test)
+ return()
set(options
INTEGRATION_TEST UNIT_TEST BENCHMARK_TEST HBADGER_TEST)
set(oneValueArgs BINARY_NAME TIMEOUT PREPARE_COMMAND POST_COMMAND)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eecd145ed..b9efa89b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,4 +5,5 @@ find_package(Boost REQUIRED
unit_test_framework)
find_package(absl REQUIRED)
add_subdirectory(v)
-add_subdirectory(go/kreq-gen)
+# Don't build kafka-request-generator, it is needed only for tests
+# add_subdirectory(go/kreq-gen)
diff --git a/src/v/CMakeLists.txt b/src/v/CMakeLists.txt
index 075da485e..af7ede2bc 100644
--- a/src/v/CMakeLists.txt
+++ b/src/v/CMakeLists.txt
@@ -58,7 +58,9 @@ else()
if(${ENABLE_GIT_HASH})
message(FATAL_ERROR "ENABLE_GIT_HASH cannot be 'on' when ENABLE_GIT_VERSION is 'off'")
endif()
- set(GIT_VER "no_version")
+ if(NOT GIT_VER)
+ set(GIT_VER "no_version")
+ endif()
endif()
if(${ENABLE_GIT_HASH})
@@ -71,8 +73,12 @@ if(${ENABLE_GIT_HASH})
set(GIT_CLEAN_DIRTY "")
endif()
else()
- set(GIT_SHA1 "000")
- set(GIT_CLEAN_DIRTY "-dev")
+ if(NOT GIT_SHA1)
+ set(GIT_SHA1 "000")
+ endif()
+ if(NOT GIT_CLEAN_DIRTY)
+ set(GIT_CLEAN_DIRTY "-dev")
+ endif()
endif()
configure_file(version.h.in version.h @ONLY)
pkgs/servers/redpanda/seastar-fixes.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/include/seastar/core/std-coroutine.hh b/include/seastar/core/std-coroutine.hh
index ea364bee..57474529 100644
--- a/include/seastar/core/std-coroutine.hh
+++ b/include/seastar/core/std-coroutine.hh
@@ -87,7 +87,7 @@ class coroutine_handle<void> {
explicit operator bool() const noexcept { return _pointer; }
- static coroutine_handle from_address(void* ptr) noexcept {
+ static constexpr coroutine_handle from_address(void* ptr) noexcept {
coroutine_handle hndl;
hndl._pointer = ptr;
return hndl;
pkgs/servers/redpanda/seastar.nix
-84
View File
@@ -1,84 +0,0 @@
{ boost175
, c-ares
, cmake
, cryptopp
, fetchFromGitHub
, fmt_8
, gnutls
, hwloc
, lib
, libsystemtap
, libtasn1
, liburing
, libxfs
, lksctp-tools
, llvmPackages_14
, lz4
, ninja
, numactl
, openssl
, pkg-config
, python3
, ragel
, valgrind
, yaml-cpp
}:
let
pname = "seastar";
version = "22.11.0";
in
llvmPackages_14.stdenv.mkDerivation {
inherit pname version;
strictDeps = true;
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "seastar";
rev = "30d3a28bde08d2228b4e560c173b89fdd94c3f05";
sha256 = "sha256-Xzu7AJMkvE++BGEqluod3fwMEIpDnbCczmlEad0/4v4=";
};
nativeBuildInputs = [
cmake
ninja
openssl
pkg-config
python3
ragel
];
buildInputs = [
libsystemtap
libxfs
];
propagatedBuildInputs = [
boost175
c-ares
gnutls
cryptopp
fmt_8
hwloc
libtasn1
liburing
lksctp-tools
lz4
numactl
valgrind
yaml-cpp
];
patches = [
./seastar-fixes.patch
];
postPatch = ''
patchShebangs ./scripts/seastar-json2code.py
'';
cmakeFlags = [
"-DSeastar_EXCLUDE_DEMOS_FROM_ALL=ON"
"-DSeastar_EXCLUDE_TESTS_FROM_ALL=ON"
];
doCheck = false;
meta = with lib; {
description = "High performance server-side application framework";
license = licenses.asl20;
homepage = "https://seastar.io/";
maintainers = with maintainers; [ avakhrenev ];
platforms = platforms.unix;
};
}
pkgs/servers/redpanda/server.nix
-124
View File
@@ -1,124 +0,0 @@
{ abseil-cpp_202206
, avro-cpp
, callPackage
, ccache
, cmake
, crc32c
, croaring
, ctre
, curl
, dpdk
, git
, lib
, llvmPackages_14
, llvm_14
, ninja
, p11-kit
, pkg-config
, procps
, protobuf_21
, python3
, snappy
, src
, unzip
, version
, writeShellScriptBin
, xxHash
, zip
, zstd
}:
let
pname = "redpanda";
pythonPackages = p: with p; [ jinja2 ];
seastar = callPackage ./seastar.nix { };
base64 = callPackage ./base64.nix { };
hdr-histogram = callPackage ./hdr-histogram.nix { };
kafka-codegen-venv = python3.withPackages (ps: [
ps.jinja2
ps.jsonschema
]);
rapidjson = callPackage ./rapidjson.nix { };
in
llvmPackages_14.stdenv.mkDerivation rec {
inherit pname version src;
preConfigure = ''
# setup sccache
export CCACHE_DIR=$TMPDIR/sccache-redpanda
mkdir -p $CCACHE_DIR
'';
patches = [
./redpanda.patch
];
postPatch = ''
# Fix 'error: use of undeclared identifier 'roaring'; did you mean 'Roaring
# qualified reference to 'Roaring' is a constructor name rather than a type in this context'
substituteInPlace \
./src/v/storage/compacted_offset_list.h \
./src/v/storage/compaction_reducers.cc \
./src/v/storage/compaction_reducers.h \
./src/v/storage/segment_utils.h \
./src/v/storage/segment_utils.cc \
--replace 'roaring::Roaring' 'Roaring'
patchShebangs ./src/v/rpc/rpc_compiler.py
'';
doCheck = false;
nativeBuildInputs = [
(python3.withPackages pythonPackages)
(writeShellScriptBin "kafka-codegen-venv" "exec -a $0 ${kafka-codegen-venv}/bin/python3 $@")
ccache
cmake
curl
git
llvm_14
ninja
pkg-config
procps
seastar
unzip
zip
];
cmakeFlags = [
"-DREDPANDA_DEPS_SKIP_BUILD=ON"
"-DRP_ENABLE_TESTS=OFF"
"-Wno-dev"
"-DGIT_VER=${version}"
"-DGIT_CLEAN_DIRTY=\"\""
];
buildInputs = [
abseil-cpp_202206
avro-cpp
base64
crc32c
croaring
ctre
dpdk
hdr-histogram
p11-kit
protobuf_21
rapidjson
seastar
snappy
xxHash
zstd
];
meta = with lib; {
broken = true;
description = "Kafka-compatible streaming platform";
license = licenses.bsl11;
longDescription = ''
Redpanda is a Kafka-compatible streaming data platform that is
proven to be 10x faster and 6x lower in total costs. It is also JVM-free,
ZooKeeper-free, Jepsen-tested and source available.
'';
homepage = "https://redpanda.com/";
maintainers = with maintainers; [ avakhrenev happysalada ];
platforms = platforms.linux;
};
}
pkgs/top-level/aliases.nix
+1
View File
@@ -1169,6 +1169,7 @@ mapAliases ({
readline63 = throw "'readline63' has been replaced with 'readline'"; # Added 2024-02-10
redocly-cli = redocly; # Added 2024-04-14
redpanda = redpanda-client; # Added 2023-10-14
redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10
restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22
retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05
retroshare06 = retroshare;
pkgs/top-level/all-packages.nix
+1 -15
View File
@@ -12261,8 +12261,6 @@ with pkgs;
redpanda-client = callPackage ../servers/redpanda { };
redpanda-server = redpanda-client.server;
redsocks = callPackage ../tools/networking/redsocks { };
rep = callPackage ../development/tools/rep { };
@@ -19822,24 +19820,12 @@ with pkgs;
then overrideSDK stdenv { darwinMinVersion = "10.13"; }
else stdenv;
};
abseil-cpp_202206 = callPackage ../development/libraries/abseil-cpp/202206.nix {
# If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
stdenv = if stdenv.isDarwin && stdenv.isx86_64
then overrideSDK stdenv { darwinMinVersion = "10.13"; }
else stdenv;
};
abseil-cpp_202301 = callPackage ../development/libraries/abseil-cpp/202301.nix {
# If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
stdenv = if stdenv.isDarwin && stdenv.isx86_64
then overrideSDK stdenv { darwinMinVersion = "10.13"; }
else stdenv;
};
abseil-cpp_202308 = callPackage ../development/libraries/abseil-cpp/202308.nix {
# If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
stdenv = if stdenv.isDarwin && stdenv.isx86_64
then overrideSDK stdenv { darwinMinVersion = "10.13"; }
else stdenv;
};
abseil-cpp_202401 = callPackage ../development/libraries/abseil-cpp/202401.nix {
# If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
stdenv = if stdenv.isDarwin && stdenv.isx86_64
@@ -38034,7 +38020,7 @@ with pkgs;
protobuf = protobuf_21;
# or-tools builds with -std=c++20, so abseil-cpp must
# also be built that way
abseil-cpp = abseil-cpp_202206.override {
abseil-cpp = abseil-cpp.override {
static = true;
cxxStandard = "20";
};
pkgs/top-level/python-packages.nix
+2 -4
View File
@@ -3482,7 +3482,7 @@ self: super: with self; {
dm-sonnet = callPackage ../development/python-modules/dm-sonnet { };
dm-tree = callPackage ../development/python-modules/dm-tree {
abseil-cpp = pkgs.abseil-cpp_202103.override {
abseil-cpp = pkgs.abseil-cpp.override {
cxxStandard = "14";
};
};
@@ -9202,9 +9202,7 @@ self: super: with self; {
onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { };
onnx = callPackage ../development/python-modules/onnx {
abseil-cpp = pkgs.abseil-cpp_202301;
};
onnx = callPackage ../development/python-modules/onnx { };
onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common {
inherit (pkgs) protobuf;