diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-19 12:01:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-19 12:01:13 +0000 |
commit | 11b87cbe5984013635d05c44e9908d12339470d6 (patch) | |
tree | ddd338d8bb7df566c58ec9b8e7f8cffb28a672c8 /pkgs/data | |
parent | da03c8fb0a127580ccb95d4430f8f1f67a89cf38 (diff) | |
parent | 193037db72bfe3ce4a24a9d7fe99a2c4160f40be (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/fira-mono/default.nix | 33 | ||||
-rw-r--r-- | pkgs/data/fonts/fira/default.nix | 37 | ||||
-rw-r--r-- | pkgs/data/fonts/junicode/tests.nix | 7 | ||||
-rw-r--r-- | pkgs/data/icons/catppuccin-cursors/default.nix | 3 | ||||
-rw-r--r-- | pkgs/data/icons/comixcursors/default.nix | 3 |
5 files changed, 5 insertions, 78 deletions
diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix deleted file mode 100644 index 5d059dbf88e08..0000000000000 --- a/pkgs/data/fonts/fira-mono/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenvNoCC, fetchzip }: - -stdenvNoCC.mkDerivation rec { - pname = "fira-mono"; - version = "4.202"; - - src = fetchzip { - url = "https://github.com/mozilla/Fira/archive/${version}.zip"; - hash = "sha256-HLReqgL0PXF5vOpwLN0GiRwnzkjGkEVEyOEV2Z4R0oQ="; - }; - - installPhase = '' - runHook preInstall - - install -Dm644 otf/FiraMono*.otf -t $out/share/fonts/opentype - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://mozilla.github.io/Fira/"; - description = "Monospace font for Firefox OS"; - longDescription = '' - Fira Mono is a monospace font designed by Erik Spiekermann, - Ralph du Carrois, Anja Meiners and Botio Nikoltchev of Carrois - Type Design for Mozilla Firefox OS. Available in Regular, - Medium, and Bold. - ''; - license = licenses.ofl; - maintainers = [ maintainers.rycee ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix deleted file mode 100644 index 4b79d14dd94e7..0000000000000 --- a/pkgs/data/fonts/fira/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: - -stdenvNoCC.mkDerivation rec { - pname = "fira"; - version = "4.202"; - - src = fetchFromGitHub { - owner = "mozilla"; - repo = "Fira"; - rev = version; - hash = "sha256-HLReqgL0PXF5vOpwLN0GiRwnzkjGkEVEyOEV2Z4R0oQ="; - }; - - installPhase = '' - runHook preInstall - - install --mode=-x -Dt $out/share/fonts/opentype otf/*.otf - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://mozilla.github.io/Fira/"; - description = "Sans-serif font for Firefox OS"; - longDescription = '' - Fira Sans is a sans-serif font designed by Erik Spiekermann, - Ralph du Carrois, Anja Meiners and Botio Nikoltchev of Carrois - Type Design for Mozilla Firefox OS. It is closely related to - Spiekermann's FF Meta typeface. Available in Two, Four, Eight, - Hair, Thin, Ultra Light, Extra Light, Light, Book, Regular, - Medium, Semi Bold, Bold, Extra Bold, Heavy weights with - corresponding italic versions. - ''; - license = licenses.ofl; - platforms = platforms.all; - }; -} diff --git a/pkgs/data/fonts/junicode/tests.nix b/pkgs/data/fonts/junicode/tests.nix index fda7de31670e1..831e60796d12f 100644 --- a/pkgs/data/fonts/junicode/tests.nix +++ b/pkgs/data/fonts/junicode/tests.nix @@ -15,14 +15,13 @@ let ''); in builtins.listToAttrs ( - map - texTest - (lib.attrsets.cartesianProductOfSets { + lib.mapCartesianProduct texTest + { tex = [ "xelatex" "lualatex" ]; fonttype = [ "ttf" "otf" ]; package = [ "junicode" ]; file = [ ./test.tex ]; - }) + } ++ [ (texTest { diff --git a/pkgs/data/icons/catppuccin-cursors/default.nix b/pkgs/data/icons/catppuccin-cursors/default.nix index 20e4718515e61..eeb9dd3227f07 100644 --- a/pkgs/data/icons/catppuccin-cursors/default.nix +++ b/pkgs/data/icons/catppuccin-cursors/default.nix @@ -9,9 +9,8 @@ let palette = [ "Frappe" "Latte" "Macchiato" "Mocha" ]; color = [ "Blue" "Dark" "Flamingo" "Green" "Lavender" "Light" "Maroon" "Mauve" "Peach" "Pink" "Red" "Rosewater" "Sapphire" "Sky" "Teal" "Yellow" ]; }; - product = lib.attrsets.cartesianProductOfSets dimensions; variantName = { palette, color }: (lib.strings.toLower palette) + color; - variants = map variantName product; + variants = lib.mapCartesianProduct variantName dimensions; in stdenvNoCC.mkDerivation rec { pname = "catppuccin-cursors"; diff --git a/pkgs/data/icons/comixcursors/default.nix b/pkgs/data/icons/comixcursors/default.nix index 1c4fdc195180b..735ff686b49cf 100644 --- a/pkgs/data/icons/comixcursors/default.nix +++ b/pkgs/data/icons/comixcursors/default.nix @@ -7,14 +7,13 @@ let thickness = [ "" "Slim_" ]; # Thick or slim edges. handedness = [ "" "LH_" ]; # Right- or left-handed. }; - product = lib.cartesianProductOfSets dimensions; variantName = { color, opacity, thickness, handedness }: "${handedness}${opacity}${thickness}${color}"; variants = # (The order of this list is already good looking enough to show in the # meta.longDescription.) - map variantName product; + lib.mapCartesianProduct variantName dimensions; in stdenvNoCC.mkDerivation rec { pname = "comixcursors"; |