Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-27 00:01:35 +00:00 committed by GitHub
commit 737604e550
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 148 additions and 12 deletions

View file

@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb";
};
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share

View file

@ -0,0 +1,67 @@
{ stdenv
, fetchFromGitHub
, lib
, python3
, cmake
, lingeling
, btor2tools
, gtest
, gmp
, cadical
, minisat
, picosat
, cryptominisat
, zlib
, pkg-config
# "*** internal error in 'lglib.c': watcher stack overflow" on aarch64-linux
, withLingeling ? !stdenv.hostPlatform.isAarch64
}:
stdenv.mkDerivation rec {
pname = "bitwuzla";
version = "unstable-2021-07-01";
src = fetchFromGitHub {
owner = "bitwuzla";
repo = "bitwuzla";
rev = "58d720598e359b1fdfec4a469c76f1d1f24db51a";
sha256 = "06ymqsdppyixb918161rmbgqvbnarj4nm4az88lkn3ri4gyimw04";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
cadical
cryptominisat
picosat
minisat
btor2tools
gmp
zlib
] ++ lib.optional withLingeling lingeling;
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DPicoSAT_INCLUDE_DIR=${lib.getDev picosat}/include/picosat"
"-DBtor2Tools_INCLUDE_DIR=${lib.getDev btor2tools}/include/btor2parser"
"-DBtor2Tools_LIBRARIES=${lib.getLib btor2tools}/lib/libbtor2parser${stdenv.hostPlatform.extensions.sharedLibrary}"
] ++ lib.optional doCheck "-DTESTING=YES";
checkInputs = [ python3 gtest ];
# two tests fail on darwin and 3 on aarch64-linux
doCheck = stdenv.hostPlatform.isLinux && (!stdenv.hostPlatform.isAarch64);
preCheck = let
var = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
in
''
export ${var}=$(readlink -f lib)
patchShebangs ..
'';
meta = with lib; {
description = "A SMT solver for fixed-size bit-vectors, floating-point arithmetic, arrays, and uninterpreted functions";
homepage = "https://bitwuzla.github.io";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ symphorien ];
};
}

View file

@ -11,14 +11,30 @@ stdenv.mkDerivation rec {
sha256 = "05lvnvapjawgkky38xknb9lgaliiwan4kggmb9yggl4ifpjrh8qf";
};
outputs = [ "out" "dev" "lib" ];
doCheck = true;
dontAddPrefix = true;
# the configure script is not generated by autotools and does not accept the
# arguments that the default configurePhase passes like --prefix and --libdir
configurePhase = ''
runHook preConfigure
./configure
runHook postConfigure
'';
installPhase = ''
runHook preInstall
install -Dm0755 build/cadical "$out/bin/cadical"
install -Dm0755 build/mobical "$out/bin/mobical"
mkdir -p "$out/share/doc/${pname}-${version}/"
install -Dm0755 {LICEN?E,README*,VERSION} "$out/share/doc/${pname}-${version}/"
install -Dm0644 src/ccadical.h "$dev/include/ccadical.h"
install -Dm0644 build/libcadical.a "$lib/lib/libcadical.a"
mkdir -p "$out/share/doc/${pname}/"
install -Dm0755 {LICEN?E,README*,VERSION} "$out/share/doc/${pname}/"
runHook postInstall
'';
meta = with lib; {

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "xknx";
version = "0.18.8";
version = "0.18.9";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "XKNX";
repo = pname;
rev = version;
sha256 = "sha256-Y+SHZd/E72eR7gANqHHutZt1a4G4R1oHC8uV0hpJ/J0=";
sha256 = "1dw1dqhd790wsa6v7bpcv921zf1y544ry7drwcfdcmprsm7hs42j";
};
propagatedBuildInputs = [

View file

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installFlags = [ "PREFIX=$(out)" ];
passthru.updateScript = nix-update-script { attrPath = pname; };

View file

@ -14,6 +14,15 @@ buildGoModule rec {
vendorSha256 = "19785rfzlx8h0h8vmg0ghd40h3p4y6ikhgf8rd2qfj5f6qxfhrgv";
buildFlagsArray = let t = "github.com/prometheus/common/version"; in ''
-ldflags=
-s -w -X ${t}.Version=${version}
-X ${t}.Revision=${rev}
-X ${t}.Branch=unknown
-X ${t}.BuildUser=nix@nixpkgs
-X ${t}.BuildDate=unknown
'';
# skips tests with external dependencies, e.g. on mysqld
checkFlags = [ "-short" ];

View file

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
postFixup = ''
# remove unwanted build-dependency references
sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc
'' + lib.optionalString (!stdenv.isDarwin) ''
# libX11.so is loaded dynamically so autopatch doesn't detect it
patchelf \
--add-needed ${libX11}/lib/libX11.so \

View file

@ -0,0 +1,40 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, libxml2
, openssl
}:
rustPlatform.buildRustPackage rec {
pname = "hurl";
version = "1.2.0";
src = fetchFromGitHub {
owner = "Orange-OpenSource";
repo = pname;
rev = version;
sha256 = "0hbyqj794pvvfrg6jgz63mih73bnmnvgmwbv705c2238w7wsgk9w";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libxml2
openssl
];
# Tests require network access to a test server
doCheck = false;
cargoSha256 = "09ndgm6kmqwdz7yn2rqxk5xr1qkai87zm1k138cng4wq135c3w6g";
meta = with lib; {
description = "Command line tool that performs HTTP requests defined in a simple plain text format.";
homepage = "https://hurl.dev/";
maintainers = with maintainers; [ eonpatapon ];
license = licenses.asl20;
};
}

View file

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "apk-tools";
version = "2.12.5";
version = "2.12.6";
src = fetchFromGitLab {
domain = "gitlab.alpinelinux.org";
owner = "alpine";
repo = "apk-tools";
rev = "v${version}";
sha256 = "0961l2qigs3wwn8lpi5f2wnzn4y4cipcm6qcr40fqj4xyq2hz2ja";
sha256 = "0ki306k2ilwwg8ia302i62qa00f31g9g5q56xfbanyl7b620wd1f";
};
nativeBuildInputs = [ pkg-config scdoc ]

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ccid";
version = "1.4.34";
version = "1.4.35";
src = fetchurl {
url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2";
sha256 = "sha256-5vdkW1mpooROtLGn7/USlg1/BKRlSvAvf9L4re1dtAo=";
sha256 = "sha256-fD4qeSTt2nIhicpXyNHP+lHn+TVKI+ga7NnRro2XEMo=";
};
postPatch = ''

View file

@ -5902,6 +5902,8 @@ in
httpx = callPackage ../tools/security/httpx { };
hurl = callPackage ../tools/networking/hurl { };
hub = callPackage ../applications/version-management/git-and-tools/hub { };
hubicfuse = callPackage ../tools/filesystems/hubicfuse { };
@ -30535,6 +30537,8 @@ in
boolector = callPackage ../applications/science/logic/boolector {};
bitwuzla = callPackage ../applications/science/logic/bitwuzla {};
symbiyosys = callPackage ../applications/science/logic/symbiyosys {};
mcy = callPackage ../applications/science/logic/mcy {};