diff options
author | sternenseemann <sternenseemann@systemli.org> | 2021-12-08 21:50:23 +0100 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2021-12-08 21:50:23 +0100 |
commit | 49eba103728befda5afc2c5019014c2bad107872 (patch) | |
tree | 1e02a7b815589e58c6429d61bc778a15221f8e29 /pkgs/data | |
parent | 54da902c841e40e6d44d3c5fe70bba4235766a6e (diff) | |
parent | e3d4cf2414b510d9ca3dbcb8b99999c3e60d7fb0 (diff) |
Merge remote-tracking branch 'origin/master' into haskell-updates
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/icons/bibata-cursors/default.nix | 61 | ||||
-rw-r--r-- | pkgs/data/icons/bibata-cursors/extra.nix | 61 | ||||
-rw-r--r-- | pkgs/data/icons/bibata-cursors/translucent.nix | 27 | ||||
-rw-r--r-- | pkgs/data/icons/papirus-icon-theme/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/scowl/default.nix | 4 |
5 files changed, 74 insertions, 83 deletions
diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix index 04fb6281f2539..15905bec3a97f 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 }: - -let - py = python3.withPackages(ps: [ ps.pillow ]); -in stdenvNoCC.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, clickgen +, unzip +}: + +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 ]; }; } diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix index f59b12ec76a99..a6fdaca842770 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 }: - -let - py = python3.withPackages(ps: [ ps.pillow ]); -in stdenvNoCC.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, clickgen +, unzip +}: + +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 ]; }; } diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix index d1e2814a8aa3a..74d7c4d7c3f91 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 ]; }; } diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 9e8856528b109..503e4e1d296a6 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20211001"; + version = "20211201"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-OVG/bKWOdSxOXVvtMOITnCDoGNSc+zPNZ/XOablfSEE="; + sha256 = "sha256-lcwQALFQ4zkgDLCX1uthAP3QZwP7UcWcPSOU+UTDykE="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index 15c2699d8bbad..e1709ae35cf31 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "scowl"; - version = "2019.10.06"; + version = "2020.12.07"; src = fetchFromGitHub { owner = "en-wl"; repo = "wordlist"; rev = "rel-${version}"; - sha256 = "1daag7h63gdijp1lv3v93bx5kmcb5zsyydsd57kv0a6kk3vs819x"; + sha256 = "sha256-J61jhpnZcXMnoGlSuSCrKDZnnyp3Snjr+fUpTVKX64g="; }; postPatch = '' |