Merge #169172: staging-next 2022-04-18
This commit is contained in:
commit
632f99a7dc
|
@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ fftwSinglePrec libsamplerate qtbase ]
|
||||
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
|
||||
|
||||
NIX_CFLAGS_COMPILE =
|
||||
lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
|
||||
"-std=c++11"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -59,6 +59,8 @@ stdenv.mkDerivation rec {
|
|||
--replace '@PREFIX@' $out/lib/
|
||||
substituteInPlace ./test/unit/tctildr-dl.c \
|
||||
--replace '@PREFIX@' $out/lib
|
||||
substituteInPlace ./configure.ac \
|
||||
--replace 'm4_esyscmd_s([git describe --tags --always --dirty])' '${version}'
|
||||
'';
|
||||
|
||||
configureFlags = lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, hypothesis
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pytz
|
||||
, pythonOlder
|
||||
|
@ -10,7 +11,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "iso8601";
|
||||
version = "1.0.2";
|
||||
format = "setuptools";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
@ -19,6 +20,10 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-J/UDIg5oRdnblU+yErlbA2LYt+bBsjJqhwYcPek1lLE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
|
|
|
@ -1,15 +1,16 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
, buildPackages, bison, flex, pkg-config
|
||||
, db, iptables, libelf, libmnl
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iproute2";
|
||||
version = "5.14.0";
|
||||
version = "5.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1m4ifnxq7lxnm95l5354z8dk3xj6w9isxmbz53266drgln2sf3r1";
|
||||
sha256 = "bjhPG0LHXhqdqsV4Zto33P+QkJC6huslpudk2niTZg4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -48,6 +49,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
# No nicer place to find latest release.
|
||||
url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git";
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.linuxfoundation.org/networking/iproute2";
|
||||
description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux";
|
||||
|
|
|
@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
|
|||
--replace \
|
||||
"env['LIBPATH'] = []" \
|
||||
"env['LIBPATH'] = ['${lib.getLib libcxx}/lib']"
|
||||
'' + ''
|
||||
sed '1i#include <limits>' -i libgringo/gringo/{control,term}.hh
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
@ -1,4 +1,17 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, libpipeline, db, groff, libiconv, makeWrapper, buildPackages, nixosTests }:
|
||||
{ buildPackages
|
||||
, db
|
||||
, fetchurl
|
||||
, groff
|
||||
, lib
|
||||
, libiconv
|
||||
, libpipeline
|
||||
, makeWrapper
|
||||
, nixosTests
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, zstd
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "man-db";
|
||||
|
@ -12,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "doc" ];
|
||||
outputMan = "out"; # users will want `man man` to work
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper groff ];
|
||||
nativeBuildInputs = [ autoreconfHook groff makeWrapper pkg-config zstd ];
|
||||
buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input)
|
||||
checkInputs = [ libiconv /* for 'iconv' binary */ ];
|
||||
|
||||
|
@ -28,6 +41,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Add mandb locations for the above
|
||||
echo "MANDB_MAP /nix/var/nix/profiles/default/share/man /var/cache/man/nixpkgs" >> src/man_db.conf.in
|
||||
|
||||
# use absolute paths to reference programs, otherwise artifacts will have undeclared dependencies
|
||||
for f in configure.ac m4/man-check-progs.m4 m4/man-po4a.m4; do
|
||||
substituteInPlace $f \
|
||||
--replace AC_CHECK_PROGS AC_PATH_PROGS
|
||||
done
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tpm2-abrmd";
|
||||
version = "2.3.3";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpm2-software";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "17nv50w1yh6fg7393vfvys9y13lp0gvxx9vcw2pb87ky551d7xkf";
|
||||
sha256 = "0lsng4sb9ikfpp0scvl9wmh0zpjdmdf5bqbjnpfyh4gk25qxn9mw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook autoconf-archive which ];
|
||||
|
|
Loading…
Reference in a new issue