summary refs log tree commit diff
path: root/pkgs/data/fonts
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/data/fonts')
-rw-r--r--pkgs/data/fonts/comic-neue/default.nix24
-rw-r--r--pkgs/data/fonts/dina/default.nix2
-rw-r--r--pkgs/data/fonts/fira-mono/default.nix33
-rw-r--r--pkgs/data/fonts/fira/default.nix16
-rw-r--r--pkgs/data/fonts/powerline-fonts/default.nix34
-rw-r--r--pkgs/data/fonts/source-code-pro/default.nix50
-rw-r--r--pkgs/data/fonts/source-sans-pro/default.nix10
-rw-r--r--pkgs/data/fonts/source-serif-pro/default.nix16
8 files changed, 120 insertions, 65 deletions
diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix
index 91608d17db4..5d3da910e0b 100644
--- a/pkgs/data/fonts/comic-neue/default.nix
+++ b/pkgs/data/fonts/comic-neue/default.nix
@@ -1,20 +1,27 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl
+, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "comic-neue-1.1";
+  name = "comic-neue-${version}";
+  version = "2.2";
 
   src = fetchurl {
-    url = "http://comicneue.com/comic-neue-1.1.zip";
-    sha256 = "f9442fc42252db62ea788bd0247ae0e74571678d1dbd3e3edc229389050d6923";
+    url = "http://comicneue.com/${name}.zip";
+    sha256 = "1dmmjhxxc0bj2755yksiiwh275vmnyciknr9b995lmdkjgh7sz6n";
   };
 
-  buildInputs = [unzip];
+  buildInputs = [ unzip ];
   phases = [ "unpackPhase" "installPhase" ];
   sourceRoot = name;
 
   installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp -v *.ttf $out/share/fonts/truetype
+    mkdir -vp $out/share/fonts/truetype $out/share/fonts/opentype $out/share/fonts/EOT $out/share/fonts/WOFF $out/share/fonts/WOFF2 $out/share/doc/${name}
+    cp -v OTF/*.otf  $out/share/fonts/opentype
+    cp -v Web/*.ttf $out/share/fonts/truetype
+    cp -v Web/*.eot  $out/share/fonts/EOT
+    cp -v Web/*.woff  $out/share/fonts/WOFF
+    cp -v Web/*.woff2  $out/share/fonts/WOFF2
+    cp -v Booklet-ComicNeue.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt $out/share/doc/${name}
   '';
 
   meta = with stdenv.lib; {
@@ -27,7 +34,8 @@ stdenv.mkDerivation rec {
       the latter angular terminals.  Both variants come in Light,
       Regular, and Bold weights with Oblique variants.
     '';
-    license = licenses.cc0;
+    license = licenses.ofl;
     platforms = platforms.all;
+    maintainers = [ maintainers.AndersonTorres ];
   };
 }
diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix
index da7a1bc5fb9..e79dcd014d3 100644
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   preferLocalBuild = true;
 
   meta = with stdenv.lib; {
-    description = "A monospace bitmap font aimed at programmers.";
+    description = "A monospace bitmap font aimed at programmers";
     longDescription = ''
       Dina is a monospace bitmap font, primarily aimed at programmers. It is
       relatively compact to allow a lot of code on screen, while (hopefully)
diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix
new file mode 100644
index 00000000000..92d6b1e25b5
--- /dev/null
+++ b/pkgs/data/fonts/fira-mono/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "fira-mono-3.2";
+
+  src = fetchurl {
+    url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3200.zip;
+    sha256 = "0g3i54q8czf3vylgasj62w2n7l1a2yrbyibjlx1qk3awh7fr1r7p";
+  };
+
+  buildInputs = [ unzip ];
+  phases = [ "unpackPhase" "installPhase" ];
+  sourceRoot = "FiraMonoFonts3200";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \;
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.carrois.com/fira-4-1/;
+    description = "Monospace font for Firefox OS";
+    longDescription = ''
+      Fira Mono is a monospace font designed by Erik Spiekermann,
+      Ralph du Carrois, Anja Meiners and Botio Nikoltchev of Carrois
+      Type Design for Mozilla Firefox OS. Available in Regular,
+      Medium, and Bold.
+    '';
+    license = licenses.ofl;
+    maintainers = [ maintainers.rycee ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix
index 532abd4e587..151c945ee9e 100644
--- a/pkgs/data/fonts/fira/default.nix
+++ b/pkgs/data/fonts/fira/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "fira-4.004";
+  name = "fira-4.1";
 
   src = fetchurl {
-    url = "http://www.carrois.com/downloads/fira_4_0/FiraFonts4004.zip";
-    sha256 = "0mab1n4i8ayhzmpfm0dj07annghrfpnsfr2rhnwsyhkk5zxlh6v7";
+    url = "http://www.carrois.com/downloads/fira_4_1/FiraFonts4100.zip";
+    sha256 = "0mqmmq1m2p0hb0x4mr74gghqr75iglilah7psfb3vdc80fc9h6yk";
   };
 
   buildInputs = [unzip];
   phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = "FiraFonts4004";
+  sourceRoot = "FiraFonts4100";
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.carrois.com/fira-4-0/;
-    description = "Sans-serif and monospace font for Firefox OS";
+    homepage = http://www.carrois.com/fira-4-1/;
+    description = "Sans-serif font for Firefox OS";
     longDescription = ''
       Fira Sans is a sans-serif font designed by Erik Spiekermann,
       Ralph du Carrois, Anja Meiners and Botio Nikoltchev of Carrois
@@ -27,9 +27,7 @@ stdenv.mkDerivation rec {
       Spiekermann's FF Meta typeface.  Available in Two, Four, Eight,
       Hair, Thin, Ultra Light, Extra Light, Light, Book, Regular,
       Medium, Semi Bold, Bold, Extra Bold, Heavy weights with
-      corresponding italic versions.  Fira Mono is a matching
-      monospace variant of Fira Sans.  It is available in regular, and
-      bold weights.
+      corresponding italic versions.
     '';
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
new file mode 100644
index 00000000000..0d3d9c104d4
--- /dev/null
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  name = "powerline-fonts-2014-12-27";
+
+  src = fetchFromGitHub {
+    owner = "powerline";
+    repo = "fonts";
+    rev = "39c99c02652f25290b64e24a7e9a7cfb8ce89a3e";
+    sha256 = "9c83a30f36dc980582c0a079bd2896f95d19e1cb0ba5afbd8cae936c944256dd";
+  };
+
+  buildPhase = "true";
+
+  installPhase =
+    ''
+      mkdir -p $out/share/fonts/opentype
+      cp -v */*.otf $out/share/fonts/opentype
+
+      mkdir -p $out/share/fonts/truetype
+      cp -v */*.ttf $out/share/fonts/truetype
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/powerline/fonts;
+    description = "Patched fonts for Powerline users.";
+    longDescription = ''
+      Pre-patched and adjusted fonts for usage with the Powerline plugin.
+    '';
+    license = "asl20 free ofl";
+    platforms = platforms.all;
+    maintainer = with maintainers; [ malyn ];
+  };
+}
diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix
index dc5bcb5b9a7..b3761bc0b5b 100644
--- a/pkgs/data/fonts/source-code-pro/default.nix
+++ b/pkgs/data/fonts/source-code-pro/default.nix
@@ -1,42 +1,26 @@
-x@{builderDefsPackage
-  , unzip
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    version="1.017";
-    name="SourceCodePro";
-    url="mirror://sourceforge/sourcecodepro.adobe/${name}_FontsOnly-${version}.zip";
-    hash="07xjfxin883a3g3admdddxxqyzigihbsnmik0zpjii09cdlb8dl1";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
+stdenv.mkDerivation rec {
+  name = "source-code-pro-${version}";
+  version = "1.017";
 
-  name = "source-code-pro-${sourceInfo.version}";
-  inherit buildInputs;
+  src = fetchurl {
+    url="https://github.com/adobe-fonts/source-code-pro/archive/${version}R.tar.gz";
+    sha256="03q4a0f142c6zlngv6kjaik52y0yzwq5z5qj3j0fvvcbfy9sanjr";
+  };
 
-  phaseNames = ["doUnpack" "installFonts"];
+  phases = "unpackPhase installPhase";
 
-  doUnpack = a.fullDepEntry (''
-    unzip ${src}
-    cd ${sourceInfo.name}*/OTF/
-  '') ["addInputs"];
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \;
+  '';
 
   meta = {
     description = "A set of monospaced OpenType fonts designed for coding environments";
-    maintainers = with a.lib.maintainers; [ relrod ];
-    platforms = with a.lib.platforms; all;
+    maintainers = with stdenv.lib.maintainers; [ relrod ];
+    platforms = with stdenv.lib.platforms; all;
     homepage = "http://blog.typekit.com/2012/09/24/source-code-pro/";
-    license = a.lib.licenses.ofl;
+    license = stdenv.lib.licenses.ofl;
   };
