From 1b2d1f839992f7f93346bdc20fd2fb9bea9f92e2 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 01:55:47 +0300 Subject: [PATCH 1/8] Added ubuntu-font-family --- .../data/fonts/ubuntu-font-family/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/data/fonts/ubuntu-font-family/default.nix diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix new file mode 100644 index 00000000000..ad798b84eb9 --- /dev/null +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "ubuntu-font-family-0.80"; + buildInputs = [unzip]; + + src = fetchurl { + url = http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip; + sha256 = "107170099bbc3beae8602b97a5c423525d363106c3c24f787d43e09811298e4c"; + }; + + installPhase = + '' + mkdir -p $out/share/fonts/ubuntu + cp *.ttf $out/share/fonts/ubuntu + ''; + + meta = { + description = "The Ubuntu typeface has been specially created to complement the Ubuntu tone of voice. It has a contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bfe8f2b3a3..5cddfc5fcb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6213,6 +6213,8 @@ let vistafonts = callPackage ../data/fonts/vista-fonts { }; + ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; + wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { }; xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { }; From 76021a76cb0fef19b0fae8d05401417c66c21c84 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 02:22:38 +0300 Subject: [PATCH 2/8] Add myself to maintainers.nix --- pkgs/lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index b790d7d1c11..aab4d685361 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -8,6 +8,7 @@ all = "Nix Committers "; amiddelk = "Arie Middelkoop "; andres = "Andres Loeh "; + antono = "Antono Vasiljev "; astsmtl = "Alexander Tsamutali "; bjg = "Brian Gough "; bluescreen303 = "Mathijs Kwik "; From 48eeb312c56d896a3a8b58c4b72573d63f7f4973 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 02:23:02 +0300 Subject: [PATCH 3/8] Improved meta section for ubuntu-font-family --- pkgs/data/fonts/ubuntu-font-family/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index ad798b84eb9..81222938ad3 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { ''; meta = { - description = "The Ubuntu typeface has been specially created to complement the Ubuntu tone of voice. It has a contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; + description = "Ubuntu Font Family"; + longDescription = "The Ubuntu typeface has been specially + created to complement the Ubuntu tone of voice. It has a + contemporary style and contains characteristics unique to + the Ubuntu brand that convey a precise, reliable and free attitude."; + homepage = http://font.ubuntu.com/; + license = free; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.antono ]; }; } From bca195dcb84b80662c20c1fbeabe6eb9e15d6114 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 02:26:39 +0300 Subject: [PATCH 4/8] Reordered alphabetically --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5cddfc5fcb1..45df41e84bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6207,14 +6207,14 @@ let ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; + ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; + ucsFonts = callPackage ../data/fonts/ucs-fonts { }; unifont = callPackage ../data/fonts/unifont { }; vistafonts = callPackage ../data/fonts/vista-fonts { }; - ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; - wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { }; xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { }; From b5b9b0371c6d8cfaffbe6c3f19b489f6d226f03f Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 02:36:46 +0300 Subject: [PATCH 5/8] sha256 in base32 format --- pkgs/data/fonts/ubuntu-font-family/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 81222938ad3..f7f5e6d3fb5 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip; - sha256 = "107170099bbc3beae8602b97a5c423525d363106c3c24f787d43e09811298e4c"; + sha256 = "0k4f548riq23gmw4zhn30qqkcpaj4g2ab5rbc3lflfxwkc4p0w8h"; }; installPhase = From d4092f153e5a9af93b8f7826476e8ff61122d2d1 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 02:38:27 +0300 Subject: [PATCH 6/8] Cleaning up ubuntu-font-family --- pkgs/data/fonts/ubuntu-font-family/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index f7f5e6d3fb5..e2139bcbc12 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ubuntu-font-family-0.80"; buildInputs = [unzip]; src = fetchurl { - url = http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip; + url = "http://font.ubuntu.com/download/${name}.zip"; sha256 = "0k4f548riq23gmw4zhn30qqkcpaj4g2ab5rbc3lflfxwkc4p0w8h"; }; From 6db0c4c51d6d9ee1e0cac1995e44202f1e4420ea Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 02:40:04 +0300 Subject: [PATCH 7/8] ubuntu-font-family: free is a string, not var --- pkgs/data/fonts/ubuntu-font-family/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index e2139bcbc12..bab2f3337e1 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; homepage = http://font.ubuntu.com/; - license = free; + license = "free"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.antono ]; }; From dd3354f0029739cc92d7d533b5e2fa642b286d5b Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 23 Jun 2012 02:42:37 +0300 Subject: [PATCH 8/8] ubuntu-font-family: rec back --- pkgs/data/fonts/ubuntu-font-family/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index bab2f3337e1..130aeef88ab 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ubuntu-font-family-0.80"; buildInputs = [unzip];