From 88f60ee57d6a0de7cb77333d9189c3d7c06d7f3d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Mon, 26 May 2014 14:55:32 -0500 Subject: [PATCH 1/3] Add source-sans-pro-1.050 --- pkgs/data/fonts/source-sans-pro/default.nix | 26 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/data/fonts/source-sans-pro/default.nix diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix new file mode 100644 index 000000000000..eccddc8f14c0 --- /dev/null +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { + name = "source-sans-pro-1.050"; + src = fetchurl { + url = "mirror://sourceforge/sourcesans.adobe/SourceSansPro_FontsOnly-1.050.zip"; + sha256 = "002z7kx8jxp5pfrilqaxbwbr5yp9fl3zsp0imawmf5wqagpzayf3"; + }; + + buildInputs = [ unzip ]; + + phases = "unpackPhase installPhase"; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \; + ''; + + meta = with stdenv.lib; { + homepage = http://sourceforge.net/adobe/sourcesans; + description = "A set of OpenType fonts designed by Adobe for UIs"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f20f6ef89531..bea4b152e5a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7978,6 +7978,8 @@ let sourceCodePro = callPackage ../data/fonts/source-code-pro {}; + source-sans-pro = callPackage ../data/fonts/source-sans-pro { }; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { }; themes = name: import (../data/misc/themes + ("/" + name + ".nix")) { From e2da5d38f39f84ae52313ea2330e1eb12bf6455a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Mon, 26 May 2014 14:58:31 -0500 Subject: [PATCH 2/3] Add source-serif-pro-1.014 --- pkgs/data/fonts/source-serif-pro/default.nix | 27 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/data/fonts/source-serif-pro/default.nix diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix new file mode 100644 index 000000000000..00ebf22d469f --- /dev/null +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { + name = "source-serif-pro-1.014"; + src = fetchurl { + url = "mirror://sourceforge/sourceserifpro.adobe/SourceSerifPro_FontsOnly-1.014.zip"; + sha256 = "1agack195jqq4g2hmga6f9nwg44garii1g3jpbrdlrwr97rwvqsh"; + }; + + buildInputs = [ unzip ]; + + phases = "unpackPhase installPhase"; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \; + ''; + + meta = with stdenv.lib; { + homepage = http://sourceforge.net/adobe/sourceserifpro; + 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bea4b152e5a1..848fa36acfe9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7980,6 +7980,8 @@ let source-sans-pro = callPackage ../data/fonts/source-sans-pro { }; + source-serif-pro = callPackage ../data/fonts/source-serif-pro { }; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { }; themes = name: import (../data/misc/themes + ("/" + name + ".nix")) { From a8168daabbd73726326927c2b57b880c38ae399c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Tue, 8 Jul 2014 15:54:17 -0500 Subject: [PATCH 3/3] Rename SourceCodePro to source-code-pro --- pkgs/data/fonts/source-code-pro/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index d48fbed696c9..8fde0c6ef03f 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -22,7 +22,7 @@ rec { sha256 = sourceInfo.hash; }; - name = "${sourceInfo.name}-${sourceInfo.version}"; + name = "source-code-pro-${sourceInfo.version}"; inherit buildInputs; phaseNames = ["doUnpack" "installFonts"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 848fa36acfe9..15458155e2c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7976,7 +7976,7 @@ let r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { }; - sourceCodePro = callPackage ../data/fonts/source-code-pro {}; + source-code-pro = callPackage ../data/fonts/source-code-pro {}; source-sans-pro = callPackage ../data/fonts/source-sans-pro { };