diff --git a/pkgs/data/fonts/inter-ui/default.nix b/pkgs/data/fonts/inter-ui/default.nix index c7bcebcf5b2..15032ebb3e3 100644 --- a/pkgs/data/fonts/inter-ui/default.nix +++ b/pkgs/data/fonts/inter-ui/default.nix @@ -1,18 +1,22 @@ { stdenv, fetchzip }: +# XXX: IMPORTANT: +# For compat, keep this at the last version that used the name "Inter UI" +# For newer versions, which are now simply named "Inter", +# see the expression for `inter` (../inter/default.nix). let - version = "3.4"; + version = "3.2"; in fetchzip { - name = "inter-${version}"; + name = "inter-ui-${version}"; - url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-${version}.zip"; + url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-UI-${version}.zip"; postFetch = '' mkdir -p $out/share/fonts/opentype unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "1dl4zc1a5dl9xkg094zmzy6bk7gms8vhsiln58ix7sffzcf3pri8"; + sha256 = "01d2ql803jrhss6g60djvs08x9xl7z6b3snkn03vqnrajdgifcl4"; meta = with stdenv.lib; { homepage = https://rsms.me/inter/; diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix new file mode 100644 index 00000000000..8973eae1464 --- /dev/null +++ b/pkgs/data/fonts/inter/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip }: + +let + version = "3.5"; +in fetchzip { + name = "inter-${version}"; + + url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "0zqixzzbb3n1j4jvpjm0hlxc32j53hgq4j078gihjkhgvjhsklf2"; + + meta = with stdenv.lib; { + homepage = https://rsms.me/inter/; + description = "A typeface specially designed for user interfaces"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ demize ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2deaa60b11b..5bdb23716f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16157,6 +16157,7 @@ in maligned = callPackage ../development/tools/maligned { }; inter-ui = callPackage ../data/fonts/inter-ui { }; + inter = callPackage ../data/fonts/inter { }; siji = callPackage ../data/fonts/siji { };