mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-17 17:44:44 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
2259be2076
@ -21,5 +21,5 @@ in
|
||||
services.github-runners.${cfg.name} = cfg;
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ veehaitch newam ];
|
||||
meta.maintainers = with maintainers; [ veehaitch newam thomasjm ];
|
||||
}
|
||||
|
||||
@ -42,10 +42,10 @@ in
|
||||
|
||||
services.unifi.mongodbPackage = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.mongodb-4_2;
|
||||
default = pkgs.mongodb-4_4;
|
||||
defaultText = literalExpression "pkgs.mongodb";
|
||||
description = lib.mdDoc ''
|
||||
The mongodb package to use. Please note: unifi7 officially only supports mongodb up until 3.6 but works with 4.2.
|
||||
The mongodb package to use. Please note: unifi7 officially only supports mongodb up until 3.6 but works with 4.4.
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -123,7 +123,7 @@ in
|
||||
|
||||
mongodbPackage = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.mongodb-4_2;
|
||||
default = pkgs.mongodb-4_4;
|
||||
defaultText = literalExpression "pkgs.mongodb";
|
||||
description = lib.mdDoc ''
|
||||
The mongodb package to use.
|
||||
|
||||
@ -33,7 +33,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
nodes = {
|
||||
node = {...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
mongodb-4_2
|
||||
mongodb-4_4
|
||||
mongodb-5_0
|
||||
];
|
||||
@ -43,7 +42,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
testScript = ''
|
||||
node.start()
|
||||
''
|
||||
+ runMongoDBTest pkgs.mongodb-4_2
|
||||
+ runMongoDBTest pkgs.mongodb-4_4
|
||||
+ runMongoDBTest pkgs.mongodb-5_0
|
||||
+ ''
|
||||
|
||||
@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.matthiasbeyer ];
|
||||
platforms = with lib.platforms; linux;
|
||||
mainProgram = "vis";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oxker";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-VIsop0XjadZQecKRbt+2U2qrMVmPaLZGUuMEY8v+aJ8=";
|
||||
sha256 = "sha256-35MHq2G2L7yfz+W9uUaRb8fpEp/h0bt2HtK615XwZG8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wBTbHHCNZvp1xc6iiK6LzBFYsF9RPHA74YM6SDv6x94=";
|
||||
cargoHash = "sha256-goIb8BoHSF0g/OWmeZtha+qKlcvLTqwMmYcD2uYUI7E=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple tui to view & control docker containers";
|
||||
|
||||
@ -167,7 +167,8 @@ stdenv.mkDerivation {
|
||||
|
||||
for executable in \
|
||||
firefox firefox-bin plugin-container \
|
||||
updater crashreporter webapprt-stub
|
||||
updater crashreporter webapprt-stub \
|
||||
glxtest vaapitest
|
||||
do
|
||||
if [ -e "$out/usr/lib/firefox-bin-${version}/$executable" ]; then
|
||||
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NvCQs6YzQ2zNLQiYgFK/q2c74g/+YkzQIQJWEINOYIE=";
|
||||
hash = "sha256-OtA7mhypPNDD7IH5XKOoE2ytcjR0uhed8B3MoMrPd0Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZJFpzBeC048RZ6YfjXQPyohCO1WagxXvBBacifkfkjE=";
|
||||
vendorHash = "sha256-QzD0Stbr8QuQ8n9l9qv16KFqSFBsRbxETmQ8LHdk3nI=";
|
||||
|
||||
subPackages = [ "cmd/clusterctl" ];
|
||||
|
||||
@ -43,6 +43,6 @@ buildGoModule rec {
|
||||
description = "Kubernetes cluster API tool";
|
||||
homepage = "https://cluster-api.sigs.k8s.io/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ zowoq ];
|
||||
maintainers = with maintainers; [ zowoq qjoly ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec{
|
||||
pname = "pinniped";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "pinniped";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-noWNklLRYW0l7fGBnsTQk8v5t+mwKheh0egHxL+YxAE=";
|
||||
sha256 = "sha256-v1VuCM6sMNVj6nAVuqphDUVGBc3k0oYJWt9TJb/3fP4=";
|
||||
};
|
||||
|
||||
subPackages = "cmd/pinniped";
|
||||
|
||||
vendorHash = "sha256-P28L+IHZ+To08Y4gdv/VldAoVcMnCPlZDxy7xe5OP8o=";
|
||||
vendorHash = "sha256-k3fFr83LPY10ASLERzUO/8ojZgx3LLGFEIjMxaGehTs=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -173,7 +173,8 @@ stdenv.mkDerivation {
|
||||
|
||||
for executable in \
|
||||
thunderbird thunderbird-bin plugin-container \
|
||||
updater crashreporter webapprt-stub
|
||||
updater crashreporter webapprt-stub \
|
||||
glxtest vaapitest
|
||||
do
|
||||
if [ -e "$out/usr/lib/thunderbird-bin-${version}/$executable" ]; then
|
||||
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
|
||||
@ -1,53 +1,80 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, libpng, gzip, fftw, blas, lapack
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, libpng
|
||||
, gzip
|
||||
, fftw
|
||||
, blas
|
||||
, lapack
|
||||
, withMPI ? false
|
||||
, mpi
|
||||
, cmake
|
||||
# Available list of packages can be found near here:
|
||||
# https://github.com/lammps/lammps/blob/develop/cmake/CMakeLists.txt#L222
|
||||
, packages ? {
|
||||
ASPHERE = true;
|
||||
BODY = true;
|
||||
CLASS2 = true;
|
||||
COLLOID = true;
|
||||
COMPRESS = true;
|
||||
CORESHELL = true;
|
||||
DIPOLE = true;
|
||||
GRANULAR = true;
|
||||
KSPACE = true;
|
||||
MANYBODY = true;
|
||||
MC = true;
|
||||
MISC = true;
|
||||
MOLECULE = true;
|
||||
OPT = true;
|
||||
PERI = true;
|
||||
QEQ = true;
|
||||
REPLICA = true;
|
||||
RIGID = true;
|
||||
SHOCK = true;
|
||||
ML-SNAP = true;
|
||||
SRD = true;
|
||||
REAXFF = true;
|
||||
}
|
||||
}:
|
||||
let packages = [
|
||||
"asphere" "body" "class2" "colloid" "compress" "coreshell"
|
||||
"dipole" "granular" "kspace" "manybody" "mc" "misc" "molecule"
|
||||
"opt" "peri" "qeq" "replica" "rigid" "shock" "snap" "srd" "user-reaxc"
|
||||
];
|
||||
lammps_includes = "-DLAMMPS_EXCEPTIONS -DLAMMPS_GZIP -DLAMMPS_MEMALIGN=64";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
# LAMMPS has weird versioning converted to ISO 8601 format
|
||||
version = "stable_29Oct2020";
|
||||
version = "23Jun2022_update4";
|
||||
pname = "lammps";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lammps";
|
||||
repo = "lammps";
|
||||
rev = version;
|
||||
sha256 = "1rmi9r5wj2z49wg43xyhqn9sm37n95cyli3g7vrqk3ww35mmh21q";
|
||||
rev = "stable_${version}";
|
||||
hash = "sha256-zGztc+iUFNIa0KKtfpAhwitInvMmXeTHp1XsOLibfzM=";
|
||||
};
|
||||
preConfigure = ''
|
||||
cd cmake
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit mpi;
|
||||
inherit packages;
|
||||
};
|
||||
cmakeFlags = [
|
||||
] ++ (builtins.map (p: "-DPKG_${p}=ON") (builtins.attrNames (lib.filterAttrs (n: v: v) packages)));
|
||||
|
||||
buildInputs = [ fftw libpng blas lapack gzip ]
|
||||
++ (lib.optionals withMPI [ mpi ]);
|
||||
buildInputs = [
|
||||
fftw
|
||||
libpng
|
||||
blas
|
||||
lapack
|
||||
gzip
|
||||
] ++ lib.optionals withMPI [
|
||||
mpi
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
cd src
|
||||
for pack in ${lib.concatStringsSep " " packages}; do make "yes-$pack" SHELL=$SHELL; done
|
||||
'';
|
||||
|
||||
# Must do manual build due to LAMMPS requiring a separate build for
|
||||
# the libraries and executable. Also non-typical make script
|
||||
buildPhase = ''
|
||||
make mode=exe ${if withMPI then "mpi" else "serial"} SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
|
||||
make mode=shlib ${if withMPI then "mpi" else "serial"} SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/include $out/lib
|
||||
|
||||
cp -v lmp_* $out/bin/
|
||||
cp -v *.h $out/include/
|
||||
cp -v liblammps* $out/lib/
|
||||
# For backwards compatibility
|
||||
postInstall = ''
|
||||
ln -s $out/bin/lmp $out/bin/lmp_serial
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -62,6 +89,10 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://lammps.sandia.gov";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
# compiling lammps with 64 bit support blas and lapack might cause runtime
|
||||
# segfaults. In anycase both blas and lapack should have the same #bits
|
||||
# support.
|
||||
broken = (blas.isILP64 && lapack.isILP64);
|
||||
maintainers = [ maintainers.costrouc maintainers.doronbehar ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -36,6 +36,34 @@
|
||||
, withPython ? with stdenv; buildPlatform.canExecute hostPlatform
|
||||
}:
|
||||
|
||||
let filters = {
|
||||
# "binary-name = package" where:
|
||||
# - "${package}/bin/${binary-name}" is the full path to the binary
|
||||
# - occurrences of `"${binary-name}"` in recoll's filters should be fixed up
|
||||
awk = gawk;
|
||||
antiword = antiword;
|
||||
catppt = catdoc;
|
||||
djvused = djvulibre;
|
||||
djvutxt = djvulibre;
|
||||
egrep = gnugrep;
|
||||
groff = groff;
|
||||
gunzip = gzip;
|
||||
iconv = libiconv;
|
||||
pdftotext = poppler_utils;
|
||||
ps2ascii = ghostscript;
|
||||
sed = gnused;
|
||||
tar = gnutar;
|
||||
unzip = unzip;
|
||||
xls2csv = catdoc;
|
||||
xsltproc = libxslt;
|
||||
unrtf = unrtf;
|
||||
untex = untex;
|
||||
wpd2html = libwpd;
|
||||
perl = perl.passthru.withPackages (p: [ p.ImageExifTool ]);
|
||||
};
|
||||
filterPath = lib.makeBinPath (map lib.getBin (builtins.attrValues filters));
|
||||
in
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "recoll";
|
||||
version = "1.33.4";
|
||||
@ -109,28 +137,15 @@ mkDerivation rec {
|
||||
substituteInPlace $out/share/recoll/filters/rclconfig.py --replace /usr/share/recoll $out/share/recoll
|
||||
for f in $out/share/recoll/filters/* ; do
|
||||
if [[ ! "$f" =~ \.zip$ ]]; then
|
||||
substituteInPlace $f --replace '"antiword"' '"${lib.getBin antiword}/bin/antiword"'
|
||||
substituteInPlace $f --replace '"awk"' '"${lib.getBin gawk}/bin/awk"'
|
||||
substituteInPlace $f --replace '"catppt"' '"${lib.getBin catdoc}/bin/catppt"'
|
||||
substituteInPlace $f --replace '"djvused"' '"${lib.getBin djvulibre}/bin/djvused"'
|
||||
substituteInPlace $f --replace '"djvutxt"' '"${lib.getBin djvulibre}/bin/djvutxt"'
|
||||
substituteInPlace $f --replace '"egrep"' '"${lib.getBin gnugrep}/bin/egrep"'
|
||||
substituteInPlace $f --replace '"groff"' '"${lib.getBin groff}/bin/groff"'
|
||||
substituteInPlace $f --replace '"gunzip"' '"${lib.getBin gzip}/bin/gunzip"'
|
||||
substituteInPlace $f --replace '"iconv"' '"${lib.getBin libiconv}/bin/iconv"'
|
||||
substituteInPlace $f --replace '"pdftotext"' '"${lib.getBin poppler_utils}/bin/pdftotext"'
|
||||
'' + lib.concatStrings (lib.mapAttrsToList (k: v: (''
|
||||
substituteInPlace $f --replace '"${k}"' '"${lib.getBin v}/bin/${k}"'
|
||||
'')) filters) + ''
|
||||
substituteInPlace $f --replace '"pstotext"' '"${lib.getBin ghostscript}/bin/ps2ascii"'
|
||||
substituteInPlace $f --replace '"sed"' '"${lib.getBin gnused}/bin/sed"'
|
||||
substituteInPlace $f --replace '"tar"' '"${lib.getBin gnutar}/bin/tar"'
|
||||
substituteInPlace $f --replace '"unzip"' '"${lib.getBin unzip}/bin/unzip"'
|
||||
substituteInPlace $f --replace '"xls2csv"' '"${lib.getBin catdoc}/bin/xls2csv"'
|
||||
substituteInPlace $f --replace '"xsltproc"' '"${lib.getBin libxslt}/bin/xsltproc"'
|
||||
substituteInPlace $f --replace '"unrtf"' '"${lib.getBin unrtf}/bin/unrtf"'
|
||||
substituteInPlace $f --replace '"untex"' '"${lib.getBin untex}/bin/untex"'
|
||||
substituteInPlace $f --replace '"wpd2html"' '"${lib.getBin libwpd}/bin/wpd2html"'
|
||||
substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl
|
||||
substituteInPlace $f --replace /usr/bin/perl ${lib.getBin (perl.passthru.withPackages (p: [ p.ImageExifTool ]))}/bin/perl
|
||||
fi
|
||||
done
|
||||
wrapProgram $out/bin/recoll --prefix PATH : "${filterPath}"
|
||||
wrapProgram $out/bin/recollindex --prefix PATH : "${filterPath}"
|
||||
wrapProgram $out/share/recoll/filters/rclaudio.py \
|
||||
--prefix PYTHONPATH : $PYTHONPATH
|
||||
wrapProgram $out/share/recoll/filters/rclimg \
|
||||
|
||||
25
pkgs/development/compilers/assemblyscript/default.nix
Normal file
25
pkgs/development/compilers/assemblyscript/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "assemblyscript";
|
||||
version = "0.27.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AssemblyScript";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3dWIYkiAA61xbUXJGmb/amjHmyXYoy16lLIAZR4sD5k=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-9ILa1qY2GpP2RckcZYcCMmgCwdXIImOm+D8nldeoQL8=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/AssemblyScript/${pname}";
|
||||
description = "A TypeScript-like language for WebAssembly";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lucperkins ];
|
||||
};
|
||||
}
|
||||
@ -6,7 +6,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in
|
||||
owner = "QuickChick";
|
||||
inherit version;
|
||||
defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [
|
||||
{ cases = [ (range "8.13" "8.16") pred.true ]; out = "1.6.4"; }
|
||||
{ cases = [ (range "8.13" "8.17") pred.true ]; out = "1.6.5"; }
|
||||
{ cases = [ "8.13" pred.true ]; out = "1.5.0"; }
|
||||
{ cases = [ "8.12" pred.true ]; out = "1.4.0"; }
|
||||
{ cases = [ "8.11" pred.true ]; out = "1.3.2"; }
|
||||
@ -17,6 +17,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in
|
||||
{ cases = [ "8.6" pred.true ]; out = "20171102"; }
|
||||
{ cases = [ "8.5" pred.true ]; out = "20170512"; }
|
||||
] null;
|
||||
release."1.6.5".sha256 = "sha256-rcFyRDH8UbB9KVk10P5qjtPkWs04p78VNHkCq4mXr3U=";
|
||||
release."1.6.4".sha256 = "sha256-C1060wPSU33yZAFLxGmZlAMXASnx98qz3oSLO8DO+mM=";
|
||||
release."1.6.2".sha256 = "0g5q9zw3xd4zndihq96nxkq4w3dh05418wzlwdk1nnn3b6vbx6z0";
|
||||
release."1.5.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dcw7hyfkw";
|
||||
|
||||
@ -6,7 +6,8 @@ mkCoqDerivation {
|
||||
owner = "gappa";
|
||||
domain = "gitlab.inria.fr";
|
||||
inherit version;
|
||||
defaultVersion = if lib.versions.range "8.8" "8.16" coq.coq-version then "1.5.2" else null;
|
||||
defaultVersion = if lib.versions.range "8.8" "8.17" coq.coq-version then "1.5.3" else null;
|
||||
release."1.5.3".sha256 = "sha256-SuMopX5sm4jh2uBuE7zr6vhWhHYZYnab+epjqYJqg+s=";
|
||||
release."1.5.2".sha256 = "sha256-A021Bhqz5r2CZBayfjIiWrCIfUlejcQAfbTmOaf6QTM=";
|
||||
release."1.5.1".sha256 = "1806bq1z6q5rq2ma7d5kfbqfyfr755hjg0dq7b2llry8fx9cxjsg";
|
||||
release."1.5.0".sha256 = "1i1c0gakffxqqqqw064cbvc243yl325hxd50jmczr6mk18igk41n";
|
||||
|
||||
@ -1,14 +1,15 @@
|
||||
{ lib, callPackage, mkCoqDerivation, coq, coq-ext-lib, version ? null }:
|
||||
|
||||
mkCoqDerivation {
|
||||
(mkCoqDerivation {
|
||||
pname = "simple-io";
|
||||
owner = "Lysxia";
|
||||
repo = "coq-simple-io";
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||
{ case = range "8.11" "8.16"; out = "1.7.0"; }
|
||||
{ case = range "8.11" "8.17"; out = "1.8.0"; }
|
||||
{ case = range "8.7" "8.13"; out = "1.3.0"; }
|
||||
] null;
|
||||
release."1.8.0".sha256 = "sha256-3ADNeXrBIpYRlfUW+LkLHUWV1w1HFrVc/TZISMuwvRY=";
|
||||
release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci";
|
||||
release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
|
||||
mlPlugin = true;
|
||||
@ -26,4 +27,7 @@ mkCoqDerivation {
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
}).overrideAttrs (o: lib.optionalAttrs (lib.versionAtLeast o.version "1.8.0" || o.version == "dev") {
|
||||
doCheck = false;
|
||||
useDune = true;
|
||||
})
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
||||
|
||||
checkPhase = ''
|
||||
cd test
|
||||
for p in Argv.v Example.v HelloWorld.v TestExtraction.v TestPervasives.v
|
||||
for p in Argv.v Example.v HelloWorld.v TestExtraction.v TestOcamlbuild.v TestPervasives.v
|
||||
do
|
||||
[ -f $p ] && echo $p && coqc $p
|
||||
done
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, ninja
|
||||
, openssl
|
||||
@ -16,23 +15,19 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "duckdb";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dCPWrB/Jqm4/kS6J/3jcQG291tFKAZSEptEYLGOZsLo=";
|
||||
hash = "sha256-w01QB3mufeKdo4d0BBm6xiidnnyo9CLpmntT6690leM=";
|
||||
};
|
||||
|
||||
patches = [ ./version.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --subst-var-by DUCKDB_VERSION "v${version}"
|
||||
substituteInPlace tools/shell/CMakeLists.txt \
|
||||
--replace \
|
||||
'install(TARGETS shell RUNTIME DESTINATION "''${PROJECT_BINARY_DIR}")' \
|
||||
'install(TARGETS shell RUNTIME DESTINATION "''${INSTALL_BIN_DIR}")'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
@ -90,6 +85,16 @@ stdenv.mkDerivation rec {
|
||||
"test/sql/copy/parquet/delta_byte_array_length_mismatch.test"
|
||||
"test/sql/function/timestamp/test_icu_strptime.test"
|
||||
"test/sql/timezone/test_icu_timezone.test"
|
||||
"test/sql/copy/parquet/snowflake_lineitem.test"
|
||||
"test/sql/copy/parquet/test_parquet_force_download.test"
|
||||
"test/sql/copy/parquet/delta_byte_array_multiple_pages.test"
|
||||
"test/sql/copy/csv/test_csv_httpfs_prepared.test"
|
||||
"test/sql/copy/csv/test_csv_httpfs.test"
|
||||
"test/sql/copy/csv/parallel/test_parallel_csv.test"
|
||||
"test/sql/copy/csv/parallel/csv_parallel_httpfs.test"
|
||||
"test/common/test_cast_struct.test"
|
||||
# test is order sensitive
|
||||
"test/sql/copy/parquet/parquet_glob.test"
|
||||
# these are only hidden if no filters are passed in
|
||||
"[!hide]"
|
||||
# this test apparently never terminates
|
||||
|
||||
@ -9,25 +9,22 @@
|
||||
# which is fixed 8.41 version requirement (nixpkgs have 8.42+, and
|
||||
# I not see any reason (for now) to backport 8.41.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyperscan";
|
||||
version = "5.4.0";
|
||||
version = "5.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = pname;
|
||||
sha256 = "sha256-AJAjaXVnGqIlMk+gb6lpTLUdZr8nxn2XSW4fj6j/cmk=";
|
||||
rev = "v${version}";
|
||||
repo = "hyperscan";
|
||||
hash = "sha256-tzmVc6kJPzkFQLUM1MttQRLpgs0uckbV6rCxEZwk1yk=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
buildInputs = [ boost ];
|
||||
nativeBuildInputs = [
|
||||
cmake ragel python3
|
||||
# Consider simply using busybox for these
|
||||
# Need at least: rev, sed, cut, nm
|
||||
util-linux
|
||||
cmake ragel python3 util-linux
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@ -37,14 +34,6 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON"
|
||||
++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# part of https://github.com/intel/hyperscan/pull/336
|
||||
url = "https://github.com/intel/hyperscan/commit/e2c4010b1fc1272cab816ba543940b3586e68a0c.patch";
|
||||
sha256 = "sha256-doVNwROL6MTcgOW8jBwGTnxe0zvxjawiob/g6AvXLak=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/examples/d' CMakeLists.txt
|
||||
substituteInPlace libhs.pc.in \
|
||||
@ -69,7 +58,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = "https://www.hyperscan.io/";
|
||||
maintainers = with maintainers; [ avnik ];
|
||||
platforms = [ "x86_64-linux" ]; # can't find nm on darwin ; might build on aarch64 but untested
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -30,13 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vte";
|
||||
version = "0.72.1";
|
||||
version = "0.72.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-BVT5+I1Wzi14OY/Mf2m8AOU7u8X2lOCuHcr1KG+J1+Q=";
|
||||
sha256 = "sha256-95Zv0YWmmB9TlkFitxz+9+YGSVFV1vWCe3KqDdZ0HJ4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
{ lib, fetchFromGitHub, buildDunePackage
|
||||
, calendar, csv, hex, ppx_deriving, ppx_sexp_conv, re, rresult, sexplib
|
||||
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, ocaml
|
||||
, calendar, camlp-streams, csv, hex, ppx_deriving, ppx_sexp_conv, re, rresult, sexplib
|
||||
}:
|
||||
|
||||
let with-camlp-streams = lib.optional (lib.versionAtLeast ocaml.version "5.0"); in
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "pgocaml";
|
||||
version = "4.3.0";
|
||||
@ -12,10 +14,16 @@ buildDunePackage rec {
|
||||
hash = "sha256-W1fbRnU1l61qqxfVY2qiBnVpGD81xrBO8k0tWr+RXMY=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
# Compatibility with OCaml ≥ 5.0
|
||||
patches = with-camlp-streams (fetchpatch {
|
||||
url = "https://github.com/darioteixeira/pgocaml/commit/906a289dc57da4971e312c31eedd26d81e902ed5.patch";
|
||||
hash = "sha256-/v9Jheg98GhrcD2gcsQpPvq7YiIrvJj22SKvrBRlR9Y=";
|
||||
});
|
||||
|
||||
propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ];
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ]
|
||||
++ with-camlp-streams camlp-streams;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An interface to PostgreSQL databases for OCaml applications";
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib }:
|
||||
|
||||
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
|
||||
"twt is not available for OCaml ${ocaml.version}"
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-twt";
|
||||
version = "0.94.0";
|
||||
|
||||
@ -1,7 +1,10 @@
|
||||
{ lib, buildDunePackage, fetchurl
|
||||
{ lib, buildDunePackage, fetchurl, ocaml
|
||||
, dune-configurator
|
||||
}:
|
||||
|
||||
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
|
||||
"vlq is not available for OCaml ${ocaml.version}"
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "vlq";
|
||||
version = "0.2.1";
|
||||
@ -11,8 +14,6 @@ buildDunePackage rec {
|
||||
sha256 = "02wr9ph4q0nxmqgbc67ydf165hmrdv9b655krm2glc3ahb6larxi";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
|
||||
|
||||
if lib.versionOlder ocaml.version "4.08"
|
||||
|| lib.versionAtLeast ocaml.version "5.0"
|
||||
then throw "wasm is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "anthropic";
|
||||
version = "0.2.9";
|
||||
version = "0.2.10";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-LURWTTYsztbo5mI2bk3n+U3NxsthNGpeUoNZsK/B8vM=";
|
||||
hash = "sha256-5NoGGobY/7hgcsCw/q8hmjpPff3dQiTfm6dp5GlJjBk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,11 +12,14 @@
|
||||
, pandas
|
||||
, pymc
|
||||
, scipy
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bambi";
|
||||
version = "0.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -26,6 +29,10 @@ buildPythonPackage rec {
|
||||
hash = "sha256-D04eTAlckEqgKA+59BRljlyneHYoqqZvLYmt/gBLHcU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
arviz
|
||||
formulae
|
||||
@ -35,7 +42,9 @@ buildPythonPackage rec {
|
||||
scipy
|
||||
];
|
||||
|
||||
preCheck = ''export HOME=$(mktemp -d)'';
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
blackjax
|
||||
@ -43,13 +52,24 @@ buildPythonPackage rec {
|
||||
numpyro
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# attempt to fetch data:
|
||||
# Tests require network access
|
||||
"test_custom_prior"
|
||||
"test_data_is_copied"
|
||||
"test_distributional_model"
|
||||
"test_gamma_with_splines"
|
||||
"test_non_distributional_model_with_categories"
|
||||
"test_non_distributional_model"
|
||||
"test_normal_with_splines"
|
||||
"test_predict_offset"
|
||||
# Assertion issue
|
||||
"test_custom_likelihood_function"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "bambi" ];
|
||||
pythonImportsCheck = [
|
||||
"bambi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://bambinos.github.io/bambi";
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pytestCheckHook
|
||||
@ -17,22 +16,22 @@ let
|
||||
name = "arrow-testing";
|
||||
owner = "apache";
|
||||
repo = "arrow-testing";
|
||||
rev = "47f7b56b25683202c1fd957668e13f2abafc0f12";
|
||||
hash = "sha256-ZDznR+yi0hm5O1s9as8zq5nh1QxJ8kXCRwbNQlzXpnI=";
|
||||
rev = "5bab2f264a23f5af68f69ea93d24ef1e8e77fc88";
|
||||
hash = "sha256-Pxx8ohUpXb5u1995IvXmxQMqWiDJ+7LAll/AjQP7ph8=";
|
||||
};
|
||||
|
||||
parquet-testing = fetchFromGitHub {
|
||||
name = "parquet-testing";
|
||||
owner = "apache";
|
||||
repo = "parquet-testing";
|
||||
rev = "b2e7cc755159196e3a068c8594f7acbaecfdaaac";
|
||||
hash = "sha256-IFvGTOkaRSNgZOj8DziRj88yH5JRF+wgSDZ5N0GNvjk=";
|
||||
rev = "e13af117de7c4f0a4d9908ae3827b3ab119868f3";
|
||||
hash = "sha256-rVI9zyk9IRDlKv4u8BeMb0HRdWLfCpqOlYCeUdA7BB8=";
|
||||
};
|
||||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datafusion";
|
||||
version = "23.0.0";
|
||||
version = "25.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -40,13 +39,13 @@ buildPythonPackage rec {
|
||||
owner = "apache";
|
||||
repo = "arrow-datafusion-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ndee7aNmoTtZyfl9UUXdNVHkp0GAuJWkyfZJyRrGwn8=";
|
||||
hash = "sha256-oC+fp41a9rsdobpvShZ7sDdtYPJQQ7JLg6MFL+4Pksg=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
name = "datafusion-cargo-deps";
|
||||
inherit src pname version;
|
||||
hash = "sha256-eDweEc+7dDbF0WBi6M5XAPIiHRjlYAdf2eNJdwj4D7c=";
|
||||
hash = "sha256-0e0ZRgwcS/46mi4c2loAnBA2bsaD+/RiMh7oNg3EvHY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
|
||||
@ -7,13 +7,14 @@
|
||||
, hypothesis
|
||||
, ipython-sql
|
||||
, poetry-core
|
||||
, snapshottest
|
||||
, sqlalchemy
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "duckdb-engine";
|
||||
version = "0.7.0";
|
||||
version = "0.7.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +23,7 @@ buildPythonPackage rec {
|
||||
repo = "duckdb_engine";
|
||||
owner = "Mause";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qLQjFkud9DivLQ9PignLrXlUVOAxsd28s7+2GdC5jKE=";
|
||||
hash = "sha256-Z9m1+Bc/csWKdPDuwf82xX0qOiD1Y5LBgJjUlLntAO8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -38,15 +39,19 @@ buildPythonPackage rec {
|
||||
export HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
# this test tries to download the httpfs extension
|
||||
disabledTests = [
|
||||
# this test tries to download the httpfs extension
|
||||
"test_preload_extension"
|
||||
# test should be skipped based on sqlalchemy version but isn't and fails
|
||||
"test_commit"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
hypothesis
|
||||
ipython-sql
|
||||
# TODO(cpcloud): include pandas here when it supports sqlalchemy 2.0
|
||||
snapshottest
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, duckdb
|
||||
, google-cloud-storage
|
||||
, mypy
|
||||
@ -47,6 +46,15 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# tries to make http request
|
||||
"test_install_non_existent_extension"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"duckdb"
|
||||
];
|
||||
|
||||
@ -1,27 +1,41 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, pytest, scipy, pytestCheckHook }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, scipy
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "fastpair";
|
||||
version = "2021-05-19";
|
||||
version = "unstable-2021-05-19";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carsonfarmer";
|
||||
repo = "fastpair";
|
||||
rev = "d3170fd7e4d6e95312e7e1cb02e84077a3f06379";
|
||||
sha256 = "1l8zgr8awg27lhlkpa2dsvghrb7b12jl1bkgpzg5q7pg8nizl9mx";
|
||||
hash = "sha256-vSb6o0XvHlzev2+uQKUI66wM39ZNqDsppEc8rlB+H9E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner",' ""
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ pytest pytestCheckHook ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
scipy
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/carsonfarmer/fastpair";
|
||||
description = "Data-structure for the dynamic closest-pair problem";
|
||||
homepage = "https://github.com/carsonfarmer/fastpair";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cmcdragonkai rakesh4g ];
|
||||
};
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-restful";
|
||||
version = "0.3.9";
|
||||
version = "0.3.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "Flask-RESTful";
|
||||
inherit version;
|
||||
hash = "sha256-zOxlC4NdSBkhOMhTKa4Dc15s7VjpstnCFG1shMBvpT4=";
|
||||
hash = "sha256-/kry7wAn34+bT3l6uiDFVmgBtq3plaxjtYir8aWc7Dc=";
|
||||
};
|
||||
|
||||
# conditional so that overrides are easier for web applications
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.22.0";
|
||||
version = "2.23.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zrttx7vfsUjFnCLyfYxG4uKH/RJr9BYCGZ3fxFg7Vsg=";
|
||||
hash = "sha256-yVyd5kowbHbs64EY5oMIa1sYIs/qShqzVdjfZ1VifA4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-spanner";
|
||||
version = "3.35.1";
|
||||
version = "3.36.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-w/Aua6IS7WHRsmjiNFJZp9D6Huo8PspYDa1JGDRp3mc=";
|
||||
hash = "sha256-zBKYxYvmUIAnC1StrhfzOSdkB4zhHlkds/6H5l1ZjG0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,31 +1,47 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, requests
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-i18n-address";
|
||||
version = "2.5.2";
|
||||
version = "3.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mirumee";
|
||||
repo = "google-i18n-address";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7t5sNpEVajdwcW8+xTNZQKZVgxhUzfbVbEVgn7JJ2MY=";
|
||||
hash = "sha256-eh0NcGJfIjCmgTyfSOlDNLrCvMnZKzkJkQb3txVmFAo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "i18naddress" ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"i18naddress"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Google's i18n address data packaged for Python";
|
||||
homepage = "https://github.com/mirumee/google-i18n-address";
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
changelog = "https://github.com/mirumee/google-i18n-address/releases/tag/${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -139,6 +139,20 @@ buildPythonPackage rec {
|
||||
# tries to download duckdb extensions
|
||||
"--deselect=ibis/backends/duckdb/tests/test_register.py::test_register_sqlite"
|
||||
"--deselect=ibis/backends/duckdb/tests/test_register.py::test_read_sqlite"
|
||||
# all the following tests are fixed in the next release (6.0.0)
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_column_to_pyarrow_table_schema"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_table_to_pyarrow_batches"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_column_to_pyarrow_batches"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_to_pyarrow_batches_memtable"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_table_to_pyarrow_table_schema"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_to_pyarrow_batches_borked_types"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_table_pyarrow_batch_chunk_size"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_column_pyarrow_batch_chunk_size"
|
||||
"--deselect=ibis/backends/tests/test_export.py::test_roundtrip_partitioned_parquet"
|
||||
"--deselect=ibis/tests/sql/test_sqlalchemy.py::test_order_by"
|
||||
"--deselect=ibis/tests/sql/test_sqlalchemy.py::test_no_cart_join"
|
||||
"--deselect=ibis/backends/tests/test_temporal.py::test_temporal_binop"
|
||||
"--deselect=ibis/backends/tests/test_temporal.py::test_interval_literal"
|
||||
];
|
||||
|
||||
# patch out tests that check formatting with black
|
||||
@ -146,6 +160,7 @@ buildPythonPackage rec {
|
||||
find ibis/tests -type f -name '*.py' -exec sed -i \
|
||||
-e '/^ *assert_decompile_roundtrip/d' \
|
||||
-e 's/^\( *\)code = ibis.decompile(expr, format=True)/\1code = ibis.decompile(expr)/g' {} +
|
||||
substituteInPlace pyproject.toml --replace 'sqlglot = ">=10.4.3,<12"' 'sqlglot = "*"'
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "iso3166";
|
||||
version = "2.0.2";
|
||||
version = "2.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "deactivated";
|
||||
repo = "python-iso3166";
|
||||
rev = version;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/y7c2qSA6+WKUP9YTSaMBjBxtqAuF4nB3MKvL5P6vL0=";
|
||||
};
|
||||
|
||||
@ -30,6 +30,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Self-contained ISO 3166-1 country definitions";
|
||||
homepage = "https://github.com/deactivated/python-iso3166";
|
||||
changelog = "https://github.com/deactivated/python-iso3166/blob/v${version}/CHANGES";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ zraexy ];
|
||||
};
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plugwise";
|
||||
version = "0.31.4";
|
||||
version = "0.31.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = "python-plugwise";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8DcURUJgngmBE6oPquSAHCsL1J2HAqvbtBcrqfrauHk=";
|
||||
hash = "sha256-gQNVHotuOur4J61QYmqFHJPZbZGifEzTI9Vh2rS1d5c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pontos";
|
||||
version = "23.5.3";
|
||||
version = "23.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QZJziSncO44KqvMTvpaQkIVAooLH8sKMt0TAC7L8UNs=";
|
||||
hash = "sha256-NWhDKcxA4lFOPLYH12FGqfsErIKp+Lsrjy0adFIKEWc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "publicsuffixlist";
|
||||
version = "0.10.0.20230506";
|
||||
version = "0.10.0.20230608";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-weQ31XTbv8VNNoyCSLpCEoCxAB11QXBRuvR+mmtGzWQ=";
|
||||
hash = "sha256-hMtOGJMX0VGquGxQUX/KSIALT0bORZaBEyoZSDLLBlc=";
|
||||
};
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
|
||||
@ -1,33 +1,46 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, pytest-runner
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyosf";
|
||||
version = "1.0.5";
|
||||
disabled = isPy27;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psychopy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1fkpmylpcbqa9ky111mz4qr1n8pik49gs7pblbb5qx6b54fzl5k2";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Yhb6HSnLdFzWouse/RKZ8SIbMia/hhD8TAovdqmvd7o=";
|
||||
};
|
||||
|
||||
preBuild = "export HOME=$TMP";
|
||||
buildInputs = [ pytest-runner ]; # required via `setup_requires`
|
||||
propagatedBuildInputs = [ requests ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner', " ""
|
||||
'';
|
||||
|
||||
doCheck = false; # requires network access
|
||||
pythonImportsCheck = [ "pyosf" ];
|
||||
preBuild = "export HOME=$TMP";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyosf"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/psychopy/pyosf";
|
||||
description = "Pure Python library for simple sync with Open Science Framework";
|
||||
homepage = "https://github.com/psychopy/pyosf";
|
||||
changelog = "https://github.com/psychopy/pyosf/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
|
||||
@ -10,10 +10,8 @@
|
||||
, mock
|
||||
, moto
|
||||
, psutil
|
||||
, pytest-cov
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pytest-runner
|
||||
, requests
|
||||
, responses
|
||||
, sqlalchemy
|
||||
@ -55,8 +53,10 @@ buildPythonPackage rec {
|
||||
websockets
|
||||
];
|
||||
|
||||
# Exclude tests that requires network features
|
||||
pytestFlagsArray = [ "--ignore=integration_tests" ];
|
||||
pytestFlagsArray = [
|
||||
# Exclude tests that requires network features
|
||||
"--ignore=integration_tests"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
@ -76,7 +76,9 @@ buildPythonPackage rec {
|
||||
"test_send_dict"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "slack" ];
|
||||
pythonImportsCheck = [
|
||||
"slack"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A client for Slack, which supports the Slack Web API and Real Time Messaging (RTM) API";
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, duckdb
|
||||
, pyspark
|
||||
, setuptools-scm
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlglot";
|
||||
version = "10.5.2";
|
||||
version = "15.0.0";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -17,12 +17,17 @@ buildPythonPackage rec {
|
||||
repo = "sqlglot";
|
||||
owner = "tobymao";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZFc2aOhCTRFlrzgnYDSdIZxRqKZ8FvkYSZRU0OMHI34=";
|
||||
hash = "sha256-F95JUYUgimWMyfPAV55e+bOcvWy5A95djKcJuSQ8RRs=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
# optional dependency used in the sqlglot optimizer
|
||||
propagatedBuildInputs = [ python-dateutil ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook duckdb pyspark ];
|
||||
nativeCheckInputs = [ pytestCheckHook duckdb ];
|
||||
|
||||
# these integration tests assume a running Spark instance
|
||||
disabledTestPaths = [ "tests/dataframe/integration" ];
|
||||
|
||||
@ -1,24 +1,38 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy27
|
||||
, requests, six
|
||||
, backports_unittest-mock, pytestCheckHook, pytest-runner }:
|
||||
{ lib
|
||||
, backports_unittest-mock
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sseclient";
|
||||
version = "0.0.27";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b2fe534dcb33b1d3faad13d60c5a7c718e28f85987f2a034ecf5ec279918c11c";
|
||||
hash = "sha256-sv5TTcszsdP6rRPWDFp8cY4o+FmH8qA07PXsJ5kYwRw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests six ];
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
six
|
||||
];
|
||||
|
||||
# some tests use python3 strings
|
||||
doCheck = !isPy27;
|
||||
nativeCheckInputs = [ backports_unittest-mock pytestCheckHook pytest-runner ];
|
||||
nativeCheckInputs = [
|
||||
backports_unittest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# tries to open connection to wikipedia
|
||||
disabledTests = [ "event_stream" ];
|
||||
disabledTests = [
|
||||
"event_stream"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client library for reading Server Sent Event streams";
|
||||
|
||||
@ -40,18 +40,19 @@ in buildPythonPackage {
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath
|
||||
patchelf
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
autoPatchelfHook
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
patchelf
|
||||
];
|
||||
|
||||
buildInputs = with cudaPackages; [
|
||||
buildInputs = lib.optionals stdenv.isLinux (with cudaPackages; [
|
||||
# $out/${sitePackages}/nvfuser/_C*.so wants libnvToolsExt.so.1 but torch/lib only ships
|
||||
# libnvToolsExt-$hash.so.1
|
||||
cuda_nvtx
|
||||
];
|
||||
]);
|
||||
|
||||
autoPatchelfIgnoreMissingDeps = [
|
||||
autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.isLinux [
|
||||
# This is the hardware-dependent userspace driver that comes from
|
||||
# nvidia_x11 package. It must be deployed at runtime in
|
||||
# /run/opengl-driver/lib or pointed at by LD_LIBRARY_PATH variable, rather
|
||||
@ -79,7 +80,7 @@ in buildPythonPackage {
|
||||
rm -rf $out/bin
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
addAutoPatchelfSearchPath "$out/${python.sitePackages}/torch/lib"
|
||||
|
||||
patchelf $out/${python.sitePackages}/torch/lib/libcudnn.so.8 --add-needed libcudnn_cnn_infer.so.8
|
||||
|
||||
@ -22,14 +22,14 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.3.281";
|
||||
version = "2.3.283";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ESekvthtLMSwAlwcFHEZ+6uVDr+BHgmrnTMwS/BauQw=";
|
||||
hash = "sha256-2NiDCzbZR82wQeRRTeKLx6FZe25k4wmzACCWNUJG+yI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "kgt";
|
||||
version = "2021-04-07";
|
||||
version = "2023-06-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "katef";
|
||||
repo = "kgt";
|
||||
# 2021-04-07, no version tags (yet)
|
||||
rev = "a7cbc52d368e413a3f1212c0fafccc05b2a42606";
|
||||
sha256 = "1x6q30xb8ihxi26rzk3s2hqd827fim4l4wn3qq252ibrwcq6lqyj";
|
||||
# 2023-06-03, no version tags (yet)
|
||||
rev = "dc881796aa691f1fddb1d01ec77216b34fe8134d";
|
||||
hash = "sha256-Az5995/eGUHFL1C1WAdgh1td3goHUYgzWFeVFz2zb8g=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -6,11 +6,11 @@ else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dune";
|
||||
version = "3.7.1";
|
||||
version = "3.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
|
||||
sha256 = "sha256-rfw48UwBiKKtgNYUUdAR0nq4g5txdJLXrUL3y5EcVMM=";
|
||||
sha256 = "sha256-lBOl1uudeWigRj3rudnxvnMCU0WAm4J5eNDBTbds+RQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ];
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-make";
|
||||
version = "0.36.8";
|
||||
version = "0.36.9";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-YLkeGLpNklXFOZ4bKn0GxWIEl9U77+PtAm8WxpDd1a4=";
|
||||
sha256 = "sha256-hWloZBhiJHfnTGVQMuYPZhRvCxD4C+Y0cVF+vQWNU3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
|
||||
|
||||
cargoHash = "sha256-JSMBJYwm/QH1W6j4X+1YLnzKlGizsiu/NI2A1wTXpJk=";
|
||||
cargoHash = "sha256-bJCK6N4IKwwm9EyixjnACX2x49xa+V+17XaEYACeJWs=";
|
||||
|
||||
# Some tests fail because they need network access.
|
||||
# However, Travis ensures a proper build.
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-public-api";
|
||||
version = "0.31.0";
|
||||
version = "0.31.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-TzdYmDLqFYHdp881SDc/QnRZv8QRgSHa00RGN0YPL2M=";
|
||||
hash = "sha256-w8K1dmTjnHm5bh1Ztn5DnBm2PEddxYLewWPiEnqbjCo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ndRpp9+dcywPKWZ7UB/NadmZKxmdiJjaiQJ/lJj8TKA=";
|
||||
cargoHash = "sha256-1SlGKnpwc8rN9w/d07nHVT3L4erA6/TWaza5qy57hlE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
41
pkgs/games/libremines/default.nix
Normal file
41
pkgs/games/libremines/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, wrapQtAppsHook
|
||||
, qtmultimedia
|
||||
, qtwayland
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libremines";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bollos00";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CQE7fggRxFI/VatS7NMcIrC78tzqSwkkVC8gK9iKdVY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
qtmultimedia
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
qtwayland
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DUSE_QT6=TRUE" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt based Minesweeper game";
|
||||
longDescription = ''
|
||||
A Free/Libre and Open Source Software Qt based Minesweeper game available for GNU/Linux, FreeBSD and Windows systems.
|
||||
'';
|
||||
homepage = "https://bollos00.github.io/LibreMines";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -168,6 +168,13 @@ in buildFHSEnv rec {
|
||||
librsvg
|
||||
xorg.libXft
|
||||
libvdpau
|
||||
|
||||
# required by coreutils stuff to run correctly
|
||||
# Steam ends up with LD_LIBRARY_PATH=<bunch of runtime stuff>:/usr/lib:<etc>
|
||||
# which overrides DT_RUNPATH in our binaries, so it tries to dynload the
|
||||
# very old versions of stuff from the runtime.
|
||||
# FIXME: how do we even fix this correctly
|
||||
attr
|
||||
] ++ lib.optionals withGameSpecificLibraries [
|
||||
# Not formally in runtime but needed by some games
|
||||
at-spi2-atk
|
||||
|
||||
@ -2,61 +2,61 @@
|
||||
"4.14": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.14.315-hardened1.patch",
|
||||
"sha256": "0mix8ycd46j53k2q1k3cpmz7kvd2p35gy2xkyrqxyqljrdfsz7wg",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.315-hardened1/linux-hardened-4.14.315-hardened1.patch"
|
||||
"name": "linux-hardened-4.14.316-hardened1.patch",
|
||||
"sha256": "1j0yx7i742mgbdn0lqq4mvcywk9jlm5k3zp40fdarsa0kscijxn0",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.316-hardened1/linux-hardened-4.14.316-hardened1.patch"
|
||||
},
|
||||
"sha256": "17f9cbinysazllrxkv1qlhgi3x61isi7jqrv0qlfpjh69k1waim3",
|
||||
"version": "4.14.315"
|
||||
"sha256": "0xlg93va7dbz2w428kiw7vr2sds3542fqq57rwyf51ykq7qii0xc",
|
||||
"version": "4.14.316"
|
||||
},
|
||||
"4.19": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.283-hardened1.patch",
|
||||
"sha256": "0yhb49w7bfsx3i3nc8wawjbzq4dzyh29wqhpkrmk42fzhwsp4lc5",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.283-hardened1/linux-hardened-4.19.283-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.284-hardened1.patch",
|
||||
"sha256": "0xqdhbsckkyg007x4247da0zza1sqq1y5a6li4z11y3xjf71dlxn",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.284-hardened1/linux-hardened-4.19.284-hardened1.patch"
|
||||
},
|
||||
"sha256": "1x2irhiv20aq2mrgqyz18d147shbmghwfxq4qi0sv5vc1k91cwq4",
|
||||
"version": "4.19.283"
|
||||
"sha256": "0gnhgxcpx9s96wa3dqgxmdjb7x12i94yh0gmv7k9nbz5qwhfxfbz",
|
||||
"version": "4.19.284"
|
||||
},
|
||||
"5.10": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.180-hardened1.patch",
|
||||
"sha256": "0ks0bcprycylnsq7xdrp7phsi2jjmw7il1k7jwbjqs6irhn5p4dd",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.180-hardened1/linux-hardened-5.10.180-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.181-hardened1.patch",
|
||||
"sha256": "0dp50zakzxxalc4zdsw8jjhzi1vnb4x3wkdcnxxjpcikn9mg6jj7",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.181-hardened1/linux-hardened-5.10.181-hardened1.patch"
|
||||
},
|
||||
"sha256": "0a8cicvcyl5w4vi7gxhgd59ny44gj9cbv4z5pnwn9jgny55rm0ys",
|
||||
"version": "5.10.180"
|
||||
"sha256": "1rx43dkxspris9529vl11blzhvsxnpaqr6yb3fy089az7yvwxrmc",
|
||||
"version": "5.10.181"
|
||||
},
|
||||
"5.15": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.15.112-hardened1.patch",
|
||||
"sha256": "0126p9s0flz544y8j8gjcx96mrivcr88lrzvmgyhly8dz06bwksb",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.112-hardened1/linux-hardened-5.15.112-hardened1.patch"
|
||||
"name": "linux-hardened-5.15.114-hardened1.patch",
|
||||
"sha256": "1nhx1k6dxnqrgv6m6c69858018cda65l4135742wlyd4vgi7ikq7",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.114-hardened1/linux-hardened-5.15.114-hardened1.patch"
|
||||
},
|
||||
"sha256": "0lfnd8mpb3nzvd0gk0jbls3zx7y5kskc4kgccjgkc34flgdyps5h",
|
||||
"version": "5.15.112"
|
||||
"sha256": "1lkpa9wv1qj90qdzzi71qf5dyy7mi95fixx3ymdp6xwz45fym0g9",
|
||||
"version": "5.15.114"
|
||||
},
|
||||
"5.4": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.243-hardened1.patch",
|
||||
"sha256": "04xnfqxxfs1cbq5ynly1vgwjdhnjf3b34yirk3cqffrwwlcba3db",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.243-hardened1/linux-hardened-5.4.243-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.244-hardened1.patch",
|
||||
"sha256": "1ap8ipkxbsqflf2lwppz41v5jrl6qbblf6ig2id6x3mjd6v0lph3",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.244-hardened1/linux-hardened-5.4.244-hardened1.patch"
|
||||
},
|
||||
"sha256": "017b1xhmjpmiq48pzzx36wn6jwwgaq2kgia51h7pxr7fxr7ndky3",
|
||||
"version": "5.4.243"
|
||||
"sha256": "06x20aq7bv86ghv2sdsz3q2rmqh8h389x5zksr53fyzdjl72ixch",
|
||||
"version": "5.4.244"
|
||||
},
|
||||
"6.1": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.1.29-hardened1.patch",
|
||||
"sha256": "09g7hk30hdjgbni02k4zrzh8i2lhcmb6fbif6n101wmcrnrf8c80",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.29-hardened1/linux-hardened-6.1.29-hardened1.patch"
|
||||
"name": "linux-hardened-6.1.31-hardened1.patch",
|
||||
"sha256": "04baw5z9nk4fjinnj1plg47b8wi8fqwj0v8si91zz19mzgpkfkkz",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.31-hardened1/linux-hardened-6.1.31-hardened1.patch"
|
||||
},
|
||||
"sha256": "1yzwp0496j63c6lhvsni1ynr8b2cpn552pli3nd3fdk0pp4nqwqy",
|
||||
"version": "6.1.29"
|
||||
"sha256": "1hbkw290kmf1dj8a255ik1gk5fk458c88m348dwrc3lrl6xifsg8",
|
||||
"version": "6.1.31"
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.181";
|
||||
version = "5.10.182";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1rx43dkxspris9529vl11blzhvsxnpaqr6yb3fy089az7yvwxrmc";
|
||||
sha256 = "1xp9bxk2vyw29bq3z854ly4cj94z8i52yl5hq4a3l3j6564wb3ny";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.15.114";
|
||||
version = "5.15.115";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1lkpa9wv1qj90qdzzi71qf5dyy7mi95fixx3ymdp6xwz45fym0g9";
|
||||
sha256 = "050j9z0wg5glgxwbmzfq4l8lv8y7g3nc2rz8342yjdcjfxh6h1qv";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.244";
|
||||
version = "5.4.245";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "06x20aq7bv86ghv2sdsz3q2rmqh8h389x5zksr53fyzdjl72ixch";
|
||||
sha256 = "195ixy9l18mhwvzj7v63fkyifb9mysq950afxh6ixlpvg0c8h1wn";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.1.31";
|
||||
version = "6.1.32";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "1hbkw290kmf1dj8a255ik1gk5fk458c88m348dwrc3lrl6xifsg8";
|
||||
sha256 = "0v0saai735jzaj3dbpgp6sbdi95n3lmv78pbg1xy9fd2kfhbg23w";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.3.5";
|
||||
version = "6.3.6";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "0pl2zypsmrnna69850jadccffxwg9xdfkldg0sv8m44b7n64gkgm";
|
||||
sha256 = "1vr418rf0zd16fq4vaxda1w2ccng2n9l0ysakmgz9xqbz86iysks";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.179-rt87"; # updated by ./update-rt.sh
|
||||
version = "5.10.180-rt88"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
@ -17,14 +17,14 @@ in buildLinux (args // {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "0abylcqbzpxxh45kmvd9i2cig64aajz87j5c8vm3w1ab2mf49g8v";
|
||||
sha256 = "0a8cicvcyl5w4vi7gxhgd59ny44gj9cbv4z5pnwn9jgny55rm0ys";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "045pjxlrv05vpiavgnaq971ziirxa1hzkzs1fv11npp4q45lqzp3";
|
||||
sha256 = "1509lg9gdjbjmg8rpx17n34xid2v1qz1lmil05b78sz86bscb2s2";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
||||
@ -12,12 +12,12 @@ callPackage ./generic.nix args {
|
||||
# check the release notes for compatible kernels
|
||||
kernelCompatible =
|
||||
if stdenv'.isx86_64
|
||||
then kernel.kernelOlder "6.3"
|
||||
then kernel.kernelOlder "6.4"
|
||||
else kernel.kernelOlder "6.2";
|
||||
latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;
|
||||
latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_3;
|
||||
|
||||
# this package should point to the latest release.
|
||||
version = "2.1.11";
|
||||
version = "2.1.12";
|
||||
|
||||
sha256 = "tJLwyqUj1l5F0WKZDeMGrEFa8fc/axKqm31xtN51a5M=";
|
||||
sha256 = "eYUR5d4gpTrlFu6j1uL83DWL9uPGgAUDRdSEb73V5i4=";
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This builder is for FoundationDB CMake build system.
|
||||
|
||||
{ lib, fetchFromGitHub
|
||||
, cmake, ninja, python3, openjdk, mono, pkg-config
|
||||
, cmake, ninja, python3, openjdk8, mono, pkg-config
|
||||
, msgpack, toml11
|
||||
|
||||
, gccStdenv, llvmPackages
|
||||
@ -12,8 +12,6 @@
|
||||
let
|
||||
stdenv = if useClang then llvmPackages.libcxxStdenv else gccStdenv;
|
||||
|
||||
tests = builtins.replaceStrings [ "\n" ] [ " " ] (lib.fileContents ./test-list.txt);
|
||||
|
||||
# Only even numbered versions compile on aarch64; odd numbered versions have avx enabled.
|
||||
avxEnabled = version:
|
||||
let
|
||||
@ -39,10 +37,9 @@ let
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
buildInputs = [ ssl boost ]
|
||||
++ lib.optionals (lib.versionAtLeast version "7.1.0") [ msgpack toml11 ];
|
||||
buildInputs = [ ssl boost msgpack toml11 ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk mono ]
|
||||
nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk8 mono ]
|
||||
++ lib.optionals useClang [ llvmPackages.lld ];
|
||||
|
||||
separateDebugInfo = true;
|
||||
@ -71,14 +68,7 @@ let
|
||||
# Same with LLD when Clang is available.
|
||||
(lib.optionalString useClang "-DUSE_LD=LLD")
|
||||
(lib.optionalString (!useClang) "-DUSE_LD=GOLD")
|
||||
] ++ lib.optionals (lib.versionOlder version "7.0.0")
|
||||
[ # FIXME: why can't libressl be found automatically?
|
||||
"-DLIBRESSL_USE_STATIC_LIBS=FALSE"
|
||||
"-DLIBRESSL_INCLUDE_DIR=${ssl.dev}"
|
||||
"-DLIBRESSL_CRYPTO_LIBRARY=${ssl.out}/lib/libcrypto.so"
|
||||
"-DLIBRESSL_SSL_LIBRARY=${ssl.out}/lib/libssl.so"
|
||||
"-DLIBRESSL_TLS_LIBRARY=${ssl.out}/lib/libtls.so"
|
||||
] ++ lib.optionals (lib.versionAtLeast version "7.1.0" && lib.versionOlder version "7.2.0")
|
||||
] ++ lib.optionals (lib.versionOlder version "7.2.0")
|
||||
[ # FIXME: why can't openssl be found automatically?
|
||||
"-DOPENSSL_USE_STATIC_LIBS=FALSE"
|
||||
"-DOPENSSL_CRYPTO_LIBRARY=${ssl.out}/lib/libcrypto.so"
|
||||
@ -100,17 +90,9 @@ let
|
||||
# coherently install packages as most linux distros expect -- it's designed to build
|
||||
# packaged artifacts that are shipped in RPMs, etc. we need to add some extra code to
|
||||
# cmake upstream to fix this, and if we do, i think most of this can go away.
|
||||
postInstall = lib.optionalString (lib.versionOlder version "7.0.0") ''
|
||||
mv $out/fdbmonitor/fdbmonitor $out/bin/fdbmonitor && rm -rf $out/fdbmonitor
|
||||
mkdir $out/libexec && ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent
|
||||
rm -rf $out/Library
|
||||
rm -rf $out/lib/foundationdb/
|
||||
mkdir $out/include/foundationdb && \
|
||||
mv $out/include/*.h $out/include/*.options $out/include/foundationdb
|
||||
'' + lib.optionalString (lib.versionAtLeast version "7.0.0") ''
|
||||
postInstall = ''
|
||||
mv $out/sbin/fdbmonitor $out/bin/fdbmonitor
|
||||
mkdir $out/libexec && mv $out/usr/lib/foundationdb/backup_agent/backup_agent $out/libexec/backup_agent
|
||||
'' + ''
|
||||
mv $out/sbin/fdbserver $out/bin/fdbserver
|
||||
|
||||
rm -rf $out/etc $out/lib/foundationdb $out/lib/systemd $out/log $out/sbin $out/usr $out/var
|
||||
@ -144,7 +126,7 @@ let
|
||||
homepage = "https://www.foundationdb.org";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" ]
|
||||
++ lib.optionals (lib.versionAtLeast version "7.1.0" && !(avxEnabled version)) [ "aarch64-linux" ];
|
||||
++ lib.optionals (!(avxEnabled version)) [ "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ thoughtpolice lostnet ];
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,93 +1,13 @@
|
||||
{ gcc6Stdenv, gccStdenv, llvmPackages
|
||||
, lib, fetchurl, fetchpatch, fetchFromGitHub
|
||||
{ gccStdenv, llvmPackages
|
||||
, lib, fetchFromGitHub
|
||||
|
||||
, cmake, ninja, which, findutils, m4, gawk
|
||||
, python2, python3, openjdk, mono, libressl, openssl, boost168, boost178
|
||||
, cmake, ninja, python3, openjdk8, mono, openssl, boost178
|
||||
, pkg-config, msgpack, toml11
|
||||
}@args:
|
||||
|
||||
let
|
||||
vsmakeBuild = import ./vsmake.nix args;
|
||||
cmakeBuild = import ./cmake.nix args;
|
||||
|
||||
python3-six-patch = fetchpatch {
|
||||
name = "update-python-six.patch";
|
||||
url = "https://github.com/apple/foundationdb/commit/4bd9efc4fc74917bc04b07a84eb065070ea7edb2.patch";
|
||||
sha256 = "030679lmc86f1wzqqyvxnwjyfrhh54pdql20ab3iifqpp9i5mi85";
|
||||
};
|
||||
|
||||
python3-print-patch = fetchpatch {
|
||||
name = "import-for-python-print.patch";
|
||||
url = "https://github.com/apple/foundationdb/commit/ded17c6cd667f39699cf663c0e87fe01e996c153.patch";
|
||||
sha256 = "11y434w68cpk7shs2r22hyrpcrqi8vx02cw7v5x79qxvnmdxv2an";
|
||||
};
|
||||
|
||||
glibc230-fix = fetchpatch {
|
||||
url = "https://github.com/Ma27/foundationdb/commit/e133cb974b9a9e4e1dc2d4ac15881d31225c0197.patch";
|
||||
sha256 = "1v9q2fyc73msigcykjnbmfig45zcrkrzcg87b0r6mxpnby8iryl1";
|
||||
};
|
||||
|
||||
in with builtins; {
|
||||
|
||||
# Older versions use the bespoke 'vsmake' build system
|
||||
# ------------------------------------------------------
|
||||
|
||||
foundationdb51 = vsmakeBuild {
|
||||
version = "5.1.7";
|
||||
branch = "release-5.1";
|
||||
sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06";
|
||||
|
||||
patches = [
|
||||
./patches/ldflags-5.1.patch
|
||||
./patches/fix-scm-version.patch
|
||||
./patches/gcc-fixes.patch
|
||||
python3-six-patch
|
||||
python3-print-patch
|
||||
];
|
||||
};
|
||||
|
||||
foundationdb52 = vsmakeBuild {
|
||||
version = "5.2.8";
|
||||
branch = "release-5.2";
|
||||
sha256 = "1kbmmhk2m9486r4kyjlc7bb3wd50204i0p6dxcmvl6pbp1bs0wlb";
|
||||
|
||||
patches = [
|
||||
./patches/ldflags-5.2.patch
|
||||
./patches/fix-scm-version.patch
|
||||
./patches/gcc-fixes.patch
|
||||
python3-six-patch
|
||||
python3-print-patch
|
||||
];
|
||||
};
|
||||
|
||||
foundationdb60 = vsmakeBuild {
|
||||
version = "6.0.18";
|
||||
branch = "release-6.0";
|
||||
sha256 = "0q1mscailad0z7zf1nypv4g7gx3damfp45nf8nzyq47nsw5gz69p";
|
||||
|
||||
patches = [
|
||||
./patches/ldflags-6.0.patch
|
||||
./patches/include-fixes-6.0.patch
|
||||
];
|
||||
};
|
||||
|
||||
# 6.1 and later versions should always use CMake
|
||||
# ------------------------------------------------------
|
||||
|
||||
foundationdb61 = cmakeBuild {
|
||||
version = "6.1.13";
|
||||
sha256 = "10vd694dcnh2pp91mri1m80kfbwjanhiy50c53c5ncqfa6pwvk00";
|
||||
boost = boost168;
|
||||
ssl = libressl;
|
||||
|
||||
patches = [
|
||||
./patches/clang-libcxx.patch
|
||||
./patches/suppress-clang-warnings.patch
|
||||
./patches/stdexcept-6.1.patch
|
||||
glibc230-fix
|
||||
];
|
||||
};
|
||||
|
||||
in {
|
||||
foundationdb71 = cmakeBuild {
|
||||
version = "7.1.30";
|
||||
sha256 = "sha256-dAnAE1m2NZLHgP4QJvURBPcxArXvWWdhqEYwh3tU+tU";
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
commit 7ed4745a092a203f92fc37ab5894e92117db0c94
|
||||
Author: Austin Seipp <aseipp@pobox.com>
|
||||
Date: Sat May 4 15:23:35 2019 -0500
|
||||
|
||||
flow: fix a build failure with Clang/libcxx on Linux
|
||||
|
||||
11bd7d7da introduced a hack on Linux to work around a missing symbol in
|
||||
libstdc++'s _pic library on Ubuntu. Unfortunately, this causes the build
|
||||
to fail when using Clang, as it doesn't believe this symbol is part of
|
||||
its headers in c++11 mode.
|
||||
|
||||
Unfortunately there's no good way to distinguish libcxx from libstdc++
|
||||
with the preprocessor, so we merely gate it by only checking for clang,
|
||||
iff we are on Linux.
|
||||
|
||||
With this change, Clang 8.x can build FoundationDB on Linux using libcxx
|
||||
as the standard C++ library.
|
||||
|
||||
Signed-off-by: Austin Seipp <aseipp@pobox.com>
|
||||
|
||||
diff --git a/flow/Platform.cpp b/flow/Platform.cpp
|
||||
index 3d3f1ac0..9f21dfd4 100644
|
||||
--- a/flow/Platform.cpp
|
||||
+++ b/flow/Platform.cpp
|
||||
@@ -2841,13 +2841,26 @@ void setupSlowTaskProfiler() {
|
||||
#endif
|
||||
}
|
||||
|
||||
-#ifdef __linux__
|
||||
+#if defined(__linux__) && !defined(__clang__)
|
||||
// There's no good place to put this, so it's here.
|
||||
// Ubuntu's packaging of libstdc++_pic offers different symbols than libstdc++. Go figure.
|
||||
// Notably, it's missing a definition of std::istream::ignore(long), which causes compilation errors
|
||||
// in the bindings. Thus, we provide weak versions of their definitions, so that if the
|
||||
// linked-against libstdc++ is missing their definitions, we'll be able to use the provided
|
||||
// ignore(long, int) version.
|
||||
+//
|
||||
+// Note that this hack is DISABLED when we use Clang. It is only needed when we statically link
|
||||
+// to the _pic libraries, but only official FDB Linux binaries are built this way using GCC. If we
|
||||
+// don't use the _pic libraries, then this hack is entirely unneeded -- likely the case when using
|
||||
+// Clang on Linux.
|
||||
+//
|
||||
+// Doing this allows us to use LLVM's libc++ with Clang on Linux -- otherwise, providing
|
||||
+// a weak symbol definition for an internal (non-public) class member fails (due to that member
|
||||
+// being non-existant on libc++.) See upstream GitHub issue #1533 for more information.
|
||||
+//
|
||||
+// TODO FIXME: Obliterate this when the official build environment is upgraded beyond Ubuntu 14.04.
|
||||
+// (This problem should be fixed in later LTS releases.)
|
||||
+
|
||||
#include <istream>
|
||||
namespace std {
|
||||
typedef basic_istream<char, std::char_traits<char>> char_basic_istream;
|
||||
@ -1,42 +0,0 @@
|
||||
diff --git a/build/scver.mk b/build/scver.mk
|
||||
index bdae8be..7539864 100644
|
||||
--- a/build/scver.mk
|
||||
+++ b/build/scver.mk
|
||||
@@ -98,33 +98,10 @@ endif
|
||||
GITPRESENT := $(wildcard $(FDBDIR)/.git)
|
||||
HGPRESENT := $(wildcard $(FDBDIR)/.hg)
|
||||
|
||||
-# Use Git, if not missing
|
||||
-ifneq ($(GITPRESENT),)
|
||||
- SCVER := $(shell cd "$(FDBDIR)" && git --version 2>/dev/null)
|
||||
- ifneq ($(SCVER),)
|
||||
- VERSION_ID := $(shell cd "$(FDBDIR)" && git rev-parse --verify HEAD)
|
||||
- SOURCE_CONTROL := GIT
|
||||
- SCBRANCH := $(shell cd "$(FDBDIR)" && git rev-parse --abbrev-ref HEAD)
|
||||
- else
|
||||
-$(error Missing git executable on $(PLATFORM) )
|
||||
- endif
|
||||
-# Otherwise, use Mercurial
|
||||
-else
|
||||
- # Otherwise, use Mercurial, if not missing
|
||||
- ifneq ($(HGPRESENT),)
|
||||
- SCVER := $(shell cd "$(FDBDIR)" && hg --version 2>/dev/null)
|
||||
- ifdef SCVER
|
||||
- VERSION_ID := $(shell cd "$(FDBDIR)" && hg id -n)
|
||||
- SOURCE_CONTROL := MERCURIAL
|
||||
- SCBRANCH := $(shell cd "$(FDBDIR)" && hg branch)
|
||||
- else
|
||||
-$(error Missing hg executable on $(PLATFORM))
|
||||
- endif
|
||||
- else
|
||||
- FDBFILES := (shell ls -la $(FDBDIR))
|
||||
-$(error Missing source control information for source on $(PLATFORM) in directory: $(FDBDIR) with files: $(FDBFILES))
|
||||
- endif
|
||||
-endif
|
||||
+# NixOS-specific non-VCS packaging, filled out by the nix build
|
||||
+SOURCE_CONTROL := GIT
|
||||
+VERSION_ID := @NIXOS_FDB_VERSION_ID@
|
||||
+SCBRANCH := @NIXOS_FDB_SCBRANCH@
|
||||
|
||||
# Set the RELEASE variable based on the KVRELEASE variable.
|
||||
ifeq ($(KVRELEASE),1)
|
||||
@ -1,138 +0,0 @@
|
||||
diff --git a/fdbrpc/ContinuousSample.h b/fdbrpc/ContinuousSample.h
|
||||
index 54ff1b109..577c228ae 100644
|
||||
--- a/fdbrpc/ContinuousSample.h
|
||||
+++ b/fdbrpc/ContinuousSample.h
|
||||
@@ -26,6 +26,7 @@
|
||||
#include "flow/IRandom.h"
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
+#include <cmath>
|
||||
|
||||
template <class T>
|
||||
class ContinuousSample {
|
||||
diff --git a/fdbrpc/Smoother.h b/fdbrpc/Smoother.h
|
||||
index 3ed8e6e98..fb4694750 100644
|
||||
--- a/fdbrpc/Smoother.h
|
||||
+++ b/fdbrpc/Smoother.h
|
||||
@@ -23,6 +23,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "flow/flow.h"
|
||||
+#include <cmath>
|
||||
|
||||
struct Smoother {
|
||||
// Times (t) are expected to be nondecreasing
|
||||
@@ -90,4 +91,4 @@ struct TimerSmoother {
|
||||
double time, total, estimate;
|
||||
};
|
||||
|
||||
-#endif
|
||||
\ No newline at end of file
|
||||
+#endif
|
||||
diff --git a/fdbrpc/libcoroutine/Coro.c b/fdbrpc/libcoroutine/Coro.c
|
||||
index cbfdc8fde..9993cee44 100644
|
||||
--- a/fdbrpc/libcoroutine/Coro.c
|
||||
+++ b/fdbrpc/libcoroutine/Coro.c
|
||||
@@ -66,6 +66,8 @@ VALGRIND_STACK_DEREGISTER((coro)->valgrindStackId)
|
||||
#define STACK_DEREGISTER(coro)
|
||||
#endif
|
||||
|
||||
+#pragma GCC diagnostic ignored "-Wreturn-local-addr"
|
||||
+
|
||||
// Define outside
|
||||
extern intptr_t g_stackYieldLimit;
|
||||
|
||||
diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp
|
||||
index 819c513c6..acfbfe7db 100644
|
||||
--- a/fdbserver/Knobs.cpp
|
||||
+++ b/fdbserver/Knobs.cpp
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "Knobs.h"
|
||||
#include "fdbrpc/Locality.h"
|
||||
+#include <cmath>
|
||||
|
||||
ServerKnobs const* SERVER_KNOBS = new ServerKnobs();
|
||||
|
||||
diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp
|
||||
index b485a8495..82541d439 100644
|
||||
--- a/flow/Knobs.cpp
|
||||
+++ b/flow/Knobs.cpp
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "Knobs.h"
|
||||
#include "flow/flow.h"
|
||||
+#include <cmath>
|
||||
|
||||
FlowKnobs const* FLOW_KNOBS = new FlowKnobs();
|
||||
|
||||
diff --git a/flow/Platform.cpp b/flow/Platform.cpp
|
||||
index 69dac889a..62bda9edb 100644
|
||||
--- a/flow/Platform.cpp
|
||||
+++ b/flow/Platform.cpp
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <algorithm>
|
||||
|
||||
#include <sys/types.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <time.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
@@ -623,7 +624,7 @@ void getDiskStatistics(std::string const& directory, uint64_t& currentIOs, uint6
|
||||
unsigned int minorId;
|
||||
disk_stream >> majorId;
|
||||
disk_stream >> minorId;
|
||||
- if(majorId == (unsigned int) major(buf.st_dev) && minorId == (unsigned int) minor(buf.st_dev)) {
|
||||
+ if(majorId == (unsigned int) gnu_dev_major(buf.st_dev) && minorId == (unsigned int) gnu_dev_minor(buf.st_dev)) {
|
||||
std::string ignore;
|
||||
uint64_t rd_ios; /* # of reads completed */
|
||||
// This is the total number of reads completed successfully.
|
||||
diff --git a/flow/Profiler.actor.cpp b/flow/Profiler.actor.cpp
|
||||
index 27af613e6..69f38c237 100644
|
||||
--- a/flow/Profiler.actor.cpp
|
||||
+++ b/flow/Profiler.actor.cpp
|
||||
@@ -35,8 +35,6 @@
|
||||
|
||||
extern volatile int profilingEnabled;
|
||||
|
||||
-static uint64_t gettid() { return syscall(__NR_gettid); }
|
||||
-
|
||||
struct SignalClosure {
|
||||
void (* func)(int, siginfo_t*, void*, void*);
|
||||
void *userdata;
|
||||
diff --git a/flow/TDMetric.actor.h b/flow/TDMetric.actor.h
|
||||
index 5421b83b5..711a96093 100755
|
||||
--- a/flow/TDMetric.actor.h
|
||||
+++ b/flow/TDMetric.actor.h
|
||||
@@ -36,6 +36,7 @@
|
||||
#include "CompressedInt.h"
|
||||
#include <algorithm>
|
||||
#include <functional>
|
||||
+#include <cmath>
|
||||
|
||||
struct MetricNameRef {
|
||||
MetricNameRef() {}
|
||||
diff --git a/flow/flow.h b/flow/flow.h
|
||||
index 0c220afae..f685fbc63 100644
|
||||
--- a/flow/flow.h
|
||||
+++ b/flow/flow.h
|
||||
@@ -248,19 +248,6 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
- bool operator == (ErrorOr const& o) const {
|
||||
- return error == o.error && (!present() || get() == o.get());
|
||||
- }
|
||||
- bool operator != (ErrorOr const& o) const {
|
||||
- return !(*this == o);
|
||||
- }
|
||||
-
|
||||
- bool operator < (ErrorOr const& o) const {
|
||||
- if (error != o.error) return error < o.error;
|
||||
- if (!present()) return false;
|
||||
- return get() < o.get();
|
||||
- }
|
||||
-
|
||||
bool isError() const { return error.code() != invalid_error_code; }
|
||||
bool isError(int code) const { return error.code() == code; }
|
||||
Error getError() const { ASSERT(isError()); return error; }
|
||||
@ -1,137 +0,0 @@
|
||||
diff --git a/fdbrpc/ContinuousSample.h b/fdbrpc/ContinuousSample.h
|
||||
index 54ff1b109..577c228ae 100644
|
||||
--- a/fdbrpc/ContinuousSample.h
|
||||
+++ b/fdbrpc/ContinuousSample.h
|
||||
@@ -26,6 +26,7 @@
|
||||
#include "flow/IRandom.h"
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
+#include <cmath>
|
||||
|
||||
template <class T>
|
||||
class ContinuousSample {
|
||||
diff --git a/fdbrpc/Smoother.h b/fdbrpc/Smoother.h
|
||||
index 3ed8e6e98..f3e4504b6 100644
|
||||
--- a/fdbrpc/Smoother.h
|
||||
+++ b/fdbrpc/Smoother.h
|
||||
@@ -23,6 +23,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "flow/flow.h"
|
||||
+#include <cmath>
|
||||
|
||||
struct Smoother {
|
||||
// Times (t) are expected to be nondecreasing
|
||||
@@ -50,7 +51,7 @@ struct Smoother {
|
||||
double elapsed = t - time;
|
||||
if(elapsed) {
|
||||
time = t;
|
||||
- estimate += (total-estimate) * (1-exp( -elapsed/eFoldingTime ));
|
||||
+ estimate += (total-estimate) * (1-std::exp( -elapsed/eFoldingTime ));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,11 +84,11 @@ struct TimerSmoother {
|
||||
void update(double t) {
|
||||
double elapsed = t - time;
|
||||
time = t;
|
||||
- estimate += (total-estimate) * (1-exp( -elapsed/eFoldingTime ));
|
||||
+ estimate += (total-estimate) * (1-std::exp( -elapsed/eFoldingTime ));
|
||||
}
|
||||
|
||||
double eFoldingTime;
|
||||
double time, total, estimate;
|
||||
};
|
||||
|
||||
-#endif
|
||||
\ No newline at end of file
|
||||
+#endif
|
||||
diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp
|
||||
index a924bc905..0dc70e7ac 100644
|
||||
--- a/fdbserver/Knobs.cpp
|
||||
+++ b/fdbserver/Knobs.cpp
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "Knobs.h"
|
||||
#include "fdbrpc/Locality.h"
|
||||
+#include <cmath>
|
||||
|
||||
ServerKnobs const* SERVER_KNOBS = new ServerKnobs();
|
||||
|
||||
diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp
|
||||
index 2d706dddd..5dbe08861 100644
|
||||
--- a/flow/Knobs.cpp
|
||||
+++ b/flow/Knobs.cpp
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "Knobs.h"
|
||||
#include "flow/flow.h"
|
||||
+#include <cmath>
|
||||
|
||||
FlowKnobs const* FLOW_KNOBS = new FlowKnobs();
|
||||
|
||||
@@ -128,7 +129,7 @@ FlowKnobs::FlowKnobs(bool randomize, bool isSimulated) {
|
||||
init( MAX_METRICS, 600 );
|
||||
init( MAX_METRIC_SIZE, 2500 );
|
||||
init( MAX_METRIC_LEVEL, 25 );
|
||||
- init( METRIC_LEVEL_DIVISOR, log(4) );
|
||||
+ init( METRIC_LEVEL_DIVISOR, std::log(4) );
|
||||
init( METRIC_LIMIT_START_QUEUE_SIZE, 10 ); // The queue size at which to start restricting logging by disabling levels
|
||||
init( METRIC_LIMIT_RESPONSE_FACTOR, 10 ); // The additional queue size at which to disable logging of another level (higher == less restrictive)
|
||||
|
||||
diff --git a/flow/Platform.cpp b/flow/Platform.cpp
|
||||
index a754c8747..4d47fad32 100644
|
||||
--- a/flow/Platform.cpp
|
||||
+++ b/flow/Platform.cpp
|
||||
@@ -98,6 +98,8 @@
|
||||
#include <sys/resource.h>
|
||||
/* Needed for crash handler */
|
||||
#include <signal.h>
|
||||
+/* Needed for major() and minor() with recent glibc */
|
||||
+#include <sys/sysmacros.h>
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__
|
||||
diff --git a/flow/Profiler.actor.cpp b/flow/Profiler.actor.cpp
|
||||
index 4603dcb77..78eda7278 100644
|
||||
--- a/flow/Profiler.actor.cpp
|
||||
+++ b/flow/Profiler.actor.cpp
|
||||
@@ -35,8 +35,6 @@
|
||||
|
||||
extern volatile int profilingEnabled;
|
||||
|
||||
-static uint64_t gettid() { return syscall(__NR_gettid); }
|
||||
-
|
||||
struct SignalClosure {
|
||||
void (* func)(int, siginfo_t*, void*, void*);
|
||||
void *userdata;
|
||||
diff --git a/flow/TDMetric.actor.h b/flow/TDMetric.actor.h
|
||||
index 306352c39..fc63e12f9 100755
|
||||
--- a/flow/TDMetric.actor.h
|
||||
+++ b/flow/TDMetric.actor.h
|
||||
@@ -35,6 +35,7 @@
|
||||
#include "genericactors.actor.h"
|
||||
#include "CompressedInt.h"
|
||||
#include <algorithm>
|
||||
+#include <cmath>
|
||||
#include <functional>
|
||||
|
||||
struct MetricNameRef {
|
||||
@@ -799,7 +800,7 @@ struct EventMetric : E, ReferenceCounted<EventMetric<E>>, MetricUtil<EventMetric
|
||||
if (x == 0.0)
|
||||
l = FLOW_KNOBS->MAX_METRIC_LEVEL-1;
|
||||
else
|
||||
- l = std::min(FLOW_KNOBS->MAX_METRIC_LEVEL-1, (int64_t)(::log(1.0/x) / FLOW_KNOBS->METRIC_LEVEL_DIVISOR));
|
||||
+ l = std::min(FLOW_KNOBS->MAX_METRIC_LEVEL-1, (int64_t)(std::log(1.0/x) / FLOW_KNOBS->METRIC_LEVEL_DIVISOR));
|
||||
|
||||
if(!canLog(l))
|
||||
return 0;
|
||||
@@ -1274,7 +1275,7 @@ public:
|
||||
l = std::min(
|
||||
FLOW_KNOBS->MAX_METRIC_LEVEL-1,
|
||||
(int64_t)(
|
||||
- log((toggleTime - tv.time) / x) /
|
||||
+ std::log((toggleTime - tv.time) / x) /
|
||||
FLOW_KNOBS->METRIC_LEVEL_DIVISOR
|
||||
)
|
||||
);
|
||||
@ -1,90 +0,0 @@
|
||||
diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk
|
||||
index 0b6eac8..b1891ca 100644
|
||||
--- a/FDBLibTLS/local.mk
|
||||
+++ b/FDBLibTLS/local.mk
|
||||
@@ -1,6 +1,5 @@
|
||||
FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR)
|
||||
-FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto
|
||||
-FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt
|
||||
+FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto
|
||||
FDBLibTLS_LDFLAGS += -Wl,-soname,FDBLibTLS.so -Wl,--version-script=FDBLibTLS/FDBLibTLS.map
|
||||
|
||||
# The plugin isn't a typical library, so it feels more sensible to have a copy
|
||||
diff --git a/bindings/c/local.mk b/bindings/c/local.mk
|
||||
index 44f0c31..7aea5a4 100644
|
||||
--- a/bindings/c/local.mk
|
||||
+++ b/bindings/c/local.mk
|
||||
@@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c
|
||||
CLEAN_TARGETS += fdb_c_tests_clean
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl
|
||||
- fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete
|
||||
+ fdb_c_LIBS += lib/libstdc++.a
|
||||
+ fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl
|
||||
fdb_c_tests_LIBS += -lpthread
|
||||
endif
|
||||
|
||||
diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk
|
||||
index 2ef4fcb..6e59625 100644
|
||||
--- a/bindings/flow/tester/local.mk
|
||||
+++ b/bindings/flow/tester/local.mk
|
||||
@@ -35,8 +35,7 @@ _fdb_flow_tester_clean:
|
||||
@rm -rf bindings/flow/bin
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdb_flow_tester_LIBS += -ldl -lpthread -lrt
|
||||
- fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc
|
||||
+ fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
|
||||
else ifeq ($(PLATFORM),osx)
|
||||
fdb_flow_tester_LDFLAGS += -lc++
|
||||
endif
|
||||
diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk
|
||||
index 033fe7d..865fc92 100644
|
||||
--- a/fdbbackup/local.mk
|
||||
+++ b/fdbbackup/local.mk
|
||||
@@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS)
|
||||
fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdbbackup_LIBS += -ldl -lpthread -lrt
|
||||
- fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc
|
||||
+ fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
|
||||
|
||||
# GPerfTools profiler (uncomment to use)
|
||||
# fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
|
||||
diff --git a/fdbcli/local.mk b/fdbcli/local.mk
|
||||
index 81a4a42..892c079 100644
|
||||
--- a/fdbcli/local.mk
|
||||
+++ b/fdbcli/local.mk
|
||||
@@ -22,14 +22,13 @@
|
||||
|
||||
fdbcli_CFLAGS := $(fdbclient_CFLAGS)
|
||||
fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS)
|
||||
-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl
|
||||
+fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
|
||||
fdbcli_STATIC_LIBS :=
|
||||
|
||||
fdbcli_GENERATED_SOURCES += versions.h
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc
|
||||
- fdbcli_LIBS += -lpthread -lrt
|
||||
+ fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl
|
||||
else ifeq ($(PLATFORM),osx)
|
||||
fdbcli_LDFLAGS += -lc++
|
||||
endif
|
||||
diff --git a/fdbserver/local.mk b/fdbserver/local.mk
|
||||
index 78cad1b..36f2c0f 100644
|
||||
--- a/fdbserver/local.mk
|
||||
+++ b/fdbserver/local.mk
|
||||
@@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS)
|
||||
fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdbserver_LIBS += -ldl -lpthread -lrt
|
||||
- fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc
|
||||
+ fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
|
||||
|
||||
# GPerfTools profiler (uncomment to use)
|
||||
# fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
|
||||
@ -1,90 +0,0 @@
|
||||
diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk
|
||||
index 5e6b9cfb..73f4e5f3 100644
|
||||
--- a/FDBLibTLS/local.mk
|
||||
+++ b/FDBLibTLS/local.mk
|
||||
@@ -1,6 +1,5 @@
|
||||
FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) -Ifdbrpc
|
||||
-FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto
|
||||
-FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt
|
||||
+FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto
|
||||
FDBLibTLS_LDFLAGS += -Wl,-soname,FDBLibTLS.so -Wl,--version-script=FDBLibTLS/FDBLibTLS.map
|
||||
|
||||
# The plugin isn't a typical library, so it feels more sensible to have a copy
|
||||
diff --git a/bindings/c/local.mk b/bindings/c/local.mk
|
||||
index 44f0c31b..7aea5a4f 100644
|
||||
--- a/bindings/c/local.mk
|
||||
+++ b/bindings/c/local.mk
|
||||
@@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c
|
||||
CLEAN_TARGETS += fdb_c_tests_clean
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl
|
||||
- fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete
|
||||
+ fdb_c_LIBS += lib/libstdc++.a
|
||||
+ fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl
|
||||
fdb_c_tests_LIBS += -lpthread
|
||||
endif
|
||||
|
||||
diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk
|
||||
index 2ef4fcb7..6e59625c 100644
|
||||
--- a/bindings/flow/tester/local.mk
|
||||
+++ b/bindings/flow/tester/local.mk
|
||||
@@ -35,8 +35,7 @@ _fdb_flow_tester_clean:
|
||||
@rm -rf bindings/flow/bin
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdb_flow_tester_LIBS += -ldl -lpthread -lrt
|
||||
- fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc
|
||||
+ fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
|
||||
else ifeq ($(PLATFORM),osx)
|
||||
fdb_flow_tester_LDFLAGS += -lc++
|
||||
endif
|
||||
diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk
|
||||
index 033fe7d4..865fc923 100644
|
||||
--- a/fdbbackup/local.mk
|
||||
+++ b/fdbbackup/local.mk
|
||||
@@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS)
|
||||
fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdbbackup_LIBS += -ldl -lpthread -lrt
|
||||
- fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc
|
||||
+ fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
|
||||
|
||||
# GPerfTools profiler (uncomment to use)
|
||||
# fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
|
||||
diff --git a/fdbcli/local.mk b/fdbcli/local.mk
|
||||
index 81a4a42e..892c079c 100644
|
||||
--- a/fdbcli/local.mk
|
||||
+++ b/fdbcli/local.mk
|
||||
@@ -22,14 +22,13 @@
|
||||
|
||||
fdbcli_CFLAGS := $(fdbclient_CFLAGS)
|
||||
fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS)
|
||||
-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl
|
||||
+fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
|
||||
fdbcli_STATIC_LIBS :=
|
||||
|
||||
fdbcli_GENERATED_SOURCES += versions.h
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc
|
||||
- fdbcli_LIBS += -lpthread -lrt
|
||||
+ fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl
|
||||
else ifeq ($(PLATFORM),osx)
|
||||
fdbcli_LDFLAGS += -lc++
|
||||
endif
|
||||
diff --git a/fdbserver/local.mk b/fdbserver/local.mk
|
||||
index 78cad1bf..36f2c0f7 100644
|
||||
--- a/fdbserver/local.mk
|
||||
+++ b/fdbserver/local.mk
|
||||
@@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS)
|
||||
fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdbserver_LIBS += -ldl -lpthread -lrt
|
||||
- fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc
|
||||
+ fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
|
||||
|
||||
# GPerfTools profiler (uncomment to use)
|
||||
# fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
|
||||
@ -1,78 +0,0 @@
|
||||
diff --git a/bindings/c/local.mk b/bindings/c/local.mk
|
||||
index c861a29c..ff886e93 100644
|
||||
--- a/bindings/c/local.mk
|
||||
+++ b/bindings/c/local.mk
|
||||
@@ -30,8 +30,8 @@ fdb_c_tests_HEADERS := -Ibindings/c
|
||||
CLEAN_TARGETS += fdb_c_tests_clean
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl
|
||||
- fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete
|
||||
+ fdb_c_LIBS += lib/libstdc++.a
|
||||
+ fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl
|
||||
fdb_c_tests_LIBS += -lpthread
|
||||
endif
|
||||
|
||||
diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk
|
||||
index 2ef4fcb7..6e59625c 100644
|
||||
--- a/bindings/flow/tester/local.mk
|
||||
+++ b/bindings/flow/tester/local.mk
|
||||
@@ -35,8 +35,7 @@ _fdb_flow_tester_clean:
|
||||
@rm -rf bindings/flow/bin
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdb_flow_tester_LIBS += -ldl -lpthread -lrt
|
||||
- fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc
|
||||
+ fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
|
||||
else ifeq ($(PLATFORM),osx)
|
||||
fdb_flow_tester_LDFLAGS += -lc++
|
||||
endif
|
||||
diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk
|
||||
index ca5dbab6..012f0130 100644
|
||||
--- a/fdbbackup/local.mk
|
||||
+++ b/fdbbackup/local.mk
|
||||
@@ -26,8 +26,7 @@ fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB
|
||||
fdbbackup_STATIC_LIBS := $(TLS_LIBS)
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdbbackup_LIBS += -ldl -lpthread -lrt
|
||||
- fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc
|
||||
+ fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
|
||||
|
||||
# GPerfTools profiler (uncomment to use)
|
||||
# fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
|
||||
diff --git a/fdbcli/local.mk b/fdbcli/local.mk
|
||||
index fd738876..3af026b9 100644
|
||||
--- a/fdbcli/local.mk
|
||||
+++ b/fdbcli/local.mk
|
||||
@@ -22,14 +22,13 @@
|
||||
|
||||
fdbcli_CFLAGS := $(fdbclient_CFLAGS)
|
||||
fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS)
|
||||
-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl $(FDB_TLS_LIB)
|
||||
+fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB)
|
||||
fdbcli_STATIC_LIBS := $(TLS_LIBS)
|
||||
|
||||
fdbcli_GENERATED_SOURCES += versions.h
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc
|
||||
- fdbcli_LIBS += -lpthread -lrt
|
||||
+ fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl
|
||||
else ifeq ($(PLATFORM),osx)
|
||||
fdbcli_LDFLAGS += -lc++
|
||||
endif
|
||||
diff --git a/fdbserver/local.mk b/fdbserver/local.mk
|
||||
index 690916d0..475abbaf 100644
|
||||
--- a/fdbserver/local.mk
|
||||
+++ b/fdbserver/local.mk
|
||||
@@ -26,8 +26,7 @@ fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB
|
||||
fdbserver_STATIC_LIBS := $(TLS_LIBS)
|
||||
|
||||
ifeq ($(PLATFORM),linux)
|
||||
- fdbserver_LIBS += -ldl -lpthread -lrt
|
||||
- fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc
|
||||
+ fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
|
||||
|
||||
# GPerfTools profiler (uncomment to use)
|
||||
# fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
|
||||
@ -1,24 +0,0 @@
|
||||
diff --git a/FDBLibTLS/FDBLibTLSPolicy.cpp b/FDBLibTLS/FDBLibTLSPolicy.cpp
|
||||
index 728ff871d..46e1dd289 100644
|
||||
--- a/FDBLibTLS/FDBLibTLSPolicy.cpp
|
||||
+++ b/FDBLibTLS/FDBLibTLSPolicy.cpp
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <algorithm>
|
||||
#include <exception>
|
||||
#include <map>
|
||||
+#include <stdexcept>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
diff --git a/FDBLibTLS/FDBLibTLSVerify.cpp b/FDBLibTLS/FDBLibTLSVerify.cpp
|
||||
index 594389916..1c8b9b50d 100644
|
||||
--- a/FDBLibTLS/FDBLibTLSVerify.cpp
|
||||
+++ b/FDBLibTLS/FDBLibTLSVerify.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <algorithm>
|
||||
#include <exception>
|
||||
#include <cstring>
|
||||
+#include <stdexcept>
|
||||
|
||||
static int hexValue(char c) {
|
||||
static char const digits[] = "0123456789ABCDEF";
|
||||
@ -1,34 +0,0 @@
|
||||
commit 8076537a52bb026941f13f5542395aac69ef0825
|
||||
Author: Austin Seipp <aseipp@pobox.com>
|
||||
Date: Sat May 4 17:34:51 2019 -0500
|
||||
|
||||
cmake: add workarounds for NixOS-specific deficiencies [NixOS]
|
||||
|
||||
The NixOS debug builder hook adds '-Wa,--compress-debug-sections' to the
|
||||
link flags (it actually adds it to the compiler flags, but the compiler
|
||||
is used for linking, so...). This makes the compiler angry when -Werror
|
||||
is passed, because it's unused at link-time (-Wa applies to the
|
||||
assembler). Suppress this warning with -Wno-unused-command-line-argument
|
||||
|
||||
NB: we *could* use -Wno-error=unused-command-line-argument, but that
|
||||
still results in warnings anyway, just not fatal ones. We'd like to
|
||||
remove them all for the sake of the build output.
|
||||
|
||||
Signed-off-by: Austin Seipp <aseipp@pobox.com>
|
||||
|
||||
diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
|
||||
index 03af9c10..7d059375 100644
|
||||
--- a/cmake/ConfigureCompiler.cmake
|
||||
+++ b/cmake/ConfigureCompiler.cmake
|
||||
@@ -119,6 +119,11 @@ else()
|
||||
else()
|
||||
add_compile_options(-Werror)
|
||||
endif()
|
||||
+ if (CLANG)
|
||||
+ # aseipp: NixOS hack
|
||||
+ add_compile_options(-Wno-unused-command-line-argument)
|
||||
+ add_link_options(-Wno-unused-command-line-argument)
|
||||
+ endif()
|
||||
add_compile_options($<$<BOOL:${GCC}>:-Wno-pragmas>)
|
||||
add_compile_options(-Wno-error=format
|
||||
-Wunused-variable
|
||||
@ -1,80 +0,0 @@
|
||||
fast/AtomicBackupCorrectness.txt
|
||||
fast/AtomicBackupToDBCorrectness.txt
|
||||
fast/AtomicOps.txt
|
||||
fast/AtomicOpsApiCorrectness.txt
|
||||
fast/BackupCorrectness.txt
|
||||
fast/BackupCorrectnessClean.txt
|
||||
fast/BackupToDBCorrectness.txt
|
||||
fast/BackupToDBCorrectnessClean.txt
|
||||
fast/CloggedSideband.txt
|
||||
fast/ConstrainedRandomSelector.txt
|
||||
fast/CycleAndLock.txt
|
||||
fast/CycleTest.txt
|
||||
fast/FuzzApiCorrectness.txt
|
||||
fast/FuzzApiCorrectnessClean.txt
|
||||
fast/IncrementTest.txt
|
||||
fast/InventoryTestAlmostReadOnly.txt
|
||||
fast/InventoryTestSomeWrites.txt
|
||||
fast/KillRegionCycle.txt
|
||||
fast/LongStackWriteDuringRead.txt
|
||||
fast/LowLatency.txt
|
||||
fast/MemoryLifetime.txt
|
||||
fast/MoveKeysCycle.txt
|
||||
fast/RandomSelector.txt
|
||||
fast/RandomUnitTests.txt
|
||||
fast/SelectorCorrectness.txt
|
||||
fast/Sideband.txt
|
||||
fast/SidebandWithStatus.txt
|
||||
fast/SwizzledRollbackSideband.txt
|
||||
fast/SystemRebootTestCycle.txt
|
||||
fast/TaskBucketCorrectness.txt
|
||||
fast/TimeKeeperCorrectness.txt
|
||||
fast/Unreadable.txt
|
||||
fast/VersionStamp.txt
|
||||
fast/Watches.txt
|
||||
fast/WriteDuringRead.txt
|
||||
fast/WriteDuringReadClean.txt
|
||||
rare/CheckRelocation.txt
|
||||
rare/ClogUnclog.txt
|
||||
rare/CloggedCycleWithKills.txt
|
||||
rare/ConflictRangeCheck.txt
|
||||
rare/ConflictRangeRYOWCheck.txt
|
||||
rare/CycleRollbackClogged.txt
|
||||
rare/CycleWithKills.txt
|
||||
rare/FuzzTest.txt
|
||||
rare/InventoryTestHeavyWrites.txt
|
||||
rare/LargeApiCorrectness.txt
|
||||
rare/LargeApiCorrectnessStatus.txt
|
||||
rare/RYWDisable.txt
|
||||
rare/RandomReadWriteTest.txt
|
||||
rare/SwizzledLargeApiCorrectness.txt
|
||||
slow/ApiCorrectness.txt
|
||||
slow/ApiCorrectnessAtomicRestore.txt
|
||||
slow/ApiCorrectnessSwitchover.txt
|
||||
slow/ClogWithRollbacks.txt
|
||||
slow/CloggedCycleTest.txt
|
||||
slow/CloggedStorefront.txt
|
||||
slow/CommitBug.txt
|
||||
slow/ConfigureTest.txt
|
||||
slow/CycleRollbackPlain.txt
|
||||
slow/DDBalanceAndRemove.txt
|
||||
slow/DDBalanceAndRemoveStatus.txt
|
||||
slow/FastTriggeredWatches.txt
|
||||
slow/LowLatencyWithFailures.txt
|
||||
slow/MoveKeysClean.txt
|
||||
slow/MoveKeysSideband.txt
|
||||
slow/RyowCorrectness.txt
|
||||
slow/Serializability.txt
|
||||
slow/SharedBackupCorrectness.txt
|
||||
slow/SharedBackupToDBCorrectness.txt
|
||||
slow/StorefrontTest.txt
|
||||
slow/SwizzledApiCorrectness.txt
|
||||
slow/SwizzledCycleTest.txt
|
||||
slow/SwizzledDdBalance.txt
|
||||
slow/SwizzledRollbackTimeLapse.txt
|
||||
slow/SwizzledRollbackTimeLapseIncrement.txt
|
||||
slow/VersionStampBackupToDB.txt
|
||||
slow/VersionStampSwitchover.txt
|
||||
slow/WriteDuringReadAtomicRestore.txt
|
||||
slow/WriteDuringReadSwitchover.txt
|
||||
slow/ddbalance.txt
|
||||
@ -1,150 +0,0 @@
|
||||
# This builder is for FoundationDB's original, somewhat strange visual studio +
|
||||
# make build system. In FoundationDB 6.1 and later, there's a new CMake system
|
||||
# (which will eventually become the default version.)
|
||||
{ gcc6Stdenv, lib, fetchurl, fetchFromGitHub
|
||||
|
||||
, which, m4
|
||||
, python2, openjdk, mono, libressl
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
# hysterical raisins dictate a version of boost this old. however,
|
||||
# we luckily do not need to build anything, we just need the header
|
||||
# files.
|
||||
boost152 = gcc6Stdenv.mkDerivation {
|
||||
name = "boost-headers-1.52.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2";
|
||||
sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
installPhase = "mkdir -p $out/include && cp -R boost $out/include/";
|
||||
};
|
||||
|
||||
makeFdb =
|
||||
{ version
|
||||
, branch
|
||||
, sha256
|
||||
|
||||
# the revision can be inferred from the fdb tagging policy
|
||||
, rev ? "refs/tags/${version}"
|
||||
|
||||
# in theory newer versions of fdb support newer boost versions, but they
|
||||
# don't :( maybe one day
|
||||
, boost ? boost152
|
||||
|
||||
# if an release is unofficial/a prerelease, then make sure this is set
|
||||
, officialRelease ? true
|
||||
|
||||
, patches ? []
|
||||
}: gcc6Stdenv.mkDerivation {
|
||||
pname = "foundationdb";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apple";
|
||||
repo = "foundationdb";
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python2 openjdk which m4 mono ];
|
||||
buildInputs = [ libressl boost ];
|
||||
|
||||
inherit patches;
|
||||
postPatch = ''
|
||||
# note: this does not do anything for 6.0+
|
||||
substituteInPlace ./build/scver.mk \
|
||||
--subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \
|
||||
--subst-var-by NIXOS_FDB_SCBRANCH "${branch}"
|
||||
|
||||
substituteInPlace ./Makefile \
|
||||
--replace 'shell which ccache' 'shell true' \
|
||||
--replace -Werror ""
|
||||
|
||||
substituteInPlace ./Makefile \
|
||||
--replace libstdc++_pic libstdc++
|
||||
|
||||
substituteInPlace ./build/link-validate.sh \
|
||||
--replace 'exit 1' '#exit 1'
|
||||
|
||||
patchShebangs .
|
||||
'' + lib.optionalString (lib.versionAtLeast version "6.0") ''
|
||||
substituteInPlace ./Makefile \
|
||||
--replace 'TLS_LIBS +=' '#TLS_LIBS +=' \
|
||||
--replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto'
|
||||
'';
|
||||
|
||||
separateDebugInfo = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makeFlags = [ "all" "fdb_java" "fdb_python" ]
|
||||
# Don't compile FDBLibTLS if we don't need it in 6.0 or later;
|
||||
# it gets statically linked in
|
||||
++ lib.optionals (lib.versionOlder version "6.0") [ "fdb_c" ]
|
||||
# Needed environment overrides
|
||||
++ [ "KVRELEASE=1"
|
||||
"NOSTRIP=1"
|
||||
] ++ lib.optionals officialRelease [ "RELEASE=true" ];
|
||||
|
||||
# on 6.0 and later, we can specify all this information manually
|
||||
configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") ''
|
||||
export SOURCE_CONTROL=GIT
|
||||
export SCBRANCH="${branch}"
|
||||
export VERSION_ID="${rev}"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb
|
||||
|
||||
'' + lib.optionalString (lib.versionOlder version "6.0") ''
|
||||
# we only copy the TLS library on < 6.0, since it's compiled-in otherwise
|
||||
cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so
|
||||
'' + ''
|
||||
|
||||
# C API
|
||||
cp -v ./lib/libfdb_c.so $lib/lib
|
||||
cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb
|
||||
cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb
|
||||
cp -v ./fdbclient/vexillographer/fdb.options $dev/include/foundationdb
|
||||
|
||||
# java
|
||||
cp -v ./bindings/java/foundationdb-client.jar $lib/share/java/fdb-java.jar
|
||||
|
||||
# python
|
||||
cp LICENSE ./bindings/python
|
||||
substitute ./bindings/python/setup.py.in ./bindings/python/setup.py \
|
||||
--replace 'VERSION' "${version}"
|
||||
rm -f ./bindings/python/setup.py.in
|
||||
rm -f ./bindings/python/fdb/*.pth # remove useless files
|
||||
rm -f ./bindings/python/*.rst ./bindings/python/*.mk
|
||||
|
||||
cp -R ./bindings/python/ tmp-pythonsrc/
|
||||
tar -zcf $pythonsrc --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/
|
||||
|
||||
# binaries
|
||||
for x in fdbbackup fdbcli fdbserver fdbmonitor; do
|
||||
cp -v "./bin/$x" $out/bin;
|
||||
done
|
||||
|
||||
ln -sfv $out/bin/fdbbackup $out/bin/dr_agent
|
||||
ln -sfv $out/bin/fdbbackup $out/bin/fdbrestore
|
||||
ln -sfv $out/bin/fdbbackup $out/bin/fdbdr
|
||||
|
||||
ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent
|
||||
'';
|
||||
|
||||
outputs = [ "out" "lib" "dev" "pythonsrc" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source, distributed, transactional key-value store";
|
||||
homepage = "https://www.foundationdb.org";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
};
|
||||
};
|
||||
in makeFdb
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitLab, libcap_ng, libseccomp }:
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitLab, fetchpatch, libcap_ng, libseccomp }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "virtiofsd";
|
||||
@ -11,6 +11,15 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "/KL1LH/3txWrZPjvuYmSkNb93euB+Whd2YofIuf/cMg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fixes SIGSYS when seccomp filtering is on
|
||||
# https://gitlab.com/virtio-fs/virtiofsd/-/issues/104
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/virtio-fs/virtiofsd/-/commit/a9141cae72e6785ca10a758c22c7a5690a1fc955.patch";
|
||||
hash = "sha256-uO8nVdNMGOkd3ThTTw23BykDP9w4I+lEx91447zxcgo=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoHash = "sha256-EkDop9v75IIIWEK+QI5v58lO20RxgJab/scFmn26idU=";
|
||||
|
||||
LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib";
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
--- a/src/third_party/asio-master/asio/include/asio/detail/config.hpp
|
||||
+++ b/src/third_party/asio-master/asio/include/asio/detail/config.hpp
|
||||
@@ -831,20 +831,8 @@
|
||||
# endif // (__cplusplus >= 201402)
|
||||
# endif // (_LIBCPP_VERSION < 7000)
|
||||
# else // defined(ASIO_HAS_CLANG_LIBCXX)
|
||||
-# if (__cplusplus >= 201402)
|
||||
-# if __has_include(<experimental/string_view>)
|
||||
-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
|
||||
-# endif // __has_include(<experimental/string_view>)
|
||||
-# endif // (__cplusplus >= 201402)
|
||||
# endif // // defined(ASIO_HAS_CLANG_LIBCXX)
|
||||
# endif // defined(__clang__)
|
||||
-# if defined(__GNUC__)
|
||||
-# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
|
||||
-# if (__cplusplus >= 201402)
|
||||
-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
|
||||
-# endif // (__cplusplus >= 201402)
|
||||
-# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
|
||||
-# endif // defined(__GNUC__)
|
||||
# endif // !defined(ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
|
||||
#endif // !defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
|
||||
@ -1,20 +0,0 @@
|
||||
diff --git a/src/third_party/asio-master/asio/include/asio/detail/config.hpp b/src/third_party/asio-master/asio/include/asio/detail/config.hpp
|
||||
index 7fe6a95a..ff4cc56b 100644
|
||||
--- a/src/third_party/asio-master/asio/include/asio/detail/config.hpp
|
||||
+++ b/src/third_party/asio-master/asio/include/asio/detail/config.hpp
|
||||
@@ -786,7 +786,6 @@
|
||||
# if (__cplusplus >= 201402)
|
||||
# if __has_include(<experimental/string_view>)
|
||||
# define ASIO_HAS_STD_STRING_VIEW 1
|
||||
-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
|
||||
# endif // __has_include(<experimental/string_view>)
|
||||
# endif // (__cplusplus >= 201402)
|
||||
# endif // defined(__clang__)
|
||||
@@ -794,7 +793,6 @@
|
||||
# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
|
||||
# if (__cplusplus >= 201402)
|
||||
# define ASIO_HAS_STD_STRING_VIEW 1
|
||||
-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
|
||||
# endif // (__cplusplus >= 201402)
|
||||
# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)
|
||||
# endif // defined(__GNUC__)
|
||||
@ -1,17 +0,0 @@
|
||||
--- a/site_scons/mongo_scons_utils.py
|
||||
+++ b/site_scons/mongo_scons_utils.py
|
||||
@@ -84,14 +84,11 @@
|
||||
def default_buildinfo_environment_data():
|
||||
return (
|
||||
('distmod', '$MONGO_DISTMOD', True, True,),
|
||||
('distarch', '$MONGO_DISTARCH', True, True,),
|
||||
('cc', '$CC_VERSION', True, False,),
|
||||
- ('ccflags', '$CCFLAGS', True, False,),
|
||||
('cxx', '$CXX_VERSION', True, False,),
|
||||
- ('cxxflags', '$CXXFLAGS', True, False,),
|
||||
- ('linkflags', '$LINKFLAGS', True, False,),
|
||||
('target_arch', '$TARGET_ARCH', True, True,),
|
||||
('target_os', '$TARGET_OS', True, False,),
|
||||
)
|
||||
|
||||
# If you want buildInfo and --version to be relatively empty, set
|
||||
@ -1,36 +0,0 @@
|
||||
# MongoDB keeps track of its build parameters, which tricks nix into
|
||||
# keeping dependencies to build inputs in the final output.
|
||||
# We remove the build flags from buildInfo data.
|
||||
--- a/site_scons/mongo/generators.py
|
||||
+++ b/site_scons/mongo/generators.py
|
||||
@@ -33,30 +33,12 @@ def default_buildinfo_environment_data():
|
||||
True,
|
||||
False,
|
||||
),
|
||||
- (
|
||||
- 'ccflags',
|
||||
- '$CCFLAGS',
|
||||
- True,
|
||||
- False,
|
||||
- ),
|
||||
(
|
||||
'cxx',
|
||||
'$CXX_VERSION',
|
||||
True,
|
||||
False,
|
||||
),
|
||||
- (
|
||||
- 'cxxflags',
|
||||
- '$CXXFLAGS',
|
||||
- True,
|
||||
- False,
|
||||
- ),
|
||||
- (
|
||||
- 'linkflags',
|
||||
- '$LINKFLAGS',
|
||||
- True,
|
||||
- False,
|
||||
- ),
|
||||
(
|
||||
'target_arch',
|
||||
'$TARGET_ARCH',
|
||||
@ -1,16 +0,0 @@
|
||||
# MongoDB keeps track of its build parameters, which tricks nix into
|
||||
# keeping dependencies to build inputs in the final output.
|
||||
# We remove the build flags from buildInfo data.
|
||||
--- a/site_scons/mongo/generators.py
|
||||
+++ b/site_scons/mongo/generators.py
|
||||
@@ -18,10 +18,7 @@ def default_buildinfo_environment_data():
|
||||
('distmod', '$MONGO_DISTMOD', True, True,),
|
||||
('distarch', '$MONGO_DISTARCH', True, True,),
|
||||
('cc', '$CC_VERSION', True, False,),
|
||||
- ('ccflags', '$CCFLAGS', True, False,),
|
||||
('cxx', '$CXX_VERSION', True, False,),
|
||||
- ('cxxflags', '$CXXFLAGS', True, False,),
|
||||
- ('linkflags', '$LINKFLAGS', True, False,),
|
||||
('target_arch', '$TARGET_ARCH', True, True,),
|
||||
('target_os', '$TARGET_OS', True, False,),
|
||||
)
|
||||
@ -1,27 +0,0 @@
|
||||
# HG changeset patch
|
||||
# User Dan Gohman <sunfish@mozilla.com>
|
||||
# Parent d9b405d82cffb07343a5f2fd941e029298c7f6c4
|
||||
# Bug 1390214 - IonMonkey: Don't test for a 3-byte opcode in a 2-byte opcode predicate.
|
||||
# https://bug1390214.bmoattachments.org/attachment.cgi?id=8902972
|
||||
|
||||
diff --git a/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h b/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h
|
||||
--- a/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h
|
||||
+++ b/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h
|
||||
@@ -310,17 +310,16 @@ enum ThreeByteOpcodeID {
|
||||
|
||||
// Test whether the given opcode should be printed with its operands reversed.
|
||||
inline bool IsXMMReversedOperands(TwoByteOpcodeID opcode)
|
||||
{
|
||||
switch (opcode) {
|
||||
case OP2_MOVSD_WsdVsd: // also OP2_MOVPS_WpsVps
|
||||
case OP2_MOVAPS_WsdVsd:
|
||||
case OP2_MOVDQ_WdqVdq:
|
||||
- case OP3_PEXTRD_EdVdqIb:
|
||||
return true;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
enum ThreeByteEscape {
|
||||
@ -1,14 +0,0 @@
|
||||
--- a/src/mongo/stdx/thread.h
|
||||
+++ b/src/mongo/stdx/thread.h
|
||||
@@ -103,10 +103,7 @@ private:
|
||||
// . N Y : 4,344 | 13,048 | 7,352
|
||||
// . Y Y : 4,424 | 13,672 | 8,392
|
||||
// ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt )
|
||||
- static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10;
|
||||
-
|
||||
- static constexpr std::size_t kStackSize =
|
||||
- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ});
|
||||
+ static constexpr std::size_t kStackSize = std::size_t{64} << 10;
|
||||
std::unique_ptr<char[]> _stackStorage = std::make_unique<char[]>(kStackSize);
|
||||
|
||||
#else // !MONGO_HAS_SIGALTSTACK
|
||||
@ -1,27 +0,0 @@
|
||||
{ stdenv, callPackage, fetchpatch, lib, sasl, boost, Security, CoreFoundation, cctools }:
|
||||
|
||||
let
|
||||
buildMongoDB = callPackage ./mongodb.nix {
|
||||
inherit sasl;
|
||||
inherit boost;
|
||||
inherit Security;
|
||||
inherit CoreFoundation;
|
||||
inherit cctools;
|
||||
};
|
||||
in buildMongoDB {
|
||||
version = "4.2.24";
|
||||
sha256 = "sha256-O6nR4wfmupuc/Vjm72Vt8WFmbGm9GHR3p1GlEtgEJpg=";
|
||||
patches = [
|
||||
./forget-build-dependencies-4-2.patch
|
||||
(fetchpatch {
|
||||
name = "mongodb-4.4.1-gcc11.patch";
|
||||
url = "https://raw.githubusercontent.com/gentoo/gentoo/7168257cad6ea7c4856b01c5703d0ed5b764367c/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch";
|
||||
sha256 = "sha256-RvfCP462RG+ZVjcb23DgCuxCdfPl2/UgH8N7FgCghGI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "mongodb-4.4.15-adjust-the-cache-alignment-assumptions.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/mongodb-4.4.15-adjust-cache-alignment-assumptions.patch.arm64?h=mongodb44";
|
||||
sha256 = "Ah4zdSFgXUJ/HSN8VRLJqDpNy3CjMCBnRqlpALXzx+g=";
|
||||
})
|
||||
] ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ];
|
||||
}
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "zigbee2mqtt";
|
||||
version = "1.31.1";
|
||||
version = "1.31.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Koenkk";
|
||||
repo = "zigbee2mqtt";
|
||||
rev = version;
|
||||
hash = "sha256-L2Jd9vr4b0zxTO4G4VhAPLcissi6E4g0Nqlpzg4o30E=";
|
||||
hash = "sha256-Pl/v1Uj+6VpuAXBVpCmcuioRGtYYNektXI96HBXn+Ck=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-2z9TNPZObCd4+ZYMaSIoKWxalso2zE6ooUWfm8gtnqM=";
|
||||
npmDepsHash = "sha256-ZbfR/dcIdiy/0FlPPodAgRvEW/muXSP5qfmQR7ym3lM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
||||
37
pkgs/shells/hishtory/default.nix
Normal file
37
pkgs/shells/hishtory/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hishtory";
|
||||
version = "0.208";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddworken";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TEto5lLH5nwqJ9PaYKrYCNW4/zrIICANQlGmqwDbOm4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FodgIELV5JbqP3h/mIDDYARZcols9ZEtVREW1853EOI=";
|
||||
|
||||
ldflags = [ "-X github.com/ddworken/hishtory/client/lib.Version=${version}" ];
|
||||
|
||||
excludedPackages = [ "backend/server" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/hishtory
|
||||
cp client/lib/config.* $out/share/hishtory
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Your shell history: synced, queryable, and in context";
|
||||
homepage = "https://github.com/ddworken/hishtory";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Enzime ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abcMIDI";
|
||||
version = "2023.03.24";
|
||||
version = "2023.05.30";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
|
||||
hash = "sha256-IL26aGB4j3IHw+T5YuDQE0bzCd0DtfwiuwNyGk+lcqo=";
|
||||
hash = "sha256-aiwObK/5UhvLMPMWNlO5GaYJH9z9RHTTrRQL1IGI7i4=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -55,11 +55,11 @@ assert lib.assertMsg
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
|
||||
version = "3.2.4";
|
||||
version = "3.2.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gmic.eu/files/source/gmic_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-FJ2zlsah/3Jf5ie4UhQsPvMoxDMc6iHl3AkhKsZSuqE=";
|
||||
hash = "sha256-mfDcRG6zEjEuemCaLUOLzbbcq8FN9+n+EqN0NeR9H7U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gmic";
|
||||
version = "3.2.4";
|
||||
version = "3.2.5";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" ];
|
||||
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "GreycLab";
|
||||
repo = "gmic";
|
||||
rev = "v.${finalAttrs.version}";
|
||||
hash = "sha256-ITKsPhfDfkHmE7a04cxrpIKsSVlrPN944ySu2DCnyEU=";
|
||||
hash = "sha256-E02/sYD7GIcdwPl34DxkK+V7VFeZP83VBei2BdPARZs=";
|
||||
};
|
||||
|
||||
# TODO: build this from source
|
||||
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gmic_stdlib = fetchurl {
|
||||
name = "gmic_stdlib.h";
|
||||
url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] finalAttrs.version}.h";
|
||||
hash = "sha256-ExMCxFkkctqrdSy5M/TXD5GBRmRA9YEdsYW8nWiTEYY=";
|
||||
hash = "sha256-08EEKzb3sVwz1z8rgTNzz9hE8KADLFyXco9iV/RccFE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -142,7 +142,7 @@ in
|
||||
{
|
||||
batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta);
|
||||
batgrep = script "batgrep" [ less coreutils ripgrep ];
|
||||
batman = script "batman" [ util-linux ];
|
||||
batman = script "batman" (lib.optionals stdenv.isLinux [ util-linux ]);
|
||||
batpipe = script "batpipe" [ less ];
|
||||
batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr);
|
||||
prettybat = script "prettybat" ([]
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "moar";
|
||||
version = "1.15.1";
|
||||
version = "1.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "walles";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZCzRSySsgg8uOlnKZ5e9Ydzwaya+5JJpG20hOFwds2w=";
|
||||
sha256 = "sha256-CUPMeuXjPVh1zWaonz7heJb0H9M4t1PksAtHe/KwsUE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aFCv6VxHD1bOLhCHXhy4ubik8Z9uvU6AeqcMqIZI2Oo=";
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-06-07";
|
||||
version = "2023-06-08";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1MWmIBPRwQtwkR0dR47RqgWyn3WhWy5eXzA/3pxf2MM=";
|
||||
hash = "sha256-zvbWYPpexd4V8kVKH2g+SE481zD9MaZa7ISIZK4weug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ntlmrecon";
|
||||
version = "0.4";
|
||||
disabled = python3.pythonOlder "3.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwnfoo";
|
||||
repo = "NTLMRecon";
|
||||
rev = "v-${version}";
|
||||
rev = "refs/tags/v-${version}";
|
||||
sha256 = "0rrx49li2l9xlcax84qxjf60nbzp3fgq77c36yqmsp0pc9i89ah6";
|
||||
};
|
||||
|
||||
@ -24,11 +24,15 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "ntlmrecon" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ntlmrecon"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Information enumerator for NTLM authentication enabled web endpoints";
|
||||
homepage = "https://github.com/pwnfoo/NTLMRecon";
|
||||
changelog = "https://github.com/pwnfoo/NTLMRecon/releases/tag/v-${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -524,6 +524,10 @@ mapAliases ({
|
||||
'';
|
||||
|
||||
foomatic_filters = throw "'foomatic_filters' has been renamed to/replaced by 'foomatic-filters'"; # Converted to throw 2022-02-22
|
||||
foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
|
||||
foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
|
||||
foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
|
||||
foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
|
||||
foxitreader = throw "foxitreader has been removed because it had vulnerabilities and was unmaintained"; # added 2023-02-20
|
||||
fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl"; # Added 2021-11-07
|
||||
fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later";
|
||||
@ -1058,6 +1062,7 @@ mapAliases ({
|
||||
mongodb-3_4 = throw "mongodb-3_4 has been removed, it's end of life since January 2020"; # Added 2022-11-30
|
||||
mongodb-3_6 = throw "mongodb-3_6 has been removed, it's end of life since April 2021"; # Added 2022-11-30
|
||||
mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05
|
||||
mongodb-4_2 = throw "mongodb-4_2 has been removed, it's end of life since April 2023"; # Added 2023-06-06
|
||||
monodevelop = throw "monodevelop has been removed from nixpkgs"; # Added 2022-01-15
|
||||
mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07
|
||||
mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18
|
||||
|
||||
@ -306,6 +306,8 @@ with pkgs;
|
||||
|
||||
asn1c = callPackage ../development/compilers/asn1c { };
|
||||
|
||||
assemblyscript = callPackage ../development/compilers/assemblyscript { };
|
||||
|
||||
authy = callPackage ../applications/misc/authy { };
|
||||
|
||||
authz0 = callPackage ../tools/security/authz0 { };
|
||||
@ -7811,16 +7813,9 @@ with pkgs;
|
||||
|
||||
fusuma = callPackage ../tools/inputmethods/fusuma { };
|
||||
|
||||
fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb {
|
||||
openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
libressl = libressl_3_4;
|
||||
});
|
||||
fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { });
|
||||
|
||||
inherit (fdbPackages)
|
||||
foundationdb51
|
||||
foundationdb52
|
||||
foundationdb60
|
||||
foundationdb61
|
||||
foundationdb71
|
||||
;
|
||||
|
||||
@ -14530,6 +14525,8 @@ with pkgs;
|
||||
|
||||
fzf-git-sh = callPackage ../shells/fzf-git-sh { };
|
||||
|
||||
hishtory = callPackage ../shells/hishtory { };
|
||||
|
||||
ion = callPackage ../shells/ion { };
|
||||
|
||||
jush = callPackage ../shells/jush { };
|
||||
@ -22216,6 +22213,8 @@ with pkgs;
|
||||
CoreServices;
|
||||
};
|
||||
|
||||
libremines = qt6.callPackage ../games/libremines { };
|
||||
|
||||
librelp = callPackage ../development/libraries/librelp { };
|
||||
|
||||
librepo = callPackage ../tools/package-management/librepo {
|
||||
@ -25994,13 +25993,6 @@ with pkgs;
|
||||
|
||||
mongodb = hiPrio mongodb-6_0;
|
||||
|
||||
mongodb-4_2 = callPackage ../servers/nosql/mongodb/v4_2.nix {
|
||||
sasl = cyrus_sasl;
|
||||
boost = boost169;
|
||||
inherit (darwin) cctools;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
|
||||
mongodb-4_4 = callPackage ../servers/nosql/mongodb/4.4.nix {
|
||||
sasl = cyrus_sasl;
|
||||
boost = boost17x.override { enableShared = false; };
|
||||
|
||||
@ -146,7 +146,6 @@ in {
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.export-rt-sched-migrate
|
||||
kernelPatches.CVE-2023-32233
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@ -9857,10 +9857,10 @@ with self; {
|
||||
|
||||
FinanceQuote = buildPerlPackage {
|
||||
pname = "Finance-Quote";
|
||||
version = "1.55";
|
||||
version = "1.56";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-1.55.tar.gz";
|
||||
hash = "sha256-4uAAtnxmtq9Q1HYYWEkhEFEKVaAwqJEBfUDH3iGLdI8=";
|
||||
url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-1.56.tar.gz";
|
||||
hash = "sha256-ER1vBY5kZLdIXAGPidDhiR/OC5aNnG+6G/JU1hLHpKs=";
|
||||
};
|
||||
buildInputs = [ DateManip DateRange DateSimple DateTime DateTimeFormatISO8601 StringUtil TestKwalitee TestPerlCritic TestPod TestPodCoverage ];
|
||||
propagatedBuildInputs = [ DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies JSON IOCompress LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ];
|
||||
|
||||
@ -114,6 +114,10 @@ mapAliases ({
|
||||
flask_testing = flask-testing; # added 2022-04-25
|
||||
flask_wtf = flask-wtf; # added 2022-05-24
|
||||
FormEncode = formencode; # added 2023-02-19
|
||||
foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
|
||||
foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
|
||||
foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
|
||||
foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
|
||||
functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01
|
||||
garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04
|
||||
garminconnect-ha = garminconnect; # added 2022-02-05
|
||||
|
||||
@ -3823,10 +3823,6 @@ self: super: with self; {
|
||||
|
||||
formulaic = callPackage ../development/python-modules/formulaic { };
|
||||
|
||||
foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; };
|
||||
foundationdb52 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb52; };
|
||||
foundationdb60 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb60; };
|
||||
foundationdb61 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb61; };
|
||||
foundationdb71 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb71; };
|
||||
|
||||
fountains = callPackage ../development/python-modules/fountains { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user