Merge pull request #158707 from 06kellyjac/agate_update

This commit is contained in:
Artturi 2022-03-01 17:48:49 +02:00 committed by GitHub
commit 8eaf3b2c64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,17 +1,25 @@
{ lib, stdenv, nixosTests, fetchFromGitHub, rustPlatform, libiconv, Security }: { lib, stdenv, nixosTests, fetchFromGitHub, fetchpatch, rustPlatform, libiconv, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "agate"; pname = "agate";
version = "3.2.2"; version = "3.2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mbrubeck"; owner = "mbrubeck";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-o4tjEIgDTj2EUbfaKCHZfvEKCwxNpsabU437kU+Vpnk="; sha256 = "sha256-nkWk/0TIAHcYQjxbg0HnT+4S4Cinl22WfqHb9U6u5eI=";
}; };
cargoSha256 = "sha256-aF86QpizJ+lMNmN9DQKA9o1QZWZObyQ3v3+HmT/s02g=";
cargoSha256 = "sha256-rE0I13dKbGgJmh6vF/cWvIZfqtKzzgn7pTiB3HJ7cgY="; patches = [
# https://github.com/mbrubeck/agate/pull/143
(fetchpatch {
name = "fix-port-collision.patch";
url = "https://github.com/mbrubeck/agate/commit/2f5d7878ec9d0dd51762c4c7680fc9f825d8ecd5.patch";
sha256 = "sha256-NEFmfb0y97O2W96YggD+MgcN7tlFEi9T4FNzLCND77s=";
})
];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];