-}) x
+}
diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix
index eccddc8f14c..83b6a3f2d57 100644
--- a/pkgs/data/fonts/source-sans-pro/default.nix
+++ b/pkgs/data/fonts/source-sans-pro/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "source-sans-pro-1.050";
+  name = "source-sans-pro-2.010";
   src = fetchurl {
-    url = "mirror://sourceforge/sourcesans.adobe/SourceSansPro_FontsOnly-1.050.zip";
-    sha256 = "002z7kx8jxp5pfrilqaxbwbr5yp9fl3zsp0imawmf5wqagpzayf3";
+    url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.tar.gz";
+    sha256 = "1s3rgia6x9fxc2pvlwm203grqkb49px6q0xnh8kbqxqsgna615p2";
   };
 
-  buildInputs = [ unzip ];
-
   phases = "unpackPhase installPhase";
 
   installPhase = ''
diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix
index 00ebf22d469..0ccb0299a36 100644
--- a/pkgs/data/fonts/source-serif-pro/default.nix
+++ b/pkgs/data/fonts/source-serif-pro/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "source-serif-pro-1.014";
-  src = fetchurl {
-    url = "mirror://sourceforge/sourceserifpro.adobe/SourceSerifPro_FontsOnly-1.014.zip";
-    sha256 = "1agack195jqq4g2hmga6f9nwg44garii1g3jpbrdlrwr97rwvqsh";
-  };
+stdenv.mkDerivation rec {
+  name = "source-serif-pro-${version}";
+  version = "1.017";
 
-  buildInputs = [ unzip ];
+  src = fetchurl rec {
+    url = "https://github.com/adobe-fonts/source-serif-pro/archive/${version}R.tar.gz";
+    sha256 = "04h24iywjl4fd08x22ypdb3sm979wjfq4wk95r3rk8w376spakrg";
+  };
 
   phases = "unpackPhase installPhase";
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-06-21 12:37:33 +0000