From 5050ed3f41c8ed77bb057d172ea8a108cbb7cfa9 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 12 Feb 2021 16:51:38 +0000 Subject: [PATCH 1/2] agate: 2.4.1 -> 2.5.0 --- pkgs/servers/gemini/agate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index 02d2f241bae..285de8d7e06 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AojemBU3BUuMqokLH9mhYf+sH5Q+zSYeoGmuI5/6vPw="; + sha256 = "sha256-mnatEvojma1+cOVllTAzDVxl5luRGleLE6GNPnQUNWQ="; }; - cargoSha256 = "sha256-TFSD+G0i5EAu7D7gOtRzwFxO214CBPdh2Y6rRt39FVo="; + cargoSha256 = "sha256-B07itUftDj3yVMDc/2VetwYs74fZBa1tmeELbbQ39P0="; meta = with lib; { homepage = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; From 0edf636ad056f008f6f2948932d3d0d78c7a7b9f Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 12 Feb 2021 19:52:20 +0000 Subject: [PATCH 2/2] agate: fix build for darwin Co-authored-by: SuperSandro2000 --- pkgs/servers/gemini/agate/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index 285de8d7e06..be3012740f5 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "agate"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-B07itUftDj3yVMDc/2VetwYs74fZBa1tmeELbbQ39P0="; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + meta = with lib; { homepage = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; changelog = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c35b055ba0..7fbc6cd0e65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -705,7 +705,9 @@ in afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; - agate = callPackage ../servers/gemini/agate { }; + agate = callPackage ../servers/gemini/agate { + inherit (darwin.apple_sdk.frameworks) Security; + }; agda-pkg = callPackage ../development/tools/agda-pkg { };