diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-04-16 01:32:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-16 01:32:09 +0200 |
| commit | cd7a519012bc0f340097bec8ef68963da61e8256 (patch) | |
| tree | eb7461235cb38d66acc0fcb98e735e16ecec8e47 /pkgs/data | |
| parent | dfd4f1430301305a0c543f034a95aaae6e3ce09d (diff) | |
| parent | 22fb4458c0087ae5b50228e8a5f9fff408fcc7c3 (diff) | |
| download | nixpkgs-cd7a519012bc0f340097bec8ef68963da61e8256.tar nixpkgs-cd7a519012bc0f340097bec8ef68963da61e8256.tar.gz nixpkgs-cd7a519012bc0f340097bec8ef68963da61e8256.tar.bz2 nixpkgs-cd7a519012bc0f340097bec8ef68963da61e8256.tar.lz nixpkgs-cd7a519012bc0f340097bec8ef68963da61e8256.tar.xz nixpkgs-cd7a519012bc0f340097bec8ef68963da61e8256.tar.zst nixpkgs-cd7a519012bc0f340097bec8ef68963da61e8256.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/courier-prime/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/data/fonts/scheherazade/default.nix | 4 |
2 files changed, 26 insertions, 2 deletions
diff --git a/pkgs/data/fonts/courier-prime/default.nix b/pkgs/data/fonts/courier-prime/default.nix new file mode 100644 index 00000000000..81788b322cf --- /dev/null +++ b/pkgs/data/fonts/courier-prime/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchzip }: + +let + version = "unstable-2019-12-05"; + repo = "CourierPrime"; + rev = "7f6d46a766acd9391d899090de467c53fd9c9cb0"; +in fetchzip rec { + name = "courier-prime-${version}"; + url = "https://github.com/quoteunquoteapps/${repo}/archive/${rev}/${name}.zip"; + sha256 = "1xh4pkksm6zrafhb69q4lq093q6pl245zi9qhqw3x6c1ab718704"; + + postFetch = '' + unzip $downloadedFile + install -m444 -Dt $out/share/fonts/truetype ${repo}-${rev}/fonts/ttf/*.ttf + ''; + + meta = with lib; { + description = "Monospaced font designed specifically for screenplays"; + homepage = "https://github.com/quoteunquoteapps/CourierPrime"; + license = licenses.ofl; + maintainers = [ maintainers.austinbutler ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix index 8639d29066c..848daa899ed 100644 --- a/pkgs/data/fonts/scheherazade/default.nix +++ b/pkgs/data/fonts/scheherazade/default.nix @@ -1,10 +1,10 @@ -{ lib, fetchzip, version ? "3.000" }: +{ lib, fetchzip, version ? "3.100" }: let new = lib.versionAtLeast version "3.000"; sha256 = { "2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; - "3.000" = "12sd2mjqb80ijc73y7p0iw6j3wy9i60a3aar3ywrxz4khpya48jw"; + "3.100" = "0svnc7l3z3vvm27zx6msyx56n2fpv6ywb5lm75bym48slkccypn7"; }."${version}"; in fetchzip rec { |