diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-08-10 11:35:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-10 11:35:44 +0200 |
| commit | 111d7a2af4d57adde6f91a60cbb024575d018d34 (patch) | |
| tree | b43e521df71d08d432ae8a3ddb0c216ed440c436 /pkgs/tools | |
| parent | b57a20b88995cdf773a77ab86d65bf3922cbe105 (diff) | |
| parent | 0bb4604b0b06b5c46c1940fb44f67fd17e7e4a5e (diff) | |
| download | nixlib-111d7a2af4d57adde6f91a60cbb024575d018d34.tar nixlib-111d7a2af4d57adde6f91a60cbb024575d018d34.tar.gz nixlib-111d7a2af4d57adde6f91a60cbb024575d018d34.tar.bz2 nixlib-111d7a2af4d57adde6f91a60cbb024575d018d34.tar.lz nixlib-111d7a2af4d57adde6f91a60cbb024575d018d34.tar.xz nixlib-111d7a2af4d57adde6f91a60cbb024575d018d34.tar.zst nixlib-111d7a2af4d57adde6f91a60cbb024575d018d34.zip | |
Merge pull request #17623 from matthewbauer/misc
Misc. hydra fixes
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/opkg/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/hevea/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index d89d4c58af35..059f63495d1c 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl +{ stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl, libxml2 , autoreconfHook }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pw7igmb4miyxl11sj9g8p8pgxg9nmn1h2hzi8b23v44hcmc1inj"; }; - buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl + buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl libxml2 autoreconfHook ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index f3ef746fedfc..0e87ef5dacc1 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { - name = "hevea-2.28"; + name = "hevea-2.29"; src = fetchurl { url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; - sha256 = "14fns13wlnpiv9i05841kvi3cq4b9v2sw5x3ff6ziws28q701qnd"; + sha256 = "1i7qkar6gjpsxqgdm90xxgp15z7gfyja0rn62n23a9aahc0hpgq6"; }; buildInputs = [ ocaml ]; |