diff options
author | Will Dietz <w@wdtz.org> | 2019-03-29 02:24:46 -0500 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2019-04-05 15:50:53 -0500 |
commit | 346082f8ec5814d3e3c85ac3951b161ecfc5da7e (patch) | |
tree | 194427a05ec30f84261687bac0db5e3101ee1ddb /pkgs | |
parent | 3d3bf7d0e0d908ca6a17513740f2240bdf8e0ab3 (diff) | |
download | nixpkgs-346082f8ec5814d3e3c85ac3951b161ecfc5da7e.tar nixpkgs-346082f8ec5814d3e3c85ac3951b161ecfc5da7e.tar.gz nixpkgs-346082f8ec5814d3e3c85ac3951b161ecfc5da7e.tar.bz2 nixpkgs-346082f8ec5814d3e3c85ac3951b161ecfc5da7e.tar.lz nixpkgs-346082f8ec5814d3e3c85ac3951b161ecfc5da7e.tar.xz nixpkgs-346082f8ec5814d3e3c85ac3951b161ecfc5da7e.tar.zst nixpkgs-346082f8ec5814d3e3c85ac3951b161ecfc5da7e.zip |
inter,inter-ui: init new 'inter', bump inter-ui to last w/that name
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/data/fonts/inter-ui/default.nix | 8 | ||||
-rw-r--r-- | pkgs/data/fonts/inter/default.nix | 25 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 32 insertions, 2 deletions
diff --git a/pkgs/data/fonts/inter-ui/default.nix b/pkgs/data/fonts/inter-ui/default.nix index 4d9973aa2a2..15032ebb3e3 100644 --- a/pkgs/data/fonts/inter-ui/default.nix +++ b/pkgs/data/fonts/inter-ui/default.nix @@ -1,7 +1,11 @@ { 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.1"; + version = "3.2"; in fetchzip { name = "inter-ui-${version}"; @@ -12,7 +16,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "0cdjpwylynwmab0x5z5lw43k39vis74xj1ciqg8nw12ccprbmj60"; + 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..81d392982ee --- /dev/null +++ b/pkgs/data/fonts/inter/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip }: + +let + version = "3.3"; +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 = "17fv33ryvbla4f4mfgw7m7gjlwyjlni90a8gpb7jws1qzn0vgazg"; + + 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 640c3803b05..09f0f67c097 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 { }; |