alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #213105 from wegank/fonts-9

Browse source 
treewide: convert 9 fonts to stdenvNoCC.mkDerivation
This commit is contained in:
Weijia Wang 2023-01-28 10:23:25 +01:00 committed by GitHub
parent c14628ef96 7562d1ed9c
commit cec62b8dfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 133 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pkgs/data/fonts/source-code-pro/default.nix
View file

@ -1,14 +1,22 @@
# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, stdenvNoCC, fetchzip }:
{ lib, fetchzip }:
let stdenvNoCC.mkDerivation rec {
pname = "source-code-pro";
version = "2.038"; version = "2.038";
in (fetchzip {
name = "source-code-pro-${version}";
url = "https://github.com/adobe-fonts/source-code-pro/releases/download/${version}R-ro%2F1.058R-it%2F1.018R-VAR/OTF-source-code-pro-${version}R-ro-1.058R-it.zip"; src = fetchzip {
url = "https://github.com/adobe-fonts/source-code-pro/releases/download/${version}R-ro%2F1.058R-it%2F1.018R-VAR/OTF-source-code-pro-${version}R-ro-1.058R-it.zip";
stripRoot = false;
hash = "sha256-ijeTLka131jf6B9xj/eNWK1T5r7r3aBXBgnVyRAxmuY=";
};
sha256 = "027cf62zj27q7l3d4sqzdfgz423lzysihdg8cvmkk6z910a1v368"; installPhase = ''
runHook preInstall
install -Dm644 *.otf -t $out/share/fonts/opentype
runHook postInstall
'';
meta = { meta = {
description = "Monospaced font family for user interface and coding environments"; description = "Monospaced font family for user interface and coding environments";
@ -17,9 +25,4 @@ in (fetchzip {
homepage = "https://adobe-fonts.github.io/source-code-pro/"; homepage = "https://adobe-fonts.github.io/source-code-pro/";
license = lib.licenses.ofl; license = lib.licenses.ofl;
}; };
}).overrideAttrs (_: { }
postFetch = ''
mkdir -p $out/share/fonts
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
})

29
pkgs/data/fonts/source-han-code-jp/default.nix
View file

@ -1,15 +1,21 @@
# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, stdenvNoCC, fetchzip }:
{ lib, fetchzip }:
let stdenvNoCC.mkDerivation rec {
pname = "source-han-code-jp"; pname = "source-han-code-jp";
version = "2.012R"; version = "2.012";
in (fetchzip {
name = "${pname}-${version}";
url = "https://github.com/adobe-fonts/${pname}/archive/${version}.zip"; src = fetchzip {
url = "https://github.com/adobe-fonts/${pname}/archive/${version}R.zip";
hash = "sha256-ljO/1/CaE9Yj+AN5xxlIr30/nV/axGQPO0fGACAZGCQ=";
};
sha256 = "16y5as1k864ghy3vzp8svr3q0sw57rv53za3f48700ksvxz5pwry"; installPhase = ''
runHook preInstall
install -Dm444 OTF/*.otf -t $out/share/fonts/opentype
runHook postInstall
'';
meta = { meta = {
description = "A monospaced Latin font suitable for coding"; description = "A monospaced Latin font suitable for coding";
@ -18,9 +24,4 @@ in (fetchzip {
homepage = "https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html"; homepage = "https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html";
license = lib.licenses.ofl; license = lib.licenses.ofl;
}; };
}).overrideAttrs (_: { }
postFetch = ''
mkdir -p $out/share/fonts
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
})

56
pkgs/data/fonts/source-han/default.nix
View file

@ -1,7 +1,7 @@
# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib
{ stdenvNoCC , stdenvNoCC
, lib , fetchurl
, fetchzip , unzip
}: }:
let let
@ -9,21 +9,37 @@ let
{ family { family
, description , description
, rev , rev
, sha256 , hash
, postFetch ? ''
install -m444 -Dt $out/share/fonts/opentype/source-han-${family} $downloadedFile
''
, zip ? "" , zip ? ""
}: }:
let Family = let Family =
lib.toUpper (lib.substring 0 1 family) + lib.toUpper (lib.substring 0 1 family) +
lib.substring 1 (lib.stringLength family) family; lib.substring 1 (lib.stringLength family) family;
in in
(fetchzip { stdenvNoCC.mkDerivation rec {
name = "source-han-${family}-${lib.removeSuffix "R" rev}"; pname = "source-han-${family}";
version = lib.removeSuffix "R" rev;
url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc${zip}"; src = fetchurl {
inherit sha256; url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc${zip}";
inherit hash;
};
nativeBuildInputs = lib.optionals (zip == ".zip") [ unzip ];
unpackPhase = lib.optionalString (zip == "") ''
cp $src SourceHan${Family}.ttc${zip}
'' + lib.optionalString (zip == ".zip") ''
unzip $src
'';
installPhase = ''
runHook preInstall
install -Dm444 *.ttc -t $out/share/fonts/opentype/${pname}
runHook postInstall
'';
meta = { meta = {
description = "An open source Pan-CJK ${description} typeface"; description = "An open source Pan-CJK ${description} typeface";
@ -31,18 +47,14 @@ let
license = lib.licenses.ofl; license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ taku0 emily ]; maintainers = with lib.maintainers; [ taku0 emily ];
}; };
}).overrideAttrs (_: { inherit postFetch; }); };
in in
{ {
sans = makePackage { sans = makePackage {
family = "sans"; family = "sans";
description = "sans-serif"; description = "sans-serif";
rev = "2.004R"; rev = "2.004R";
sha256 = "052d17hvz435zc4r2y1p9cgkkgn0ps8g74mfbvnbm1pv8ykj40m9"; hash = "sha256-b1kRiprdpaf+Tp5rtTgwn34dPFQR+anTKvMqeVAbfk8=";
postFetch = ''
mkdir -p $out/share/fonts/opentype/source-han-sans
unzip $downloadedFile -d $out/share/fonts/opentype/source-han-sans
'';
zip = ".zip"; zip = ".zip";
}; };
@ -50,11 +62,7 @@ in
family = "serif"; family = "serif";
description = "serif"; description = "serif";
rev = "2.000R"; rev = "2.000R";
sha256 = "0x3n6s4khdd6l0crwd7g9sjaqp8lkvksglhc7kj3cv80hldab9wp"; hash = "sha256-RDgywab7gwT+YBO7F1KJvKOv0E/3+7Zi/pQl+UDsGcM=";
postFetch = ''
mkdir -p $out/share/fonts/opentype/source-han-serif
unzip $downloadedFile -d $out/share/fonts/opentype/source-han-serif
'';
zip = ".zip"; zip = ".zip";
}; };
@ -62,6 +70,6 @@ in
family = "mono"; family = "mono";
description = "monospaced"; description = "monospaced";
rev = "1.002"; rev = "1.002";
sha256 = "010h1y469c21bjavwdmkpbwk3ny686inz8i062wh1dhcv8cnqk3c"; hash = "sha256-DBkkSN6QhI8R64M2h2iDqaNtxluJZeSJYAz8x6ZzWME=";
}; };
} }

33
pkgs/data/fonts/source-sans-pro/default.nix
View file

@ -1,18 +1,28 @@
# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, stdenvNoCC, fetchzip }:
{ lib, fetchzip }:
# Source Sans Pro got renamed to Source Sans 3 (see # Source Sans Pro got renamed to Source Sans 3 (see
# https://github.com/adobe-fonts/source-sans/issues/192). This is the # https://github.com/adobe-fonts/source-sans/issues/192). This is the
# last version named "Pro". It is useful for backward compatibility # last version named "Pro". It is useful for backward compatibility
# with older documents/templates/etc. # with older documents/templates/etc.
let
version = "3.006"; stdenvNoCC.mkDerivation rec {
in (fetchzip {
name = "source-sans-pro-${version}"; name = "source-sans-pro-${version}";
version = "3.006";
url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; src = fetchzip {
url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip";
hash = "sha256-1Savijgq3INuUN89MR0t748HOuGseXVw5Kd4hYwuVas=";
};
sha256 = "sha256-uWr/dFyLF65v0o6+oN/3RQoe4ziPspzGB1rgiBkoTYY="; installPhase = ''
runHook preInstall
install -Dm444 OTF/*.otf -t $out/share/fonts/opentype
install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype
install -Dm444 VAR/*.otf -t $out/share/fonts/variable
runHook postInstall
'';
meta = with lib; { meta = with lib; {
homepage = "https://adobe-fonts.github.io/source-sans/"; homepage = "https://adobe-fonts.github.io/source-sans/";
@ -21,11 +31,4 @@ in (fetchzip {
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ ttuegel ]; maintainers = with maintainers; [ ttuegel ];
}; };
}).overrideAttrs (_: { }
postFetch = ''
mkdir -p $out/share/fonts/{opentype,truetype,variable}
unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
'';
})

32
pkgs/data/fonts/source-sans/default.nix
View file

@ -1,14 +1,23 @@
# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, stdenvNoCC, fetchzip }:
{ lib, fetchzip }:
let stdenvNoCC.mkDerivation rec {
pname = "source-sans";
version = "3.046"; version = "3.046";
in (fetchzip {
name = "source-sans-${version}";
url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; src = fetchzip {
url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip";
hash = "sha256-nBLEK+T5n1CdZK2zvCWIhF2MxPmiAwL9l55a55yHtgU=";
};
sha256 = "1wxdinnliq0xqbjrs0sqykwaggkmyqawfq862d9xn05g1pnxda94"; installPhase = ''
runHook preInstall
install -Dm444 OTF/*.otf -t $out/share/fonts/opentype
install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype
install -Dm444 VAR/*.otf -t $out/share/fonts/variable
runHook postInstall
'';
meta = with lib; { meta = with lib; {
homepage = "https://adobe-fonts.github.io/source-sans/"; homepage = "https://adobe-fonts.github.io/source-sans/";
@ -17,11 +26,4 @@ in (fetchzip {
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ ttuegel ]; maintainers = with maintainers; [ ttuegel ];
}; };
}).overrideAttrs (_: { }
postFetch = ''
mkdir -p $out/share/fonts/{opentype,truetype,variable}
unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
'';
})

33
pkgs/data/fonts/source-serif-pro/default.nix
View file

@ -1,18 +1,28 @@
# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, stdenvNoCC, fetchzip }:
{ lib, fetchzip }:
# Source Serif Pro got renamed to Source Serif 4 (see # Source Serif Pro got renamed to Source Serif 4 (see
# https://github.com/adobe-fonts/source-serif/issues/77). This is the # https://github.com/adobe-fonts/source-serif/issues/77). This is the
# last version named "Pro". It is useful for backward compatibility # last version named "Pro". It is useful for backward compatibility
# with older documents/templates/etc. # with older documents/templates/etc.
let
stdenvNoCC.mkDerivation rec {
pname = "source-serif-pro";
version = "3.001"; version = "3.001";
in (fetchzip {
name = "source-serif-pro-${version}";
url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-pro-${version}R.zip"; src = fetchzip {
url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-pro-${version}R.zip";
hash = "sha256-chXoaPOACtQ7wz/etElXuIJH/yvUsP03WlxeCfqWF/w=";
};
sha256 = "sha256-rYWk8D41QMuuSP+cQMk8ttT7uX3a7gBk4OqjA7K9udk="; installPhase = ''
runHook preInstall
install -Dm444 OTF/*.otf -t $out/share/fonts/opentype
install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype
install -Dm444 VAR/*.otf -t $out/share/fonts/variable
runHook postInstall
'';
meta = with lib; { meta = with lib; {
homepage = "https://adobe-fonts.github.io/source-serif/"; homepage = "https://adobe-fonts.github.io/source-serif/";
@ -21,11 +31,4 @@ in (fetchzip {
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ ttuegel ]; maintainers = with maintainers; [ ttuegel ];
}; };
}).overrideAttrs (_: { }
postFetch = ''
mkdir -p $out/share/fonts/{opentype,truetype,variable}
unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
'';
})

32
pkgs/data/fonts/source-serif/default.nix
View file

@ -1,14 +1,23 @@
# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, stdenvNoCC, fetchzip }:
{ lib, fetchzip }:
let stdenvNoCC.mkDerivation rec {
pname = "source-serif";
version = "4.004"; version = "4.004";
in (fetchzip {
name = "source-serif-${version}";
url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-${version}.zip"; src = fetchzip {
url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-${version}.zip";
hash = "sha256-tGSMOwYBEZat7MI78wkPr6lgJdsOdOaIZb+IAOoOlq4=";
};
sha256 = "06814hcp20abca6p0ii61f23g6h1ibqyhq30lsva59wbwx5iha0h"; installPhase = ''
runHook preInstall
install -Dm444 OTF/*.otf -t $out/share/fonts/opentype
install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype
install -Dm444 VAR/*.otf -t $out/share/fonts/variable
runHook postInstall
'';
meta = with lib; { meta = with lib; {
homepage = "https://adobe-fonts.github.io/source-serif/"; homepage = "https://adobe-fonts.github.io/source-serif/";
@ -17,11 +26,4 @@ in (fetchzip {
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ ttuegel ]; maintainers = with maintainers; [ ttuegel ];
}; };
}).overrideAttrs (_: { }
postFetch = ''
mkdir -p $out/share/fonts/{opentype,truetype,variable}
unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
'';
})