From 6ed23f7b1736cf6464728865b8391812aa7005d3 Mon Sep 17 00:00:00 2001 From: Balaji Sivaraman Date: Sun, 26 Oct 2014 19:14:00 +0530 Subject: [PATCH 1/2] Add balajisivaraman to maintainers --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index effcfb36e9d2..79263a5e43c9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -23,6 +23,7 @@ aszlig = "aszlig "; auntie = "Jonathan Glines "; aycanirican = "Aycan iRiCAN "; + balajisivaraman = "Balaji Sivaraman"; bbenoist = "Baptist BENOIST "; bennofs = "Benno Fünfstück "; berdario = "Dario Bertini "; From a76ee499a36a4e304aeb1d134b1d1d171ddb5488 Mon Sep 17 00:00:00 2001 From: Balaji Sivaraman Date: Mon, 27 Oct 2014 23:05:37 +0530 Subject: [PATCH 2/2] Add Meslo LG & Meslo LG DZ fonts. Clean up description as per Nix standards. --- pkgs/data/fonts/meslo-lg/default.nix | 42 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/data/fonts/meslo-lg/default.nix diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix new file mode 100644 index 000000000000..fe123f6622d0 --- /dev/null +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + version = "1.2.1"; + + name = "meslo-lg"; + + meslo-lg = fetchurl { + url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true"; + name="${name}"; + sha256="1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h"; + }; + + meslo-lg-dz = fetchurl { + url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20DZ%20v${version}.zip?raw=true"; + name="${name}-dz"; + sha256="0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875"; + }; + + buildInputs = [ unzip ]; + + sourceRoot = "."; + + phases = [ "unpackPhase" "installPhase" ]; + unpackPhase = '' + unzip -j ${meslo-lg} + unzip -j ${meslo-lg-dz} + ''; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = { + description = "A customized version of Apple’s Menlo-Regular font"; + homepage = https://github.com/andreberg/Meslo-Font/; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ balajisivaraman ]; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5072245fad5..01b4789ce504 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8594,6 +8594,8 @@ let manpages = callPackage ../data/documentation/man-pages { }; + meslo-lg = callPackage ../data/fonts/meslo-lg {}; + miscfiles = callPackage ../data/misc/miscfiles { }; mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { };