diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-09 19:58:40 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-09 19:58:40 -0800 |
commit | 39669ea2b6de398c6bacee1e653a27934c5e1c3b (patch) | |
tree | 2ee88f16e1e0a63f3e8de69a42253cfa0b22de79 /pkgs/data | |
parent | 52fc3ed6cefafb7d138d3d474ae0aa0c4cdf06b8 (diff) | |
parent | 02197c4b5e61f73152c807cd5b8ebdafeab0cdbf (diff) | |
download | nixlib-39669ea2b6de398c6bacee1e653a27934c5e1c3b.tar nixlib-39669ea2b6de398c6bacee1e653a27934c5e1c3b.tar.gz nixlib-39669ea2b6de398c6bacee1e653a27934c5e1c3b.tar.bz2 nixlib-39669ea2b6de398c6bacee1e653a27934c5e1c3b.tar.lz nixlib-39669ea2b6de398c6bacee1e653a27934c5e1c3b.tar.xz nixlib-39669ea2b6de398c6bacee1e653a27934c5e1c3b.tar.zst nixlib-39669ea2b6de398c6bacee1e653a27934c5e1c3b.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/top-level/aliases.nix
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/ipaexfont/default.nix | 8 | ||||
-rw-r--r-- | pkgs/data/icons/tela-circle-icon-theme/default.nix | 8 | ||||
-rw-r--r-- | pkgs/data/themes/graphite-gtk-theme/default.nix (renamed from pkgs/data/themes/graphite/default.nix) | 21 | ||||
-rw-r--r-- | pkgs/data/themes/graphite-kde-theme/default.nix | 6 |
4 files changed, 29 insertions, 14 deletions
diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix index cafd3c16fd4d..5223bc499d5c 100644 --- a/pkgs/data/fonts/ipaexfont/default.nix +++ b/pkgs/data/fonts/ipaexfont/default.nix @@ -1,16 +1,16 @@ { lib, fetchzip }: fetchzip { - name = "ipaexfont-003.01"; + name = "ipaexfont-004.01"; - url = "https://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip"; + url = "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype ''; - sha256 = "02a6sj990cnig5lq0m54nmbmfkr3s57jpxl9fiyzrjmigvd1qmhj"; + sha256 = "0wp369kri33kb1mmiq4lpl9i4xnacw9fj63ycmkmlkq64s8qnjnx"; meta = with lib; { description = "Japanese font package with Mincho and Gothic fonts"; @@ -21,7 +21,7 @@ fetchzip { This is the successor to the IPA fonts. ''; - homepage = "http://ipafont.ipa.go.jp/"; + homepage = "https://moji.or.jp/ipafont/"; license = licenses.ipa; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index 3ed389569bdc..d19dcba69fd8 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -16,13 +16,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow stdenvNoCC.mkDerivation rec { inherit pname; - version = "unstable-2021-12-24"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "aa1f1446b6dbc6acfe3ee247e6841369c68e1495"; - sha256 = "03f79h6kv5vbf92fhpi1wivzvcrfvvdvkhbmy805x4b4wl7qynki"; + rev = version; + sha256 = "08a1jhirvn2x9hhjr0lqqqayhsf446cddapprxpsnsn9q6x2j2gp"; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; # These fixup steps are slow and unnecessary for this package. - # Package may installs almost 400 000 small files. + # Package may install almost 400 000 small files. dontPatchELF = true; dontRewriteSymlinks = true; diff --git a/pkgs/data/themes/graphite/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix index 7f3ee33c039c..0c9bae8ac31e 100644 --- a/pkgs/data/themes/graphite/default.nix +++ b/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -10,6 +10,8 @@ , sizeVariants ? [] # default: standard , tweaks ? [] , wallpapers ? false +, withGrub ? false +, grubScreens ? [] # default: 1080p }: let @@ -20,16 +22,17 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "midblack" "rimless" "normal" ] tweaks +lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens stdenvNoCC.mkDerivation { inherit pname; - version = "unstable-2022-01-07"; + version = "unstable-2022-02-04"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "78e5421fee63b4c2a2a3d2e321538367b01a24ec"; - sha256 = "1vfvv1gfbr9yr9mz0kb7c7ij6pxcryni1fjs87gn4hpyzns431wk"; + rev = "7ab6a1b7eda81e914405a9931408b1d5c73e6891"; + sha256 = "09xixd6cz2iyyyg6vskyk0wj2mahfsg21dlfcvi862h8w01hg9lr"; }; nativeBuildInputs = [ @@ -65,6 +68,18 @@ stdenvNoCC.mkDerivation { ''} ''} + ${lib.optionalString withGrub '' + ( + cd other/grub2 + + patchShebangs install.sh + + ./install.sh --justcopy --dest $out/share/grub/themes \ + ${lib.optionalString (builtins.elem "nord" tweaks) "--theme nord"} \ + ${lib.optionalString (grubScreens != []) "--screen " + builtins.toString grubScreens} + ) + ''} + jdupes -L -r $out/share runHook postInstall diff --git a/pkgs/data/themes/graphite-kde-theme/default.nix b/pkgs/data/themes/graphite-kde-theme/default.nix index b402c29922b0..dd3a215a0385 100644 --- a/pkgs/data/themes/graphite-kde-theme/default.nix +++ b/pkgs/data/themes/graphite-kde-theme/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "graphite-kde-theme"; - version = "unstable-2022-01-22"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "d60a26533b104d6d2251c5187a402f3f35ecbdf7"; - sha256 = "0cry5s3wr0frpchc0hx97r9v6r3v6rvln7l1hb3znn8npkr4mssi"; + rev = version; + sha256 = "0pnn5s1vfdgkpsy5sc838731ly1imi8pbyd4asibw4zi238l0nvf"; }; installPhase = '' |