b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

liberation_ttf: drop binary packages

Browse source 
That means the following attributes are gone:
  - liberation_ttf_v1_binary
  - liberation_ttf_v2_binary

Because of this Libreoffice uses liberation source fonts

I've renamed these attributes because the binary form is gone:

  - liberation_ttf_v1_from_source -> liberation_ttf_v1
  - liberation_ttf_v2_from_source -> liberation_ttf_v2

They're aliases for these.
This commit is contained in:
worldofpeace 2018-12-13 12:54:38 -05:00
parent ec8d663d59
commit b2c6efeaed
3 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/data/fonts/redhat-liberation-fonts/default.nix
View file

@ -49,21 +49,14 @@ let
};
in {
liberation_ttf_v1_from_source = common rec {
liberation_ttf_v1 = common rec {
version = "1.07.4";
url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz";
sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d";
nativeBuildInputs = [ fontforge ];
outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p";
};
liberation_ttf_v1_binary = common rec {
version = "1.07.4";
url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1";
nativeBuildInputs = [ ];
outputHash = "12gwb9b4ij9d93ky4c9ykgp03fqr62axy37pds88q7y6zgciwkab";
};
liberation_ttf_v2_from_source = common rec {
liberation_ttf_v2 = common rec {
version = "2.00.1";
url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz";
sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
@ -75,11 +68,4 @@ in {
'';
outputHash = "0nldgawm0a6lpn86w4w3rzx01ns3ph09ar1knq1g4jkxc8ci5rqn";
};
liberation_ttf_v2_binary = common rec {
version = "2.00.1";
url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q";
nativeBuildInputs = [ ];
outputHash = "19jky9li345zsig9pcb0rnlsjqqclh7r60vbi4pwh16f14850gpk";
};
}

2
pkgs/top-level/aliases.nix
View file

@ -161,6 +161,8 @@ mapAliases ({
libcap_progs = libcap.out; # added 2016-04-29
libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19
libdbusmenu-glib = libdbusmenu; # added 2018-05-01
liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12
liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12
liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12
libgnome_keyring = libgnome-keyring; # added 2018-02-25
libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25

13
pkgs/top-level/all-packages.nix
View file

@ -15529,11 +15529,10 @@ in
league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {};
inherit (callPackages ../data/fonts/redhat-liberation-fonts { })
liberation_ttf_v1_from_source
liberation_ttf_v1_binary
liberation_ttf_v2_from_source
liberation_ttf_v2_binary;
liberation_ttf = liberation_ttf_v2_binary;
liberation_ttf_v1
liberation_ttf_v2
;
liberation_ttf = liberation_ttf_v2;
liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { };
@ -17910,8 +17909,8 @@ in
fontDirectories = [
carlito dejavu_fonts
freefont_ttf xorg.fontmiscmisc
liberation_ttf_v1_binary
liberation_ttf_v2_binary
liberation_ttf_v1
liberation_ttf_v2
];
};
clucene_core = clucene_core_2;