From b7d2914baa8ea7e1df2d884b4c90e0e62f325b0b Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 16 Apr 2022 09:14:06 +0300 Subject: [PATCH 01/11] python3Packages.iso8601: build with poetry --- pkgs/development/python-modules/iso8601/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix index a5eb03dc8eb6..14cef7c62a8c 100644 --- a/pkgs/development/python-modules/iso8601/default.nix +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -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 From 9ac0f3c915afe9753be47679af49b7c2020e8f85 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 1 Apr 2022 17:51:37 +0100 Subject: [PATCH 02/11] iproute2: 5.14.0 -> 5.17.0 5.17.0 changelog: https://lore.kernel.org/netdev/20220323140712.5b593820@hermes.local/ 5.16.0 changelog: https://lore.kernel.org/netdev/20220110153223.253e1954@hermes.local/ 5.15.0 changelog: https://lore.kernel.org/netdev/20211101164705.6f4f2e41@hermes.local/ While at it added trivial udupdater. --- pkgs/os-specific/linux/iproute/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 74003ff83b83..64c54306333a 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -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"; From 6f6daf3a6a5be74b70ba2bd270ff19824824c3a5 Mon Sep 17 00:00:00 2001 From: DavHau Date: Thu, 29 Apr 2021 16:06:52 +0700 Subject: [PATCH 03/11] man-db: add support for zstd --- pkgs/tools/misc/man-db/default.nix | 16 +++++++++++++++- pkgs/tools/misc/man-db/fix-configure.patch | 13 +++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/misc/man-db/fix-configure.patch diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 6a3bca404712..e5364ab4f576 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; outputMan = "out"; # users will want `man man` to work - nativeBuildInputs = [ pkg-config makeWrapper groff ]; + nativeBuildInputs = [ autoconf automake gettext groff libtool makeWrapper pkg-config zstd ]; buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) checkInputs = [ libiconv /* for 'iconv' binary */ ]; @@ -28,6 +28,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 = [ @@ -44,7 +50,15 @@ stdenv.mkDerivation rec { "ac_cv_func_mempcpy=no" ]; + preConfigure = '' + # need to recreate configure script due to substitutions in postPatch + ./bootstrap --gnulib-srcdir=${gnulib.src} --no-git + + # deal with autoconf 2.70 bug: https://lists.gnu.org/archive/html/bug-autoconf/2020-12/msg00036.html + # can be removed once autoconf 2.71 is merged + patch < ${./fix-configure.patch} + configureFlagsArray+=("--with-sections=1 n l 8 3 0 2 5 4 9 6 7") ''; diff --git a/pkgs/tools/misc/man-db/fix-configure.patch b/pkgs/tools/misc/man-db/fix-configure.patch new file mode 100644 index 000000000000..5c528de9f04d --- /dev/null +++ b/pkgs/tools/misc/man-db/fix-configure.patch @@ -0,0 +1,13 @@ +--- configure 2021-04-29 09:58:14.430422095 +0000 ++++ configure 2021-04-29 09:58:46.783454349 +0000 +@@ -6018,8 +6018,9 @@ + return 0; + } + _ACEOF ++ ++ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + for ac_arg in '' ac_prog_cc_stdc=c89 +- ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" From fe7fb4b87fe1d3160b1dcb9ec70c2371ac2665a2 Mon Sep 17 00:00:00 2001 From: DavHau Date: Fri, 30 Apr 2021 14:05:12 +0700 Subject: [PATCH 04/11] man-db: use autoreconfHook; --- pkgs/tools/misc/man-db/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index e5364ab4f576..ba6b99c4d9be 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; outputMan = "out"; # users will want `man man` to work - nativeBuildInputs = [ autoconf automake gettext groff libtool makeWrapper pkg-config zstd ]; + nativeBuildInputs = [ autoreconfHook gettext groff libtool makeWrapper pkg-config zstd ]; buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) checkInputs = [ libiconv /* for 'iconv' binary */ ]; @@ -52,9 +52,6 @@ stdenv.mkDerivation rec { preConfigure = '' - # need to recreate configure script due to substitutions in postPatch - ./bootstrap --gnulib-srcdir=${gnulib.src} --no-git - # deal with autoconf 2.70 bug: https://lists.gnu.org/archive/html/bug-autoconf/2020-12/msg00036.html # can be removed once autoconf 2.71 is merged patch < ${./fix-configure.patch} From 2030ed94c557918af94f3ff3769fbba2c4c0d854 Mon Sep 17 00:00:00 2001 From: DavHau Date: Fri, 30 Apr 2021 20:05:56 +0700 Subject: [PATCH 05/11] Update pkgs/tools/misc/man-db/default.nix Co-authored-by: Sandro --- pkgs/tools/misc/man-db/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index ba6b99c4d9be..93cc57de44d2 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; outputMan = "out"; # users will want `man man` to work - nativeBuildInputs = [ autoreconfHook gettext groff libtool makeWrapper pkg-config zstd ]; + nativeBuildInputs = [ autoreconfHook groff makeWrapper pkg-config zstd ]; buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) checkInputs = [ libiconv /* for 'iconv' binary */ ]; From 9135ad098d535fd4252fd0ce8d2432509ef96af2 Mon Sep 17 00:00:00 2001 From: DavHau Date: Sun, 17 Apr 2022 16:13:40 +0200 Subject: [PATCH 06/11] man-db: fix after rebase --- pkgs/tools/misc/man-db/default.nix | 20 ++++++++++++++------ pkgs/tools/misc/man-db/fix-configure.patch | 13 ------------- 2 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 pkgs/tools/misc/man-db/fix-configure.patch diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 93cc57de44d2..4f08f9e63b8c 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -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"; @@ -50,12 +63,7 @@ stdenv.mkDerivation rec { "ac_cv_func_mempcpy=no" ]; - preConfigure = '' - # deal with autoconf 2.70 bug: https://lists.gnu.org/archive/html/bug-autoconf/2020-12/msg00036.html - # can be removed once autoconf 2.71 is merged - patch < ${./fix-configure.patch} - configureFlagsArray+=("--with-sections=1 n l 8 3 0 2 5 4 9 6 7") ''; diff --git a/pkgs/tools/misc/man-db/fix-configure.patch b/pkgs/tools/misc/man-db/fix-configure.patch deleted file mode 100644 index 5c528de9f04d..000000000000 --- a/pkgs/tools/misc/man-db/fix-configure.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- configure 2021-04-29 09:58:14.430422095 +0000 -+++ configure 2021-04-29 09:58:46.783454349 +0000 -@@ -6018,8 +6018,9 @@ - return 0; - } - _ACEOF -+ -+ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - for ac_arg in '' ac_prog_cc_stdc=c89 -- ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" From 9a724bde60b2e61cea1e892861e042780d4e9f39 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 17 Apr 2022 18:26:20 +0100 Subject: [PATCH 07/11] tpm2-abrmd: 2.3.3 -> 2.4.1 --- pkgs/tools/security/tpm2-abrmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index a3352c5abfdc..b3efb6c542e9 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -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 ]; From 779cca1bd152b2d25ff8bbfcafcc30d1aad7fa6e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 17 Apr 2022 18:46:29 +0100 Subject: [PATCH 08/11] tpm2-tss: fix version detection without this, the version field in the .pc files is empty leading to tpm2-abrmd failing to build --- pkgs/development/libraries/tpm2-tss/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index caf00dcca77d..34a545d7996a 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -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) [ From c07da190f5a14307222016bed70170efacdf9043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 Apr 2022 17:51:46 +0200 Subject: [PATCH 09/11] libsForQt5.liblastfm: fixup build with gcc 11 --- pkgs/development/libraries/liblastfm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 0f0fec46a277..d663ca9b71a2 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + dontWrapQtApps = true; meta = with lib; { From 90edec053b58e1dafb2c76c59604bb5c87fade40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 Apr 2022 18:46:57 +0200 Subject: [PATCH 10/11] gringo: fixup build with gcc 11 --- pkgs/tools/misc/gringo/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 87902de0cb03..02314ec77e9c 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { --replace \ "env['LIBPATH'] = []" \ "env['LIBPATH'] = ['${lib.getLib libcxx}/lib']" + '' + '' + sed '1i#include ' -i libgringo/gringo/{control,term}.hh ''; buildPhase = '' From 1dfcf7d2e7515d5856d7756c39e7fe9c0a9e5484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 Apr 2022 20:27:58 +0200 Subject: [PATCH 11/11] libsForQt5.liblastfm: revert addition of flags on darwin Apparently on x86_64-darwin there are also C files compiled, and that doesn't go well with -std=c++* https://hydra.nixos.org/build/174111870 Fortunately the flag only seems needed with gcc 11 so far. --- pkgs/development/libraries/liblastfm/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index d663ca9b71a2..68658d20ba6d 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; - NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + NIX_CFLAGS_COMPILE = + lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ + "-std=c++11" + ]; dontWrapQtApps = true;