Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

inter,inter-ui: keep font name the same for attributes, split off #58520

Merged
merged 4 commits into from Apr 5, 2019
Merged

inter,inter-ui: keep font name the same for attributes, split off #58520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfeaf5e
Revert "inter(-ui): 3.3 -> 3.4"
dtzWill Apr 5, 2019
3d3bf7d
Revert "inter-ui: 3.1 -> 3.3 (#57605)"
dtzWill Mar 29, 2019
346082f
inter,inter-ui: init new 'inter', bump inter-ui to last w/that name
dtzWill Mar 29, 2019
0741927
inter: 3.3 -> 3.5
dtzWill Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions pkgs/data/fonts/inter-ui/default.nix
View file
Open in desktop
@@ -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/;
Expand Down
25 changes: 25 additions & 0 deletions pkgs/data/fonts/inter/default.nix
View file
Open in desktop
@@ -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 ];
};
}

1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Expand Up @@ -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 { };

Expand Down