diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-15 13:57:28 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-15 13:59:18 +0200 |
commit | 3ee33f35f88ee8558b27f0f3cc6eb0259b312724 (patch) | |
tree | ec4f6b2feb817cbbc2a580db7a97ecc0b299f4ee /pkgs/development/tools | |
parent | 5a21efdcdf7c3f4349192036e661247e2cd07916 (diff) | |
parent | 75e419173959f3e96a6569268f310e80f4f836b4 (diff) | |
download | nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.gz nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.bz2 nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.lz nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.xz nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.zst nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.zip |
Merge branch 'staging'
Contains security fixes in X server and X libs. On Hydra, the amount to rebuild on master is now higher than on staging; the comparison looks OK.
Diffstat (limited to 'pkgs/development/tools')
6 files changed, 41 insertions, 30 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 0cb9078aede5..94428ecc174d 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; majorVersion = "3.9"; - minorVersion = "2"; + minorVersion = "4"; version = "${majorVersion}.${minorVersion}"; in @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - # from https://cmake.org/files/v3.9/cmake-3.9.2-SHA-256.txt - sha256 = "954a5801a456ee48e76f01107c9a4961677dd0f3e115275bbd18410dc22ba3c1"; + # from https://cmake.org/files/v3.9/cmake-3.9.4-SHA-256.txt + sha256 = "b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1"; }; prePatch = optionalString (!useSharedLibraries) '' diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 114913403577..77ff46d94722 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.42.1"; + version = "0.43.0"; pname = "meson"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1phf1xpwm8m85qiiirkqhrf5aigx7ajaw0l59d6lzadf1fmgfx5v"; + sha256 = "0qn5hyzvam3rimn7g3671s1igj7fbkwdnf5nc8jr4d5swy25mq61"; }; postFixup = '' diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 0d9d19c8b939..ed6c7f4fefb6 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -53,10 +53,6 @@ buildGoPackage rec { go generate github.com/drone/drone/store/datastore/ddl ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/drone - ''; - src = fetchFromGitHub { owner = "drone"; repo = "drone"; diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 506684088343..5f31a2dfb7c6 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, python, libxml2Python, libxslt, which +{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which , docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext, itstool }: stdenv.mkDerivation rec { @@ -10,29 +10,20 @@ stdenv.mkDerivation rec { sha256 = "0hpxcij9xx9ny3gs9p0iz4r8zslw8wqymbyababiyl7603a6x90y"; }; - outputDevdoc = "out"; - - # maybe there is a better way to pass the needed dtd and xsl files - # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" - preConfigure = '' - mkdir -p $out/nix-support - cat > $out/nix-support/catalog.xml << EOF - <?xml version="1.0"?> - <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> - <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> - <nextCatalog catalog="${docbook_xsl}/xml/xsl/docbook/catalog.xml" /> - <nextCatalog catalog="${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml" /> - </catalog> - EOF + patches = [ + ./respect-xml-catalog-files-var.patch + ]; - configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml --disable-scrollkeeper"; - ''; + outputDevdoc = "out"; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl gnome_doc_utils dblatex gettext which itstool ]; + configureFlags = "--disable-scrollkeeper"; + meta = with stdenv.lib; { homepage = https://www.gtk.org/gtk-doc; description = "Tools to extract documentation embedded in GTK+ and GNOME source code"; diff --git a/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch b/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch new file mode 100644 index 000000000000..78c57306b797 --- /dev/null +++ b/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch @@ -0,0 +1,28 @@ +diff --git a/m4/gtkdoc_jh_check_xml_catalog.m4 b/m4/gtkdoc_jh_check_xml_catalog.m4 +index 618c1c9..1842a0d 100644 +--- a/m4/gtkdoc_jh_check_xml_catalog.m4 ++++ b/m4/gtkdoc_jh_check_xml_catalog.m4 +@@ -10,7 +10,21 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], + AC_MSG_RESULT([found]) + ifelse([$3],,,[$3]) + else +- AC_MSG_RESULT([not found]) +- ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4]) ++ jh_check_xml_catalog_saved_ifs="$IFS" ++ IFS=' ' ++ for f in $XML_CATALOG_FILES; do ++ if [[ -f "$f" ]] && \ ++ AC_RUN_LOG([$XMLCATALOG --noout "$f" "$1" >&2]); then ++ jh_found_xmlcatalog=true ++ AC_MSG_RESULT([found]) ++ ifelse([$3],,,[$3]) ++ break ++ fi ++ done ++ IFS="$jh_check_xml_catalog_saved_ifs" ++ if ! $jh_found_xmlcatalog; then ++ AC_MSG_RESULT([not found]) ++ ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4]) ++ fi + fi + ]) diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index bd1dbb3f90a1..eb626d0aa586 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -16,10 +16,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib $bin/bin/textql - ''; - meta = with stdenv.lib; { description = "Execute SQL against structured text like CSV or TSV"; homepage = https://github.com/dinedal/textql; |