about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorRenaud <c0bw3b@users.noreply.github.com>2018-12-05 23:53:56 +0100
committerGitHub <noreply@github.com>2018-12-05 23:53:56 +0100
commit75fe53799d262b88d7135ef20d6915eb715bb9db (patch)
treef0a5861e8f9982e039f362bbd06572b3604a47b2 /pkgs/top-level
parent808d52ee05d2672963e3da8d3ca25e4dc022840f (diff)
parentf5e664f805b143cd2a85bedfd28177089c062d1f (diff)
downloadnixlib-75fe53799d262b88d7135ef20d6915eb715bb9db.tar
nixlib-75fe53799d262b88d7135ef20d6915eb715bb9db.tar.gz
nixlib-75fe53799d262b88d7135ef20d6915eb715bb9db.tar.bz2
nixlib-75fe53799d262b88d7135ef20d6915eb715bb9db.tar.lz
nixlib-75fe53799d262b88d7135ef20d6915eb715bb9db.tar.xz
nixlib-75fe53799d262b88d7135ef20d6915eb715bb9db.tar.zst
nixlib-75fe53799d262b88d7135ef20d6915eb715bb9db.zip
Merge pull request #51529 from worldofpeace/open-sans/different-source
opensans-ttf: change source to salsa, rename to open-sans
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 2 insertions, 1 deletions
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 537c186bf9d5..e939afa1808a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/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 { };