diff options
Diffstat (limited to 'pkgs/development')
16 files changed, 161 insertions, 122 deletions
diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index 182f8fbefab..01a2fb873aa 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -3,19 +3,8 @@ let pio-pkgs = pkgs: let - python = pkgs.python.override { + python = pkgs.python3.override { packageOverrides = self: super: { - - # https://github.com/platformio/platformio-core/issues/349 - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "5.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a"; - }; - postPatch = ""; - }); - platformio = self.callPackage ./core.nix { }; }; }; @@ -38,7 +27,7 @@ in buildFHSUserEnv { meta = with lib; { description = "An open source ecosystem for IoT development"; - homepage = http://platformio.org; + homepage = "https://platformio.org"; maintainers = with maintainers; [ mog ]; license = licenses.asl20; platforms = with platforms; linux; diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 0866311ad89..bfe216c6ad3 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPythonApplication, fetchFromGitHub , bottle, click, colorama , lockfile, pyserial, requests -, pytest, semantic-version, tox +, pytest, semantic-version, tox, tabulate , git }: @@ -35,6 +35,7 @@ let "test_builder.py::test_build_unflags" "test_misc.py::test_api_cache" "test_misc.py::test_ping_internet_ips" + "test_misc.py::test_platformio_cli" "test_pkgmanifest.py::test_packages" ]) ++ (map (e: "--ignore=tests/${e}") [ "commands/test_boards.py" @@ -46,19 +47,20 @@ let in buildPythonApplication rec { pname = "platformio"; - version = "3.6.6"; + version = "4.0.3"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "1qwd6684y2xagl375sv8fm6a535hcdqx296hknjlbvsgc1jc514a"; + sha256 = "1naaa53cc7n7zyqggqjvvgkcq8cyzngdf904y9ag0x1vvb70f8j9"; }; propagatedBuildInputs = [ bottle click colorama git lockfile pyserial requests semantic-version + tabulate ]; HOME = "/tmp"; diff --git a/pkgs/development/arduino/platformio/fix-searchpath.patch b/pkgs/development/arduino/platformio/fix-searchpath.patch index a215ffc7d61..1570cae1b19 100644 --- a/pkgs/development/arduino/platformio/fix-searchpath.patch +++ b/pkgs/development/arduino/platformio/fix-searchpath.patch @@ -1,6 +1,6 @@ ---- ./platformio/util.py-old 2017-09-29 01:20:08.174548250 +0200 -+++ ./platformio/util.py 2017-09-29 01:19:48.410485308 +0200 -@@ -395,7 +395,7 @@ +--- ./platformio/proc.py-old 2017-09-29 01:20:08.174548250 +0200 ++++ ./platformio/proc.py 2017-09-29 01:19:48.410485308 +0200 +@@ -164,7 +164,7 @@ isdir(join(p, "click")) or isdir(join(p, "platformio"))) if all(conditions): _PYTHONPATH.append(p) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 049dd9192d7..b4ed9232452 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,12 +9,12 @@ in mkDerivation rec { pname = "supercollider"; - version = "3.10.2"; + version = "3.10.3"; src = fetchurl { - url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "0ynz1ydcpsd5h57h1n4a7avm6p1cif5a8rkmz4qpr46pr8z9p6iq"; + url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"; + sha256 = "1wvsrr4qcqmpxpn57wwrnwbnf3pflr3n4wkj9j6b9cdisp34kv5d"; }; hardeningDisable = [ "stackprotector" ]; @@ -26,6 +26,8 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig qttools ]; + enableParallelBuilding = true; + buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] ++ optional (!stdenv.isDarwin) alsaLib @@ -33,7 +35,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Programming language for real time audio synthesis"; - homepage = http://supercollider.sourceforge.net/; + homepage = "https://supercollider.github.io"; maintainers = with maintainers; [ mrmebelman ]; license = licenses.gpl3; platforms = [ "x686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 858bc209391..2f2e22de12c 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { pname = "fflas-ffpack"; - version = "2.4.0"; + version = "2.4.3"; src = fetchFromGitHub { owner = "linbox-team"; repo = "${pname}"; - rev = "v${version}"; - sha256 = "1q1ala88ysz14pb5cn2kskv829nc1qif7zfzjwzhd5nnzwyivmc4"; + rev = "${version}"; + sha256 = "1ynbjd72qrwp0b4kpn0p5d7gddpvj8dlb5fwdxajr5pvkvi3if74"; }; checkInputs = [ diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 75b377ff8d4..fbc4b4bcec5 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = "-DBUILD_SHARED_LIBS=ON"; + cmakeFlags = "-DBUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TESTS=OFF"; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/python-modules/imagecodecs-lite/default.nix b/pkgs/development/python-modules/imagecodecs-lite/default.nix new file mode 100644 index 00000000000..6374b882718 --- /dev/null +++ b/pkgs/development/python-modules/imagecodecs-lite/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchPypi, buildPythonPackage +, pytest +, numpy +, cython +}: + +buildPythonPackage rec { + pname = "imagecodecs-lite"; + version = "2019.4.20"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cp88g7g91gdhjhaz6gvb4jzvi5ad817id9f2bnc5r95ag93bqb0"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy cython ]; + + meta = with lib; { + description = "Block-oriented, in-memory buffer transformation, compression, and decompression functions"; + homepage = "https://www.lfd.uci.edu/~gohlke/"; + maintainers = [ maintainers.tbenst ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix new file mode 100644 index 00000000000..a7fbf301295 --- /dev/null +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests }: + +buildPythonPackage rec { + pname = "pyvmomi"; + version = "6.7.1.2018.12"; + + src = fetchFromGitHub { + owner = "vmware"; + repo = pname; + rev = "v${version}"; + sha256 = "1pgl95rbghidbyr8hndjzfzgb1yjchfcknlqgg3qbqvljnz9hfja"; + }; + + # requires old version of vcrpy + doCheck = false; + + propagatedBuildInputs = [ requests ]; + + meta = with lib; { + description = "Python SDK for the VMware vSphere API that allows you to manage ESX, ESXi, and vCenter"; + homepage = "https://github.com/vmware/pyvmomi"; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix index e3c92a0e40f..4fcc19e57fc 100644 --- a/pkgs/development/python-modules/semantic-version/default.nix +++ b/pkgs/development/python-modules/semantic-version/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "semantic_version"; - version = "2.6.0"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "1h2l9xyg1zzsda6kjcmfcgycbvrafwci283vcr1v5sbk01l2hhra"; + sha256 = "1lnnpxmf3z1rcfr5n562vbraq236s13wlj8fmw2kwr2mrq7lqb8r"; }; # ModuleNotFoundError: No module named 'tests' diff --git a/pkgs/development/python-modules/speedtest-cli/default.nix b/pkgs/development/python-modules/speedtest-cli/default.nix index 36816f6133d..3c7a1c8d839 100644 --- a/pkgs/development/python-modules/speedtest-cli/default.nix +++ b/pkgs/development/python-modules/speedtest-cli/default.nix @@ -7,11 +7,11 @@ # required for home-assistant buildPythonPackage rec { pname = "speedtest-cli"; - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1s3ylvkclzdsyqmpjnsd6ixrbmj7vd4bfsdplkjaz1c2czyy3j9p"; + sha256 = "0m1fpsb318mrpliw026a7nhx8iky306rmfi565734k7r49i3h7fg"; }; # tests require working internet connection diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 086218b8439..454cff5e4a8 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -1,69 +1,59 @@ -{ stdenv -, buildPythonPackage -, isPy27 -, fetchPypi +{ lib, buildPythonPackage, fetchPypi, isPy27 , cachetools -, cld2-cffi , cytoolz -, ftfy -, ijson +, jellyfish , matplotlib , networkx , numpy , pyemd , pyphen -, python-Levenshtein +, pytest , requests , scikitlearn , scipy , spacy -, tqdm -, unidecode +, srsly }: buildPythonPackage rec { pname = "textacy"; - version = "0.6.3"; + version = "0.9.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "50402545ac92b1a931c2365e341cb35c4ebe5575525f1dcc5265901ff3895a5f"; + sha256 = "1jhj02g6kh5vc0z4az7n547siav3gj5571bqpzdryskj6bsma2z1"; }; propagatedBuildInputs = [ cachetools - cld2-cffi cytoolz - ftfy - ijson + jellyfish matplotlib networkx numpy pyemd pyphen - python-Levenshtein requests scikitlearn scipy spacy - tqdm - unidecode + srsly ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "'ftfy>=4.2.0,<5.0.0'," "'ftfy>=5.0.0'," + checkInputs = [ pytest ]; + # almost all tests have to deal with downloading a dataset, only test pure tests + checkPhase = '' + pytest tests/test_text_utils.py \ + tests/test_utils.py \ + tests/preprocessing \ + tests/datasets/test_base_dataset.py ''; - doCheck = false; # tests want to download data files - - meta = with stdenv.lib; { + meta = with lib; { description = "Higher-level text processing, built on spaCy"; homepage = "http://textacy.readthedocs.io/"; license = licenses.asl20; maintainers = with maintainers; [ rvl ]; - # ftfy and jellyfish no longer support python2 - # latest scikitlearn not supported for this: https://github.com/chartbeat-labs/textacy/issues/260 - broken = true; }; } diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix index e0c5329d23f..17ecd369136 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -8,6 +8,8 @@ , mnemonic , keepkey , semver +, wheel +, pinentry }: buildPythonPackage rec{ @@ -19,13 +21,13 @@ buildPythonPackage rec{ sha256 = "e82bf000c1178b1a7612f2a90487eb34c6234d2edb15dc8e310ad875d8298690"; }; - propagatedBuildInputs = [ trezor libagent ecdsa ed25519 mnemonic keepkey semver ]; + propagatedBuildInputs = [ trezor libagent ecdsa ed25519 mnemonic keepkey semver wheel pinentry ]; meta = with stdenv.lib; { description = "Using Trezor as hardware SSH agent"; - homepage = https://github.com/romanz/trezor-agent; + homepage = "https://github.com/romanz/trezor-agent"; license = licenses.gpl3; - maintainers = with maintainers; [ np ]; + maintainers = with maintainers; [ np mmahut ]; }; } diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index d6a8f3ddbc6..353adbcea6f 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -6,13 +6,13 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "bundix"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { - owner = "manveru"; + owner = "nix-community"; repo = "bundix"; rev = version; - sha256 = "03jhj1dy0ljrymjnpi6mcxn36a29qxr835l1lc11879jjzvnr2ax"; + sha256 = "05y8sy6v9km1dwvpjzkjxpfzv95g6yzac1b5blac2f1r2kw167p8"; }; buildInputs = [ ruby bundler ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index fb351f4adfd..f4c7047e8de 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.106.0"; + version = "0.107.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0da32j8s3avxa84g2gn9sr4nakibllz1kq5i3bgqbndrgcgsdvgw"; + sha256 = "1in7a006lgw4v2p0gn5sx41cn3p259vncpq0l3rz52lyfpn7ai3b"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index a528a849ad7..84c56a9b569 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -5,7 +5,8 @@ , qtbase, qtsvg, qtwebengine # buildInputs , r2-for-cutter -, python3 }: +, python3 +, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "radare2-cutter"; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ qmake pkgconfig ]; - buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ]; + buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 wrapQtAppsHook ]; qmakeFlags = [ "CONFIG+=link_pkgconfig" diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 1767eaab8bc..07bb1337745 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -1,20 +1,22 @@ -{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, makeDesktopItem, wrapGAppsHook +, atk, at-spi2-atk, alsaLib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3 +, freetype, fontconfig, nss, nspr, pango, udev, libX11, libxcb, libXi +, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes +, libXrender, libXtst, libXScrnSaver +}: stdenv.mkDerivation rec { pname = "postman"; - version = "7.0.7"; + version = "7.6.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "47be1b955759520f3a2c7dcdecb85b4c52c38df717da294ba184f46f2058014a"; - name = "${pname}-${version}.tar.gz"; + sha256 = "sha256:03y82ydkj46l7dn35y944gnghbrrhc75y3yxdyidbh8fl3xvmlfv"; + name = "${pname}.tar.gz"; }; - nativeBuildInputs = [ makeWrapper ]; - - dontPatchELF = true; - - buildPhase = ":"; # nothing to build + dontBuild = true; # nothing to build + dontConfigure = true; desktopItem = makeDesktopItem { name = "postman"; @@ -26,12 +28,48 @@ stdenv.mkDerivation rec { categories = "Application;Development;"; }; + buildInputs = [ + stdenv.cc.cc.lib + atk + at-spi2-atk + alsaLib + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + freetype + fontconfig + nss + nspr + pango + udev + libX11 + libxcb + libXi + libXcursor + libXdamage + libXrandr + libXcomposite + libXext + libXfixes + libXrender + libXtst + libXScrnSaver + ]; + + nativeBuildInputs = [ wrapGAppsHook ]; + + installPhase = '' mkdir -p $out/share/postman cp -R app/* $out/share/postman + rm $out/share/postman/Postman mkdir -p $out/bin - ln -s $out/share/postman/Postman $out/bin/postman + ln -s $out/share/postman/_Postman $out/bin/postman mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ @@ -43,55 +81,21 @@ stdenv.mkDerivation rec { ln -s $out/share/postman/resources/app/assets/icon.png $iconSizeDir/postman.png ''; - preFixup = let - libPath = lib.makeLibraryPath [ - stdenv.cc.cc.lib - gnome2.pango - gnome2.GConf - pkgs.atk - pkgs.alsaLib - pkgs.cairo - pkgs.cups - pkgs.dbus.daemon.lib - pkgs.expat - pkgs.gdk-pixbuf - pkgs.glib - pkgs.gtk2-x11 - pkgs.freetype - pkgs.fontconfig - pkgs.nss - pkgs.nspr - pkgs.udev.lib - xorg.libX11 - xorg.libxcb - xorg.libXi - xorg.libXcursor - xorg.libXdamage - xorg.libXrandr - xorg.libXcomposite - xorg.libXext - xorg.libXfixes - xorg.libXrender - xorg.libX11 - xorg.libXtst - xorg.libXScrnSaver - ]; - in '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:$out/share/postman" \ - $out/share/postman/Postman - patchelf --set-rpath "${libPath}" $out/share/postman/libnode.so - patchelf --set-rpath "${libPath}" $out/share/postman/libffmpeg.so - - wrapProgram $out/share/postman/Postman --prefix LD_LIBRARY_PATH : ${libPath} + postFixup = '' + pushd $out/share/postman + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" _Postman + for file in $(find . -type f \( -name \*.node -o -name _Postman -o -name \*.so\* \) ); do + ORIGIN=$(patchelf --print-rpath $file); \ + patchelf --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}:$ORIGIN" $file + done + popd ''; meta = with stdenv.lib; { homepage = https://www.getpostman.com; description = "API Development Environment"; - license = stdenv.lib.licenses.postman; + license = licenses.postman; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ xurei ]; + maintainers = with maintainers; [ xurei evanjs ]; }; } |