From 5c647de65fa8c115319092e938ef1225ab7c7700 Mon Sep 17 00:00:00 2001 From: Adson Cicilioti Date: Tue, 7 Dec 2021 21:35:43 -0300 Subject: [PATCH 1/6] maintainers: add AdsonCicilioti --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e9b7df1801b7..e098cf76fd5d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -278,6 +278,12 @@ githubId = 1250775; name = "Adolfo E. García Castro"; }; + AdsonCicilioti = { + name = "Adson Cicilioti"; + email = "adson.cicilioti@live.com"; + github = "AdsonCicilioti"; + githubId = 6278398; + }; adsr = { email = "as@php.net"; github = "adsr"; From 7e48f4294eb86789d47086e368709d9bb65c1d0b Mon Sep 17 00:00:00 2001 From: Adson Cicilioti Date: Tue, 7 Dec 2021 21:37:07 -0300 Subject: [PATCH 2/6] clickgen: init at 1.1.9 --- .../python-modules/clickgen/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/clickgen/default.nix diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix new file mode 100644 index 000000000000..141fd4569b52 --- /dev/null +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pillow +, libX11 +, libXcursor +, libpng +, python +}: + +buildPythonPackage rec { + pname = "clickgen"; + version = "1.1.9"; + + src = fetchFromGitHub { + owner = "ful1e5"; + repo = "clickgen"; + rev = "v${version}"; + sha256 = "108f3sbramd3hhs4d84s3i3lbwllfrkvjakjq4gdmbw6xpilvm0l"; + }; + + buildInputs = [ libXcursor libX11 libpng ]; + + propagatedBuildInputs = [ pillow ]; + + pythonImportsCheck = [ "clickgen" ]; + + postInstall = '' + install -m644 clickgen/xcursorgen.so $out/${python.sitePackages}/clickgen/xcursorgen.so + ''; + + # Tests fail with ${bitmap_error}. + # Application works normally if tests are disabled + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/ful1e5/clickgen"; + description = "The hassle-free cursor building toolbox"; + longDescription = '' + clickgen is API for building X11 and Windows Cursors from + .png files. clickgen is using anicursorgen and xcursorgen under the hood. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AdsonCicilioti ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7ebb313370b..1d032db17d97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2478,6 +2478,8 @@ with pkgs; clickclack = callPackage ../tools/misc/clickclack { }; + clickgen = with python3Packages; toPythonApplication clickgen; + clog-cli = callPackage ../development/tools/clog-cli { }; cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee2cc85022da..1b8062ce6175 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1597,6 +1597,8 @@ in { click-threading = callPackage ../development/python-modules/click-threading { }; + clickgen = callPackage ../development/python-modules/clickgen { }; + clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash { }; clickhouse-cli = callPackage ../development/python-modules/clickhouse-cli { }; From b8fbdc8852549db892853c2fa3a1b7549d35493f Mon Sep 17 00:00:00 2001 From: Adson Cicilioti Date: Tue, 7 Dec 2021 21:38:38 -0300 Subject: [PATCH 3/6] bibata-cursors: 0.4.2 -> 1.1.2 --- pkgs/data/icons/bibata-cursors/default.nix | 59 ++++++++++++---------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix index 04fb6281f253..15905bec3a97 100644 --- a/pkgs/data/icons/bibata-cursors/default.nix +++ b/pkgs/data/icons/bibata-cursors/default.nix @@ -1,51 +1,54 @@ -{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, clickgen +, unzip +}: -let - py = python3.withPackages(ps: [ ps.pillow ]); -in stdenvNoCC.mkDerivation rec { +stdenv.mkDerivation rec { pname = "bibata-cursors"; - version = "0.4.2"; + version = "1.1.2"; src = fetchFromGitHub { - owner = "KaizIqbal"; + owner = "ful1e5"; repo = "Bibata_Cursor"; rev = "v${version}"; - sha256 = "1f7i5jkl21fvrr45zpcj40avkc7camjb1ddrrdlaabbplgz5mcgn"; + sha256 = "1q2wdbrmdnr9mwiilm5cc9im3zwbl7yaj1zpy5wwn44ypq3hcngy"; }; - postPatch = '' - patchShebangs . - substituteInPlace build.sh --replace "sudo" "" + bitmaps = fetchurl { + url = "https://github.com/ful1e5/Bibata_Cursor/releases/download/v${version}/bitmaps.zip"; + sha256 = "1pcn6par0f0syyhzpzmqr3c6b9ri4lprkdd2ncwzdas01p2d9v1i"; + }; - # Don't generate windows cursors, - # they aren't used and aren't installed - # by the project's install script anyway. - echo "exit 0" > w32-make.sh - ''; + nativeBuildInputs = [ unzip ]; - nativeBuildInputs = [ - gnome-themes-extra - inkscape - xcursorgen - py - ]; + buildInputs = [ clickgen ]; buildPhase = '' - HOME="$NIX_BUILD_ROOT" ./build.sh + mkdir bitmaps + unzip $bitmaps -d bitmaps + rm -rf themes + cd builder && make build_unix ''; installPhase = '' install -dm 0755 $out/share/icons - for x in Bibata_*; do - cp -pr $x/out/X11/$x $out/share/icons/ - done + cd ../ + cp -rf themes/* $out/share/icons/ + ''; + + postPatch = '' + substituteInPlace "builder/Makefile" \ + --replace "/bin/bash" "bash" ''; meta = with lib; { - description = "Material Based Cursor"; - homepage = "https://github.com/KaizIqbal/Bibata_Cursor"; + description = "Material Based Cursor Theme"; + homepage = "https://github.com/ful1e5/Bibata_Cursor"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ rawkode ]; + maintainers = with maintainers; [ rawkode AdsonCicilioti ]; }; } From 408ecd60d43ad0985a65e7b0c3ec6d2e5d18ab1a Mon Sep 17 00:00:00 2001 From: Adson Cicilioti Date: Tue, 7 Dec 2021 21:39:55 -0300 Subject: [PATCH 4/6] bibata-extra-cursors: 0.3 -> 1.0.1 --- pkgs/data/icons/bibata-cursors/extra.nix | 59 +++++++++++++----------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix index f59b12ec76a9..a6fdaca84277 100644 --- a/pkgs/data/icons/bibata-cursors/extra.nix +++ b/pkgs/data/icons/bibata-cursors/extra.nix @@ -1,51 +1,54 @@ -{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, clickgen +, unzip +}: -let - py = python3.withPackages(ps: [ ps.pillow ]); -in stdenvNoCC.mkDerivation rec { +stdenv.mkDerivation rec { pname = "bibata-extra-cursors"; - version = "0.3"; + version = "1.0.1"; src = fetchFromGitHub { - owner = "KaizIqbal"; + owner = "ful1e5"; repo = "Bibata_Extra_Cursor"; rev = "v${version}"; - sha256 = "1bh945hvakbh985jkr6g6x0myw3k49pvn24m1clvqdv35v65nfxk"; + sha256 = "0wndl4c547k99y0gq922hn7z1mwdgxvvyjfm6757g6shfbcmkz7m"; }; - postPatch = '' - patchShebangs . - substituteInPlace build.sh --replace "sudo" "" + bitmaps = fetchurl { + url = "https://github.com/ful1e5/Bibata_Extra_Cursor/releases/download/v${version}/bitmaps.zip"; + sha256 = "0vf14ln53wigaq3dkqdk5avarqplsq751nlv72da04ms6gqjfhdl"; + }; - # Don't generate windows cursors, - # they aren't used and aren't installed - # by the project's install script anyway. - echo "exit 0" > w32-make.sh - ''; + nativeBuildInputs = [ unzip ]; - nativeBuildInputs = [ - gnome-themes-extra - inkscape - xcursorgen - py - ]; + buildInputs = [ clickgen ]; buildPhase = '' - HOME="$NIX_BUILD_ROOT" ./build.sh + mkdir bitmaps + unzip $bitmaps -d bitmaps + rm -rf themes + cd builder && make build_unix ''; installPhase = '' install -dm 0755 $out/share/icons - for x in Bibata_*; do - cp -pr $x/out/X11/$x $out/share/icons/ - done + cd ../ + cp -rf themes/* $out/share/icons/ + ''; + + postPatch = '' + substituteInPlace "builder/Makefile" \ + --replace "/bin/bash" "bash" ''; meta = with lib; { - description = "Cursors Based on Bibata"; - homepage = "https://github.com/KaizIqbal/Bibata_Extra_Cursor"; + description = "Material Based Cursor Theme"; + homepage = "https://github.com/ful1e5/Bibata_Extra_Cursor"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill AdsonCicilioti ]; }; } From 15e4cefbea5ead252b4b0145e2b8751a75aa37a5 Mon Sep 17 00:00:00 2001 From: Adson Cicilioti Date: Tue, 7 Dec 2021 21:40:15 -0300 Subject: [PATCH 5/6] bibata-cursors-translucent: unstable-2019-09-13 -> 1.1.1 --- .../data/icons/bibata-cursors/translucent.nix | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix index d1e2814a8aa3..74d7c4d7c3f9 100644 --- a/pkgs/data/icons/bibata-cursors/translucent.nix +++ b/pkgs/data/icons/bibata-cursors/translucent.nix @@ -1,31 +1,16 @@ -{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }: +{ lib, stdenv, fetchFromGitHub }: -stdenvNoCC.mkDerivation rec { +stdenv.mkDerivation rec { pname = "bibata-cursors-translucent"; - version = "unstable-2019-09-13"; + version = "1.1.1"; src = fetchFromGitHub { owner = "Silicasandwhich"; repo = "Bibata_Cursor_Translucent"; - rev = "2eed979d817148817ea6bca15c594809aa9c2cb9"; - sha256 = "1s688v40xx9jbvfncb4kgfnnxkmknji7igqx7c4q1ly9s7imbd1f"; + rev = "v${version}"; + sha256 = "1ddnwqkxricnd731blckcxvksbgql8k4pfiz65591p81n5095k8y"; }; - postPatch = '' - patchShebangs . - substituteInPlace build.sh --replace "gksu " "" - ''; - - nativeBuildInputs = [ - gnome-themes-extra - inkscape - xcursorgen - ]; - - buildPhase = '' - HOME="$NIX_BUILD_ROOT" ./build.sh - ''; - installPhase = '' install -dm 0755 $out/share/icons cp -pr Bibata_* $out/share/icons/ @@ -36,6 +21,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill AdsonCicilioti ]; }; } From 2d91877c3778bdf8223ccd9899cc5f6c7cf13d56 Mon Sep 17 00:00:00 2001 From: Adson Cicilioti Date: Tue, 7 Dec 2021 22:57:20 -0300 Subject: [PATCH 6/6] clickgen: run tests with pytestCheckHook --- pkgs/development/python-modules/clickgen/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix index 141fd4569b52..a85cee778b0b 100644 --- a/pkgs/development/python-modules/clickgen/default.nix +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -6,6 +6,7 @@ , libXcursor , libpng , python +, pytestCheckHook }: buildPythonPackage rec { @@ -29,9 +30,7 @@ buildPythonPackage rec { install -m644 clickgen/xcursorgen.so $out/${python.sitePackages}/clickgen/xcursorgen.so ''; - # Tests fail with ${bitmap_error}. - # Application works normally if tests are disabled - doCheck = false; + checkInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/ful1e5/clickgen";