From 6ad7121f7c15437c2d3e08ef73f8ab7e47e0c933 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 9 Feb 2023 19:04:56 +0100 Subject: [PATCH 1/6] atlassian-confluence: 7.19.1 -> 7.19.5 Changes: * https://confluence.atlassian.com/doc/issues-resolved-in-7-19-5-1189802683.html * https://confluence.atlassian.com/doc/issues-resolved-in-7-19-4-1189480226.html * https://confluence.atlassian.com/doc/issues-resolved-in-7-19-3-1182925647.html * https://confluence.atlassian.com/doc/issues-resolved-in-7-19-2-1168852726.html (cherry picked from commit 7e4b538af869e55239b92b5eb51db8255199a781) --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index b52b0fb0220e..5bfb2881c4cc 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -15,11 +15,11 @@ in optionalWarning (crowdProperties != null) "Using `crowdProperties` is deprecated!" (stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.19.1"; + version = "7.19.5"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-icfyxuS6chh3ibXZ0V9YYB0oCDd9o5rmcDC5Rbr0tOQ="; + sha256 = "sha256-32syhzbFCWzwE2NftTY58aA+iD0kABraT4FA7mYU1II="; }; buildPhase = '' From 94be27582bb12a75153376da289644e93a2329ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 9 Feb 2023 12:20:24 +0100 Subject: [PATCH 2/6] rustup: 1.25.1 -> 1.25.2 .1 won't build since 2023-02-01 (date impurity) https://hydra.nixos.org/log/akk9d52ainbdvd8x9v9l34csl1hr8ilz-rustup-1.25.1.drv (cherry picked from commit bbd31f5ec2b02e4ca7248ecf76f610644bdc4c2c) --- pkgs/development/tools/rust/rustup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index d7c4aaa39eef..6f9466b60d20 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -23,16 +23,16 @@ in rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.25.1"; + version = "1.25.2"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup"; rev = version; - sha256 = "sha256-zCr8xu0j/pBsdJEAYTCGrEouA8QumBnyhM4YLFZJqZI="; + sha256 = "sha256-zFdw6P4yrLDshtF9A5MbkxFcUE8KvlZGx5qkW4LSPzw="; }; - cargoSha256 = "sha256-FDVZn2PjqxovQmmandJICkidurhoXCAxo3bibuxQSMY="; + cargoSha256 = "sha256-QJKxKAW7MutpJsJwB/EImQLPaax7L/A25yRAAwEDXUQ="; nativeBuildInputs = [ makeBinaryWrapper pkg-config ]; From ea18eed39e334a1891a123af1d93ab424645ccd3 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Tue, 7 Feb 2023 23:59:39 -0800 Subject: [PATCH 3/6] yubikey-manager: 5.0.0 -> 5.0.1 (cherry picked from commit 99682c8588e3e726b8416bbe8615b6b6c9a9c700) --- pkgs/tools/misc/yubikey-manager/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index fe64a2df37b2..6c28776a439d 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,14 +3,14 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "5.0.0"; + version = "5.0.1"; format = "pyproject"; src = fetchFromGitHub { repo = "yubikey-manager"; rev = "refs/tags/${version}"; owner = "Yubico"; - sha256 = "sha256-ZQQhRiUsQwLaOY8NCzSc/PTmRewTL0ECBKj7Uj+6Gn8="; + sha256 = "sha256-Dj3ftyFeVgM0YMFI8cbiH5dmc8SKi2SBbScnc0+ad0M="; }; postPatch = '' @@ -23,7 +23,7 @@ python3Packages.buildPythonPackage rec { nativeBuildInputs = with python3Packages; [ poetry-core ]; propagatedBuildInputs = - with python3Packages; ([ + with python3Packages; [ click cryptography pyscard @@ -31,7 +31,7 @@ python3Packages.buildPythonPackage rec { six fido2 keyring - ]) ++ [ + ] ++ [ libu2f-host libusb1 yubikey-personalization From 96bdd86491ec01b134362299f32aced863576c01 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Thu, 9 Feb 2023 09:47:53 +0100 Subject: [PATCH 4/6] ungoogled-chromium: 109.0.5414.120 -> 110.0.5481.78 (cherry picked from commit 998c3cd1ce7d6186f9931ccd9dce9e89208972a0) --- .../networking/browsers/chromium/common.nix | 13 ++----------- .../browsers/chromium/upstream-info.json | 14 +++++++------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index c94ac89d0f24..78ed0b7e5103 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -152,10 +152,10 @@ let libdrm wayland mesa.drivers libxkbcommon curl libepoxy + libffi ] ++ optional systemdSupport systemd ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio - ++ lib.optional (chromiumVersionAtLeast "110") libffi; + ++ optional pulseSupport libpulseaudio; patches = [ # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): @@ -295,15 +295,6 @@ let chrome_pgo_phase = 0; clang_base_path = "${llvmPackages.clang}"; use_qt = false; - } // lib.optionalAttrs (!chromiumVersionAtLeast "110") { - # The default has changed to false. We'll build with libwayland from - # Nixpkgs for now but might want to eventually use the bundled libwayland - # as well to avoid incompatibilities (if this continues to be a problem - # from time to time): - use_system_libwayland = true; - # The default value is hardcoded instead of using pkg-config: - system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner"; - } // lib.optionalAttrs (chromiumVersionAtLeast "110") { # To fix the build as we don't provide libffi_pic.a # (ld.lld: error: unable to find library -l:libffi_pic.a): use_system_libffi = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index bd72ef447e3f..830239076d4a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,19 +45,19 @@ } }, "ungoogled-chromium": { - "version": "109.0.5414.120", - "sha256": "1yvfd0a7zfz4x00f83irrs6hy15wn85mrbbm7mk5wy4gjwg5zyrj", + "version": "110.0.5481.78", + "sha256": "1m67xfdgggaan09xsbppna209b8sm882xq587i0hsnnnzb3fdxdj", "sha256bin64": null, "deps": { "gn": { - "version": "2022-11-10", + "version": "2022-12-12", "url": "https://gn.googlesource.com/gn", - "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", - "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" + "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", + "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" }, "ungoogled-patches": { - "rev": "109.0.5414.120-1", - "sha256": "0hq48lsjl7da8rdq129mc7cd0z5ykqbaf1sbhhs1d10dzm5zs4p3" + "rev": "110.0.5481.78-1", + "sha256": "1ffb2wf1bdmzlxk4ih8qq439jzqz17f8nchvx7na52y48am1qr3c" } } } From 30c5ca67d7e28cfc747616c6f58c03f59a120a1d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 10 Feb 2023 09:12:32 +0100 Subject: [PATCH 5/6] php: add `meta.mainProgram` (cherry picked from commit a344af4c2404f701da6e29792478b2688b22f2fa) --- pkgs/development/interpreters/php/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 96ba56e00b92..9b2909ebf786 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -316,6 +316,7 @@ let description = "An HTML-embedded scripting language"; homepage = "https://www.php.net/"; license = licenses.php301; + mainProgram = "php"; maintainers = teams.php.members; platforms = platforms.all; outputsToInstall = [ "out" "dev" ]; From 099e3973285b3a1123434b499f6d384d6a3d70bc Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 9 Feb 2023 18:00:22 +0100 Subject: [PATCH 6/6] phpExtensions.opcache: remove flaky tests on darwin Some of the tests of ext-opcache are flaky on darwin. Issue is not obvious to me and I cannot troubleshoot this locally. (cherry picked from commit 7a09daa9139d543129a56f50b74e152843579f3e) --- pkgs/top-level/php-packages.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cb8637df2a63..6c27059ae528 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -80,7 +80,6 @@ lib.makeScope pkgs.newScope (self: with self; { , zendExtension ? false , doCheck ? true , extName ? name - , allowLocalNetworking ? false , ... }@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // { pname = "php-${name}"; @@ -100,7 +99,6 @@ lib.makeScope pkgs.newScope (self: with self; { ]; inherit configureFlags internalDeps buildInputs zendExtension doCheck; - __darwinAllowLocalNetworking = allowLocalNetworking; preConfigurePhases = [ "cdToExtensionRootPhase" @@ -409,8 +407,17 @@ lib.makeScope pkgs.newScope (self: with self; { valgrind.dev ]; zendExtension = true; + postPatch = lib.optionalString stdenv.isDarwin '' + # Tests are flaky on darwin + rm ext/opcache/tests/blacklist.phpt + rm ext/opcache/tests/bug66338.phpt + rm ext/opcache/tests/bug78106.phpt + rm ext/opcache/tests/issue0115.phpt + rm ext/opcache/tests/issue0149.phpt + rm ext/opcache/tests/revalidate_path_01.phpt + ''; # Tests launch the builtin webserver. - allowLocalNetworking = true; + __darwinAllowLocalNetworking = true; } { name = "openssl";