diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-04-19 07:52:28 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-04-19 07:52:28 +0200 |
| commit | 8c0c955a0938952e7da27de5425c74dc806f05ab (patch) | |
| tree | 056e84891b42e50e774a65087517cd4b1b2013d0 /pkgs/data | |
| parent | e2c4ab09c7356b27f5eb561824a65cad321205b4 (diff) | |
| parent | d080edeb6b2d5402782adb80863dd2442bf3f4d1 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/nasin-nanpa/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/data/themes/orchis-theme/default.nix | 4 |
2 files changed, 8 insertions, 19 deletions
diff --git a/pkgs/data/fonts/nasin-nanpa/default.nix b/pkgs/data/fonts/nasin-nanpa/default.nix index cd05c667a2487..339c89dd9b0b4 100644 --- a/pkgs/data/fonts/nasin-nanpa/default.nix +++ b/pkgs/data/fonts/nasin-nanpa/default.nix @@ -2,29 +2,18 @@ stdenvNoCC.mkDerivation rec { pname = "nasin-nanpa"; - version = "2.5.1"; + version = "3.1.0"; - srcs = [ - (fetchurl { - name = "nasin-nanpa.otf"; - url = "https://github.com/ETBCOR/nasin-nanpa/releases/download/n${version}/nasin-nanpa-${version}.otf"; - hash = "sha256-++uOrqFzQ6CB/OPEmBivpjMfAtFk3PSsCNpFBjOtGEg="; - }) - (fetchurl { - name = "nasin-nanpa-lasina-kin.otf"; - url = "https://github.com/ETBCOR/nasin-nanpa/releases/download/n${version}/nasin-nanpa-${version}-lasina-kin.otf"; - hash = "sha256-4WIX74y2O4NaKi/JQrgTbOxlKDQKJ/F9wkQuoOdWuTI="; - }) - ]; + src = fetchurl { + url = "https://github.com/ETBCOR/nasin-nanpa/releases/download/n${version}/nasin-nanpa-${version}.otf"; + hash = "sha256-remTvvOt7kpvTdq9H8tFI2yU+BtqePXlDDLQv/jtETU="; + }; dontUnpack = true; installPhase = '' mkdir -p $out/share/fonts/opentype - for src in $srcs; do - file=$(stripHash $src) - cp $src $out/share/fonts/opentype/$file - done + cp $src $out/share/fonts/opentype/nasin-nanpa.otf ''; meta = with lib; { diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index 100599b34c3c1..75bdf7b07aa9c 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -26,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-04-01"; + version = "2024-04-18"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - hash = "sha256-gszyUZGWlgrBTQnaz6Ws7jzfTN5KAfX5SjVwmVrP9QE="; + hash = "sha256-Kvafbvw1q8F0+l47WshFHPfZEQhFXPPXuI0RjBJnP4s="; }; nativeBuildInputs = [ gtk3 sassc ]; |