From 35b7632bdb2fb725dbf35957f91947c09289cbe5 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Sun, 11 Mar 2018 15:22:06 +0100 Subject: gauge: 0.9.6 -> 0.9.7 Also removes the unecessary binary from the package Signed-off-by: Vincent Demeester --- pkgs/development/tools/gauge/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/development/tools') diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index f1533f551b2e..58bc24e1ec64 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,15 +2,16 @@ buildGoPackage rec { name = "gauge-${version}"; - version = "0.9.6"; + version = "0.9.7"; goPackagePath = "github.com/getgauge/gauge"; + excludedPackages = ''\(build\|man\)''; src = fetchFromGitHub { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - sha256 = "0p2bnrzgx616jbyr9h4h9azaq7ry63z4qkwgy0ivwrpmhfqfqwmh"; + sha256 = "09afsi97yxlqwmrxvihravqvz17m7y402gbw4hvdk0iixa6jpq6a"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From ec2981ae3dcb63fc1f5a65f1f8b512d27d85a3bb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 11 Mar 2018 15:44:20 +0100 Subject: fmbt: init at 0.39 --- pkgs/development/tools/fmbt/default.nix | 53 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/tools/fmbt/default.nix (limited to 'pkgs/development/tools') diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix new file mode 100644 index 000000000000..11880213bada --- /dev/null +++ b/pkgs/development/tools/fmbt/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, python, autoreconfHook, pkgconfig, makeWrapper +, flex +, gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz +, tesseract, gts, libXtst +}: +stdenv.mkDerivation rec { + version = "0.39"; + name = "fMBT-${version}"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "fMBT"; + rev = "v${version}"; + sha256 = "15sxwdcsjybq50vkla4md2ay8m67ndc4vwcsl5vwsjkim5qlxslb"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig flex makeWrapper + python.pkgs.wrapPython ]; + + buildInputs = [ python gettext libedit glib imagemagick libxml2 boost + gnuplot graphviz tesseract gts + ]; + + propagatedBuildInputs = with python.pkgs; [ + pyside pydbus pexpect pysideShiboken + ]; + + preBuild = '' + export PYTHONPATH="$PYTHONPATH:$out/lib/python${python.pythonVersion}/site-packages" + export PATH="$PATH:$out/bin" + export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [libXtst]}" + ''; + + postInstall = '' + echo -e '#! ${stdenv.shell}\npython "$@"' > "$out/bin/fmbt-python" + chmod a+x "$out/bin/fmbt-python" + patchShebangs "$out/bin" + for i in "$out"/bin/*; do + wrapProgram "$i" --suffix "PATH" ":" "$PATH" \ + --suffix "PYTHONPATH" ":" "$PYTHONPATH" \ + --suffix "LD_LIBRARY_PATH" ":" "$LD_LIBRARY_PATH" + done + ''; + + meta = with stdenv.lib; { + description = "Free Model-Based Testing tool"; + homepage = "https://github.com/intel/fMBT"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ raskin ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1914ec7a090..ffada189f208 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2290,6 +2290,10 @@ with pkgs; flameGraph = flamegraph; flvtool2 = callPackage ../tools/video/flvtool2 { }; + + fmbt = callPackage ../development/tools/fmbt { + python = python2; + }; fontforge = lowPrio (callPackage ../tools/misc/fontforge { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; -- cgit 1.4.1 From bbf69b7301a5e67b1af28e8e36bc2d12994eb4c6 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Mon, 12 Mar 2018 10:47:17 +0000 Subject: travis: add update instructions (#36855) --- pkgs/development/tools/misc/travis/Gemfile | 2 +- pkgs/development/tools/misc/travis/Gemfile.lock | 4 ++-- pkgs/development/tools/misc/travis/default.nix | 5 +++++ pkgs/development/tools/misc/travis/gemset.nix | 8 ++++++++ pkgs/development/tools/misc/travis/shell.nix | 11 +++++++++++ 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/misc/travis/shell.nix (limited to 'pkgs/development/tools') diff --git a/pkgs/development/tools/misc/travis/Gemfile b/pkgs/development/tools/misc/travis/Gemfile index d52f576be243..788341de3fa6 100644 --- a/pkgs/development/tools/misc/travis/Gemfile +++ b/pkgs/development/tools/misc/travis/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem "travis" +gem "travis", "1.8.8" diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock index 529be0793605..a1c8332a3d44 100644 --- a/pkgs/development/tools/misc/travis/Gemfile.lock +++ b/pkgs/development/tools/misc/travis/Gemfile.lock @@ -45,7 +45,7 @@ PLATFORMS ruby DEPENDENCIES - travis + travis (= 1.8.8) BUNDLED WITH - 1.14.4 + 1.14.6 diff --git a/pkgs/development/tools/misc/travis/default.nix b/pkgs/development/tools/misc/travis/default.nix index a520c4deb342..b5c5740e80ff 100644 --- a/pkgs/development/tools/misc/travis/default.nix +++ b/pkgs/development/tools/misc/travis/default.nix @@ -1,5 +1,10 @@ { lib, bundlerEnv, ruby }: +# Maintainer notes for updating +# 1. increment version number in Gemfile +# 2. run $ nix-shell --command "bundler install && bundix" +# in the travis directory in nixpkgs + bundlerEnv { inherit ruby; pname = "travis"; diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix index 148923848beb..c9a54bd324c2 100644 --- a/pkgs/development/tools/misc/travis/gemset.nix +++ b/pkgs/development/tools/misc/travis/gemset.nix @@ -16,6 +16,7 @@ version = "3.6.8"; }; ethon = { + dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; sha256 = "1i873cvma4j52xmij7kasjylh66vf60cy5prkp4cz4hcn9jlkznl"; @@ -24,6 +25,7 @@ version = "0.10.1"; }; faraday = { + dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; sha256 = "18p1csdivgwmshfw3mb698a3bn0yrykg30khk5qxjf6n168g91jr"; @@ -32,6 +34,7 @@ version = "0.11.0"; }; faraday_middleware = { + dependencies = ["faraday"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0bcarc90brm1y68bl957w483bddsy9idj2gghqnysk6bbxpsvm00"; @@ -48,6 +51,7 @@ version = "1.9.18"; }; gh = { + dependencies = ["addressable" "backports" "faraday" "multi_json" "net-http-persistent" "net-http-pipeline"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0g4df0jsscq16g6f27flfmvk7p4sbq81d5mdylbz4ikqq60kywzg"; @@ -72,6 +76,7 @@ version = "2.0.3"; }; launchy = { + dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; @@ -112,6 +117,7 @@ version = "1.0.1"; }; pusher-client = { + dependencies = ["json" "websocket"]; source = { remotes = ["https://rubygems.org"]; sha256 = "18ymxz34gmg7jff3h0nyzp5vdg5i06dbdxlrdl2nq4hf14qwj1f4"; @@ -120,6 +126,7 @@ version = "0.6.2"; }; travis = { + dependencies = ["backports" "faraday" "faraday_middleware" "gh" "highline" "launchy" "pusher-client" "typhoeus"]; source = { remotes = ["https://rubygems.org"]; sha256 = "02bjz73f6r9b7nskwzcvcbr4hlvgwrf9rnr6d218d2i1rk4ww936"; @@ -128,6 +135,7 @@ version = "1.8.8"; }; typhoeus = { + dependencies = ["ethon"]; source = { remotes = ["https://rubygems.org"]; sha256 = "03x3fxjsnhgayl4s96h0a9975awlvx2v9nmx2ba0cnliglyczdr8"; diff --git a/pkgs/development/tools/misc/travis/shell.nix b/pkgs/development/tools/misc/travis/shell.nix new file mode 100644 index 000000000000..ddcf493bb468 --- /dev/null +++ b/pkgs/development/tools/misc/travis/shell.nix @@ -0,0 +1,11 @@ +# Env to update Gemfile.lock / gemset.nix + +with import {}; +stdenv.mkDerivation { + name = "env"; + buildInputs = [ + ruby.devEnv + gnumake + bundix + ]; +} -- cgit 1.4.1 From 79f4548aa2c46d82115324a14dd15f413b22b79e Mon Sep 17 00:00:00 2001 From: John Children Date: Mon, 12 Mar 2018 13:46:13 +0000 Subject: go-langserver: init at unstable-2018-03-05 --- maintainers/maintainer-list.nix | 5 +++++ pkgs/development/tools/go-langserver/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/go-langserver/default.nix (limited to 'pkgs/development/tools') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 74b9f23af792..807b5e07201f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1720,6 +1720,11 @@ github = "johnazoidberg"; name = "Daniel Schäfer"; }; + johnchildren = { + email = "john.a.children@gmail.com"; + github = "johnchildren"; + name = "John Children"; + }; johnmh = { email = "johnmh@openblox.org"; github = "johnmh"; diff --git a/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix new file mode 100644 index 000000000000..84efaf2a4b63 --- /dev/null +++ b/pkgs/development/tools/go-langserver/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "go-langserver-${version}"; + version = "unstable-2018-03-05"; + rev = "5d7a5dd74738978d635f709669241f164c120ebd"; + + goPackagePath = "github.com/sourcegraph/go-langserver"; + subPackages = [ "." ]; + + src = fetchFromGitHub { + inherit rev; + owner = "sourcegraph"; + repo = "go-langserver"; + sha256 = "0aih0akk3wk3332znkhr2bzxcc3parijq7n089mdahnf20k69xyz"; + }; + + meta = with stdenv.lib; { + description = "A Go language server protocol server"; + homepage = https://github.com/sourcegraph/go-langserver; + license = licenses.mit; + maintainers = with maintainers; [ johnchildren ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b3d29ce57ea..6f0df09bb147 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13650,6 +13650,8 @@ with pkgs; gomodifytags = callPackage ../development/tools/gomodifytags { }; + go-langserver = callPackage ../development/tools/go-langserver { }; + gotests = callPackage ../development/tools/gotests { }; gogoclient = callPackage ../os-specific/linux/gogoclient { }; -- cgit 1.4.1 From 1993ebf0c7294f371f3988f1bb2b4db932dc7024 Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Wed, 7 Mar 2018 17:01:02 +0100 Subject: flyway: refactor supported platforms Other Unix platforms are supported (not only Linux). --- pkgs/development/tools/flyway/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/tools') diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 11e2c6d2c5a4..43026e55e7f3 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -23,7 +23,7 @@ description = "Evolve your Database Schema easily and reliably across all your instances"; homepage = "https://flywaydb.org/"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.cmcdragonkai ]; }; } -- cgit 1.4.1 From 5fdfe61b35945b287b084f22076fef34062f17d2 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 11 Mar 2018 15:21:01 +0100 Subject: conan: Fix build conan has very strict requirements on the versions of its dependencies. This patch adds downgraded versinos of node-semver and distro to statisfy these requirements. --- pkgs/development/python-modules/distro/11.nix | 26 ++++++++++++++++++++++ pkgs/development/python-modules/node-semver/2.nix | 21 +++++++++++++++++ .../tools/build-managers/conan/default.nix | 10 +++++---- pkgs/top-level/python-packages.nix | 4 ++++ 4 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/python-modules/distro/11.nix create mode 100644 pkgs/development/python-modules/node-semver/2.nix (limited to 'pkgs/development/tools') diff --git a/pkgs/development/python-modules/distro/11.nix b/pkgs/development/python-modules/distro/11.nix new file mode 100644 index 000000000000..bc9158e1545a --- /dev/null +++ b/pkgs/development/python-modules/distro/11.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "distro"; + version = "1.1.0"; + + buildInputs = [ pytest pytestcov tox]; + + checkPhase = '' + touch tox.ini + tox + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "1vn1db2akw98ybnpns92qi11v94hydwp130s8753k6ikby95883j"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/nir0s/distro; + description = "Linux Distribution - a Linux OS platform information API."; + license = licenses.asl20; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/node-semver/2.nix b/pkgs/development/python-modules/node-semver/2.nix new file mode 100644 index 000000000000..0ca61bd13510 --- /dev/null +++ b/pkgs/development/python-modules/node-semver/2.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "0.2.0"; + pname = "node-semver"; + + buildInputs = [ pytest tox ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/podhmo/python-semver; + description = "A port of node-semver"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 4a2afbeedfe6..6350798e1086 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,26 +1,28 @@ { lib, buildPythonApplication, fetchPypi , requests, fasteners, pyyaml, pyjwt, colorama, patch -, bottle, pluginbase, six, distro, pylint, node-semver +, bottle, pluginbase, six, distro11, pylint, node-semver2 , future, pygments, mccabe +, fetchpatch }: buildPythonApplication rec { - version = "0.28.1"; + version = "1.1.1"; pname = "conan"; src = fetchPypi { inherit pname version; - sha256 = "0zf564iqh0099yd779f9fgk21qyp87d7cmgfj34hmncf8y3qh32a"; + sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl"; }; propagatedBuildInputs = [ requests fasteners pyyaml pyjwt colorama patch - bottle pluginbase six distro pylint node-semver + bottle pluginbase six distro11 pylint node-semver2 future pygments mccabe ]; # enable tests once all of these pythonPackages available: # [ nose nose_parameterized mock webtest codecov ] + # update 2018-03-11: only nose_parameterized is missing doCheck = false; meta = with lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0adbb054778..3c48c72e3402 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21051,8 +21051,12 @@ EOF node-semver = callPackage ../development/python-modules/node-semver { }; + node-semver2 = callPackage ../development/python-modules/node-semver/2.nix { }; + distro = callPackage ../development/python-modules/distro { }; + distro11 = callPackage ../development/python-modules/distro/11.nix { }; + bz2file = callPackage ../development/python-modules/bz2file { }; smart_open = callPackage ../development/python-modules/smart_open { }; -- cgit 1.4.1