From cf4927e005ef245cabf69f6454b71b89fb83289d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 01:28:22 +0000 Subject: [PATCH 01/11] cargo-tarpaulin: 0.25.0 -> 0.25.1 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 499a424292308..ea50c29fcd535 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - sha256 = "sha256-9duL16AuwG3lBMq1hUAXbNrvoBF6SASCiakmT42LQ/E="; + sha256 = "sha256-JTkVNy2wqPIQ5mVcptI10a3Ghhdygnm9dmwUmiDqYjE="; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - cargoHash = "sha256-MXnE3Fq/jzWHvmO2i8cWixRKRuwVbUU/OmBj1SUkEiY="; + cargoHash = "sha256-t4L3HSOGk/lAL8mOaVl/pm3kE0CVVzsYpyu0V6zeIFQ="; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; From 2e719bcde5056e7db066da394ebf89810fab28ae Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 2 Mar 2023 13:34:45 +0100 Subject: [PATCH 02/11] pgadmin4: 6.19 -> 6.20 Changelog: https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_6_20.html Signed-off-by: Florian Brandes --- pkgs/tools/admin/pgadmin/default.nix | 4 ++-- pkgs/tools/admin/pgadmin/package.json | 5 ++++- pkgs/tools/admin/pgadmin/yarn.lock | 23 ++++++++++++++++--- pkgs/tools/admin/pgadmin/yarn.nix | 32 +++++++++++++++++++++++---- 4 files changed, 54 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index a83d96779de6a..2025b4290dca9 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -14,11 +14,11 @@ let pname = "pgadmin"; - version = "6.19"; + version = "6.20"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; - sha256 = "sha256-xHvdqVpNU9ZzTA6Xl2Bv044l6Tbvf4fjqyz4TmS9gmI="; + sha256 = "sha256-6aQvg98LymZGAgAcNX5Xhw/aRdE5h4HOCPS+kQnkstU="; }; yarnDeps = mkYarnModules { diff --git a/pkgs/tools/admin/pgadmin/package.json b/pkgs/tools/admin/pgadmin/package.json index 462d82e2134dd..f43473b081cd0 100644 --- a/pkgs/tools/admin/pgadmin/package.json +++ b/pkgs/tools/admin/pgadmin/package.json @@ -150,6 +150,7 @@ "react-draggable": "^4.4.4", "react-dropzone": "^14.2.1", "react-leaflet": "^3.2.2", + "react-resize-detector": "^8.0.3", "react-rnd": "^10.3.5", "react-router-dom": "^6.2.2", "react-select": "^4.2.1", @@ -164,6 +165,8 @@ "styled-components": "^5.2.1", "tempusdominus-bootstrap-4": "^5.1.2", "tempusdominus-core": "^5.19.3", + "uplot": "^1.6.24", + "uplot-react": "^1.1.4", "valid-filename": "^2.0.1", "webcabin-docker": "git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8", "wkx": "^0.5.0", @@ -188,7 +191,7 @@ "pep8": "pycodestyle --config=../.pycodestyle ../docs && pycodestyle --config=../.pycodestyle ../pkg && pycodestyle --config=../.pycodestyle ../tools && pycodestyle --config=../.pycodestyle ../web", "auditjs-html": "yarn audit --json | yarn run yarn-audit-html --output ../auditjs.html", "auditjs": "yarn audit --groups dependencies", - "auditpy": "safety check --full-report -i 40493 -i 51668", + "auditpy": "safety check --full-report -i 51668 -i 52495", "audit": "yarn run auditjs && yarn run auditpy" } } diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index df20a984a8f70..f506196c20402 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -8609,6 +8609,13 @@ react-property@2.0.0: resolved "https://registry.yarnpkg.com/react-property/-/react-property-2.0.0.tgz#2156ba9d85fa4741faf1918b38efc1eae3c6a136" integrity sha512-kzmNjIgU32mO4mmH5+iUyrqlpFQhF8K2k7eZ4fdLSOPFrD1XgEuSBv9LDEgxRXTMBqMd8ppT0x6TIzqE5pdGdw== +react-resize-detector@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-8.0.3.tgz#dab4470aae23bb07deb857230ccf945d000ef99b" + integrity sha512-c3eqm5BVcluVhxHsBQnhyPO/5uYB3XHIHz6D1ZOHzU2WcnZF0Cr3KLl5OIozRC2RSsdQlu5vn1PHEqrvKRnIYA== + dependencies: + lodash "^4.17.21" + react-rnd@^10.3.5: version "10.3.7" resolved "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.7.tgz#037ce277e6c5e682989b51278e44a6ba299990af" @@ -10084,9 +10091,9 @@ typescript@^3.2.2: integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== ua-parser-js@^0.7.30: - version "0.7.32" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz#cd8c639cdca949e30fa68c44b7813ef13e36d211" - integrity sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw== + version "0.7.33" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532" + integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw== uglify-js@^3.1.4: version "3.17.4" @@ -10192,6 +10199,16 @@ update-browserslist-db@^1.0.9: escalade "^3.1.1" picocolors "^1.0.0" +uplot-react@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/uplot-react/-/uplot-react-1.1.4.tgz#02b9918a199da9983fc0d375fb44e443749e2ac0" + integrity sha512-qO1UkQwjVKdj5vTm3O3yldvu1T6hwY4++rH4KznLhjqpnLdncq1zsRxq/zQz/HUHPVD0j7WBcEISbNM61JsuAQ== + +uplot@^1.6.24: + version "1.6.24" + resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.24.tgz#dfa213fa7da92763261920ea972ed1a5f9f6af12" + integrity sha512-WpH2BsrFrqxkMu+4XBvc0eCDsRBhzoq9crttYeSI0bfxpzR5YoSVzZXOKFVWcVC7sp/aDXrdDPbDZGCtck2PVg== + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" diff --git a/pkgs/tools/admin/pgadmin/yarn.nix b/pkgs/tools/admin/pgadmin/yarn.nix index d4c5e2c7b1ce1..0dc8367c7ca26 100644 --- a/pkgs/tools/admin/pgadmin/yarn.nix +++ b/pkgs/tools/admin/pgadmin/yarn.nix @@ -9223,6 +9223,14 @@ sha512 = "kzmNjIgU32mO4mmH5+iUyrqlpFQhF8K2k7eZ4fdLSOPFrD1XgEuSBv9LDEgxRXTMBqMd8ppT0x6TIzqE5pdGdw=="; }; } + { + name = "react_resize_detector___react_resize_detector_8.0.3.tgz"; + path = fetchurl { + name = "react_resize_detector___react_resize_detector_8.0.3.tgz"; + url = "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-8.0.3.tgz"; + sha512 = "c3eqm5BVcluVhxHsBQnhyPO/5uYB3XHIHz6D1ZOHzU2WcnZF0Cr3KLl5OIozRC2RSsdQlu5vn1PHEqrvKRnIYA=="; + }; + } { name = "react_rnd___react_rnd_10.3.7.tgz"; path = fetchurl { @@ -10912,11 +10920,11 @@ }; } { - name = "ua_parser_js___ua_parser_js_0.7.32.tgz"; + name = "ua_parser_js___ua_parser_js_0.7.33.tgz"; path = fetchurl { - name = "ua_parser_js___ua_parser_js_0.7.32.tgz"; - url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz"; - sha512 = "f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw=="; + name = "ua_parser_js___ua_parser_js_0.7.33.tgz"; + url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz"; + sha512 = "s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw=="; }; } { @@ -11047,6 +11055,22 @@ sha512 = "OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ=="; }; } + { + name = "uplot_react___uplot_react_1.1.4.tgz"; + path = fetchurl { + name = "uplot_react___uplot_react_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/uplot-react/-/uplot-react-1.1.4.tgz"; + sha512 = "qO1UkQwjVKdj5vTm3O3yldvu1T6hwY4++rH4KznLhjqpnLdncq1zsRxq/zQz/HUHPVD0j7WBcEISbNM61JsuAQ=="; + }; + } + { + name = "uplot___uplot_1.6.24.tgz"; + path = fetchurl { + name = "uplot___uplot_1.6.24.tgz"; + url = "https://registry.yarnpkg.com/uplot/-/uplot-1.6.24.tgz"; + sha512 = "WpH2BsrFrqxkMu+4XBvc0eCDsRBhzoq9crttYeSI0bfxpzR5YoSVzZXOKFVWcVC7sp/aDXrdDPbDZGCtck2PVg=="; + }; + } { name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { From 8f84ab48c4005e63efb5390b72505f5f01cb3ac2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Mar 2023 10:43:07 +0000 Subject: [PATCH 03/11] libreswan: 4.9 -> 4.10 --- pkgs/tools/networking/libreswan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index ab3249e57a873..47838f7566354 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "libreswan"; - version = "4.9"; + version = "4.10"; src = fetchurl { url = "https://download.libreswan.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-9kLctjXpCVZMqP2Z6kSrQ/YHI7TXbBWO2BKXjEWzmLk="; + sha256 = "sha256-WpQAwlqO26B0IEJvtV3Lqv2qNwLlsPLBkgWmxWckins="; }; strictDeps = true; From b3209f6dbc9b6431b8d14044b5a03a0c66f3108c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Mar 2023 14:10:39 +0000 Subject: [PATCH 04/11] git-machete: 3.15.2 -> 3.16.0 --- pkgs/applications/version-management/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 885f6d1355e93..455b7497aa96a 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.15.2"; + version = "3.16.0"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-hIm3JDLXUTwjuVfAHvZBWFBJNOAVWyfl/X4A6B0OoXg="; + hash = "sha256-94qYCyWqVwMMptlJIe4o4/mEHnhcMubcupd+Qs2SYH0="; }; nativeBuildInputs = [ installShellFiles ]; From 946be78ef3c057166e36dbec61eaf9f305b74387 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Mar 2023 16:48:40 +0000 Subject: [PATCH 05/11] nixpacks: 1.4.0 -> 1.4.1 --- pkgs/applications/virtualization/nixpacks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index c8072c903d260..695cd970b7bb7 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v9ycluLfkrPDzjsMXtv7w9UHgMaGzTsJw4lT/KfRAu4="; + sha256 = "sha256-zxgNHzKXekZnk0OsHw30u4L9U2mIT/MryZuAQ2EBEYg="; }; - cargoHash = "sha256-wVQEa1qS+JF6PHKvRrRFbSvj2qp6j14ErOQPkxP0uuA="; + cargoHash = "sha256-tsGyrU/5yp5PJ2d5HUoaw/jhGgYyDt6qBK+DvC79kmY="; # skip test due FHS dependency doCheck = false; From bf4b584153acc1863de889ae004bcd8ca222399e Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 4 Mar 2023 20:31:33 +0100 Subject: [PATCH 06/11] octoprint: fix build with (flask-)babel Signed-off-by: Florian Brandes --- pkgs/applications/misc/octoprint/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index c1a4f6aec9228..4c740852f6af9 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -38,6 +38,17 @@ let nativeBuildInputs = [ ]; format = "setuptools"; outputs = [ "out" ]; + patches = [ ]; + }); + # downgrade needed for flask-babel 2.0.0 + babel = super.babel.overridePythonAttrs (oldAttrs: rec { + version = "2.11.0"; + src = super.fetchPypi { + pname = "Babel"; + inherit version; + hash = "sha256-XvSzImsBgN7d7UIpZRyLDho6aig31FoHMnLzE+TPl/Y="; + }; + propagatedBuildInputs = [ self.pytz ]; }); } ) From d78148fb3944aca23adc5e72c782384ce9208f15 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 Mar 2023 21:15:26 +0000 Subject: [PATCH 07/11] gnumake44: reintrocude older 4.4 version for openjdk openjdk fails to build after gnumake-4.4.1 update. Let's bring back 4.4 release until we sort out openjdk. --- .../gnumake/4.4/0001-No-impure-bin-sh.patch | 35 +++++++++ .../gnumake/4.4/0002-remove-impure-dirs.patch | 40 ++++++++++ .../build-managers/gnumake/4.4/default.nix | 75 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 152 insertions(+) create mode 100644 pkgs/development/tools/build-managers/gnumake/4.4/0001-No-impure-bin-sh.patch create mode 100644 pkgs/development/tools/build-managers/gnumake/4.4/0002-remove-impure-dirs.patch create mode 100644 pkgs/development/tools/build-managers/gnumake/4.4/default.nix diff --git a/pkgs/development/tools/build-managers/gnumake/4.4/0001-No-impure-bin-sh.patch b/pkgs/development/tools/build-managers/gnumake/4.4/0001-No-impure-bin-sh.patch new file mode 100644 index 0000000000000..58ee2d6fe09b0 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.4/0001-No-impure-bin-sh.patch @@ -0,0 +1,35 @@ +From e00a5257a6ca5fedbf68b09eee7df3502971a057 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Sat, 24 Apr 2021 10:11:40 +0200 +Subject: [PATCH 1/2] No impure bin sh + +default_shell is used to populuate default shell used to execute jobs. +Unless SHELL is set to a different value this would be /bin/sh. +Our stdenv provides sh in form of bash anyway. Having this value not +hard-coded has some advantages: + +- It would ensure that on all systems it uses sh from its PATH rather + than /bin/sh, which helps as different systems might have different + shells there (bash vs. dash) +- In the past I had issues with LD_PRELOAD with BEAR, where /bin/sh + used a different glibc than BEAR which came from my development shell. +--- + src/job.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/job.c b/src/job.c +index ae1f18b..6b4ddb3 100644 +--- a/src/job.c ++++ b/src/job.c +@@ -77,7 +77,7 @@ char * vms_strsignal (int status); + + #else + +-const char *default_shell = "/bin/sh"; ++const char *default_shell = "sh"; + int batch_mode_shell = 0; + + #endif +-- +2.31.1 + diff --git a/pkgs/development/tools/build-managers/gnumake/4.4/0002-remove-impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.4/0002-remove-impure-dirs.patch new file mode 100644 index 0000000000000..e62aee7d9993d --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.4/0002-remove-impure-dirs.patch @@ -0,0 +1,40 @@ +From 795d63d3c8b5c0dbb7e544954f75507b371b7228 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Sat, 24 Apr 2021 10:20:16 +0200 +Subject: [PATCH 2/2] remove impure dirs + +--- + src/read.c | 3 --- + src/remake.c | 2 -- + 2 files changed, 5 deletions(-) + +diff --git a/src/read.c b/src/read.c +index fa197fb..defacfb 100644 +--- a/src/read.c ++++ b/src/read.c +@@ -109,9 +109,6 @@ static const char *default_include_directories[] = + #endif + INCLUDEDIR, + #ifndef _AMIGA +- "/usr/gnu/include", +- "/usr/local/include", +- "/usr/include", + #endif + 0 + }; +diff --git a/src/remake.c b/src/remake.c +index fb237c5..94bff7d 100644 +--- a/src/remake.c ++++ b/src/remake.c +@@ -1601,8 +1601,6 @@ library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr) + static const char *dirs[] = + { + #ifndef _AMIGA +- "/lib", +- "/usr/lib", + #endif + #if defined(WINDOWS32) && !defined(LIBDIR) + /* +-- +2.31.1 + diff --git a/pkgs/development/tools/build-managers/gnumake/4.4/default.nix b/pkgs/development/tools/build-managers/gnumake/4.4/default.nix new file mode 100644 index 0000000000000..3057a0a4d40b8 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.4/default.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, fetchurl +, guileSupport ? false, guile +# avoid guile depend on bootstrap to prevent dependency cycles +, inBootstrap ? false +, pkg-config +, gnumake +}: + +let + guileEnabled = guileSupport && !inBootstrap; +in + +stdenv.mkDerivation rec { + pname = "gnumake"; + version = "4.4"; + + src = fetchurl { + url = "mirror://gnu/make/make-${version}.tar.gz"; + hash = "sha256-WB9NToctp0s5Qch0IViYp9NYAvA3Mr3M7h1KeXkQXRg="; + }; + + # to update apply these patches with `git am *.patch` to https://git.savannah.gnu.org/git/make.git + patches = [ + # Replaces /bin/sh with sh, see patch file for reasoning + ./0001-No-impure-bin-sh.patch + # Purity: don't look for library dependencies (of the form `-lfoo') in /lib + # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for + # included Makefiles, don't look in /usr/include and friends. + ./0002-remove-impure-dirs.patch + ]; + + nativeBuildInputs = lib.optionals guileEnabled [ pkg-config ]; + buildInputs = lib.optionals guileEnabled [ guile ]; + + configureFlags = lib.optional guileEnabled "--with-guile" + + # Make uses this test to decide whether it should keep track of + # subseconds. Apple made this possible with APFS and macOS 10.13. + # However, we still support macOS 10.11 and 10.12. Binaries built + # in Nixpkgs will be unable to use futimens to set mtime less than + # a second. So, tell Make to ignore nanoseconds in mtime here by + # overriding the autoconf test for the struct. + # See https://github.com/NixOS/nixpkgs/issues/51221 for discussion. + ++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no"; + + outputs = [ "out" "man" "info" ]; + separateDebugInfo = true; + + passthru.tests = { + # make sure that the override doesn't break bootstrapping + gnumakeWithGuile = gnumake.override { guileSupport = true; }; + }; + + meta = with lib; { + description = "A tool to control the generation of non-source files from sources"; + longDescription = '' + Make is a tool which controls the generation of executables and + other non-source files of a program from the program's source files. + + Make gets its knowledge of how to build your program from a file + called the makefile, which lists each of the non-source files and + how to compute it from other files. When you write a program, you + should write a makefile for it, so that it is possible to use Make + to build and install the program. + ''; + homepage = "https://www.gnu.org/software/make/"; + + license = licenses.gpl3Plus; + maintainers = [ maintainers.vrthra ]; + mainProgram = "make"; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1855ab69fccce..d6f39375faf2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18037,6 +18037,8 @@ with pkgs; gnumake = callPackage ../development/tools/build-managers/gnumake { }; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; + # openjdk-17 fails on 4.4.1. Provide 4.4 until we fix it. + gnumake44 = callPackage ../development/tools/build-managers/gnumake/4.4 { }; gob2 = callPackage ../development/tools/misc/gob2 { }; From 41a6b03b89552caf37f4acc4bc9e5b7921d77d44 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 Mar 2023 21:48:54 +0000 Subject: [PATCH 08/11] openjdk: revert back to gnumake-4.4 as gnumake-4.4.1 breaks the build Without the change `openjdk` build fails on `staging-next` as: > installing > mv: missing destination file operand after '/nix/store/pwgvafi1xwa6l0dygmcyr1sl27dhpy67-openjdk-19.0.2+7/lib/openjdk' > Try 'mv --help' for more information. --- pkgs/development/compilers/openjdk/19.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index 41a630425e98a..1ac3796cf9bb2 100644 --- a/pkgs/development/compilers/openjdk/19.nix +++ b/pkgs/development/compilers/openjdk/19.nix @@ -9,6 +9,9 @@ , headless ? stdenv.targetPlatform.isGhcjs , enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +# Hold back make-4.4 as 4.4.1 breaks the build: +# https://github.com/NixOS/nixpkgs/issues/219513 +, gnumake44 }: let @@ -29,7 +32,7 @@ let hash = "sha256-pBEHmBtIgG4Czou4C/zpBBYZEDImvXiLoA5CjOzpeyI="; }; - nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; + nativeBuildInputs = [ gnumake44 pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; buildInputs = [ cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst From e6d4aecb9716afeeeecefc12b8ea7ac10ec856c1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 Mar 2023 21:52:53 +0000 Subject: [PATCH 09/11] openjdk17: revert back to gnumake-4.4 as gnumake-4.4.1 breaks the build Without the change `openjdk` build fails on `staging-next` as: > installing > mv: missing destination file operand after '/nix/store/pwgvafi1xwa6l0dygmcyr1sl27dhpy67-openjdk-19.0.2+7/lib/openjdk' > Try 'mv --help' for more information. --- pkgs/development/compilers/openjdk/17.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index 4714bf11c5558..c085d669971a3 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -6,6 +6,9 @@ , headless ? false , enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +# Hold back make-4.4 as 4.4.1 breaks the build: +# https://github.com/NixOS/nixpkgs/issues/219513 +, gnumake44 }: let @@ -26,7 +29,7 @@ let sha256 = "sha256-zPpINi++3Ct0PCwlwlfhceh/ploMkclw+MgeI9dULdc="; }; - nativeBuildInputs = [ pkg-config autoconf unzip ]; + nativeBuildInputs = [ gnumake44 pkg-config autoconf unzip ]; buildInputs = [ cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst From 7d786aa21bc5935e9b8795a2c517b966a1b44628 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Mar 2023 21:54:13 +0000 Subject: [PATCH 10/11] python310Packages.uvloop: Fix tests on aarch64-darwin --- pkgs/development/python-modules/uvloop/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index ac3da7eb78d37..adc041f7d1c21 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -12,6 +12,7 @@ , aiohttp , psutil , pyopenssl +, pytest-forked , pytestCheckHook }: @@ -39,6 +40,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; nativeCheckInputs = [ + pytest-forked pytestCheckHook psutil ] ++ lib.optionals (pythonOlder "3.11") [ @@ -65,13 +67,13 @@ buildPythonPackage rec { "--deselect=tests/test_process.py::Test_UV_Process::test_process_env_2" "--deselect=tests/test_process.py::Test_AIO_Process::test_process_env_2" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # Flaky test: https://github.com/MagicStack/uvloop/issues/412 - "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set" # Broken: https://github.com/NixOS/nixpkgs/issues/160904 "--deselect=tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" - # Flaky test: https://github.com/MagicStack/uvloop/issues/513 - "--deselect=tests/test_tcp.py::Test_UV_TCP::test_create_server_5" - "--deselect=tests/test_tcp.py::Test_UV_TCP::test_create_server_6" + # Segmentation fault + "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" + # AssertionError: b'' != b'out\n' + "--deselect=tests/test_process.py::Test_UV_Process::test_process_streams_redirect" + "--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect" ]; disabledTestPaths = [ From 3c99ad4dd48cd30d88b5092232f4eb215fe9953c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 Mar 2023 21:55:09 +0000 Subject: [PATCH 11/11] openjdk11: revert back to gnumake-4.4 as gnumake-4.4.1 breaks the build Without the change `openjdk` build fails on `staging-next` as: > installing > mv: missing destination file operand after '/nix/store/pwgvafi1xwa6l0dygmcyr1sl27dhpy67-openjdk-19.0.2+7/lib/openjdk' > Try 'mv --help' for more information. --- pkgs/development/compilers/openjdk/11.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index d350c937110f8..75e2d9c17148b 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -6,6 +6,9 @@ , headless ? false , enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +# Hold back make-4.4 as 4.4.1 breaks the build: +# https://github.com/NixOS/nixpkgs/issues/219513 +, gnumake44 }: let @@ -25,7 +28,7 @@ let sha256 = "sha256-QGOpMIrWwOtIcUY/CLbTRDvcVTG2xioZu46v+n+IIQ4="; }; - nativeBuildInputs = [ pkg-config autoconf unzip ]; + nativeBuildInputs = [ gnumake44 pkg-config autoconf unzip ]; buildInputs = [ cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst