Merge pull request #191725 from figsoda/zine

zine: use fetchCrate to remove patch, add figsoda as a maintainer
This commit is contained in:
figsoda 2022-09-19 09:43:16 -04:00 committed by GitHub
commit 7f659f34bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2733 deletions

File diff suppressed because it is too large Load diff

View file

@ -1,26 +1,23 @@
{ lib { lib
, stdenv
, fetchFromGitHub
, rustPlatform , rustPlatform
, fetchCrate
, pkg-config , pkg-config
, stdenv
, openssl , openssl
, CoreServices , CoreServices
, Security , Security
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "zine"; pname = "zine";
version = "0.6.0"; version = "0.6.0";
src = fetchFromGitHub { src = fetchCrate {
owner = "zineland"; inherit pname version;
repo = pname; sha256 = "sha256-savwRdIO48gCwqW2Wz/nWZuI1TxW/F0OR9jhNzHF+us=";
rev = "v${version}";
sha256 = "sha256-Pd/UAg6O9bOvrdvbY46Vf8cxFzjonEwcwPaaW59vH6E=";
}; };
cargoPatches = [ ./Cargo.lock.patch ]; # Repo does not provide Cargo.lock cargoSha256 = "sha256-U+pzT3V4rHiU+Hrax1EUXGQgdjrdfd3G07luaDSam3g=";
cargoSha256 = "sha256-qpzBDyNSZblmdimnnL4T/wS+6EXpduJ1U2+bfxM7piM=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
@ -33,6 +30,6 @@ rustPlatform.buildRustPackage rec {
description = "A simple and opinionated tool to build your own magazine"; description = "A simple and opinionated tool to build your own magazine";
homepage = "https://github.com/zineland/zine"; homepage = "https://github.com/zineland/zine";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ dit7ya ]; maintainers = with maintainers; [ dit7ya figsoda ];
}; };
} }