diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-03 00:05:29 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-03 00:36:38 +0100 |
| commit | 618ac29687a650d854c8bea7efd4490387589ce2 (patch) | |
| tree | 4fe29e8c2599869e480ee3a30cf6486aa78b3464 | |
| parent | f6af32c6544746c22f182053e5f6c9b45a07e478 (diff) | |
| download | nixpkgs-618ac29687a650d854c8bea7efd4490387589ce2.tar nixpkgs-618ac29687a650d854c8bea7efd4490387589ce2.tar.gz nixpkgs-618ac29687a650d854c8bea7efd4490387589ce2.tar.bz2 nixpkgs-618ac29687a650d854c8bea7efd4490387589ce2.tar.lz nixpkgs-618ac29687a650d854c8bea7efd4490387589ce2.tar.xz nixpkgs-618ac29687a650d854c8bea7efd4490387589ce2.tar.zst nixpkgs-618ac29687a650d854c8bea7efd4490387589ce2.zip | |
cantarell-fonts: rename from cantarell_fonts
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/fonts/cantarell-fonts/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 3d68f2b1c9b..7256013d5d8 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -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"; diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 36a46a23a7e..9d002ef02ad 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -20,7 +20,6 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "cantarell_fonts"; }; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 06da21813ae..f00544c907b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82c62c19563..65b5b4e4d70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {}; |