diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
commit | 457f28f6f85eea1b1671d62d2abe39297c9c90f7 (patch) | |
tree | 3c6e68534e7bfcde19893c830af7498b0606e6d2 /pkgs/data | |
parent | a25e03e76ae1e0367419db1de009e1139d08de68 (diff) | |
parent | 1aa7d4e6c61526606d9e26f939cdb60ec8f45fcd (diff) |
Merge branch 'master' into staging-next
; Conflicts: ; pkgs/development/tools/codespell/default.nix codespell 2.2.2 switched to pyproject & setuptools_scm: https://github.com/codespell-project/codespell/pull/2523
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/envypn-font/default.nix | 16 | ||||
-rw-r--r-- | pkgs/data/fonts/lxgw-wenkai/default.nix | 16 | ||||
-rw-r--r-- | pkgs/data/icons/bibata-cursors/translucent.nix | 4 | ||||
-rw-r--r-- | pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/icons/numix-icon-theme-square/default.nix | 4 |
5 files changed, 29 insertions, 15 deletions
diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index b80067baff058..fc69e398e44d5 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -2,11 +2,12 @@ , xorg }: -stdenv.mkDerivation { - name = "envypn-font-1.7.1"; +stdenv.mkDerivation rec { + pname = "envypn-font"; + version = "1.7.1"; src = fetchurl { - url = "https://ywstd.fr/files/p/envypn-font/envypn-font-1.7.1.tar.gz"; + url = "https://ywstd.fr/files/p/envypn-font/envypn-font-${version}.tar.gz"; sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270"; }; @@ -17,16 +18,24 @@ stdenv.mkDerivation { ''; buildPhase = '' + runHook preBuild + # convert pcf fonts to otb for i in *e.pcf.gz; do faketime -f "1970-01-01 00:00:01" \ fonttosfnt -v -o "$(basename "$i" .pcf.gz)".otb "$i" done + + runHook postBuild ''; installPhase = '' + runHook preInstall + install -D -m 644 -t "$out/share/fonts/misc" *.otb *.pcf.gz mkfontdir "$out/share/fonts/misc" + + runHook postInstall ''; meta = with lib; { @@ -36,5 +45,6 @@ stdenv.mkDerivation { homepage = "http://ywstd.fr/p/pj/#envypn"; license = licenses.miros; platforms = platforms.all; + maintainers = with maintainers; [ erdnaxe ]; }; } diff --git a/pkgs/data/fonts/lxgw-wenkai/default.nix b/pkgs/data/fonts/lxgw-wenkai/default.nix index a5ead2274b805..bb36d9a920a56 100644 --- a/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/pkgs/data/fonts/lxgw-wenkai/default.nix @@ -1,17 +1,21 @@ { lib, fetchzip }: -let version = "1.222"; in -fetchzip { - name = "lxgw-wenkai-${version}"; +fetchzip rec { + pname = "lxgw-wenkai"; + version = "1.245.1"; + url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/lxgw-wenkai-v${version}.tar.gz"; postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype + mv $out/*.ttf $out/share/fonts/truetype + + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob ''; - sha256 = "sha256-u2NTEYZrotOHktc2R5RWMFqeZ775/IpYJSUBO6PWijM="; + hash = "sha256-4RQ+aqAZPQH3t6v2KvrNWgYT3J3uMuY34XTuvyLEOeI="; meta = with lib; { homepage = "https://lxgw.github.io/"; diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix index efaf25c59f2bf..fa01e05766b44 100644 --- a/pkgs/data/icons/bibata-cursors/translucent.nix +++ b/pkgs/data/icons/bibata-cursors/translucent.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "bibata-cursors-translucent"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "Silicasandwhich"; repo = "Bibata_Cursor_Translucent"; rev = "v${version}"; - sha256 = "1ddnwqkxricnd731blckcxvksbgql8k4pfiz65591p81n5095k8y"; + sha256 = "sha256-RroynJfdFpu+Wl9iw9NrAc9wNZsSxWI+heJXUTwEe7s="; }; installPhase = '' diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index be667047120b2..d81937dad9a76 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "22.10.05"; + version = "22.10.17"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-fQSAyVf3IwsTTUxzvYRvu5uUEyaPPdbuK2tQ3o16zDA="; + sha256 = "sha256-eM6oRchH7kuK9CZiQ8iIrHYrSG4p+y1bdXEdezFjNDw="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 2c27fa8ebf966..e63703d839199 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "22.10.05"; + version = "22.10.17"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-uOS6oWcB+2A26u9NTT+xhLHWqaKy5WMSR6WddKS6gEw="; + sha256 = "sha256-uS2Oqb5yRNHZDheflo5U4wyMm8fLvU4w3qLjPQ+zE68="; }; nativeBuildInputs = [ gtk3 ]; |