JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cantarell-fonts: rename from cantarell_fonts

Browse Source
This commit is contained in:
Jan Tojnar 2018-03-03 00:05:29 +01:00
parent f6af32c654
commit 618ac29687
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -124,7 +124,7 @@ in {
# If gnome3 is installed, build vim for gtk3 too.
nixpkgs.config.vim.gui = "gtk3";
fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ];
fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ];
services.xserver.desktopManager.session = singleton
{ name = "gnome3";

1
pkgs/data/fonts/cantarell-fonts/default.nix
View File

@ -20,7 +20,6 @@ in stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "cantarell_fonts";
};
};

1
pkgs/top-level/aliases.nix
View File

@ -42,6 +42,7 @@ mapAliases (rec {
bridge_utils = bridge-utils; # added 2015-02-20
btrfsProgs = btrfs-progs; # added 2016-01-03
bundler_HEAD = bundler; # added 2015-11-15
cantarell_fonts = cantarell-fonts; # added 2018-03-03
checkbashism = checkbashisms; # added 2016-08-16
cifs_utils = cifs-utils; # added 2016-08
clangAnalyzer = clang-analyzer; # added 2015-02-20

2
pkgs/top-level/all-packages.nix
View File

@ -13940,7 +13940,7 @@ with pkgs;
caladea = callPackage ../data/fonts/caladea {};
cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { };
cantarell-fonts = callPackage ../data/fonts/cantarell-fonts { };
carlito = callPackage ../data/fonts/carlito {};