From e5584bc53df565158182415a8afe6911ef80dea8 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Tue, 7 Jun 2022 08:58:18 +0200 Subject: [PATCH 1/9] libusb1: 1.0.25 -> 1.0.26 (cherry picked from commit 7f8d28e99bb43316e8b8d57edb02bd84ac3e2376) --- pkgs/development/libraries/libusb1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 24b147d142d7..3b23402fe33c 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libusb"; - version = "1.0.25"; + version = "1.0.26"; src = fetchFromGitHub { owner = "libusb"; repo = "libusb"; rev = "v${version}"; - sha256 = "141wygijjcgka0h31504cdlvih4l2j02j67pcbb2l527p7dbc5pn"; + sha256 = "sha256-LEy45YiFbueCCi8d2hguujMsxBezaTUERHUpFsTKGZQ="; }; outputs = [ "out" "dev" ]; From b529cc8dff79d26856a4665a97f8f4f32420f4ac Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 16 Jun 2022 13:51:29 -0300 Subject: [PATCH 2/9] Cosmetical: 80-char fill the opening paragraph of all-packages.nix (cherry picked from commit 2ee6526b2a52ae7d244887ef4207c3ae54865c87) --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cefa1d65a98..630ff4964faa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1,8 +1,8 @@ /* The top-level package collection of nixpkgs. - * It is sorted by categories corresponding to the folder names - * in the /pkgs folder. Inside the categories packages are roughly - * sorted by alphabet, but strict sorting has been long lost due - * to merges. Please use the full-text search of your editor. ;) + * It is sorted by categories corresponding to the folder names in the /pkgs + * folder. Inside the categories packages are roughly sorted by alphabet, but + * strict sorting has been long lost due to merges. Please use the full-text + * search of your editor. ;) * Hint: ### starts category names. */ { lib, noSysDirs, config, overlays }: From 49a797a31ac9525ea62e00fce4145250626e7066 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 16 Jun 2022 13:49:41 -0300 Subject: [PATCH 3/9] Move uclibc to uclibc-ng In order to keep coherence between upstream project's name. Also, aliasing it to the older names uclibc and uclibcCross. (cherry picked from commit e418cc4298654659ae512a4e8f3e4144a3bf3ead) --- pkgs/os-specific/linux/{uclibc => uclibc-ng}/default.nix | 0 pkgs/top-level/all-packages.nix | 8 ++++++-- 2 files changed, 6 insertions(+), 2 deletions(-) rename pkgs/os-specific/linux/{uclibc => uclibc-ng}/default.nix (100%) diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc-ng/default.nix similarity index 100% rename from pkgs/os-specific/linux/uclibc/default.nix rename to pkgs/os-specific/linux/uclibc-ng/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 630ff4964faa..2e3a3e71eaf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23899,12 +23899,16 @@ with pkgs; buildBarebox bareboxTools; - uclibc = callPackage ../os-specific/linux/uclibc { }; + uclibc-ng = callPackage ../os-specific/linux/uclibc-ng { }; - uclibcCross = callPackage ../os-specific/linux/uclibc { + uclibc-ng-cross = callPackage ../os-specific/linux/uclibc-ng { stdenv = crossLibcStdenv; }; + # Aliases + uclibc = uclibc-ng; + uclibcCross = uclibc-ng-cross; + eudev = callPackage ../os-specific/linux/eudev { util-linux = util-linuxMinimal; }; libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { }; From 4357e19ecac074574ff9eb7bed78ed11a00b2d9d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 16 Jun 2022 17:29:09 -0300 Subject: [PATCH 4/9] uclibc-ng: 1.0.38 -> 1.0.41 Also - Add AndersonTorres as maintainer - Set badPlatforms to aarch64 (because it does not exist on the source tree of uclibc-ng (cherry picked from commit 949579633ddf817daa7d29baf8abdc3c99c18e8d) --- pkgs/os-specific/linux/uclibc-ng/default.nix | 67 +++++++++++++------- 1 file changed, 45 insertions(+), 22 deletions(-) diff --git a/pkgs/os-specific/linux/uclibc-ng/default.nix b/pkgs/os-specific/linux/uclibc-ng/default.nix index 1d4166e4083d..f7cd34a458c3 100644 --- a/pkgs/os-specific/linux/uclibc-ng/default.nix +++ b/pkgs/os-specific/linux/uclibc-ng/default.nix @@ -1,9 +1,14 @@ -{ lib, stdenv, buildPackages -, fetchurl, linuxHeaders, libiconvReal +{ lib +, stdenv +, buildPackages +, fetchurl +, linuxHeaders +, libiconvReal , extraConfig ? "" }: let + isCross = (stdenv.buildPlatform != stdenv.hostPlatform); configParser = '' function parseconfig { set -x @@ -36,12 +41,13 @@ let UCLIBC_HAS_RPC y DO_C99_MATH y UCLIBC_HAS_PROGRAM_INVOCATION_NAME y + UCLIBC_HAS_RESOLVER_SUPPORT y UCLIBC_SUSV4_LEGACY y UCLIBC_HAS_THREADS_NATIVE y KERNEL_HEADERS "${linuxHeaders}/include" '' + lib.optionalString (stdenv.hostPlatform.gcc.float or "" == "soft") '' UCLIBC_HAS_FPU n - '' + lib.optionalString (stdenv.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' + '' + lib.optionalString (stdenv.isAarch32 && isCross) '' CONFIG_ARM_EABI y ARCH_WANTS_BIG_ENDIAN n ARCH_BIG_ENDIAN n @@ -49,18 +55,14 @@ let ARCH_LITTLE_ENDIAN y UCLIBC_HAS_FPU n ''; - - version = "1.0.38"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "uclibc-ng"; - inherit version; + version = "1.0.41"; src = fetchurl { - url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.bz2"; - # from "${url}.sha256"; - sha256 = "sha256-7wexvOOfDpIsM3XcdhHxESz7GsOW+ZkiA0dfiN5rHrU="; + url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.xz"; + sha256 = "sha256-syqSoCGNlZItaXZGTm71Hi66z7zbYFggRY2du4ph4CU="; }; # 'ftw' needed to build acl, a coreutils dependency @@ -78,7 +80,7 @@ stdenv.mkDerivation { hardeningDisable = [ "stackprotector" ]; # Cross stripping hurts. - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; + dontStrip = isCross; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -86,7 +88,7 @@ stdenv.mkDerivation { "ARCH=${stdenv.hostPlatform.linuxArch}" "TARGET_ARCH=${stdenv.hostPlatform.linuxArch}" "VERBOSE=1" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + ] ++ lib.optionals (isCross) [ "CROSS=${stdenv.cc.targetPrefix}" ]; @@ -95,24 +97,45 @@ stdenv.mkDerivation { enableParallelBuilding = false; installPhase = '' + runHook preInstall + mkdir -p $out make $makeFlags PREFIX=$out VERBOSE=1 install (cd $out/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .) # libpthread.so may not exist, so I do || true sed -i s@/lib/@$out/lib/@g $out/lib/libc.so $out/lib/libpthread.so || true - ''; - passthru = { - # Derivations may check for the existance of this attribute, to know what to link to. - libiconv = libiconvReal; - }; + runHook postInstall + ''; meta = with lib; { homepage = "https://uclibc-ng.org"; - description = "A small implementation of the C library"; - maintainers = with maintainers; [ rasendubi ]; - license = licenses.lgpl2; + description = "Embedded C library"; + longDescription = '' + uClibc-ng is a small C library for developing embedded Linux systems. It + is much smaller than the GNU C Library, but nearly all applications + supported by glibc also work perfectly with uClibc-ng. + + Porting applications from glibc to uClibc-ng typically involves just + recompiling the source code. uClibc-ng supports shared libraries and + threading. It currently runs on standard Linux and MMU-less (also known as + uClinux) systems with support for Aarch64, Alpha, ARC, ARM, AVR32, + Blackfin, CRIS, C-Sky, C6X, FR-V, H8/300, HPPA, i386, IA64, KVX, LM32, + M68K/Coldfire, Metag, Microblaze, MIPS, MIPS64, NDS32, NIOS2, OpenRISC, + PowerPC, RISCV64, Sparc, Sparc64, SuperH, Tile, X86_64 and XTENSA + processors. Alpha, FR-V, HPPA, IA64, LM32, NIOS2, Tile and Sparc64 are + experimental and need more testing. + ''; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ rasendubi AndersonTorres ]; platforms = platforms.linux; - broken = stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64; + badPlatforms = platforms.aarch64; }; + + passthru = { + # Derivations may check for the existance of this attribute, to know what to + # link to. + libiconv = libiconvReal; + }; + } From f87de21d118c37fc11202258edb2e3825c945b70 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 18 Jun 2022 08:57:41 -0500 Subject: [PATCH 5/9] postgresql: 14.3 -> 14.4 (#177968) (cherry picked from commit 124d0f2f8d420a6b5104dc2e944aac3ee793a921) Co-authored-by: timothy --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index bfbac087bc30..7c1ed8b6b375 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -239,9 +239,9 @@ in self: { }; postgresql_14 = self.callPackage generic { - version = "14.3"; + version = "14.4"; psqlSchema = "14"; - sha256 = "sha256-J5BXNov1mpGcBa2o+VxeBKu0PnS5oqacPUaiDgeprzg="; + sha256 = "sha256-wjtiN8UjHHkVEb3HkJhhfWhS6eO982Dv2LXRWho9j2o="; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; From 591e1fd4466c049dd0828144b610c640d5048567 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 21 Jun 2022 17:57:43 +0200 Subject: [PATCH 6/9] openssl_1_1: 1.1.1o -> 1.1.1p Fixes additional sanitization issues in the c_rehash script. https://mta.openssl.org/pipermail/openssl-announce/2022-June/000226.html Fixes: CVE-2022-2068 (cherry picked from commit 0c213829222e20c83eb2044c36ff205854a583b9) --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index a0506dda1f69..a14615b878bf 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -186,8 +186,8 @@ in { openssl_1_1 = common rec { - version = "1.1.1o"; - sha256 = "sha256-k4SisFcN2ANYhBRkZ3EV33he25QccSEfdQdtcv5rQ48="; + version = "1.1.1p"; + sha256 = "sha256-v2G2Kqpmx8djmUKpTeTJroKAwI8X1OrC5EZE2fyKzm8="; patches = [ ./1.1/nix-ssl-cert-file.patch From 0a7e76c141c508af9182ccca883dfdfeb7aa537b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 21 Jun 2022 17:57:43 +0200 Subject: [PATCH 7/9] openssl_3_0: 3.0.3 -> 3.0.4 Fixes additional sanitization issues in the c_rehash script. https://mta.openssl.org/pipermail/openssl-announce/2022-June/000227.html Fixes: CVE-2022-2068 (cherry picked from commit deb8ef11623db2127133293642a8719f71f76b82) --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index a14615b878bf..8f940b69256e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -201,8 +201,8 @@ in { }; openssl_3_0 = common { - version = "3.0.3"; - sha256 = "sha256-7gB4rc7x3l8APGLIDMllJ3IWCcbzu0K3eV3zH4tVjAs="; + version = "3.0.4"; + sha256 = "sha256-KDGEPppmigq0eOcCCtY9LWXlH3KXdHLcc+/O+6/AwA8="; patches = [ ./3.0/nix-ssl-cert-file.patch From 80beb79660823ead1606f3e431fed50fe4a3037e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Jun 2022 00:19:25 +0000 Subject: [PATCH 8/9] python310Packages.bottle: 0.12.19 -> 0.12.21 fixes CVE-2022-31799 (cherry picked from commit a4afd6aa1e0120a1867b601e301e3c0132c13f64) --- .../python-modules/bottle/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index eeaf34a44ebc..6532312ab71b 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -1,21 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "bottle"; - version = "0.12.19"; + version = "0.12.21"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "a9d73ffcbc6a1345ca2d7949638db46349f5b2b77dac65d6494d45c23628da2c"; + sha256 = "787c61b6cc02b9c229bf2663011fac53dd8fc197f7f8ad2eeede29d888d7887e"; }; - propagatedBuildInputs = [ setuptools ]; + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' + cd test + ''; + + disabledTests = [ + "test_delete_cookie" + "test_error" + "test_error_in_generator_callback" + ]; meta = with lib; { - homepage = "http://bottlepy.org"; + homepage = "https://bottlepy.org/"; description = "A fast and simple micro-framework for small web-applications"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ koral ]; }; } From 0d9095e4c7921468255e9c26fc893884f67f056c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 23 Jun 2022 17:43:56 +0200 Subject: [PATCH 9/9] libzip: Fix static build Don't build the regression tests because they don't build with pkgsStatic and are not executed anyway. (cherry picked from commit b97f46c807a4fafab450be0384a866ccf243fe35) --- pkgs/development/libraries/libzip/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 3620943d6c53..f794868baf0d 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { ++ lib.optionals withOpenssl [ openssl ] ++ lib.optionals withZstd [ zstd ]; + # Don't build the regression tests because they don't build with + # pkgsStatic and are not executed anyway. + cmakeFlags = [ "-DBUILD_REGRESS=0" ]; + preCheck = '' # regress/runtest is a generated file patchShebangs regress