Commit b3c8c0e4 authored by jopejoe1's avatar jopejoe1
Browse files

ubuntu_font_family: replace with ubuntu-classic

parent 03f1e583

nixos/modules/services/x11/desktop-managers/cinnamon.nix

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ in 
      # Default Fonts

      fonts.packages = with pkgs; [

        dejavu_fonts # Default monospace font in LMDE 6+

        ubuntu_font_family # required for default theme

        ubuntu-classic # required for default theme

      ];

    })

nixos/modules/services/x11/desktop-managers/enlightenment.nix

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ in 


    environment.etc."X11/xkb".source = xcfg.xkb.dir;



    fonts.packages = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ];

    fonts.packages = [ pkgs.dejavu_fonts ];



    services.udisks2.enable = true;

    services.upower.enable = config.powerManagement.enable;

nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ in 
      font = {

        package = mkOption {

          type = types.package;

          default = pkgs.ubuntu_font_family;

          defaultText = literalExpression "pkgs.ubuntu_font_family";

          default = pkgs.ubuntu-classic;

          defaultText = literalExpression "pkgs.ubuntu-classic";

          description = ''

            The package path that contains the font given in the name option.

          '';

pkgs/data/fonts/ubuntu-font-family/default.nix

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
{ lib, stdenvNoCC, fetchzip }:



stdenvNoCC.mkDerivation rec {

  pname = "ubuntu-font-family";

  version = "0.83";



  src = fetchzip {

    url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-${version}.zip";

    hash = "sha256-FAg1xn8Gcbwmuvqtg9SquSet4oTT9nqE+Izeq7ZMVcA=";

  };



  installPhase = ''

    runHook preInstall



    mkdir -p $out/share/fonts/ubuntu

    mv *.ttf $out/share/fonts/ubuntu



    runHook postInstall

  '';



  meta = with lib; {

    description = "Ubuntu Font Family";

    longDescription = "The Ubuntu typeface has been specially

    created to complement the Ubuntu tone of voice. It has a

    contemporary style and contains characteristics unique to

    the Ubuntu brand that convey a precise, reliable and free attitude.";

    homepage = "http://font.ubuntu.com/";

    license = licenses.ufl;

    platforms = platforms.all;

    maintainers = [ maintainers.antono ];

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -1303,6 +1303,7 @@ mapAliases ({ 
  uade123 = uade; # Added 2022-07-30

  uberwriter = apostrophe; # Added 2020-04-23

  ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21

  ubuntu_font_family = ubuntu-classic; # Added 2024-02-19

  ue4 = throw "ue4 has been removed, because the package was broken for years"; # Added 2023-11-22

  uhd3_5 = throw "uhd3_5 has been removed, because it was no longer needed"; # Added 2023-10-07

  uhhyou.lv2 = throw "'uhhyou.lv2' has been removed, upstream gone"; # Added 2023-06-21