diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-03-26 17:17:48 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-03-26 17:36:07 +0000 |
commit | 70e58881128ed8170821840138ab08fc5cdd3c11 (patch) | |
tree | 1bf0d3d977878df5b58493ea02b2e6c79df3ba22 /pkgs/data | |
parent | a9847c36e6aa003998c1ef5518e5710658ca5770 (diff) | |
parent | 90dcc3360327e250536eeeca7fe9d887c9f7a817 (diff) | |
download | nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.gz nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.bz2 nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.lz nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.xz nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.zst nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.zip |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/data')
47 files changed, 654 insertions, 308 deletions
diff --git a/pkgs/data/fonts/amiri/default.nix b/pkgs/data/fonts/amiri/default.nix index 36d8ed3c674..9ecde1939e8 100644 --- a/pkgs/data/fonts/amiri/default.nix +++ b/pkgs/data/fonts/amiri/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "0.111"; + version = "0.112"; in fetchzip rec { name = "Amiri-${version}"; url = "https://github.com/alif-type/amiri/releases/download/${version}/${name}.zip"; - sha256 = "1w3a5na4mazspwy8j2hvpjha10sgd287kamm51p49jcr90cvwbdr"; + sha256 = "13j8kglgca296czxjz1xvrbz6yx05s2xassiliyszndbkrhn6bkl"; postFetch = '' unzip $downloadedFile diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index 0d46fc92d5f..da2d67c084f 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -1,16 +1,17 @@ { lib, fetchzip }: let - version = "12.1.7"; + version = "13.0.3"; in fetchzip { name = "babelstone-han-${version}"; - url = https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip; + # upstream download links are unversioned, so hash changes + url = https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip; postFetch = '' mkdir -p $out/share/fonts/truetype unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype ''; - sha256 = "07liv0lmk28ybxccf91gp2wmc17pk3fcshixpj0jx069b64zwf1v"; + sha256 = "018isk3hbzsihzrxavgjbn485ngzvlm96npqx9y7zpkxsssslc4w"; meta = with lib; { description = "Unicode CJK font with over 36000 Han characters"; @@ -18,7 +19,6 @@ in fetchzip { license = licenses.free; platforms = platforms.all; - hydraPlatforms = []; - maintainers = [ maintainers.volth ]; + maintainers = with maintainers; [ volth emily ]; }; } diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix new file mode 100644 index 00000000000..a5d9f905562 --- /dev/null +++ b/pkgs/data/fonts/cozette/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, mkfontscale }: + +let + version = "1.5.1"; + releaseUrl = + "https://github.com/slavfox/Cozette/releases/download/v.${version}"; +in stdenv.mkDerivation rec { + pname = "Cozette"; + inherit version; + + srcs = map fetchurl [ + { + url = "${releaseUrl}/cozette.otb"; + sha256 = "05k45n7jar11gnng2awpmc7zk9jdlzd6wz87xx49cp75jm4z9xm8"; + } + { + url = "${releaseUrl}/CozetteVector.otf"; + sha256 = "1sqhnjpizn1wi26lc7z2zml7yr7zkcpa72mh1drvd74rlcs1ip30"; + } + { + url = "${releaseUrl}/CozetteVector.ttf"; + sha256 = "1q4ml8shv9lmyc6bwhffwvbvl92s73j7xkb0rkqvci4f0zbz7mcy"; + } + ]; + + nativeBuildInputs = [ mkfontscale ]; + + sourceRoot = "./"; + + unpackCmd = '' + otName=$(stripHash "$curSrc") + cp $curSrc ./$otName + ''; + + installPhase = '' + + install -D -m 644 *.otf -t "$out/share/fonts/opentype" + install -D -m 644 *.ttf -t "$out/share/fonts/truetype" + install -D -m 644 *.otb -t "$out/share/fonts/misc" + + mkfontdir "$out/share/fonts/misc" + mkfontscale "$out/share/fonts/truetype" + mkfontscale "$out/share/fonts/opentype" + ''; + + outputs = [ "out" ]; + + meta = with stdenv.lib; { + description = "A bitmap programming font optimized for coziness."; + homepage = "https://github.com/slavfox/cozette"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ brettlyons ]; + }; +} diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix index 71c92a72e59..afe73aa1caf 100644 --- a/pkgs/data/fonts/gdouros/default.nix +++ b/pkgs/data/fonts/gdouros/default.nix @@ -26,10 +26,11 @@ let meta = { inherit description; - # In lieu of a license: - # Fonts in this site are offered free for any use; - # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. - license = lib.licenses.free; + # see http://users.teilar.gr/~g1951d/License.pdf + # quite draconian: non-commercial, no modifications, + # no redistribution, "a single instantiation and no + # network installation" + license = lib.licenses.unfree; homepage = http://users.teilar.gr/~g1951d/; }; }; diff --git a/pkgs/data/fonts/inconsolata-nerdfont/default.nix b/pkgs/data/fonts/inconsolata-nerdfont/default.nix new file mode 100644 index 00000000000..b4356e73d5c --- /dev/null +++ b/pkgs/data/fonts/inconsolata-nerdfont/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchzip }: + +let + version = "2.0.0"; +in fetchzip { + name = "inconsolata-nerdfont-${version}"; + + url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/Inconsolata.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/inconsolata-nerdfont + unzip -j $downloadedFile -d $out/share/fonts/inconsolata-nerdfont + ''; + + sha256 = "06i1akjblqd038cn5lvz67lwp6afpv31vqcfdihp66qisgbgm4w9"; + + meta = with lib; { + description = '' + Nerd Fonts is a project that attempts to patch as many developer targeted + and/or used fonts as possible. The patch is to specifically add a high + number of additional glyphs from popular 'iconic fonts' such as Font + Awesome, Devicons, Octicons, and others. + ''; + homepage = https://github.com/ryanoasis/nerd-fonts; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index e6e3aeba9de..4ff0ed5fe49 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - npm run build -- ttf::$pname >/dev/null + npm run build --no-update-notifier -- ttf::$pname >/dev/null runHook postBuild ''; diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index 258114715f3..4297d15da94 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,18 +1,19 @@ { lib, fetchzip }: let - version = "1.0.3"; + version = "1.0.5"; in fetchzip rec { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "16am5fxvda24jfl8lb9jf8mkcqfc97scj8hvwgd3m771db0dpflf"; + sha256 = "1iqqix7rr22ij0cn7vg812qs4gbjpphndgbzm57abqk658lra4kl"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.eot -d $out/share/fonts/eot unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix index ecada2eda7b..3c1403da263 100644 --- a/pkgs/data/fonts/jost/default.nix +++ b/pkgs/data/fonts/jost/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchzip}: let - version = "3.3"; + version = "3.5"; in fetchzip { name = "jost-${version}"; url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip"; @@ -11,7 +11,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256="00nrhs3aif2hc4yhjhbn9ywmydl2w0g0hv5m5is8gv7wx8yi2j9z"; + sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq"; meta = with stdenv.lib; { homepage = https://github.com/indestructible-type/Jost; diff --git a/pkgs/data/fonts/lm-math/default.nix b/pkgs/data/fonts/lmmath/default.nix index 8df851cb9df..c971a699b2a 100644 --- a/pkgs/data/fonts/lm-math/default.nix +++ b/pkgs/data/fonts/lmmath/default.nix @@ -3,14 +3,14 @@ let version = "1.959"; in fetchzip rec { - name = "latinmodern-math-${version}"; + name = "lmmath-${version}"; url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"; postFetch = '' mkdir -p $out/share/fonts/opentype/ - mkdir -p $out/share/doc/${name}/ - unzip -f $downloadedFile otf/*.otf -d $out/share/fonts/opentype/ - unzip -f $downloadedFile doc/*.txt -d $out/share/doc/${name}/ + mkdir -p $out/share/doc/latinmodern-math-${version}/ + unzip -j $downloadedFile "*/otf/*.otf" -d $out/share/fonts/opentype/ + unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/latinmodern-math-${version}/ ''; sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn"; diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/pkgs/data/fonts/lmodern/lmmath.nix deleted file mode 100644 index 679f5200213..00000000000 --- a/pkgs/data/fonts/lmodern/lmmath.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchzip }: - -fetchzip { - name = "lmmath-0.903"; - - url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf"; - - postFetch = '' - unzip $downloadedFile - - mkdir -p $out/texmf-dist/fonts/opentype - mkdir -p $out/share/fonts/opentype - - cp *.{OTF,otf} $out/texmf-dist/fonts/opentype/lmmath-regular.otf - cp *.{OTF,otf} $out/share/fonts/opentype/lmmath-regular.otf - - ln -s -r $out/texmf* $out/share/ - ''; - - sha256 = "19821d4vbd6z20jzsw24zh0hhwayglhrfw8larg2w6alhdqi7rln"; - - meta = { - description = "Latin Modern font"; - }; -} - diff --git a/pkgs/data/fonts/merriweather-sans/default.nix b/pkgs/data/fonts/merriweather-sans/default.nix new file mode 100644 index 00000000000..397f42236b5 --- /dev/null +++ b/pkgs/data/fonts/merriweather-sans/default.nix @@ -0,0 +1,34 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "merriweather-sans"; + version = "1.008"; + + src = fetchFromGitHub { + owner = "SorkinType"; + repo = "Merriweather-Sans"; + rev = "8a1b078e3aeec6aecc856c3422898816af9b9dc7"; + sha256 = "1f6a64bv4b4b1v3g2pgrzxcys8rk12wq6wfxamgzligcq5fxaffd"; + }; + + # TODO: it would be nice to build this from scratch, but lots of + # Python dependencies to package (fontmake, gftools) + + installPhase = '' + install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf + install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff + install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2 + # TODO: install variable version? + ''; + + meta = with lib; { + homepage = "https://github.com/SorkinType/Merriweather-Sans"; + description = "Merriweather Sans is a low-contrast semi-condensed sans-serif text typeface family designed to be pleasant to read at very small sizes"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/data/fonts/merriweather/default.nix b/pkgs/data/fonts/merriweather/default.nix new file mode 100644 index 00000000000..1768c44bc03 --- /dev/null +++ b/pkgs/data/fonts/merriweather/default.nix @@ -0,0 +1,35 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "merriweather"; + version = "2.005"; + + src = fetchFromGitHub { + owner = "SorkinType"; + repo = "Merriweather"; + rev = "4fd88c9299009d1c1d201e7da3ff75cf1de5153a"; + sha256 = "1ndycja2jzhcfbqbm0p6ka2zl1i1pdbkf0crw2lp3pi4k89wlm29"; + }; + + # TODO: it would be nice to build this from scratch, but lots of + # Python dependencies to package (fontmake, gftools) + + installPhase = '' + install -m444 -Dt $out/share/fonts/opentype/${pname} fonts/otf/*.otf + install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf + install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff + install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2 + # TODO: install variable version? + ''; + + meta = with lib; { + homepage = "https://github.com/SorkinType/Merriweather"; + description = "Merriweather was designed to be a text face that is pleasant to read on screens"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ emily ]; + }; +} diff --git a/pkgs/data/fonts/navilu/default.nix b/pkgs/data/fonts/navilu/default.nix new file mode 100644 index 00000000000..0433ad22de5 --- /dev/null +++ b/pkgs/data/fonts/navilu/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, fontforge }: + +stdenv.mkDerivation rec { + pname = "navilu-font"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "aravindavk"; + repo = "Navilu"; + rev = "v${version}"; + sha256 = "1vm6n04siaa0zf6jzp5s2gzgr2qxs3vdnmcmg4dcy07py2kd2fla"; + }; + + nativeBuildInputs = [ fontforge ]; + + dontConfigure = true; + + preBuild = "patchShebangs generate.pe"; + + installPhase = "install -Dm444 -t $out/share/fonts/truetype/ Navilu.ttf"; + + meta = with stdenv.lib; src.meta // { + description = "A Kannada handwriting font"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 04e8e581b63..9681bb50efa 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -1,28 +1,44 @@ -{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, python3Packages, pkgconfig, pngquant, which, imagemagick }: +{ stdenv +, stdenvNoCC +, lib +, fetchFromGitHub +, fetchzip +, optipng +, cairo +, python3Packages +, pkgconfig +, pngquant +, which +, imagemagick +}: let - mkNoto = { name, weights, sha256, }: - let - version = "2018-11-30"; - ref = "85e78f831469323c85847e23f95026c894159135"; - in - fetchzip { - name = "${name}-${version}"; - inherit sha256; - url = "https://github.com/googlei18n/noto-fonts/archive/${ref}.zip"; - postFetch = '' - unzip $downloadedFile - mkdir -p $out/share/fonts/noto - # Also copy unhinted & alpha fonts for better glyph coverage, - # if they don't have a hinted version - # (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J) - for ttf in noto-fonts-*/{hinted,unhinted,alpha}/*-${weights}.ttf - do - cp -n "$ttf" -t "$out/share/fonts/noto" - done + mkNoto = { pname, weights }: + stdenvNoCC.mkDerivation { + inherit pname; + version = "2020-01-23"; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "noto-fonts"; + rev = "f4726a2ec36169abd02a6d8abe67c8ff0236f6d8"; + sha256 = "0zc1r7zph62qmvzxqfflsprazjf6x1qnwc2ma27kyzh6v36gaykw"; + }; + + installPhase = '' + # We copy in reverse preference order -- unhinted first, then + # hinted -- to get the "best" version of each font while + # maintaining maximum coverage. + # + # TODO: install OpenType, variable versions? + local out_ttf=$out/share/fonts/truetype/noto + install -m444 -Dt $out_ttf phaseIII_only/unhinted/ttf/*/*-${weights}.ttf + install -m444 -Dt $out_ttf phaseIII_only/hinted/ttf/*/*-${weights}.ttf + install -m444 -Dt $out_ttf unhinted/*/*-${weights}.ttf + install -m444 -Dt $out_ttf hinted/*/*-${weights}.ttf ''; - meta = with stdenv.lib; { - inherit version; + + meta = with lib; { description = "Beautiful and free fonts for many languages"; homepage = https://www.google.com/get/noto/; longDescription = @@ -39,37 +55,39 @@ let This package also includes the Arimo, Cousine, and Tinos fonts. ''; - license = licenses.asl20; + license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ mathnerd314 ]; + maintainers = with maintainers; [ mathnerd314 emily ]; }; }; in { noto-fonts = mkNoto { - name = "noto-fonts"; + pname = "noto-fonts"; weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}"; - sha256 = "0kvq5ldip2ra2njlxg9fxj46nfqzq5l3n359d3kwfbsld7hixm2d"; }; + noto-fonts-extra = mkNoto { - name = "noto-fonts-extra"; + pname = "noto-fonts-extra"; weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*"; - sha256 = "0l94aiy1b3qirg2mmbagbr0014vqk32za79pzck1acy2hgy716kq"; }; - noto-fonts-cjk = let version = "1.004"; in fetchzip { - name = "noto-fonts-cjk-${version}"; - - # Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file - url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttc -d $out/share/fonts/noto + + noto-fonts-cjk = let zip = fetchzip { + url = let rev = "be6c059ac1587e556e2412b27f5155c8eb3ddbe6"; in + "https://raw.githubusercontent.com/googlefonts/noto-cjk/${rev}/NotoSansCJK.ttc.zip"; + # __MACOSX... + stripRoot = false; + sha256 = "0ik4z2b15i0pghskgfm3adzb0h35fr4gyzvz3bq49hhkhn9h85vi"; + }; in stdenvNoCC.mkDerivation { + pname = "noto-fonts-cjk"; + version = "2.001"; + + buildCommand = '' + install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${zip}/*.ttc ''; - sha256 = "0ghw2azqq3nkcxsbvf53qjmrhcfsnry79rq7jsr0wwi2pn7d3dsq"; - meta = with stdenv.lib; { - inherit version; + meta = with lib; { description = "Beautiful and free fonts for CJK languages"; homepage = https://www.google.com/get/noto/help/cjk/; longDescription = @@ -86,9 +104,10 @@ in ''; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ mathnerd314 ]; + maintainers = with maintainers; [ mathnerd314 emily ]; }; }; + noto-fonts-emoji = let version = "unstable-2019-10-22"; in stdenv.mkDerivation { @@ -118,7 +137,7 @@ in cp NotoColorEmoji.ttf fonts/NotoEmoji-Regular.ttf $out/share/fonts/noto ''; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Color and Black-and-White emoji fonts"; homepage = https://github.com/googlei18n/noto-emoji; diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index c8044905a08..f051ef76c9c 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -13,10 +13,10 @@ fetchFromGitHub { find . -name '*.ttf' -exec install -Dt $out/share/fonts/truetype {} \; find . -name '*.bdf' -exec install -Dt $out/share/fonts/bdf {} \; find . -name '*.pcf.gz' -exec install -Dt $out/share/fonts/pcf {} \; - find . -name '*.psf.gz' -exec install -Dt $out/share/fonts/psf {} \; + find . -name '*.psf.gz' -exec install -Dt $out/share/consolefonts {} \; ''; - sha256 = "0irifak86gn7hawzgxcy53s22y215mxc2kjncv37h7q44jsqdqww"; + sha256 = "0r8p4z3db17f5p8jr7sv80nglmjxhg83ncfvwg1dszldswr0dhvr"; meta = with lib; { homepage = https://github.com/powerline/fonts; diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 3b1e8931b89..8aab8c0cd72 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,24 +1,23 @@ -{ stdenv, fetchzip }: +{ lib, fetchzip }: -stdenv.mkDerivation rec { - pname = "recursive"; - version = "1.030"; +let + version = "1.043"; +in +fetchzip { + name = "recursive-${version}"; - src = fetchzip { - url = "https://github.com/arrowtype/recursive/releases/download/${version}/recursive-beta_1_030--statics.zip"; - sha256 = "1clds4ljiqdf0zc3b7nlna1w7kc23pc9gxdd5vwbgmz9xfvkam0f"; - stripRoot = false; - }; + url = "https://github.com/arrowtype/recursive/releases/download/${version}/Recursive-Beta_${version}.zip"; - installPhase = '' - mkdir -p $out/share/fonts/{opentype,truetype,woff2} - find -name "*.otf" -exec cp "{}" $out/share/fonts/opentype \; - find -name "*.ttf" -exec cp "{}" $out/share/fonts/truetype \; - find -name "*.woff2" -exec cp "{}" $out/share/fonts/woff2 \; + postFetch = '' + mkdir -p $out/share/fonts/ + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - meta = with stdenv.lib; { - homepage = https://github.com/arrowtype/recursive; + sha256 = "0y7wg3ssr4j0r8dyxd0i0ji8bjvipzsqf0l6wznl5sfxk41mvjvd"; + + meta = with lib; { + homepage = "https://recursive.design/"; description = "A variable font family for code & UI"; license = licenses.ofl; maintainers = [ maintainers.eadwu ]; diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index bf19fb8238f..ccfc72dc180 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchgit, fontforge, python2, python3 }: +{ stdenv, fetchgit, fontforge, python3 }: stdenv.mkDerivation rec { pname = "rictydiminished-with-firacode"; - version = "1.2.0"; + version = "1.2.2"; src = fetchgit { url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git"; rev = version; - sha256 = "1vlzx5dsx6j9d9q84pdnwcxjy7mr1sv8sacx0zgfxhxnj66n1gnn"; + sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4="; fetchSubmodules = true; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace apply-feature.py --replace \ 'ricty = ttLib.TTFont(options.in_font)' \ 'ricty = ttLib.TTFont(options.in_font, recalcTimestamp=False)' - substituteInPlace build-py3.py --replace \ + substituteInPlace build.py --replace \ 'datetime.date.today()' \ 'datetime.date.fromtimestamp(float(os.environ["SOURCE_DATE_EPOCH"]))' ''; @@ -30,21 +30,16 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - # Python 3 not supported by parts of the build system - # https://github.com/hakatashi/RictyDiminished-with-FiraCode/pull/3 - (fontforge.override { - python = python2; - }) (python3.withPackages (ps: [ ps.jinja2 - ps.py3to2 ps.fonttools + ps.fontforge ])) ]; meta = with stdenv.lib; { homepage = "https://github.com/hakatashi/RictyDiminished-with-FiraCode"; - description = "The best Japanese programming font meets the awesone ligatures of Firacode"; + description = "The best Japanese programming font meets the awesome ligatures of Firacode"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ mt-caret ]; diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix deleted file mode 100644 index 87e24c0e23c..00000000000 --- a/pkgs/data/fonts/source-han-sans/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, fetchzip }: - -let - makePackage = {variant, language, region, sha256}: let - version = "1.004R"; - revision = "5f5311e71cb628321cc0cffb51fb38d862b726aa"; - in fetchzip { - name = "source-han-sans-${variant}-${version}"; - - url = "https://github.com/adobe-fonts/source-han-sans/raw/${revision}/SubsetOTF/SourceHanSans${region}.zip"; - - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; - - inherit sha256; - - meta = { - description = "${language} subset of an open source Pan-CJK sans-serif typeface"; - homepage = https://github.com/adobe-fonts/source-han-sans; - license = lib.licenses.ofl; - maintainers = with lib.maintainers; [ taku0 ]; - }; - }; -in -{ - japanese = makePackage { - variant = "japanese"; - language = "Japanese"; - region = "JP"; - sha256 = "194zapswaqly8ycx3k66vznlapvpyhdigp3sabsl4hn87j9xsc5v"; - }; - korean = makePackage { - variant = "korean"; - language = "Korean"; - region = "KR"; - sha256 = "0xij6mciiqgpwv1agqily2jji377x084k7fj4rpv6z0r5vvhqr08"; - }; - simplified-chinese = makePackage { - variant = "simplified-chinese"; - language = "Simplified Chinese"; - region = "CN"; - sha256 = "038av18d45qr85bgx95j2fm8j64d72nsm9xzg0lpwr9xwni2sbx0"; - }; - traditional-chinese = makePackage { - variant = "traditional-chinese"; - language = "Traditional Chinese"; - region = "TW"; - sha256 = "1mzcv5hksyxplyv5q3w5nr1xz73hdnvip5gicz35j0by4gc739lr"; - }; -} diff --git a/pkgs/data/fonts/source-han-serif/default.nix b/pkgs/data/fonts/source-han-serif/default.nix deleted file mode 100644 index bb5a67c8306..00000000000 --- a/pkgs/data/fonts/source-han-serif/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, fetchzip }: - -let - makePackage = {variant, language, region, sha256}: let - version = "1.000R"; - revision = "f6cf97d92b22e7bd77e355a61fe549ae44b6de76"; - in fetchzip { - name = "source-han-serif-${variant}-${version}"; - - url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip"; - - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; - - inherit sha256; - - meta = { - description = "${language} subset of an open source Pan-CJK serif typeface"; - homepage = https://github.com/adobe-fonts/source-han-sans; - license = lib.licenses.ofl; - maintainers = with lib.maintainers; [ taku0 ]; - }; - }; -in -{ - japanese = makePackage { - variant = "japanese"; - language = "Japanese"; - region = "JP"; - sha256 = "0cklcy6y3r7pg8z43fzd8zl5g46bkqa1iy0li49rm0fgdaw7kin2"; - }; - korean = makePackage { - variant = "korean"; - language = "Korean"; - region = "KR"; - sha256 = "0lxrr978djsych8fmbl57n1c9c7ihl61w0b9q4plw27vd6p41fza"; - }; - simplified-chinese = makePackage { - variant = "simplified-chinese"; - language = "Simplified Chinese"; - region = "CN"; - sha256 = "0k3x4kncjnbipf4i3lkk6b33zpf1ckp5648z51v48q47l3zqpm6p"; - }; - traditional-chinese = makePackage { - variant = "traditional-chinese"; - language = "Traditional Chinese"; - region = "TW"; - sha256 = "00bi66nlkrargmmf4av24qfd716py7a9smcvr4xnll7fffldxv06"; - }; -} diff --git a/pkgs/data/fonts/source-han/default.nix b/pkgs/data/fonts/source-han/default.nix new file mode 100644 index 00000000000..7b6bef0198d --- /dev/null +++ b/pkgs/data/fonts/source-han/default.nix @@ -0,0 +1,54 @@ +{ stdenvNoCC +, lib +, fetchzip +, fetchurl +}: + +let + makePackage = { family, description, rev, sha256 }: let + Family = + lib.toUpper (lib.substring 0 1 family) + + lib.substring 1 (lib.stringLength family) family; + + ttc = fetchurl { + url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc"; + inherit sha256; + }; + in stdenvNoCC.mkDerivation { + pname = "source-han-${family}"; + version = lib.removeSuffix "R" rev; + + buildCommand = '' + install -m444 -Dt $out/share/fonts/opentype/source-han-${family} ${ttc} + ''; + + meta = { + description = "An open source Pan-CJK ${description} typeface"; + homepage = "https://github.com/adobe-fonts/source-han-${family}"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ taku0 emily ]; + }; + }; +in +{ + sans = makePackage { + family = "sans"; + description = "sans-serif"; + rev = "2.001R"; + sha256 = "101p8q0sagf1sd1yzwdrmmxvkqq7j0b8hi0ywsfck9w56r4zx54y"; + }; + + serif = makePackage { + family = "serif"; + description = "serif"; + rev = "1.001R"; + sha256 = "1d968h30qvvwy3s77m9y3f1glq8zlr6bnfw00yinqa18l97n7k45"; + }; + + mono = makePackage { + family = "mono"; + description = "monospaced"; + rev = "1.002"; + sha256 = "1haqffkcgz0cc24y8rc9bg36v8x9hdl8fdl3xc8qz14hvr42868c"; + }; +} diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 3906353d82b..8becdf83f5d 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,19 +1,21 @@ { lib, fetchzip }: let - version = "0.41"; + version = "0.42"; in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "055sz9jg3fg7ypk9nia4dl9haaaq3w8zx5c2cdi3iq9kj8k5gg53"; + sha256 = "1rqpwihf2sakrhkaw041r3xc9fhafaqn22n79haqkmwv4vmnspch"; postFetch = '' - mkdir -p $out/share/fonts/truetype/ + mkdir -p $out/share/fonts/ unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ + unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff/ + unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2/ ''; meta = with lib; { description = "Font for programmers and command line users"; - homepage = https://www.kutilek.de/sudo-font/; + homepage = "https://www.kutilek.de/sudo-font/"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/terminus-nerdfont/default.nix b/pkgs/data/fonts/terminus-nerdfont/default.nix new file mode 100644 index 00000000000..3c1730146b3 --- /dev/null +++ b/pkgs/data/fonts/terminus-nerdfont/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchzip }: + +let + version = "2.0.0"; +in fetchzip { + name = "terminus-nerdfont-${version}"; + + url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/Terminus.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/terminus-nerdfont + unzip -j $downloadedFile -d $out/share/fonts/terminus-nerdfont + ''; + + sha256 = "036i1qwwrb0r8hvcjf3h34w0g7mbsmngvrjic98jgikbz3i2f46c"; + + meta = with lib; { + description = '' + Nerd Fonts is a project that attempts to patch as many developer targeted + and/or used fonts as possible. The patch is to specifically add a high + number of additional glyphs from popular 'iconic fonts' such as Font + Awesome, Devicons, Octicons, and others. + ''; + homepage = https://github.com/ryanoasis/nerd-fonts; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix index f3986753809..a41013fd490 100755 --- a/pkgs/data/fonts/vazir-fonts/default.nix +++ b/pkgs/data/fonts/vazir-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "vazir-fonts"; - version = "19.2.0"; + version = "22.1.0"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -12,12 +12,12 @@ in fetchFromGitHub { postFetch = '' tar xf $downloadedFile --strip=1 - find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/vazir-fonts {} \; + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; ''; - sha256 = "008h095rjrcjhz9h02v6cf3gv64khj21lii4zffgpdlmvfs29f8l"; + sha256 = "1nh3pyyw3082aizdwgyihh4z122z7kzp45ry7lzdhq9lshkpzglc"; meta = with lib; { - homepage = https://github.com/rastikerdar/vazir-font; + homepage = "https://github.com/rastikerdar/vazir-font"; description = "A Persian (Farsi) Font - قلم (فونت) فارسی وزیر"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/pkgs/data/icons/capitaine-cursors/default.nix index 46d6c1a731e..09491b904ef 100644 --- a/pkgs/data/icons/capitaine-cursors/default.nix +++ b/pkgs/data/icons/capitaine-cursors/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub -, inkscape, xcursorgen }: +, inkscape, xcursorgen, bc }: stdenv.mkDerivation rec { pname = "capitaine-cursors"; - version = "3"; + version = "4"; src = fetchFromGitHub { owner = "keeferrourke"; repo = pname; rev = "r${version}"; - sha256 = "0pnfbmrn9nv8pryv6cbjcq5hl9366hzvz1kd8vsdkgb2nlfv5gdv"; + sha256 = "0652ydy73x29z7wc6ccyqihmfg4bk0ksl7yryycln6c7i0iqfmc9"; }; postPatch = '' @@ -19,24 +19,27 @@ stdenv.mkDerivation rec { buildInputs =[ inkscape xcursorgen + bc ]; buildPhase = '' + for variant in dark light ; do # https://github.com/NixOS/nixpkgs/blob/master/pkgs/data/fonts/emojione/default.nix#L16 - HOME="$NIX_BUILD_ROOT" ./build.sh + HOME="$NIX_BUILD_ROOT" ./build.sh --max-dpi xhd --type $variant + done ''; installPhase = '' install -dm 0755 $out/share/icons - cp -pr dist $out/share/icons/capitaine-cursors - cp -pr dist-white $out/share/icons/capitaine-cursors-white + cp -pr dist/dark $out/share/icons/capitaine-cursors + cp -pr dist/light $out/share/icons/capitaine-cursors-white ''; meta = with stdenv.lib; { description = '' An x-cursor theme inspired by macOS and based on KDE Breeze ''; - homepage = https://github.com/keeferrourke/capitaine-cursors; + homepage = "https://github.com/keeferrourke/capitaine-cursors"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 221974c7941..3aebf09554c 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; rev = "v${version}"; - sha256 = "00sk6sv0kkfb3q0jqwcllzawi30rw8nfkkfn5l1qwqha48izw3r4"; + sha256 = "1f6qvpzxz759znishmr4b22n540y18glv41wmy91r78sa4g6x4sh"; }; nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Elementary icons for Xfce and other GTK desktops like GNOME"; - homepage = https://github.com/shimmerproject/elementary-xfce; + homepage = "https://github.com/shimmerproject/elementary-xfce"; license = licenses.gpl2; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix index 96514b6a4cd..c954af9e83d 100644 --- a/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/pkgs/data/icons/iconpack-obsidian/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-obsidian"; - version = "4.10"; + version = "4.11"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1imnbfrmizs0yx2165qj423y3m5vw9z33pqxmvhvs0rcwwddgqix"; + sha256 = "18sqnrvh4bbmg3zzm78n4s2hvv8a77ilg7xa3hl94mp9qla6gasn"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index c85f01d2718..96ad0e2c2b8 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0za44h7f4vk37yl30xlaa6w76maiipb6p63gl9hl1rshdn9nxq0y"; }; - nativeBuildInputs = [ gtk3 numix-icon-theme ]; + nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + buildInputs = [ numix-icon-theme ]; + + propagatedBuildInputs = [ hicolor-icon-theme ]; dontDropIconThemeCache = true; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 620ef02fde7..644d20cccfd 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "19.09.20"; + version = "19.12.27"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0q3d4d4wndknz3043bh8ardjvdpds2hkzk73kyyh1848wg4ff0ly"; + sha256 = "0pjbi2g7wk8gyr4lvp8fvcb8z29kc3l6v19a45axgadnc609hqw7"; }; - nativeBuildInputs = [ gtk3 numix-icon-theme ]; + nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + buildInputs = [ numix-icon-theme ]; + + propagatedBuildInputs = [ hicolor-icon-theme ]; dontDropIconThemeCache = true; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index a6751b0938e..8055b19ad63 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20200201"; + version = "20200301"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "06scfncid3mhc99lj7iq99la5ls7gsc9kzzccbvcbfnvpzlmwjfh"; + sha256 = "1hknprylmd5zciaz4nkysmbb03am41r9dgnzm3r9l8qg2548js9v"; }; nativeBuildInputs = [ gtk3 ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Papirus icon theme"; - homepage = https://github.com/PapirusDevelopmentTeam/papirus-icon-theme; + homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"; license = licenses.lgpl3; # darwin gives hash mismatch in source, probably because of file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index 8bfde381633..641b3da883e 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2020-01-29"; + version = "2020-02-21"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0g6qiry4gzkr48xn4qi8sdna0hi3982sywskz9adkzqcznir542h"; + sha256 = "0m7f26dzzz5gkxi9dbbc96pl0xcvayr1ibxbjkrlsjcdvfg7p3rr"; }; nativeBuildInputs = [ gtk3 ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A colorful design icon theme for linux desktops"; + description = "Flat colorful design icon theme"; homepage = "https://github.com/vinceliuice/Qogir-icon-theme"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 2415e94b92d..96617bb0f27 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/10e6ea0c54a4aa41de51d1d7e2314115bb2e172a.tar.gz"; - sha256 = "0kjy1dxa2kra4j02ni8lpg74jy7fl361yiha330c52spvd2v8i8h"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/fcb0ed924c8504d54870d6dc2092b9dab8305732.tar.gz"; + sha256 = "0b7dxgj40y9svddrx14scnxls20ww4f717zhz3lwigb16dm4crpi"; } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 96fd9ad33f1..9afe4a9e400 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20200203"; + version = "20200214"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "1zjq1dhlci00j17dij7s3l30hybzmaykpk5b6bd5xbllp745njn5"; + sha256 = "1fpdb8r8kzwp1k5dc9xyy9jr2jr3haq7n9b6spamm599zvzf8nb6"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Osinfo database of information about operating systems for virtualization provisioning tools"; - homepage = https://libosinfo.org/; + homepage = "https://libosinfo.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/data/misc/unicode-character-database/default.nix b/pkgs/data/misc/unicode-character-database/default.nix index 5f50049856f..1eda25fbe2b 100644 --- a/pkgs/data/misc/unicode-character-database/default.nix +++ b/pkgs/data/misc/unicode-character-database/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "unicode-character-database"; - version = "12.1.0"; + version = "13.0.0"; src = fetchurl { url = "https://www.unicode.org/Public/zipped/${version}/UCD.zip"; - sha256 = "19m06iw0jl7lhlggcmghi12p6jld0qrmfpksgc243yn6sjh53fi5"; + sha256 = "0ld97ppkb5f8d5b3mlkxfwnr6f3inijyqias9xc4bbin9lxrfxig"; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/ant-theme/ant-bloody.nix b/pkgs/data/themes/ant-theme/ant-bloody.nix new file mode 100644 index 00000000000..3c540889c13 --- /dev/null +++ b/pkgs/data/themes/ant-theme/ant-bloody.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, gtk-engine-murrine }: + +let + themeName = "Ant-Bloody"; +in +stdenv.mkDerivation rec { + pname = "ant-bloody-theme"; + version = "1.3.0"; + + src = fetchurl { + url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar"; + sha256 = "0rrz50kmzjmqj17hvrw67pbaclwxv85i5m08s7842iky6dnn5z8s"; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes/${themeName} + cp -a * $out/share/themes/${themeName} + rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh} + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Bloody variant of the Ant theme"; + homepage = "https://github.com/EliverLara/${themeName}"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ alexarice ]; + }; +} diff --git a/pkgs/data/themes/ant-theme/ant-dracula.nix b/pkgs/data/themes/ant-theme/ant-dracula.nix new file mode 100644 index 00000000000..e365ab94c30 --- /dev/null +++ b/pkgs/data/themes/ant-theme/ant-dracula.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, gtk-engine-murrine }: + +let + themeName = "Ant-Dracula"; +in +stdenv.mkDerivation rec { + pname = "ant-dracula-theme"; + version = "1.3.0"; + + src = fetchurl { + url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar"; + sha256 = "00b8w69xapqy8kc7zqwlfz1xpld6hibbh35djvhcnd905gzzymkd"; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes/${themeName} + cp -a * $out/share/themes/${themeName} + rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh} + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Dracula variant of the Ant theme"; + homepage = "https://github.com/EliverLara/${themeName}"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ alexarice ]; + }; +} diff --git a/pkgs/data/themes/ant-theme/ant-nebula.nix b/pkgs/data/themes/ant-theme/ant-nebula.nix new file mode 100644 index 00000000000..03ee3b5d2d4 --- /dev/null +++ b/pkgs/data/themes/ant-theme/ant-nebula.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, gtk-engine-murrine }: + +let + themeName = "Ant-Nebula"; +in +stdenv.mkDerivation rec { + pname = "ant-nebula-theme"; + version = "1.3.0"; + + src = fetchurl { + url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar"; + sha256 = "1xpgw577nmgjk547mg2vvv0gdai60srgncykm5pb1w8dnlk69jbz"; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes/${themeName} + cp -a * $out/share/themes/${themeName} + rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh} + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Nebula variant of the Ant theme"; + homepage = "https://github.com/EliverLara/${themeName}"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ alexarice ]; + }; +} diff --git a/pkgs/data/themes/ant-theme/default.nix b/pkgs/data/themes/ant-theme/ant.nix index c60fb4d3355..736c8a1aa6a 100644 --- a/pkgs/data/themes/ant-theme/default.nix +++ b/pkgs/data/themes/ant-theme/ant.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, gtk-engine-murrine }: +let + themeName = "Ant"; +in stdenv.mkDerivation rec { pname = "ant-theme"; version = "1.3.0"; src = fetchurl { - url = "https://github.com/EliverLara/Ant/releases/download/v${version}/Ant.tar"; + url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar"; sha256 = "1r795v96ywzcb4dq08q2fdbmfia32g36cc512mhy41s8fb1a47dz"; }; @@ -13,25 +16,19 @@ stdenv.mkDerivation rec { gtk-engine-murrine ]; - dontBuild = true; - installPhase = '' runHook preInstall - mkdir -p $out/share/themes/Ant - cp -a * $out/share/themes/Ant - rm -r $out/share/themes/Ant/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh} + mkdir -p $out/share/themes/${themeName} + cp -a * $out/share/themes/${themeName} + rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh} runHook postInstall ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1gpacrmi5y87shp39jgy78n0ca2xdpvbqfh0mgldlxx99ca9rvvy"; - meta = with stdenv.lib; { description = "A flat and light theme with a modern look"; - homepage = https://github.com/EliverLara/Ant; + homepage = "https://github.com/EliverLara/${themeName}"; license = licenses.gpl3; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ alexarice ]; }; } diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix index cc665749d3c..794034af7e7 100644 --- a/pkgs/data/themes/greybird/default.nix +++ b/pkgs/data/themes/greybird/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "greybird"; - version = "3.22.11"; + version = "3.22.12"; src = fetchFromGitHub { owner = "shimmerproject"; repo = pname; rev = "v${version}"; - sha256 = "00x7dcjldph9k0nmvc8hyh3k4lhbmwk791rywd89ry6jivrx40pc"; + sha256 = "1j66ddvl3pmwh2v8ajm8r5g5nbsr7r262ff1qn2nf3i0gy8b3lq8"; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 6e00bc2d88d..ecf508a61b3 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha"; - version = "2020-02-06"; + version = "2020-03-24"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "14kii4dn028yqbsd0pr195di067harh9z2h753856dlxvs8d6vkx"; + sha256 = "13lcv2cihb24zjsdzhh188kd1rga49mzfa2sddqd63pqxxph188z"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -18,8 +18,10 @@ stdenv.mkDerivation rec { installPhase = '' patchShebangs . mkdir -p $out/share/themes - name= ./Install -d $out/share/themes + name= ./install.sh -d $out/share/themes install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml + mkdir -p $out/share/doc/${pname} + cp -a src/extra/firefox $out/share/doc/${pname} ''; meta = with stdenv.lib; { diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index 6c38e3aaba4..0bd71b46c0d 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, fetchurl, gtk_engines, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }: stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; - version = "2019-12-12"; + version = "2020-03-19"; srcs = [ (fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0d5m9gh97db01ygqlp2sv9v1m183d9fgid9n9wms9r5rrrw6bs8m"; + sha256 = "1f120sx092i56q4dx2b8d3nnn9pdw67656446nw702rix7zc5jpx"; }) (fetchurl { url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz"; @@ -19,12 +19,32 @@ stdenv.mkDerivation rec { sourceRoot = "source"; + nativeBuildInputs = [ glib inkscape optipng sassc which ]; + buildInputs = [ gtk_engines ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - installPhase = '' + postPatch = '' patchShebangs . + + for f in render-assets.sh \ + src/assets/gtk-2.0/render-assets.sh \ + src/assets/gtk-3.0/common-assets/render-assets.sh \ + src/assets/gtk-3.0/windows-assets/render-assets.sh \ + src/assets/metacity-1/render-assets.sh \ + src/assets/xfwm4/render-assets.sh + do + substituteInPlace $f \ + --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ + --replace /usr/bin/optipng ${optipng}/bin/optipng + done + + # Shut up inkscape's warnings + export HOME="$NIX_BUILD_ROOT" + ''; + + installPhase = '' name= ./install.sh -d $out/share/themes install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/* ''; diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix index d1cfb800001..1ec260f5033 100644 --- a/pkgs/data/themes/nordic-polar/default.nix +++ b/pkgs/data/themes/nordic-polar/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "nordic-polar"; - version = "1.5.0"; + version = "1.6.0"; srcs = [ (fetchurl { - url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v.${version}/Nordic-Polar.tar.xz"; - sha256 = "0ddccxvyf929045x6fm8xyx6rvb0d6wh6pylycwgqqm4vxbdwnly"; + url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar.tar.xz"; + sha256 = "0cym8rcg8jpfraqlfrmymkm0jrsk1s9p7z6vcil4vxbyim9q9w16"; }) (fetchurl { - url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v.${version}/Nordic-Polar-standard-buttons.tar.xz"; - sha256 = "0q0qfy0aw80rds6isx3pjrqx4zrq2crxrm29nrmyzh4gr7n17li6"; + url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar-standard-buttons.tar.xz"; + sha256 = "0s4wf9nqpa75km905jh03gl2d2hjcdvfacmkdz3njviqm6pwqxsv"; }) ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gtk theme created using the awesome Nord color pallete"; - homepage = https://github.com/EliverLara/Nordic-Polar; + homepage = "https://github.com/EliverLara/Nordic-Polar"; license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index 5172b2992cc..4979738231d 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -2,24 +2,32 @@ stdenv.mkDerivation rec { pname = "nordic"; - version = "1.6.5"; + version = "1.8.1"; srcs = [ (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic.tar.xz"; - sha256 = "163g1kh92fhgbwi91053xs39bpdd032w2v67c3jf8lf4cgvkwggp"; + url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic.tar.xz"; + sha256 = "0jvc6l093gj9azkrjswdc1kqlyc6drnhsxgpzylzcgjxvxyi9vmd"; }) (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue.tar.xz"; - sha256 = "05qq1v8sil8s51aa78q2najcqdnkpgdzc8dckrx47wy36cfxbxwz"; + url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-standard-buttons.tar.xz"; + sha256 = "049hcvccjds465v78sk3cjg7zck36l1zpyrf4p8xinj2h3b74zr8"; }) (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz"; - sha256 = "17r450xxd8v8125a4bwd0yj3f3vnwcad2f19a0vgmk63s9grvkg0"; + url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-darker.tar.xz"; + sha256 = "1qaj4x451ic8mx4aak1axw29jm6ymwgh5w3n3mw5kjm1fwg4b5dz"; }) (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue-standard-buttons.tar.xz"; - sha256 = "0894naw0wkl2h9l27qz9h1k02dfgfqyb02icmgadg0cb44j3zlpb"; + url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-darker-standard-buttons.tar.xz"; + sha256 = "19wczzppimp7sql9v0sq1sc5j0ix51270c58j22mg01kd2h2iivy"; + }) + (fetchurl { + url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-bluish-accent.tar.xz"; + sha256 = "1jvjjxiz8q9583f3gidky65s2g5pd5bkvbx0jvwn0p0kz8vlzmzk"; + }) + (fetchurl { + url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-bluish-accent-standard-buttons.tar.xz"; + sha256 = "0wqn0aszddq8nbh6c667rwhy7c1zky23a9q3d8gci421n20l6lyd"; }) ]; @@ -35,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dark Gtk theme created using the awesome Nord color pallete"; - homepage = https://github.com/EliverLara/Nordic; + homepage = "https://github.com/EliverLara/Nordic"; license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 0fb061519e6..08f178b30e8 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "plata-theme"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "1z8kiac3gb4hsyq92p5dd8fyjv7bad55q65kbnjiskpm4ircg4ja"; + sha256 = "183kas7b5vxm6l2m5c4yh8cnq05sfa82afcp9h6cfj2rh2iv6kqy"; }; preferLocalBuild = true; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GTK theme based on Material Design Refresh"; - homepage = https://gitlab.com/tista500/plata-theme; + homepage = "https://gitlab.com/tista500/plata-theme"; license = with licenses; [ gpl2 cc-by-sa-40 ]; platforms = platforms.linux; maintainers = [ maintainers.tadfisher ]; diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index 44993c7e2ec..23afcf5ece2 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2019-10-25"; + version = "2020-02-26"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "027c9pbfv5flqrjcvmbyjrfi37nzq33z19bai4zjjxjvryfqpmlm"; + sha256 = "1s14knj0ral5a62ymwbg5k5g94v8cq0acq0kyam8ay0rfi7wycdm"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -19,11 +19,14 @@ stdenv.mkDerivation rec { patchShebangs . mkdir -p $out/share/themes name= ./install.sh -d $out/share/themes + mkdir -p $out/share/doc/${pname} + cp -a src/firefox $out/share/doc/${pname} + rm $out/share/themes/*/{AUTHORS,COPYING} ''; meta = with stdenv.lib; { description = "Flat Design theme for GTK based desktop environments"; - homepage = https://vinceliuice.github.io/Qogir-theme; + homepage = "https://vinceliuice.github.io/Qogir-theme"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/snowblind/default.nix b/pkgs/data/themes/snowblind/default.nix new file mode 100644 index 00000000000..db7b34d78e7 --- /dev/null +++ b/pkgs/data/themes/snowblind/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitLab, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "snowblind"; + version = "2020-02-26"; + + src = fetchFromGitLab { + domain = "www.opencode.net"; + owner = "ju1464"; + repo = pname; + rev = "94c35410be5cccc142c9cd6be9dff973ce0761c4"; + sha256 = "1aqmpg1vyqwp6s6iikp5c5yfrvdkzq75jdr9mmv2ijcam1g0jhnv"; + }; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + mkdir -p $out/share/themes + cp -a Snowblind* $out/share/themes + rm $out/share/themes/*/{COPYING,CREDITS} + ''; + + meta = with stdenv.lib; { + description = "Smooth blue theme based on Materia Design"; + homepage = "https://www.opencode.net/ju1464/Snowblind"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/data/themes/vimix/default.nix new file mode 100644 index 00000000000..1b3d2005f08 --- /dev/null +++ b/pkgs/data/themes/vimix/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "vimix-gtk-themes"; + version = "2020-02-24"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "18v7yhwzachjgy276rdhj5cg353f0qysa2kxk9gyc6s71q2gjzcv"; + }; + + buildInputs = [ gtk_engines ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + patchShebangs . + mkdir -p $out/share/themes + name= ./install.sh -d $out/share/themes + rm $out/share/themes/*/{AUTHORS,LICENSE} + ''; + + meta = with stdenv.lib; { + description = "Flat Material Design theme for GTK based desktop environments"; + homepage = "https://github.com/vinceliuice/vimix-gtk-themes"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 2c3686f63d0..27a879af184 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "19.10.5"; + version = "20.04.1"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "0d53flfkb01kycchdhv72ga0qh8947bxvm5njfrrbk6rqfg0zc1v"; + sha256 = "0c9az0bmnrnkgxfifp6nkan5bvjrkqrpg38zsp2vg493bm3bpbg1"; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; |