diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-02 00:12:18 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-02 00:12:18 +0000 |
commit | 57ea53ecca95c93fdaca56b5f51553130a759a4f (patch) | |
tree | 0fa3d252ed4af5365e3f60f0fc374652418a475d /pkgs/data | |
parent | 503526029c7814c56f0cbb2749357e581a1345b3 (diff) | |
parent | eb18da27b9cb7e2006574cd962f8a22baf2955f1 (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/cozette/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/quivira/default.nix | 29 | ||||
-rw-r--r-- | pkgs/data/misc/common-licenses/default.nix | 4 |
3 files changed, 33 insertions, 4 deletions
diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index f20e4d82222c2..afac3dbd8f830 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "cozette"; - version = "1.22.2"; + version = "1.23.1"; src = fetchzip { url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${builtins.replaceStrings ["."] ["-"] version}.zip"; - hash = "sha256-Y6StCbAsFJrRZtJu1IAsMYuyNhwe3YIlT41EhSXhCUE="; + hash = "sha256-LbC5siSxDZnOEkfxeqOSyoaDuTEMG2xCpZaOZrHLTJo="; }; installPhase = '' diff --git a/pkgs/data/fonts/quivira/default.nix b/pkgs/data/fonts/quivira/default.nix new file mode 100644 index 0000000000000..8affc4f6c729b --- /dev/null +++ b/pkgs/data/fonts/quivira/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchurl }: +let + pname = "quivira"; + version = "4.1"; +in fetchurl { + name = "${pname}-${version}"; + url = "http://www.quivira-font.com/files/Quivira.otf"; + + # Download the source file to a temporary directory so that $out can be a + # directory with the expected structure. + downloadToTemp = true; + # recursiveHash needs to be true because $out is going to be a directory. + recursiveHash = true; + postFetch = '' + install -D $downloadedFile $out/share/fonts/opentype/Quivira.otf + ''; + + sha256 = "Hhl+0Oc5DDohOpBbEARMunMYCpr6nn4X6RgpQeEksNo="; + meta = { + description = "a free Unicode font in the OpenType format which is supported by every usual office program or printer"; + homepage = "http://www.quivira-font.com/"; + license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.nosewings ]; + # From the homepage: "If you try to install Quivira on a Mac, + # you will get an error message about the 'post table + # usability'." + platforms = lib.filter (platform: !lib.hasInfix "darwin" platform) lib.platforms.all; + }; +} diff --git a/pkgs/data/misc/common-licenses/default.nix b/pkgs/data/misc/common-licenses/default.nix index a0c21b5d900b9..d3888fde615c0 100644 --- a/pkgs/data/misc/common-licenses/default.nix +++ b/pkgs/data/misc/common-licenses/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "common-licenses"; - version = "11.1"; + version = "13"; src = fetchurl { url = "http://deb.debian.org/debian/pool/main/b/base-files/base-files_${version}.tar.xz"; - sha256 = "1i3hgd9vs14k819k441iibcgmi2zavnpqbnppyn2cz70kd830nbm"; + hash = "sha256-Q5FTvfKWSBE1ywuAH+RnZdyD+LmRSgJ11qFiM53hL1Y="; }; installPhase = '' |