Merge pull request #51529 from worldofpeace/open-sans/different-source

opensans-ttf: change source to salsa, rename to open-sans

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 ];
+  };
+}

pkgs/data/fonts/opensans-ttf/default.nix

@@ -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 = [ ];
-  };
-}

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

pkgs/top-level/all-packages.nix

@@ -15514,7 +15514,7 @@ in
 
   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 { };