From 00f7fa948d5e63d29cee0969d10e5e61491fe7c5 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 10 Mar 2023 14:44:34 -0300 Subject: [PATCH] geekbench6: init at 6.0.1 --- pkgs/tools/misc/geekbench/6.nix | 52 +++++++++++++++++++++++++++++++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 7 +++-- 3 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/misc/geekbench/6.nix diff --git a/pkgs/tools/misc/geekbench/6.nix b/pkgs/tools/misc/geekbench/6.nix new file mode 100644 index 000000000000..46b1cbe71968 --- /dev/null +++ b/pkgs/tools/misc/geekbench/6.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, addOpenGLRunpath +, makeWrapper +, ocl-icd +, vulkan-loader +}: + +stdenv.mkDerivation rec { + pname = "geekbench"; + version = "6.0.1"; + + src = fetchurl { + url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; + hash = "sha256-RrfyB7RvYWkVCbjblLIPOFcZjUR/fJHk1Em1HP74kmY="; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r geekbench.plar geekbench-workload.plar geekbench6 geekbench_x86_64 geekbench_avx2 $out/bin + + for f in geekbench6 geekbench_x86_64 geekbench_avx2 ; do + wrapProgram $out/bin/$f \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + addOpenGLRunpath.driverLink + ocl-icd + vulkan-loader + ]}" + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Cross-platform benchmark"; + homepage = "https://geekbench.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = [ maintainers.michalrus ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "geekbench6"; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0e8b9bddb623..dd2c8c7735c1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -511,6 +511,8 @@ mapAliases ({ gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead"; # Added 2021-04-03 gdb-multitarget = throw "'gdb-multitarget' has been renamed to/replaced by 'gdb'"; # Converted to throw 2022-02-22 gdk_pixbuf = throw "'gdk_pixbuf' has been renamed to/replaced by 'gdk-pixbuf'"; # Converted to throw 2022-02-22 + geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 + geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6"; # Added 2022-01-12 gettextWithExpat = throw "'gettextWithExpat' has been renamed to/replaced by 'gettext'"; # Converted to throw 2022-02-22 gfm = throw "gfm has been removed"; # Added 2021-01-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f59fda45229b..515b559349e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4839,9 +4839,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - geekbench4 = callPackage ../tools/misc/geekbench/4.nix { }; - geekbench5 = callPackage ../tools/misc/geekbench/5.nix { }; - geekbench = geekbench5; + geekbench_4 = callPackage ../tools/misc/geekbench/4.nix { }; + geekbench_5 = callPackage ../tools/misc/geekbench/5.nix { }; + geekbench_6 = callPackage ../tools/misc/geekbench/6.nix { }; + geekbench = geekbench_6; gencfsm = callPackage ../tools/security/gencfsm { };