From f5e664f805b143cd2a85bedfd28177089c062d1f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 5 Dec 2018 16:12:48 -0500 Subject: [PATCH] opensans-ttf: change source to salsa, rename to open-sans --- pkgs/data/fonts/open-sans/default.nix | 33 ++++++++++++++++++++++++ pkgs/data/fonts/opensans-ttf/default.nix | 27 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 35 insertions(+), 28 deletions(-) create mode 100644 pkgs/data/fonts/open-sans/default.nix delete mode 100644 pkgs/data/fonts/opensans-ttf/default.nix diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix new file mode 100644 index 000000000000..d8918a6567bb --- /dev/null +++ b/pkgs/data/fonts/open-sans/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitLab }: + +stdenv.mkDerivation rec { + pname = "open-sans"; + version = "1.11"; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "fonts-team"; + repo = "fonts-open-sans"; + rev = "debian%2F1.11-1"; # URL-encoded form of "debian/1.11-1" tag + sha256 = "077hkvpmk3ghbqyb901w43b2m2a27lh8ddasyx1x7pdwyr2bjjl2"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "Open Sans fonts"; + longDescription = '' + Open Sans is a humanist sans serif typeface designed by Steve Matteson, + Type Director of Ascender Corp. + ''; + homepage = https://www.opensans.com; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.worldofpeace ]; + }; +} diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix deleted file mode 100644 index 6f3762c971c9..000000000000 --- a/pkgs/data/fonts/opensans-ttf/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{stdenv, fetchzip}: - -fetchzip { - name = "opensans-ttf-20140617"; - - url = "http://web.archive.org/web/20150801161609/https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz"; - - postFetch = '' - tar -xzf $downloadedFile - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype - ''; - - sha256 = "0zpzqw5y9g5jk7xjcxa12ds60ckvxmpw8p7bnkkmad53s94yr5wf"; - - meta = { - description = "Open Sans fonts"; - longDescription = '' - Open Sans is a humanist sans serif typeface designed by Steve Matteson, - Type Director of Ascender Corp. - ''; - homepage = https://en.wikipedia.org/wiki/Open_Sans; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 02971c5dcff6..e33d9bccafb6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -209,6 +209,7 @@ mapAliases ({ opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 openjpeg_2_1 = openjpeg_2; # added 2018-10-25 + opensans-ttf = open-sans; # added 2018-12-04 openssh_with_kerberos = openssh; # added 2018-01-28 owncloudclient = owncloud-client; # added 2016-08 p11_kit = p11-kit; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e52ed5429825..28861078fb9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15487,7 +15487,7 @@ with pkgs; open-dyslexic = callPackage ../data/fonts/open-dyslexic { }; - opensans-ttf = callPackage ../data/fonts/opensans-ttf { }; + open-sans = callPackage ../data/fonts/open-sans { }; orbitron = callPackage ../data/fonts/orbitron { };