From 520f8db902f2f1d3541f01f96cd8d82f5235af7a Mon Sep 17 00:00:00 2001 From: nartsisss Date: Mon, 4 Nov 2024 00:32:57 +0300 Subject: [PATCH 1/4] matugen: 2.3.0 -> 2.4.0 --- pkgs/by-name/ma/matugen/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index b147e74c2294..5e9e04c6bf60 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "matugen"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "InioX"; repo = "matugen"; - rev = "v${version}"; - hash = "sha256-WFitpFF1Ah4HkzSe4H4aN/ZM0EEIcP5ozLMUWaDggFU="; + rev = "refs/tags/v${version}"; + hash = "sha256-SN4m0ka5VHLIQYTszhlCIB+2D+nyWMzJM5n5bZdkG/I="; }; - cargoHash = "sha256-pD1NKUJmvMTnYKWjRrGnvbA0zVvGpWRIlf/9ovP9Jq4="; + cargoHash = "sha256-FwQhhwlldDskDzmIOxhwRuUv8NxXCxd3ZmOwqcuWz64="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security From 7a38c0547d70e5b75d68d7ebc55e501d59edea84 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Mon, 4 Nov 2024 00:34:12 +0300 Subject: [PATCH 2/4] matugen: format with nixfmt-rfc-style --- pkgs/by-name/ma/matugen/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index 5e9e04c6bf60..26690566c156 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -1,8 +1,9 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, }: rustPlatform.buildRustPackage rec { From 943aff98bc71efd79032009594ff7f16292357c3 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Mon, 4 Nov 2024 00:34:30 +0300 Subject: [PATCH 3/4] matugen: refactor meta, remove with lib; --- pkgs/by-name/ma/matugen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index 26690566c156..afef4c26eda2 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -24,12 +24,12 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.SystemConfiguration ]; - meta = with lib; { + meta = { description = "Material you color generation tool"; homepage = "https://github.com/InioX/matugen"; changelog = "https://github.com/InioX/matugen/blob/${src.rev}/CHANGELOG.md"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ lampros ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ lampros ]; mainProgram = "matugen"; }; } From 478934a2a5e314eaf15913c89b13a51ebb4c8e33 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Mon, 4 Nov 2024 16:42:26 +0300 Subject: [PATCH 4/4] matugen: use new darwin sdk pattern --- pkgs/by-name/ma/matugen/package.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index afef4c26eda2..1a67c6cd51f7 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,11 +17,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-FwQhhwlldDskDzmIOxhwRuUv8NxXCxd3ZmOwqcuWz64="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - meta = { description = "Material you color generation tool"; homepage = "https://github.com/InioX/matugen";