diff options
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/analysis/cppcheck/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/buildbot/pkg.nix | 4 | ||||
-rwxr-xr-x | pkgs/development/tools/build-managers/cmake/setup-hook.sh | 2 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/conan/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/ninja/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/tools/flootty/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/tools/misc/gdbgui/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/tools/misc/lit/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/tools/packer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/parsing/byacc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/remarshal/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/tools/vcstool/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/yarn/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/yq/default.nix | 4 |
15 files changed, 22 insertions, 25 deletions
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 6019235c47b..5a095c8b6a0 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.83"; + version = "1.84"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "14d4afjz0jshwpqryvwvzrs3rrqnd7cgg3x19awgy116591ibd83"; + sha256 = "1rp8j0akxzcpvr2na5zchz8zxq5ldngiwj7f6sibjq5p3dcyn2w5"; }; buildInputs = [ pcre ]; diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix index ef8a0cdc38e..e0f1be8351a 100644 --- a/pkgs/development/tools/build-managers/buildbot/pkg.nix +++ b/pkgs/development/tools/build-managers/buildbot/pkg.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "7b255f5ec97946c3d32e822b8fcbff0459cfe4f94fb26ee4813ffd80440c93e8"; + sha256 = "0f14453e2f2f357f44edd79df2d3b3901b4e03f4746693c209b71e226ed238cd"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 8e3993fadc1..d37e25943b5 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -22,7 +22,7 @@ cmakeConfigurePhase() { if [ -z "$dontUseCmakeBuildDir" ]; then mkdir -p build cd build - cmakeDir=.. + cmakeDir=${cmakeDir:-..} fi if [ -z "$dontAddPrefix" ]; then diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 849c722e554..3aab715e4d9 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -20,12 +20,12 @@ let newPython = python.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.2.3"; + version = "1.4.4"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "623e92d99cd0f4ec92552b23af66a6bb066071e213659f502480bb9a96d7be23"; + sha256 = "1g03f8rw9l198w9ph0gi0q3g84ilp1dxxc9nmj0dgnymcfgpf89n"; }; checkInputs = with newPython.pkgs; [ diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 6022b645172..f14f6adf5fe 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -4,7 +4,6 @@ in python3Packages.buildPythonApplication rec { version = "0.46.1"; pname = "meson"; - name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index c59d2faaf26..b1df54f9bd5 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, asciidoc, re2c }: +{ stdenv, fetchFromGitHub, python, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }: stdenv.mkDerivation rec { name = "ninja-${version}"; @@ -11,11 +11,13 @@ stdenv.mkDerivation rec { sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f"; }; - nativeBuildInputs = [ python asciidoc re2c ]; + nativeBuildInputs = [ python asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin re2c ]; buildPhase = '' python configure.py --bootstrap - asciidoc doc/manual.asciidoc + # "./ninja -vn manual" output copied here to support cross compilation. + asciidoc -b docbook -d book -o build/manual.xml doc/manual.asciidoc + xsltproc --nonet doc/docbook.xsl build/manual.xml > doc/manual.html ''; installPhase = '' diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/development/tools/flootty/default.nix index 9535ba86dd0..796c3dc79a0 100644 --- a/pkgs/development/tools/flootty/default.nix +++ b/pkgs/development/tools/flootty/default.nix @@ -7,7 +7,6 @@ in buildPythonApplication rec { pname = "Flootty"; version = "3.2.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index de66bf5da14..12d3f97dfc4 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -3,7 +3,6 @@ let deps = import ./requirements.nix { inherit pkgs; }; in python27Packages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "gdbgui"; version = "0.11.1.2"; diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index 05229e4be7b..42824d1a543 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -3,7 +3,6 @@ python2.pkgs.buildPythonApplication rec { pname = "lit"; version = "0.5.1"; - name = "${pname}-${version}"; src = python2.pkgs.fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index b7757b47471..ae624c549eb 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.2.0"; + version = "1.2.4"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "05qsyh6d4qsvabr543ggd4b09fipxzr270cawsx0glmkgw82nkzi"; + sha256 = "06prn2mq199476zlxi5hxk5yn21mqzbqk8v0fy8s6h91g8h6205n"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 17d1e47cb4e..fc0c6c9ed8a 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "byacc-${version}"; - version = "20180525"; + version = "20180609"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${name}.tgz" "https://invisible-mirror.net/archives/byacc/${name}.tgz" ]; - sha256 = "1ridghk1xprxfg2k8ls87wjc00i4a7f39x2fkswfqb2wwf5qv6qj"; + sha256 = "173l9yai5yndbyn8nzdl6q11wv4x959bd0w392i82nfsqcz0pfsv"; }; doCheck = true; diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 79cca444a1e..6632d062633 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -20,6 +20,5 @@ python3Packages.buildPythonApplication rec { license = licenses.mit; homepage = https://github.com/dbohdan/remarshal; maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index aafff7290c5..f6c160de65c 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -6,11 +6,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "vcstool"; - version = "0.1.35"; + version = "0.1.36"; src = fetchPypi { inherit pname version; - sha256 = "c52ef4bae424deb284d042005db22844dae290758af77d76cac37d26bed9ad1c"; + sha256 = "3c3d347f46cda641344ec5d613896499981b0540e2bfa299baf6026dab7649ca"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 535ab7b45fa..635c9efa40e 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "1.7.0"; + version = "1.8.0"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "00fxihv9ih40k6f21a7hb6vkx4h4m6ks0fbai5h9ssi0p4m5j3by"; + sha256 = "145z9i935kab5pv3pldgs3b1i9ppplc928c71c2lbz8my1z6j77w"; }; buildInputs = [makeWrapper nodejs]; diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix index 201e85985d8..52231d0a831 100644 --- a/pkgs/development/tools/yq/default.nix +++ b/pkgs/development/tools/yq/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "yq"; - version = "2.5.0"; + version = "2.6.0"; propagatedBuildInputs = [ pyyaml xmltodict jq ]; @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "e9fd2aa32defcd051058e3b6f665873282aa4eed19e11b1db94fe70847535d4c"; + sha256 = "0wyzg6lwxmzqsblljg9hddkadda7qdpw54sp0pmmbv89hhz7cky6"; }; meta = with lib; { |