From 4a2b827c716ffcd67f6c12d14024ae63a5311c34 Mon Sep 17 00:00:00 2001 From: Jeremy Schlatter Date: Sun, 23 Jun 2024 15:39:58 -0700 Subject: treewide: use cmakeCudaArchitecturesString --- pkgs/by-name/ll/llama-cpp/package.nix | 7 +------ pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 2e5514dd15f29..254f8c2a51f6f 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -122,12 +122,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (cmakeBool "LLAMA_VULKAN" vulkanSupport) ] ++ optionals cudaSupport [ - ( - with cudaPackages.flags; - cmakeFeature "CMAKE_CUDA_ARCHITECTURES" ( - builtins.concatStringsSep ";" (map dropDot cudaCapabilities) - ) - ) + (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) ] ++ optionals rocmSupport [ (cmakeFeature "CMAKE_C_COMPILER" "hipcc") diff --git a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix index 53ac9fa3bfc11..77b7e00b06186 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix @@ -14,10 +14,6 @@ let effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; - cudaCapabilities = cudaPackages.cudaFlags.cudaCapabilities; - # E.g. [ "80" "86" "90" ] - cudaArchitectures = (builtins.map cudaPackages.cudaFlags.dropDot cudaCapabilities); - cudaArchitecturesString = lib.strings.concatStringsSep ";" cudaArchitectures; in effectiveStdenv.mkDerivation (finalAttrs: { pname = "fastdeploy-ppocr"; @@ -65,7 +61,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_SHARED_LIBS" true) ] ++ lib.optionals cudaSupport [ - (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) ]; postInstall = '' -- cgit 1.4.1 From 1b6089e945d6c8f3bdb196370c1a0fc7233570ef Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Mon, 10 Jun 2024 08:49:56 +0200 Subject: notary: 0.6.1 -> 0.6.1-unstable-2024-04-16 --- pkgs/by-name/no/notary/package.nix | 57 +++++++++++++++++++++++ pkgs/tools/security/notary/default.nix | 66 --------------------------- pkgs/tools/security/notary/no-git-usage.patch | 15 ------ pkgs/top-level/all-packages.nix | 2 - 4 files changed, 57 insertions(+), 83 deletions(-) create mode 100644 pkgs/by-name/no/notary/package.nix delete mode 100644 pkgs/tools/security/notary/default.nix delete mode 100644 pkgs/tools/security/notary/no-git-usage.patch (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/no/notary/package.nix b/pkgs/by-name/no/notary/package.nix new file mode 100644 index 0000000000000..1f35222ee9600 --- /dev/null +++ b/pkgs/by-name/no/notary/package.nix @@ -0,0 +1,57 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: +buildGoModule rec { + pname = "notary"; + version = "0.6.1-unstable-2024-04-16"; + + src = fetchFromGitHub { + owner = "notaryproject"; + repo = "notary"; + rev = "9d2b3b35929392c9945d976b8bdecbe2f53a299e"; + sha256 = "sha256-u19BfTJwRWholK0b3BcgSmcMM9AR7OeXo64AOi87r0A="; + }; + + vendorHash = null; + + tags = [ + "pkcs11" + ]; + + ldflags = [ + "-X github.com/theupdateframework/notary/version.NotaryVersion=${version}" + ]; + + # Tests try to use network. + doCheck = false; + + meta = { + description = "Project that allows anyone to have trust over arbitrary collections of data"; + mainProgram = "notary"; + longDescription = '' + The Notary project comprises a server and a client for running and + interacting with trusted collections. See the service architecture + documentation for more information. + + Notary aims to make the internet more secure by making it easy for people + to publish and verify content. We often rely on TLS to secure our + communications with a web server which is inherently flawed, as any + compromise of the server enables malicious content to be substituted for + the legitimate content. + + With Notary, publishers can sign their content offline using keys kept + highly secure. Once the publisher is ready to make the content available, + they can push their signed trusted collection to a Notary Server. + + Consumers, having acquired the publisher's public key through a secure + channel, can then communicate with any notary server or (insecure) mirror, + relying only on the publisher's key to determine the validity and + integrity of the received content. + ''; + license = lib.licenses.asl20; + homepage = "https://github.com/theupdateframework/notary"; + maintainers = [ lib.maintainers.vdemeester ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix deleted file mode 100644 index be147369ffe29..0000000000000 --- a/pkgs/tools/security/notary/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, fetchFromGitHub, buildGoPackage, libtool }: - -buildGoPackage rec { - pname = "notary"; - version = "0.6.1"; - gitcommit = "d6e1431f"; - - src = fetchFromGitHub { - owner = "theupdateframework"; - repo = "notary"; - rev = "v${version}"; - sha256 = "1ak9dk6vjny5069hp3w36dbjawcnaq82l3i2qvf7mn7zfglbsnf9"; - }; - - patches = [ ./no-git-usage.patch ]; - - buildInputs = [ libtool ]; - buildPhase = '' - runHook preBuild - cd go/src/github.com/theupdateframework/notary - SKIPENVCHECK=1 make client GITCOMMIT=${gitcommit} - runHook postBuild - ''; - - goPackagePath = "github.com/theupdateframework/notary"; - - installPhase = '' - runHook preInstall - install -D bin/notary $out/bin/notary - runHook postInstall - ''; - - #doCheck = true; # broken by tzdata: 2018g -> 2019a - checkPhase = '' - make test PKGS=github.com/theupdateframework/notary/cmd/notary - ''; - - meta = with lib; { - description = "Project that allows anyone to have trust over arbitrary collections of data"; - mainProgram = "notary"; - longDescription = '' - The Notary project comprises a server and a client for running and - interacting with trusted collections. See the service architecture - documentation for more information. - - Notary aims to make the internet more secure by making it easy for people - to publish and verify content. We often rely on TLS to secure our - communications with a web server which is inherently flawed, as any - compromise of the server enables malicious content to be substituted for - the legitimate content. - - With Notary, publishers can sign their content offline using keys kept - highly secure. Once the publisher is ready to make the content available, - they can push their signed trusted collection to a Notary Server. - - Consumers, having acquired the publisher's public key through a secure - channel, can then communicate with any notary server or (insecure) mirror, - relying only on the publisher's key to determine the validity and - integrity of the received content. - ''; - license = licenses.asl20; - homepage = "https://github.com/theupdateframework/notary"; - maintainers = with maintainers; [ vdemeester ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/security/notary/no-git-usage.patch b/pkgs/tools/security/notary/no-git-usage.patch deleted file mode 100644 index 363eefe36921d..0000000000000 --- a/pkgs/tools/security/notary/no-git-usage.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile b/Makefile -index ab794165..0cbd047f 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,8 +5,8 @@ PREFIX?=$(shell pwd) - # Add to compile time flags - NOTARY_PKG := github.com/theupdateframework/notary - NOTARY_VERSION := $(shell cat NOTARY_VERSION) --GITCOMMIT := $(shell git rev-parse --short HEAD) --GITUNTRACKEDCHANGES := $(shell git status --porcelain --untracked-files=no) -+GITCOMMIT ?= $(shell git rev-parse --short HEAD) -+GITUNTRACKEDCHANGES := - ifneq ($(GITUNTRACKEDCHANGES),) - GITCOMMIT := $(GITCOMMIT)-dirty - endif diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1068f2ed4f216..deea39bc7416d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11062,8 +11062,6 @@ with pkgs; noisetorch = callPackage ../applications/audio/noisetorch { }; - notary = callPackage ../tools/security/notary { }; - notation = callPackage ../tools/security/notation { }; notify-osd = callPackage ../applications/misc/notify-osd { }; -- cgit 1.4.1