diff options
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/inconsolata/lgc.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/libertine/default.nix | 11 | ||||
-rw-r--r-- | pkgs/data/fonts/monoid/default.nix | 8 | ||||
-rw-r--r-- | pkgs/data/fonts/rictydiminished-with-firacode/default.nix | 11 | ||||
-rw-r--r-- | pkgs/data/fonts/unscii/default.nix | 5 | ||||
-rw-r--r-- | pkgs/data/fonts/xits-math/default.nix | 8 | ||||
-rw-r--r-- | pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix | 4 | ||||
-rw-r--r-- | pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix | 4 | ||||
-rw-r--r-- | pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix | 4 | ||||
-rw-r--r-- | pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix | 4 | ||||
-rw-r--r-- | pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix | 4 | ||||
-rw-r--r-- | pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix | 3 | ||||
-rw-r--r-- | pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 4 |
13 files changed, 56 insertions, 18 deletions
diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix index e7445186b729..aa7d3d7def4f 100644 --- a/pkgs/data/fonts/inconsolata/lgc.nix +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "18brmw0h4hjq1m2l0abwc3zmib4rnfalpywdk68djm711zldxr76"; + meta = with stdenv.lib; { description = "Fork of Inconsolata font, with proper support of Cyrillic and Greek"; longDescription = '' diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index c69cc7ae34de..91a7932c2caf 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"; }; - setSourceRoot = "sourceRoot=`pwd`"; + sourceRoot = "."; nativeBuildInputs = [ fontforge ]; @@ -40,9 +40,14 @@ stdenv.mkDerivation rec { cp *.map $out/share/texmf/fonts/map ''; - meta = { + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1mj0j0hkp8pn7jcs4pvcan6whba60bfd671g3vhx3s9kxwf7xjvr"; + + meta = with stdenv.lib; { description = "Linux Libertine Fonts"; homepage = http://linuxlibertine.sf.net; - platforms = stdenv.lib.platforms.all; + platforms = platforms.linux; + maintainers = [ maintainers.volth ]; }; } diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix index 5e9a2c219167..77c311ce364c 100644 --- a/pkgs/data/fonts/monoid/default.nix +++ b/pkgs/data/fonts/monoid/default.nix @@ -13,15 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python fontforge ]; - enableParallelBuilding = true; - buildPhase = '' local _d="" local _l="" for _d in {Monoisome,Source}/*.sfdir; do _l="''${_d##*/}.log" echo "Building $_d (log at $_l)" - python Scripts/build.py ${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} 0 $_d > $_l + python Scripts/build.py 1 0 $_d > $_l done ''; @@ -31,6 +29,10 @@ stdenv.mkDerivation rec { cp -va Readme.md $out/share/doc ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0lbipgygiva3gg1pqw07phpnnf0s6ka9vqdk1pw7bkybjw3f7wzm"; + meta = with stdenv.lib; { homepage = http://larsenwork.com/monoid; description = "Customisable coding font with alternates, ligatures and contextual positioning"; diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index 074fceeac94a..45618972c348 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { }; buildPhase = '' + substituteInPlace apply-feature.py --replace \ + 'ricty = ttLib.TTFont(options.in_font)' \ + 'ricty = ttLib.TTFont(options.in_font, recalcTimestamp=False)' + substituteInPlace build-py3.py --replace \ + 'datetime.date.today()' \ + 'datetime.date.fromtimestamp(float(os.environ["SOURCE_DATE_EPOCH"]))' + make ''; @@ -28,6 +35,10 @@ stdenv.mkDerivation rec { ])) ]; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "09ldviapljn4bb1mcxap2pkz7cq3wr2k2qialbnav5y7ii82acd4"; + meta = with stdenv.lib; { homepage = https://github.com/hakatashi/RictyDiminished-with-FiraCode; description = "The best Japanese programming font meets the awesone ligatures of Firacode"; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 64e01124a67d..092537c216aa 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { cp *.svg "$out/share/fonts/svg" cp *.woff "$out/share/fonts/web" ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "03zvczdka665zcyf9fjrnx434mwpr5q8396j34kjmc67w7nhc49r"; + meta = { inherit version; description = ''Bitmapped character-art-friendly Unicode fonts''; diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index c3ba435cbbf9..25431c7f9d70 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { postPatch = '' rm *.otf + + substituteInPlace tools/postprocess.py --replace \ + 'font = ttLib.TTFont(sys.argv[1])' \ + 'font = ttLib.TTFont(sys.argv[1], recalcTimestamp=False)' ''; installPhase = '' @@ -22,6 +26,10 @@ stdenv.mkDerivation rec { cp *.otf $out/share/fonts/opentype ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "00xycmb9ka67j5s66nkng53y8q6362igisxz04zb58r2717jk50m"; + meta = with stdenv.lib; { homepage = https://github.com/khaledhosny/xits-math; description = "OpenType implementation of STIX fonts with math support"; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix index 7ff79488a89f..d4cb7bc889d3 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: let @@ -12,7 +12,7 @@ let in import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.1.2"; src = fetchurl { url = http://www.docbook.org/xml/4.1.2/docbkx412.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix index 3875362dcb3d..d2cc69559b86 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.2"; src = fetchurl { url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index 19ad49aa9280..e1f9337df941 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.3"; src = fetchurl { url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix index 98a1853e4942..1a9d622affc6 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.4"; src = fetchurl { url = http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix index 669536962a12..301b400ac7e1 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.5"; src = fetchurl { url = http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index fc3c4c3c8410..373778d43de6 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {} }: +{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: assert unzip != null; @@ -6,6 +6,7 @@ stdenv.mkDerivation { inherit src name postInstall; builder = ./builder.sh; buildInputs = [unzip]; + propagatedBuildInputs = [ findXMLCatalogs ]; meta = meta // { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index a955f5cf8a48..7bae913ed5e6 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, findXMLCatalogs }: let @@ -10,6 +10,8 @@ let inherit sha256; }; + propagatedBuildInputs = [ findXMLCatalogs ]; + dontBuild = true; installPhase = '' |