diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index c9518b78a65..eaf82d412a1 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -1,21 +1,21 @@ { lib, fetchzip }: let - version = "2.030"; + version = "2.038"; in fetchzip { name = "source-code-pro-${version}"; - url = "https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.zip"; + url = "https://github.com/adobe-fonts/source-code-pro/releases/download/${version}R-ro%2F1.058R-it%2F1.018R-VAR/OTF-source-code-pro-${version}R-ro-1.058R-it.zip"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "0d8qwzjgnz264wlm4qim048z3236z4hbblvc6yplw13f6b65j6fv"; + sha256 = "027cf62zj27q7l3d4sqzdfgz423lzysihdg8cvmkk6z910a1v368"; meta = { - description = "A set of monospaced OpenType fonts designed for coding environments"; + description = "Monospaced font family for user interface and coding environments"; maintainers = with lib.maintainers; [ relrod ]; platforms = with lib.platforms; all; homepage = "https://adobe-fonts.github.io/source-code-pro/"; diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans/default.nix similarity index 55% rename from pkgs/data/fonts/source-sans-pro/default.nix rename to pkgs/data/fonts/source-sans/default.nix index 7d5c7679ad8..c16d0d2b8b4 100644 --- a/pkgs/data/fonts/source-sans-pro/default.nix +++ b/pkgs/data/fonts/source-sans/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "3.006"; + version = "3.046"; in fetchzip { - name = "source-sans-pro-${version}"; + name = "source-sans-${version}"; - url = "https://github.com/adobe-fonts/source-sans-pro/releases/download/${version}R/source-sans-pro-${version}R.zip"; + url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; postFetch = '' mkdir -p $out/share/fonts/{opentype,truetype,variable} @@ -14,11 +14,11 @@ in fetchzip { unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable ''; - sha256 = "11jd50cqiq2s0z39rclg73iiw2j5yzgs1glfs9psw5wbbisgysmr"; + sha256 = "1wxdinnliq0xqbjrs0sqykwaggkmyqawfq862d9xn05g1pnxda94"; meta = with lib; { - homepage = "https://adobe-fonts.github.io/source-sans-pro/"; - description = "A set of OpenType fonts designed by Adobe for UIs"; + homepage = "https://adobe-fonts.github.io/source-sans/"; + description = "Sans serif font family for user interface environments"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix deleted file mode 100644 index 86a45b80efd..00000000000 --- a/pkgs/data/fonts/source-serif-pro/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchzip }: - -let - version = "3.000"; -in fetchzip { - name = "source-serif-pro-${version}"; - - url = "https://github.com/adobe-fonts/source-serif-pro/releases/download/${version}R/source-serif-pro-${version}R.zip"; - - postFetch = '' - mkdir -p $out/share/fonts/{opentype,truetype,variable} - unzip -j $downloadedFile "OTF/*.otf" -d $out/share/fonts/opentype - unzip -j $downloadedFile "TTF/*.ttf" -d $out/share/fonts/truetype - unzip -j $downloadedFile "VAR/*.otf" -d $out/share/fonts/variable - ''; - - sha256 = "06yp8y79mqk02qzp81h8zkmzqqlhicgrkwmzkd0bm338xh8grsiz"; - - meta = with lib; { - homepage = "https://adobe-fonts.github.io/source-serif-pro/"; - description = "A set of OpenType fonts to complement Source Sans Pro"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ ttuegel ]; - }; -} - diff --git a/pkgs/data/fonts/source-serif/default.nix b/pkgs/data/fonts/source-serif/default.nix new file mode 100644 index 00000000000..855fe7e6e9e --- /dev/null +++ b/pkgs/data/fonts/source-serif/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchzip }: + +let + version = "4.004"; +in fetchzip { + name = "source-serif-${version}"; + + url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/{opentype,truetype,variable} + unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype + unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable + ''; + + sha256 = "06814hcp20abca6p0ii61f23g6h1ibqyhq30lsva59wbwx5iha0h"; + + meta = with lib; { + homepage = "https://adobe-fonts.github.io/source-serif/"; + description = "Typeface for setting text in many sizes, weights, and languages. Designed to complement Source Sans"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e28d75c8421..73fff60ff45 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -885,6 +885,8 @@ mapAliases ({ source-han-serif-korean = source-han-serif; source-han-serif-simplified-chinese = source-han-serif; source-han-serif-traditional-chinese = source-han-serif; + source-sans-pro = source-sans; # added 2021-10-20 + source-serif-pro = source-serif; # added 2021-10-20 net_snmp = net-snmp; # added 2019-12-21 oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained."; # added 2020-10-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eeaa3efa328..7429a603407 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23355,9 +23355,9 @@ with pkgs; source-code-pro = callPackage ../data/fonts/source-code-pro {}; - source-sans-pro = callPackage ../data/fonts/source-sans-pro { }; + source-sans = callPackage ../data/fonts/source-sans { }; - source-serif-pro = callPackage ../data/fonts/source-serif-pro { }; + source-serif = callPackage ../data/fonts/source-serif { }; source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { };