From 84c0241154125bc5a1c0b5d87dfbb09825566e8c Mon Sep 17 00:00:00 2001 From: Noah Fontes Date: Fri, 12 May 2023 10:49:09 -0700 Subject: [PATCH] p4: 2022.1.2305383 -> 2022.2.2407422 Minor version upgrade. We're now able to link against OpenSSL 3.0. --- pkgs/applications/version-management/p4/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 8a54d4eb77bf..188c5bbe2206 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -40,12 +40,12 @@ let in stdenv.mkDerivation rec { pname = "p4"; - version = "2022.1.2305383"; + version = "2022.2.2407422"; src = fetchurl { # Upstream replaces minor versions, so use archived URL. - url = "https://web.archive.org/web/20220901184735id_/https://ftp.perforce.com/perforce/r22.1/bin.tools/p4source.tgz"; - sha256 = "27ab3ddd7b178b05cf0b710e941650dac0688d294110ebafda9027732c0944c6"; + url = "https://web.archive.org/web/20230512173806id_/https://ftp.perforce.com/perforce/r22.2/bin.tools/p4source.tgz"; + sha256 = "4355375def3f3d2256d4a92ac1b9960173e7aa97404346c0c74caf23a0905e1b"; }; nativeBuildInputs = [ jam ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5be122b5c00..dcfd28fd4739 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32645,7 +32645,6 @@ with pkgs; p4 = callPackage ../applications/version-management/p4 { inherit (darwin.apple_sdk.frameworks) CoreServices Foundation Security; - openssl = openssl_1_1; }; p4d = callPackage ../applications/version-management/p4d { }; p4v = callPackage ../applications/version-management/p4v { };