Merge pull request #231511 from impl/p4-2022.2.2407422

p4: 2022.1.2305383 -> 2022.2.2407422
This commit is contained in:
Martin Weinelt 2023-05-12 22:37:31 +02:00 committed by GitHub
commit a56161ab38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions

View file

@ -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 ];

View file

@ -32636,7 +32636,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 { };