From a6139a2da61542cc591bf840dc994e4f0d60b937 Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Sat, 7 Dec 2024 18:45:44 -0500 Subject: [PATCH 01/14] color-scheme-generator: init at v0.9.2.1 --- .../co/color-scheme-generator/package.nix | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/co/color-scheme-generator/package.nix diff --git a/pkgs/by-name/co/color-scheme-generator/package.nix b/pkgs/by-name/co/color-scheme-generator/package.nix new file mode 100644 index 0000000000000..97e8162b96801 --- /dev/null +++ b/pkgs/by-name/co/color-scheme-generator/package.nix @@ -0,0 +1,44 @@ +{ + rustPlatform, + fetchFromGitHub, + lib, + perl, +}: + +rustPlatform.buildRustPackage rec { + pname = "color-scheme-generator"; + version = "0.9.2.1"; + + src = fetchFromGitHub { + owner = "nikolaizombie1"; + repo = "color_scheme_generator"; + rev = "v${version}"; + hash = "sha256-tSoM6MP58vOoKRMQjNq8nKMiVTfS9N/mckchAPcUM0g="; + }; + + cargoHash = "sha256-A8ld2c8ZcqaZN29Fz085FQy8UpugIDMOKT01r+SfCcc="; + + nativeBuildInputs = [ perl ]; + + meta = with lib; { + description = "Quickly generate color schemes for waybar from an image."; + longDescription = '' + color_scheme_generator is a command line utility used to analyze images and generate color themes from them given a path to an image. + + This command line utility behaves like a standard UNIX utility where the path to the image can be either piped in or sent a command line argument. + + The intended purpose of this application is to automatically create color themes for Waybar, but it can be used for the bar in AwesomeWM or other applications to theme based on the on an image. This utility has a cache for the image analysis. This means that once an image has been analyzed once, the result will be saved in the cache and when an image is analyzed again, the results will be returned instantly + + ''; + homepage = "https://github.com/nikolaizombie1/color_scheme_generator"; + license = licenses.gpl3; + maintainers = [ + { + name = "Fabio J. Matos Nieves"; + email = "fabio.matos999@gmail.com"; + githubId = "70602908"; + github = "nikolaizombie1"; + } + ]; + }; +} From 14cf71646516a934fa029ad65c6e884a3ce4554b Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Tue, 10 Dec 2024 17:41:10 -0500 Subject: [PATCH 02/14] Add nikolaizombie1 to maintainers-list.nix --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index effe1f76b9202..5da98e78f08bc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15843,6 +15843,12 @@ github = "nigelgbanks"; githubId = 487373; }; + nikolaizombie1 = { + name = "Fabio J. Matos Nieves"; + email = "fabio.matos999@gmail.com"; + githubId = "70602908"; + github = "nikolaizombie1"; + }; nikitavoloboev = { email = "nikita.voloboev@gmail.com"; github = "nikitavoloboev"; From c5db6eae46be76503b3711f0a1005f3743a2d71c Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Tue, 10 Dec 2024 17:52:45 -0500 Subject: [PATCH 03/14] incorporate changes from reviewer. --- .../by-name/co/color-scheme-generator/package.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/co/color-scheme-generator/package.nix b/pkgs/by-name/co/color-scheme-generator/package.nix index 97e8162b96801..fed930f7ada37 100644 --- a/pkgs/by-name/co/color-scheme-generator/package.nix +++ b/pkgs/by-name/co/color-scheme-generator/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "nikolaizombie1"; repo = "color_scheme_generator"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-tSoM6MP58vOoKRMQjNq8nKMiVTfS9N/mckchAPcUM0g="; }; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl ]; - meta = with lib; { + meta = { description = "Quickly generate color schemes for waybar from an image."; longDescription = '' color_scheme_generator is a command line utility used to analyze images and generate color themes from them given a path to an image. @@ -31,14 +31,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/nikolaizombie1/color_scheme_generator"; - license = licenses.gpl3; - maintainers = [ - { - name = "Fabio J. Matos Nieves"; - email = "fabio.matos999@gmail.com"; - githubId = "70602908"; - github = "nikolaizombie1"; - } - ]; + license = with lib.licenses; [ gpl3 ]; + maintainers = with lib.maintainers; [ nikolaizombie1 ]; }; } From b7bd99e6b0ded2a4b246e5dcdcee4adab202b224 Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Tue, 10 Dec 2024 17:54:38 -0500 Subject: [PATCH 04/14] Made maintainer-list.nix sorted. --- maintainers/maintainer-list.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5da98e78f08bc..6abfec97f5b4e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15843,18 +15843,18 @@ github = "nigelgbanks"; githubId = 487373; }; - nikolaizombie1 = { - name = "Fabio J. Matos Nieves"; - email = "fabio.matos999@gmail.com"; - githubId = "70602908"; - github = "nikolaizombie1"; - }; nikitavoloboev = { email = "nikita.voloboev@gmail.com"; github = "nikitavoloboev"; githubId = 6391776; name = "Nikita Voloboev"; }; + nikolaizombie1 = { + name = "Fabio J. Matos Nieves"; + email = "fabio.matos999@gmail.com"; + githubId = "70602908"; + github = "nikolaizombie1"; + }; niklashh = { email = "niklas.2.halonen@aalto.fi"; github = "xhalo32"; From 1a984ded1b8cd8ecf7a38b25480484cc086aabad Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Tue, 10 Dec 2024 17:58:08 -0500 Subject: [PATCH 05/14] Sort maintainer-list.nix and format package.nix. --- maintainers/maintainer-list.nix | 12 ++++++------ pkgs/by-name/co/color-scheme-generator/package.nix | 9 ++------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6abfec97f5b4e..e3ae17f00dfe1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15849,12 +15849,6 @@ githubId = 6391776; name = "Nikita Voloboev"; }; - nikolaizombie1 = { - name = "Fabio J. Matos Nieves"; - email = "fabio.matos999@gmail.com"; - githubId = "70602908"; - github = "nikolaizombie1"; - }; niklashh = { email = "niklas.2.halonen@aalto.fi"; github = "xhalo32"; @@ -15869,6 +15863,12 @@ github = "niklaskorz"; githubId = 590517; }; + nikolaizombie1 = { + name = "Fabio J. Matos Nieves"; + email = "fabio.matos999@gmail.com"; + githubId = "70602908"; + github = "nikolaizombie1"; + }; nikstur = { email = "nikstur@outlook.com"; name = "nikstur"; diff --git a/pkgs/by-name/co/color-scheme-generator/package.nix b/pkgs/by-name/co/color-scheme-generator/package.nix index fed930f7ada37..5f58c368b4c64 100644 --- a/pkgs/by-name/co/color-scheme-generator/package.nix +++ b/pkgs/by-name/co/color-scheme-generator/package.nix @@ -1,9 +1,4 @@ -{ - rustPlatform, - fetchFromGitHub, - lib, - perl, -}: +{ rustPlatform, fetchFromGitHub, lib, perl, }: rustPlatform.buildRustPackage rec { pname = "color-scheme-generator"; @@ -32,6 +27,6 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/nikolaizombie1/color_scheme_generator"; license = with lib.licenses; [ gpl3 ]; - maintainers = with lib.maintainers; [ nikolaizombie1 ]; + maintainers = with lib.maintainers; [ nikolaizombie1 ]; }; } From 1f1f22c0deca01df78cf8a0d832ee787e81d75a3 Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Tue, 10 Dec 2024 18:20:00 -0500 Subject: [PATCH 06/14] Fix errors durring last commit --- maintainers/maintainer-list.nix | 41 ++------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a7c249109eda1..e3ae17f00dfe1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7335,17 +7335,6 @@ githubId = 1633361; name = "Iztok Fister Jr."; }; - FirelightFlagboy = { - email = "firelight.flagboy+nixpkgs@gmail.com"; - github = "FirelightFlagboy"; - githubId = 30697622; - name = "Firelight Flagboy"; - keys = [ - { - fingerprint = "D6E2 4BD5 680C 609D D146 99B4 4304 CE0B A5E8 67D1"; - } - ]; - }; FireyFly = { email = "nix@firefly.nu"; github = "FireyFly"; @@ -10274,7 +10263,7 @@ name = "jdev082"; }; jdreaver = { - email = "me@davidreaver.com"; + email = "johndreaver@gmail.com"; github = "jdreaver"; githubId = 1253071; name = "David Reaver"; @@ -15463,12 +15452,6 @@ githubId = 93013864; name = "nat-418"; }; - nateeag = { - github = "NateEag"; - githubId = 837719; - name = "Nate Eagleson"; - email = "nate@nateeag.com"; - }; nathan-gs = { email = "nathan@nathan.gs"; github = "nathan-gs"; @@ -15729,12 +15712,6 @@ githubId = 7845120; name = "Alex Martens"; }; - nezia = { - email = "anthony@nezia.dev"; - github = "nezia1"; - githubId = 43719748; - name = "Anthony Rodriguez"; - }; ngerstle = { name = "Nicholas Gerstle"; email = "ngerstle@gmail.com"; @@ -15891,11 +15868,6 @@ email = "fabio.matos999@gmail.com"; githubId = "70602908"; github = "nikolaizombie1"; - NiklasVousten = { - name = "Niklas Vousten"; - email = "nixpkgs@vousten.dev"; - github = "NiklasVousten"; - githubId = 24965952; }; nikstur = { email = "nikstur@outlook.com"; @@ -17938,10 +17910,7 @@ github = "JarvisCraft"; githubId = 7693005; name = "Petr Portnov"; - keys = [ - { fingerprint = "884B 08D2 8DFF 6209 1857 C1C7 7E8F C8F7 D1BB 84A3"; } - { fingerprint = "AA96 35AA F392 52BF 0E60 825E 1192 2217 F828 8484"; } - ]; + keys = [ { fingerprint = "884B 08D2 8DFF 6209 1857 C1C7 7E8F C8F7 D1BB 84A3"; } ]; }; progval = { email = "progval+nix@progval.net"; @@ -24332,12 +24301,6 @@ githubId = 145775305; name = "Sergei Zimmerman"; }; - xosnrdev = { - email = "hello@xosnrdev.tech"; - github = "xosnrdev"; - githubId = 106241330; - name = "Success Kingsley"; - }; xrelkd = { github = "xrelkd"; githubId = 46590321; From 8c39d617d42808688d0869622e562168a1621afa Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Tue, 10 Dec 2024 18:25:38 -0500 Subject: [PATCH 07/14] Format package.nix correctly. --- pkgs/by-name/co/color-scheme-generator/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/color-scheme-generator/package.nix b/pkgs/by-name/co/color-scheme-generator/package.nix index 5f58c368b4c64..3a85d6578dea4 100644 --- a/pkgs/by-name/co/color-scheme-generator/package.nix +++ b/pkgs/by-name/co/color-scheme-generator/package.nix @@ -1,4 +1,9 @@ -{ rustPlatform, fetchFromGitHub, lib, perl, }: +{ + rustPlatform, + fetchFromGitHub, + lib, + perl, +}: rustPlatform.buildRustPackage rec { pname = "color-scheme-generator"; From 63ca814267acbc6ed06fb175bd8f69930dc9505c Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Tue, 10 Dec 2024 18:38:12 -0500 Subject: [PATCH 08/14] Fix breaking chnages on maintainer-list.nix --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e3ae17f00dfe1..995605c568064 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15849,6 +15849,12 @@ githubId = 6391776; name = "Nikita Voloboev"; }; + nikolaizombie1 = { + name = "Fabio J. Matos Nieves"; + email = "fabio.matos999@gmail.com"; + githubId = "70602908"; + github = "nikolaizombie1"; + }; niklashh = { email = "niklas.2.halonen@aalto.fi"; github = "xhalo32"; From 6d729852e5ee2b647538990100e014d34f6f750b Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Tue, 10 Dec 2024 18:39:14 -0500 Subject: [PATCH 09/14] Sort fixed list. --- maintainers/maintainer-list.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 995605c568064..19721cb079780 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15849,12 +15849,6 @@ githubId = 6391776; name = "Nikita Voloboev"; }; - nikolaizombie1 = { - name = "Fabio J. Matos Nieves"; - email = "fabio.matos999@gmail.com"; - githubId = "70602908"; - github = "nikolaizombie1"; - }; niklashh = { email = "niklas.2.halonen@aalto.fi"; github = "xhalo32"; @@ -15875,6 +15869,12 @@ githubId = "70602908"; github = "nikolaizombie1"; }; + nikolaizombie1 = { + name = "Fabio J. Matos Nieves"; + email = "fabio.matos999@gmail.com"; + githubId = "70602908"; + github = "nikolaizombie1"; + }; nikstur = { email = "nikstur@outlook.com"; name = "nikstur"; From 180d33e91a633f1c198f05f36067129c53beb540 Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Tue, 10 Dec 2024 18:40:14 -0500 Subject: [PATCH 10/14] Remove duplicate entry. --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 19721cb079780..e3ae17f00dfe1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15869,12 +15869,6 @@ githubId = "70602908"; github = "nikolaizombie1"; }; - nikolaizombie1 = { - name = "Fabio J. Matos Nieves"; - email = "fabio.matos999@gmail.com"; - githubId = "70602908"; - github = "nikolaizombie1"; - }; nikstur = { email = "nikstur@outlook.com"; name = "nikstur"; From f702ddf0ecd144f664c6194733520c6c1c88d51e Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Tue, 10 Dec 2024 18:47:05 -0500 Subject: [PATCH 11/14] Revert package.nix to first commit on branch. --- maintainers/maintainer-list.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e3ae17f00dfe1..2b1f5fbeae9a9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15863,18 +15863,18 @@ github = "niklaskorz"; githubId = 590517; }; - nikolaizombie1 = { - name = "Fabio J. Matos Nieves"; - email = "fabio.matos999@gmail.com"; - githubId = "70602908"; - github = "nikolaizombie1"; - }; nikstur = { email = "nikstur@outlook.com"; name = "nikstur"; github = "nikstur"; githubId = 61635709; }; + nikolaizombie1 = { + name = "Fabio J. Matos Nieves"; + email = "fabio.matos999@gmail.com"; + githubId = "70602908"; + github = "nikolaizombie1"; + }; nilp0inter = { email = "robertomartinezp@gmail.com"; github = "nilp0inter"; @@ -25028,4 +25028,4 @@ name = "Mathias Zhang"; }; } -# Keep the list alphabetically sorted. +# Keep the list alphabetically sorted. \ No newline at end of file From 767e957e6e7b7371cfddb7c4faad7c669da8447c Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Tue, 10 Dec 2024 18:49:21 -0500 Subject: [PATCH 12/14] Sort and format maintainer-list.nix. --- maintainers/maintainer-list.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2b1f5fbeae9a9..e3ae17f00dfe1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15863,18 +15863,18 @@ github = "niklaskorz"; githubId = 590517; }; - nikstur = { - email = "nikstur@outlook.com"; - name = "nikstur"; - github = "nikstur"; - githubId = 61635709; - }; nikolaizombie1 = { name = "Fabio J. Matos Nieves"; email = "fabio.matos999@gmail.com"; githubId = "70602908"; github = "nikolaizombie1"; }; + nikstur = { + email = "nikstur@outlook.com"; + name = "nikstur"; + github = "nikstur"; + githubId = 61635709; + }; nilp0inter = { email = "robertomartinezp@gmail.com"; github = "nilp0inter"; @@ -25028,4 +25028,4 @@ name = "Mathias Zhang"; }; } -# Keep the list alphabetically sorted. \ No newline at end of file +# Keep the list alphabetically sorted. From ec002c199df171897a524c1569507a415bde40f3 Mon Sep 17 00:00:00 2001 From: nikolaizombie1 Date: Tue, 10 Dec 2024 18:58:24 -0500 Subject: [PATCH 13/14] Update maintainer-list.nix --- maintainers/maintainer-list.nix | 42 +++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e3ae17f00dfe1..e0c3bf401d093 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7335,6 +7335,17 @@ githubId = 1633361; name = "Iztok Fister Jr."; }; + FirelightFlagboy = { + email = "firelight.flagboy+nixpkgs@gmail.com"; + github = "FirelightFlagboy"; + githubId = 30697622; + name = "Firelight Flagboy"; + keys = [ + { + fingerprint = "D6E2 4BD5 680C 609D D146 99B4 4304 CE0B A5E8 67D1"; + } + ]; + }; FireyFly = { email = "nix@firefly.nu"; github = "FireyFly"; @@ -10263,7 +10274,7 @@ name = "jdev082"; }; jdreaver = { - email = "johndreaver@gmail.com"; + email = "me@davidreaver.com"; github = "jdreaver"; githubId = 1253071; name = "David Reaver"; @@ -15452,6 +15463,12 @@ githubId = 93013864; name = "nat-418"; }; + nateeag = { + github = "NateEag"; + githubId = 837719; + name = "Nate Eagleson"; + email = "nate@nateeag.com"; + }; nathan-gs = { email = "nathan@nathan.gs"; github = "nathan-gs"; @@ -15712,6 +15729,12 @@ githubId = 7845120; name = "Alex Martens"; }; + nezia = { + email = "anthony@nezia.dev"; + github = "nezia1"; + githubId = 43719748; + name = "Anthony Rodriguez"; + }; ngerstle = { name = "Nicholas Gerstle"; email = "ngerstle@gmail.com"; @@ -15863,6 +15886,12 @@ github = "niklaskorz"; githubId = 590517; }; + NiklasVousten = { + name = "Niklas Vousten"; + email = "nixpkgs@vousten.dev"; + github = "NiklasVousten"; + githubId = 24965952; + }; nikolaizombie1 = { name = "Fabio J. Matos Nieves"; email = "fabio.matos999@gmail.com"; @@ -17910,7 +17939,10 @@ github = "JarvisCraft"; githubId = 7693005; name = "Petr Portnov"; - keys = [ { fingerprint = "884B 08D2 8DFF 6209 1857 C1C7 7E8F C8F7 D1BB 84A3"; } ]; + keys = [ + { fingerprint = "884B 08D2 8DFF 6209 1857 C1C7 7E8F C8F7 D1BB 84A3"; } + { fingerprint = "AA96 35AA F392 52BF 0E60 825E 1192 2217 F828 8484"; } + ]; }; progval = { email = "progval+nix@progval.net"; @@ -24301,6 +24333,12 @@ githubId = 145775305; name = "Sergei Zimmerman"; }; + xosnrdev = { + email = "hello@xosnrdev.tech"; + github = "xosnrdev"; + githubId = 106241330; + name = "Success Kingsley"; + }; xrelkd = { github = "xrelkd"; githubId = 46590321; From c0a6bd2de9e58f695a145404c1fc53c9e1b09f79 Mon Sep 17 00:00:00 2001 From: nikolaizombie1 <70602908+nikolaizombie1@users.noreply.github.com> Date: Wed, 11 Dec 2024 19:52:46 -0500 Subject: [PATCH 14/14] Change githubId to unsigned int. --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e0c3bf401d093..1d445443474e7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15895,7 +15895,7 @@ nikolaizombie1 = { name = "Fabio J. Matos Nieves"; email = "fabio.matos999@gmail.com"; - githubId = "70602908"; + githubId = 70602908; github = "nikolaizombie1"; }; nikstur = {