mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
ce789e7e35
- merge libcxxabi into libcxx for LLVM 12, 13, 14, 15, 16, 17, and git. - remove the link time workaround `-lc++ -lc++abi` from 58 packages as it is no longer required. - fixes https://github.com/NixOS/nixpkgs/issues/166205 - provides alternative fixes for. https://github.com/NixOS/nixpkgs/issues/269548 https://github.com/NixOS/nix/issues/9640 - pkgsCross.x86_64-freebsd builds work again This change can be represented in 3 stages 1. merge libcxxabi into libcxx -- files: pkgs/development/compilers/llvm/[12, git]/{libcxx, libcxxabi} 2. update stdenv to account for merge -- files: stdenv.{adapters, cc.wrapper, darwin} 3. remove all references to libcxxabi outside of llvm (about 58 packages modified) ### merging libcxxabi into libcxx - take the union of the libcxxabi and libcxx cmake flags - eliminate the libcxx-headers-only package - it was only needed to break libcxx <-> libcxxabi circular dependency - libcxx.cxxabi is removed. external cxxabi (freebsd) will symlink headers / libs into libcxx. - darwin will re-export the libcxxabi symbols into libcxx so linking `-lc++` is sufficient. - linux/freebsd `libc++.so` is a linker script `LINK(libc++.so.1, -lc++abi)` making `-lc++` sufficient. - libcxx/default.nix [12, 17] are identical except for patches and `LIBCXX_ADDITIONAL_LIBRARIES` (only used in 16+) - git/libcxx/defaul.nix does not link with -nostdlib when useLLVM is true so flag is removed. this is not much different than before as libcxxabi used -nostdlib where libcxx did not, so libc was linked in anyway. ### stdenv changes - darwin bootstrap, remove references to libcxxabi and cxxabi - cc-wrapper: remove c++ link workaround when libcxx.cxxabi doesn't exist (still exists for LLVM pre 12) - adapter: update overrideLibcxx to account for a pkgs.stdenv that only has libcxx ### 58 package updates - remove `NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}` as no longer needed - swift, nodejs_v8 remove libcxxabi references in the clang override https://github.com/NixOS/nixpkgs/pull/292043
81 lines
1.7 KiB
Nix
81 lines
1.7 KiB
Nix
{ lib
|
|
, stdenv
|
|
, fetchFromGitHub
|
|
, buildGoModule
|
|
, unixODBC
|
|
, icu
|
|
, nix-update-script
|
|
, testers
|
|
, usql
|
|
}:
|
|
|
|
buildGoModule rec {
|
|
pname = "usql";
|
|
version = "0.17.5";
|
|
|
|
src = fetchFromGitHub {
|
|
owner = "xo";
|
|
repo = "usql";
|
|
rev = "v${version}";
|
|
hash = "sha256-Lh5CProffPB/GEYvU1h7St8zgmnS1QOjBgvdUXlsGzc=";
|
|
};
|
|
|
|
buildInputs = [ unixODBC icu ];
|
|
|
|
vendorHash = "sha256-IdqSTwQeMRjB5sE53VvTVAXPyIyN+pMj4XziIT31rV0=";
|
|
proxyVendor = true;
|
|
|
|
# Exclude broken genji, hive & impala drivers (bad group)
|
|
# These drivers break too often and are not used.
|
|
#
|
|
# See https://github.com/xo/usql/pull/347
|
|
#
|
|
excludedPackages = [
|
|
"genji"
|
|
"hive"
|
|
"impala"
|
|
];
|
|
|
|
# These tags and flags are copied from build.sh
|
|
tags = [
|
|
"most"
|
|
"sqlite_app_armor"
|
|
"sqlite_fts5"
|
|
"sqlite_introspect"
|
|
"sqlite_json1"
|
|
"sqlite_math_functions"
|
|
"sqlite_stat4"
|
|
"sqlite_userauth"
|
|
"sqlite_vtable"
|
|
"no_adodb"
|
|
];
|
|
|
|
ldflags = [
|
|
"-s"
|
|
"-w"
|
|
"-X github.com/xo/usql/text.CommandVersion=${version}"
|
|
];
|
|
|
|
# All the checks currently require docker instances to run the databases.
|
|
doCheck = false;
|
|
|
|
passthru = {
|
|
updateScript = nix-update-script { };
|
|
tests.version = testers.testVersion {
|
|
inherit version;
|
|
package = usql;
|
|
command = "usql --version";
|
|
};
|
|
};
|
|
|
|
meta = with lib; {
|
|
description = "Universal command-line interface for SQL databases";
|
|
homepage = "https://github.com/xo/usql";
|
|
changelog = "https://github.com/xo/usql/releases/tag/v${version}";
|
|
license = licenses.mit;
|
|
mainProgram = "usql";
|
|
maintainers = with maintainers; [ georgyo anthonyroussel ];
|
|
platforms = with platforms; linux ++ darwin;
|
|
};
|
|
}
|