diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-12-21 18:01:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-21 18:01:15 +0000 |
| commit | a7f62c75af934be4fcde5806c08e176e67b21c41 (patch) | |
| tree | 80febf90e0bf0fe8442498f6fb8e714237610bc4 /pkgs/data | |
| parent | 65c986fbfab1de2c0f9bc79667f77941d82461a1 (diff) | |
| parent | 9e624dea71a5479cb8ca6f014ef2763a6400dff4 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/unfonts-core/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/data/misc/hackage/pin.json | 8 | ||||
| -rw-r--r-- | pkgs/data/themes/flat-remix-gtk/default.nix | 4 |
3 files changed, 34 insertions, 6 deletions
diff --git a/pkgs/data/fonts/unfonts-core/default.nix b/pkgs/data/fonts/unfonts-core/default.nix new file mode 100644 index 000000000000..7f01d5531e15 --- /dev/null +++ b/pkgs/data/fonts/unfonts-core/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchzip }: + +let + pname = "unfonts-core"; + version = "1.0.2-080608"; +in fetchzip { + name = "${pname}-${version}"; + url = "https://kldp.net/unfonts/release/2607-un-fonts-core-${version}.tar.gz"; + hash = "sha256-k9C7d/SbVLWFzRnDWpOIMtY6cAEIcaLcbxQAqjwuWds="; + + postFetch = '' + tar -xzf $downloadedFile --strip-components=1 + install -m444 -Dt $out/share/fonts/truetype *.ttf + ''; + + meta = with lib; { + homepage = "https://kldp.net/unfonts/"; + description = "Korean Hangul typeface collection"; + longDescription = '' + The Un-fonts come from the HLaTeX as type1 fonts in 1998 by Koaunghi Un, he made type1 fonts to use with Korean TeX (HLaTeX) in the late 1990's and released it under the GPL license. + + They were converted to TrueType with the FontForge (PfaEdit) by Won-kyu Park in 2003. + ''; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 9efdd76ce234..b5d5b4f42902 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "5b1efa929ec68b76f8e84df53bf48b6e4a392feb", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/5b1efa929ec68b76f8e84df53bf48b6e4a392feb.tar.gz", - "sha256": "1azja4gm6yy8zs0fjfiscjamfn13w4wp9wwadqhzhv0dmisg9y8v", - "msg": "Update from Hackage at 2021-12-08T21:36:39Z" + "commit": "45e72928a9053df2938492a535a1b4351251d82f", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/45e72928a9053df2938492a535a1b4351251d82f.tar.gz", + "sha256": "1a87yf9bly5ayldgrkakyipxfkk7h9ifqb4dpd8l1f9zb1csdg1x", + "msg": "Update from Hackage at 2021-12-09T20:50:23Z" } diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index 722c3cbc41e5..813fba61dde7 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20211130"; + version = "20211201"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - sha256 = "0n6djx346bzk558yd9nk0r6hqszcbkj0h1pv2n8n15ps2j9lyvw8"; + sha256 = "sha256-JxvCdmExDh9t5UZKqF936SiT/PYxAJpGgY1Hgh8ykzw="; }; dontBuild = true; |