diff options
Diffstat (limited to 'pkgs/development')
33 files changed, 345 insertions, 153 deletions
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 4fe8db4d2977d..7673bb2279bed 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -109,6 +109,9 @@ in { buildPhase = '' runHook preBuild local HOME=$TMPDIR + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + sed -i "s/aarch64/arm64/g" makefile + '' + '' make -j$NIX_BUILD_CORES ./bin/nim c --parallelBuild:$NIX_BUILD_CORES koch ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index 9c89b27d371f5..4df73c752e5d4 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -1,6 +1,6 @@ {callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.16.1"; - sha256 = "1333ca6lnsdck4fsgjpbqf4lagxsnbg9970wxlsrinmwvdvdnwg2"; + version = "1.24.0"; + sha256 = "sha256-iXaBLCShGGAPb88HGiBgZjCmmv5MCr7jsN6lKOaCxYU="; }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 594adc0463066..87b93a868985b 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -159,7 +159,7 @@ stdenv.mkDerivation rec { ++ optional libmfxSupport intel-media-sdk ++ optional libaomSupport libaom ++ optional vpxSupport libvpx - ++ optionals (!stdenv.isDarwin && !stdenv.isAarch32 && pulseaudioSupport) [ libpulseaudio ] # Need to be fixed on Darwin and ARM + ++ optionals (!stdenv.isDarwin && pulseaudioSupport) [ libpulseaudio ] # Need to be fixed on Darwin ++ optionals vaapiSupport [ libva libdrm ] ++ optional stdenv.isLinux alsa-lib ++ optionals stdenv.isDarwin [ Cocoa CoreMedia VideoToolbox ] diff --git a/pkgs/development/libraries/libcerf/default.nix b/pkgs/development/libraries/libcerf/default.nix index 287c9a61b9c74..7a3b963141894 100644 --- a/pkgs/development/libraries/libcerf/default.nix +++ b/pkgs/development/libraries/libcerf/default.nix @@ -1,16 +1,20 @@ -{ stdenv, lib, fetchurl, cmake, perl }: +{ stdenv, lib, fetchurl, cmake, perl, gnuplot }: stdenv.mkDerivation rec { pname = "libcerf"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz"; - sha256 = "05lpaxmy6275nbzvf1ahxcfymyph89pvlgg8h9sp9iwal4g8nvn8"; + sha256 = "sha256-ihzYt/rgS4KpUWglISm4wbrKCYooX/jT8leB3q0Ut1o="; }; nativeBuildInputs = [ cmake perl ]; + passthru.tests = { + inherit gnuplot; + }; + meta = with lib; { description = "Complex error (erf), Dawson, Faddeeva, and Voigt function library"; homepage = "https://jugit.fz-juelich.de/mlz/libcerf"; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 09788cfef71d3..d4812c6f08233 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -3,7 +3,7 @@ }: let - version = "2.0.7"; + version = "2.0.8"; # Make sure we override python, so the correct version is chosen boostPython = boost.override { enablePython = true; inherit python; }; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "v${version}"; - sha256 = "sha256-ikDtx1BIikVEL5jf37byNbuS+ft1lDtHUlFqegndapw="; + sha256 = "sha256-mMY3NiSL/lYuYmV/KWgfKbs8XukSV4PvQ87tpgBid6M="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 79a11e2958ad8..afbdc374ce493 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -2,14 +2,17 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.8.3"; + version = "1.8.7"; src = fetchFromGitHub { owner = "tdlib"; repo = "td"; - # https://github.com/tdlib/td/issues/1790 - rev = "054a823c1a812ee3e038f702c6d8ba3e6974be9c"; - sha256 = "sha256-YlvIGR3Axej0nfcGBQ5lwwYVWsLgqFrYgOxoNubYMPM="; + + # The tdlib authors do not set tags for minor versions, but + # external programs depending on tdlib constrain the minor + # version, hence we set a specific commit with a known version. + rev = "a7a17b34b3c8fd3f7f6295f152746beb68f34d83"; + sha256 = "sha256:0a5609knn7rmiiblz315yrvc9f2r207l2nl6brjy5bnhjdspmzs6"; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index c11e09790eb76..602f87584ef7a 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "0.3.4"; + version = "0.3.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-jInCWya146QI7D89zSAPChF8GMDj7NRzu9NvVIbkntM="; + hash = "sha256-2GmBO67sUIjasF5MHrDkZ4D+dk3xN+HNpc7nSN+qTaQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/click-shell/default.nix b/pkgs/development/python-modules/click-shell/default.nix new file mode 100644 index 0000000000000..68d65069ae443 --- /dev/null +++ b/pkgs/development/python-modules/click-shell/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, click +, pytestCheckHook +, pytest-click +}: + +buildPythonPackage rec { + pname = "click-shell"; + version = "2.1"; + format = "setuptools"; + + # PyPi release is missing tests + src = fetchFromGitHub { + owner = "clarkperkins"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-4QpQzg0yFuOFymGiTI+A8o6LyX78iTJMqr0ernYbilI="; + }; + + propagatedBuildInputs = [ + click + ]; + + checkInputs = [ + pytest-click + pytestCheckHook + ]; + + pythonImportsCheck = [ + "click_shell" + ]; + + preCheck = "export HOME=$(mktemp -d)"; + + meta = with lib; { + description = "An extension to click that easily turns your click app into a shell utility"; + longDescription = '' + This is an extension to click that easily turns your click app into a + shell utility. It is built on top of the built in python cmd module, + with modifications to make it work with click. It adds a 'shell' mode + with command completion to any click app. + ''; + homepage = "https://github.com/clarkperkins/click-shell"; + license = licenses.bsd3; + maintainers = with maintainers; [ binsky ]; + }; +} diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index c0519332342ea..368e95c2a1a02 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -8,50 +8,56 @@ , numpy , pytestCheckHook , pyyaml +, toml , pythonOlder }: buildPythonPackage rec { pname = "deepdiff"; - version = "5.8.2"; + version = "6.1.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "seperman"; repo = "deepdiff"; - rev = "v${version}"; - hash = "sha256-7eagu6lef5bc/4KU3y067LFOGtH6whda1ocBuRHS/kI="; + rev = "refs/tags/${version}"; + hash = "sha256-ngtQNyVQaywMyYitj37m0RJGBiMpjB4b8Rn+feMOjVU="; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace "ordered-set==4.0.2" "ordered-set" substituteInPlace tests/test_command.py \ --replace '/tmp/' "$TMPDIR/" ''; propagatedBuildInputs = [ - click ordered-set ]; - pythonImportsCheck = [ - "deepdiff" - ]; + passthru.optional-dependencies = { + cli = [ + clevercsv + click + pyyaml + toml + ]; + }; checkInputs = [ - clevercsv jsonpickle numpy pytestCheckHook - pyyaml + ] ++ passthru.optional-dependencies.cli; + + pythonImportsCheck = [ + "deepdiff" ]; meta = with lib; { description = "Deep Difference and Search of any Python object/data"; homepage = "https://github.com/seperman/deepdiff"; + changelog = "https://github.com/seperman/deepdiff/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 2478b07d90401..e179f5c94d203 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -11,12 +11,14 @@ }: buildPythonPackage rec { - pname = "Eve"; - version = "2.0.1"; + pname = "eve"; + version = "2.0.2"; + format = "setuptools"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-34dfYd1DSMAHSB0w6T8YPSQA3GUCgcNEFOD5sM+SapQ="; + inherit version; + pname = "Eve"; + sha256 = "80cad5702d07189c5f43f432d307c473331144477a6a360d22a27dc018366c13"; }; disabled = pythonOlder "3.7"; @@ -32,7 +34,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "events>=0.3,<0.4" "events>=0.3,<0.5" + --replace "flask<2.2" "flask" \ + --replace "events>=0.3,<0.4" "events>=0.3" ''; pythonImportsCheck = [ "eve" ]; diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index 8697d4fee1da9..0bd151e236afe 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "heatzypy"; - version = "2.0.6"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Cyr-ius"; repo = pname; - rev = version; - sha256 = "sha256-sD32zP3HWEq9FCM9PFywHaLEU+MJOvro+FpjrlM4dG4="; + rev = "refs/tags/${version}"; + sha256 = "sha256-4/v0xodpJzVi6/ciW5icqDFGCtBFKtGoMB92CknH9xw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index 0ef45a56a6dee..f0b702b1b5133 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -1,9 +1,11 @@ { lib , aenum , aiohttp +, asynctest , buildPythonPackage , fetchFromGitHub , pydantic +, pytest-mock , pytestCheckHook , pythonOlder , requests @@ -11,7 +13,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "2.0.1"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +22,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = pname; rev = version; - hash = "sha256-CO6ImL2e6B2yvHAQs3Cc7oaOllB5V9sap4bQS/XRnWI="; + hash = "sha256-dn5814eRZ9456Fn7blf1UzXPii4dXu3sjoXBV7CmwSs="; }; propagatedBuildInputs = [ @@ -31,6 +33,8 @@ buildPythonPackage rec { ]; checkInputs = [ + asynctest + pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix index c15bb59f47382..c71bf3214b2c1 100644 --- a/pkgs/development/python-modules/mediafile/default.nix +++ b/pkgs/development/python-modules/mediafile/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mediafile"; - version = "0.9.0"; + version = "0.10.0"; format = "flit"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "beetbox"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S90BgjKXpE4kAR0mPXgacmr2A+0hrkGpHRMeuvyFNCg="; + hash = "sha256-Sdb5Hvm4Y344msZGie4PJ88ZmFtWfc0chABtmwnEN/Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index f132614d1ca00..b34c883d685cf 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -1,26 +1,37 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, isPy3k -, bitcoinlib, GitPython, pysha3, git }: +{ lib +, bitcoinlib +, buildPythonPackage +, fetchFromGitHub +, git +, GitPython +, pysha3 +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "opentimestamps"; - version = "0.4.1"; - disabled = (!isPy3k); + version = "0.4.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # We can't use the pypi source because it doesn't include README.md which is - # needed in setup.py src = fetchFromGitHub { owner = "opentimestamps"; repo = "python-opentimestamps"; rev = "python-opentimestamps-v${version}"; - sha256 = "0c45ij8absfgwizq6dfgg81siq3y8605sgg184vazp292w8nqmqr"; + hash = "sha256-RRCAxDYWySmnG1sEQWurUDQsu+vPx9Npbr6BaoNGm1U="; }; - patches = [ - # build against bitcoinlib-0.11 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/opentimestamps/python-opentimestamps/pull/43.patch"; - sha256 = "0bxzk4pzpqk7zrk2x7vn2bj2n3pc5whf8ijbd225s6674q450zbg"; - }) + propagatedBuildInputs = [ + bitcoinlib + GitPython + pysha3 + ]; + + checkInputs = [ + git + pytestCheckHook ]; # Remove a failing test which expects the test source file to reside in the @@ -29,12 +40,14 @@ buildPythonPackage rec { rm opentimestamps/tests/core/test_git.py ''; - checkInputs = [ git ]; - propagatedBuildInputs = [ bitcoinlib GitPython pysha3 ]; + pythonImportsCheck = [ + "opentimestamps" + ]; - meta = { + meta = with lib; { description = "Create and verify OpenTimestamps proofs"; homepage = "https://github.com/opentimestamps/python-opentimestamps"; - license = lib.licenses.lgpl3; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 241953cda3ed2..e97db8beefe0b 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , buildPythonPackage +, pythonOlder , fetchFromGitHub , cmake , boost @@ -9,6 +10,7 @@ , catch , numpy , pytestCheckHook +, libxcrypt }: buildPythonPackage rec { @@ -27,6 +29,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/python-modules/pycotap/default.nix b/pkgs/development/python-modules/pycotap/default.nix new file mode 100644 index 0000000000000..df7591459e2d3 --- /dev/null +++ b/pkgs/development/python-modules/pycotap/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pycotap"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-+Tjs1JMczRnZWY+2M9Xqu3k48IuEcXMV5SUmqmJ3yew="; + }; + + meta = with lib; { + description = "Test runner for unittest that outputs TAP results to stdout"; + homepage = "https://el-tramo.be/pycotap"; + license = licenses.mit; + maintainers = with maintainers; [ mwolfe ]; + }; +} diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 5c56150e8f535..e84374e4f744f 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -43,6 +43,12 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # https://github.com/natekspencer/pylitterbot/issues/73 + substituteInPlace pyproject.toml \ + --replace 'deepdiff = "^5.8.1"' 'deepdiff = ">=5.8.1"' + ''; + pytestFlagsArray = [ "--asyncio-mode=legacy" ]; diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix index 3bee9f61780b4..8980a9ff592ba 100644 --- a/pkgs/development/python-modules/pypdf2/default.nix +++ b/pkgs/development/python-modules/pypdf2/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Pure-Python library built as a PDF toolkit"; - homepage = "https://github.com/py-pdf/PyPDF2"; + homepage = "https://pypdf2.readthedocs.io/"; changelog = "https://github.com/py-pdf/PyPDF2/raw/${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ desiderius vrthra ]; diff --git a/pkgs/development/python-modules/pysol-cards/default.nix b/pkgs/development/python-modules/pysol-cards/default.nix new file mode 100644 index 0000000000000..7be154a315c99 --- /dev/null +++ b/pkgs/development/python-modules/pysol-cards/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, six, random2 }: + +buildPythonPackage rec { + pname = "pysol-cards"; + version = "0.14.2"; + + src = fetchPypi { + inherit version; + pname = "pysol_cards"; + sha256 = "sha256-wI3oV1d7w+7JcMOt08RbNlMWzChErNYIO7Vuox1A6vA="; + }; + + propagatedBuildInputs = [ six random2 ]; + + meta = with lib; { + description = "Generates Solitaire deals"; + homepage = "https://github.com/shlomif/pysol_cards"; + license = licenses.mit; + maintainers = with maintainers; [ mwolfe ]; + }; +} diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 0f5601bd4851a..b48804ed86709 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.82"; + version = "0.0.83"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-2pm0fLPw/ROjYwvaL1wyZ39ZAbAjwc1TPsbYsO0+vcI="; + hash = "sha256-N+DSaPohwkMJ+YjbnUi7k8GQ+YFd6Ng8n0yesEnOnRA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 3de5d13e9c929..aa7d65320671b 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -498,7 +498,9 @@ let packagesWithBuildInputs = { # sort -t '=' -k 2 + deldir = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; gam = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; + interp = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; RcppArmadillo = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; quantreg = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; rmutil = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 1011cacd3661c..18a2e1a145c2e 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u2k812oGePSxhWkU2iXzIRnZFfnECXPV5Ocq9jwywb4="; + sha256 = "sha256-stfHkQqgxlPJ6qMGZ+oCcp5M6GuL71GC8PE08lL8Fig="; }; - vendorSha256 = "sha256-W9dKOxyLIplCQVOJGMvdSsaOFfUkCiS615NVzQFR+DM="; + vendorSha256 = "sha256-Ced/3KY78wBSo02sbowV8eI1tHe+a6g9DnRQ3AXp8fU="; doCheck = false; diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index b03d4f3b3aa1e..82d0359de9643 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.88.0"; + version = "0.89.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FlkDequdr8dOgbk4fFlLnBSPWvOWz0tTmPJTlXxV6fg="; + sha256 = "sha256-MsuLMEbOz68RNq0kLicTslSiucdmcOn7Y6Nhbxwyt+Q="; }; - vendorSha256 = "sha256-HX4seTtO5DWeR1PqXnYKIKq1/wP6/ppTclDpkQSzgbM="; + vendorSha256 = "sha256-Llq6siZn34sHsZFneT+MLXf2W9cXqi4DZwrH1R5laOY="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index d55ea9ae52ab5..9e3e663118275 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "15.4.0"; + version = "15.5.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorSha256 = "sha256-S0x1b2ITtqMoqdssoTgnolDC6Tyq3IdkJqxwZ29qCyU="; + vendorSha256 = "sha256-IcsYH1V3b5IUY2JqOADJrc4lkng1GS7lndfHObRQbxU="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-zItzg5r0V+m68c5aIJLMKsTKgmkgWrQD9t0cx5Lcaho="; + sha256 = "sha256-WdrvVmuYyFAMwUDEANOjXiPoQ8rvXbcQz5mBlWUL54k="; }; patches = [ diff --git a/pkgs/development/tools/cucumber/Gemfile.lock b/pkgs/development/tools/cucumber/Gemfile.lock index 82a972144938f..cad9810973f55 100644 --- a/pkgs/development/tools/cucumber/Gemfile.lock +++ b/pkgs/development/tools/cucumber/Gemfile.lock @@ -1,28 +1,39 @@ GEM remote: https://rubygems.org/ specs: - backports (3.14.0) - builder (3.2.3) - cucumber (3.1.2) - builder (>= 2.1.2) - cucumber-core (~> 3.2.0) - cucumber-expressions (~> 6.0.1) - cucumber-wire (~> 0.0.1) - diff-lcs (~> 1.3) - gherkin (~> 5.1.0) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.2) - cucumber-core (3.2.1) - backports (>= 3.8.0) - cucumber-tag_expressions (~> 1.1.0) - gherkin (~> 5.0) - cucumber-expressions (6.0.1) - cucumber-tag_expressions (1.1.1) - cucumber-wire (0.0.1) - diff-lcs (1.3) - gherkin (5.1.0) - multi_json (1.13.1) - multi_test (0.1.2) + builder (3.2.4) + cucumber (8.0.0) + builder (~> 3.2, >= 3.2.4) + cucumber-ci-environment (~> 9.0, >= 9.0.4) + cucumber-core (~> 11.0, >= 11.0.0) + cucumber-cucumber-expressions (~> 15.1, >= 15.1.1) + cucumber-gherkin (~> 23.0, >= 23.0.1) + cucumber-html-formatter (~> 19.1, >= 19.1.0) + cucumber-messages (~> 18.0, >= 18.0.0) + diff-lcs (~> 1.5, >= 1.5.0) + mime-types (~> 3.4, >= 3.4.1) + multi_test (~> 1.1, >= 1.1.0) + sys-uname (~> 1.2, >= 1.2.2) + cucumber-ci-environment (9.1.0) + cucumber-core (11.0.0) + cucumber-gherkin (~> 23.0, >= 23.0.1) + cucumber-messages (~> 18.0, >= 18.0.0) + cucumber-tag-expressions (~> 4.1, >= 4.1.0) + cucumber-cucumber-expressions (15.2.0) + cucumber-gherkin (23.0.1) + cucumber-messages (~> 18.0, >= 18.0.0) + cucumber-html-formatter (19.2.0) + cucumber-messages (~> 18.0, >= 18.0.0) + cucumber-messages (18.0.0) + cucumber-tag-expressions (4.1.0) + diff-lcs (1.5.0) + ffi (1.15.5) + mime-types (3.4.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2022.0105) + multi_test (1.1.0) + sys-uname (1.2.2) + ffi (~> 1.1) PLATFORMS ruby @@ -31,4 +42,4 @@ DEPENDENCIES cucumber BUNDLED WITH - 2.1.4 + 2.3.22 diff --git a/pkgs/development/tools/cucumber/gemset.nix b/pkgs/development/tools/cucumber/gemset.nix index d96d907180634..f702301c24720 100644 --- a/pkgs/development/tools/cucumber/gemset.nix +++ b/pkgs/development/tools/cucumber/gemset.nix @@ -1,114 +1,158 @@ { - backports = { + builder = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn"; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; type = "gem"; }; - version = "3.14.0"; + version = "3.2.4"; }; - builder = { + cucumber = { + dependencies = ["builder" "cucumber-ci-environment" "cucumber-core" "cucumber-cucumber-expressions" "cucumber-gherkin" "cucumber-html-formatter" "cucumber-messages" "diff-lcs" "mime-types" "multi_test" "sys-uname"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + sha256 = "1ahpifcqv0h5r9cgd97fwr73ps90h50jzi0h17zsaw4ksb3b6g2m"; type = "gem"; }; - version = "3.2.3"; + version = "8.0.0"; }; - cucumber = { - dependencies = ["builder" "cucumber-core" "cucumber-expressions" "cucumber-wire" "diff-lcs" "gherkin" "multi_json" "multi_test"]; + cucumber-ci-environment = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s2brssrpal8hyhcgg974x3xyhpmvpwps5ypd9p8w2lg01l1pp3j"; + sha256 = "1nmn2hfrjlbazgcryr3hwvsa5v4csfbjqxb4q7wbjhaxl9xxn0k7"; type = "gem"; }; - version = "3.1.2"; + version = "9.1.0"; }; cucumber-core = { - dependencies = ["backports" "cucumber-tag_expressions" "gherkin"]; + dependencies = ["cucumber-gherkin" "cucumber-messages" "cucumber-tag-expressions"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0drg9w5cz5mchh077y9ixsy7yiyrzg3cqc29mmkl3vjcwlkhn3rh"; + type = "gem"; + }; + version = "11.0.0"; + }; + cucumber-cucumber-expressions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14xkgpy69p24winh4p5q2b3534i02xxbxl5rn0capqv97qjyj63j"; + type = "gem"; + }; + version = "15.2.0"; + }; + cucumber-gherkin = { + dependencies = ["cucumber-messages"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iavlh8hqj9lwljbpkw06259gdicbr1bdb6pbj5yy3n8szgr8k3c"; + sha256 = "0dsvcjy78c114q3znacs25zhq3f49q9kkxq4j9iw8b6kwimrl8wj"; type = "gem"; }; - version = "3.2.1"; + version = "23.0.1"; }; - cucumber-expressions = { + cucumber-html-formatter = { + dependencies = ["cucumber-messages"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zwmv6hznyz9vk81f5dhwcr9jhxx2vmbk8yyazayvllvhy0fkpdw"; + sha256 = "1gnmm1r4gyqqwzx482zsbahjyamnj0lxxky86zs4a376jv9bicyz"; type = "gem"; }; - version = "6.0.1"; + version = "19.2.0"; }; - cucumber-tag_expressions = { + cucumber-messages = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cvmbljybws0qzjs1l67fvr9gqr005l8jk1ni5gcsis9pfmqh3vc"; + sha256 = "1i8abkxykq7ab15pirrrf0jz9200i3x3pda2ffyxmck6063lyjgv"; type = "gem"; }; - version = "1.1.1"; + version = "18.0.0"; }; - cucumber-wire = { + cucumber-tag-expressions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09ymvqb0sbw2if1nxg8rcj33sf0va88ancq5nmp8g01dfwzwma2f"; + sha256 = "0v1ssg4chkahck1ddl2j1hcifm0vlcn9sb104ywshw5gyv59s9qd"; type = "gem"; }; - version = "0.0.1"; + version = "4.1.0"; }; diff-lcs = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; + type = "gem"; + }; + version = "1.5.0"; + }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; type = "gem"; }; - version = "1.3"; + version = "1.15.5"; }; - gherkin = { + mime-types = { + dependencies = ["mime-types-data"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cgcdchwwdm10rsk44frjwqd4ihprhxjbm799nscqy2q1raqfj5s"; + sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; type = "gem"; }; - version = "5.1.0"; + version = "3.4.1"; }; - multi_json = { + mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; type = "gem"; }; - version = "1.13.1"; + version = "3.2022.0105"; }; multi_test = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sx356q81plr67hg16jfwz9hcqvnk03bd9n75pmdw8pfxjfy1yxd"; + sha256 = "042d6a1416h3di57z107ygmjdgacrpyswi73ryz75yv3v36m1rg9"; + type = "gem"; + }; + version = "1.1.0"; + }; + sys-uname = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gk625krfm00nppb2ni0794kzr1cqbs1a0059fhp4s3lcrmx69jc"; type = "gem"; }; - version = "0.1.2"; + version = "1.2.2"; }; } diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index ec0cd56e019b3..913cde8ca493e 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.50.0"; + version = "1.50.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-bYLKju4+X28KpAcd1OcniTHwLZz97qDj9ZruGFqspaY="; + sha256 = "sha256-7HoneQtKxjQVvaTdkjPeu+vJWVOZG3AOiRD87/Ntgn8="; }; - vendorSha256 = "sha256-DYfoPyE8MA2NiPDE1y8bE+tOn81adkN9zQJ7G3dqA64="; + vendorSha256 = "sha256-6ttRd2E8Zsf/2StNYt6JSC64A57QIv6EbwAwJfhTDaY="; doCheck = false; diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index ff9253e4b0397..5d0120804f44a 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -4,6 +4,8 @@ , makeWrapper , mercurial , git +, openssh +, nixosTests }: buildGoModule rec { @@ -25,9 +27,11 @@ buildGoModule rec { doCheck = false; postInstall = '' - wrapProgram $out/bin/houndd --prefix PATH : ${lib.makeBinPath [ mercurial git ]} + wrapProgram $out/bin/houndd --prefix PATH : ${lib.makeBinPath [ mercurial git openssh ]} ''; + passthru.tests = { inherit (nixosTests) hound; }; + meta = with lib; { inherit (src.meta) homepage; description = "Lightning fast code searching made easy"; diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 66ac8c66096d4..fc71c4aa4ea48 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # fails 8 out of 24 tests, problems when loading libc.so.6 - doCheck = stdenv.name == "stdenv-linux"; + doCheck = stdenv.name == "stdenv-linux" + # test scripts require unprefixed bintools binaries + # https://github.com/NixOS/patchelf/issues/417 + && stdenv.cc.targetPrefix == ""; meta = with lib; { homepage = "https://github.com/NixOS/patchelf"; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index b7585c04456fc..b82743b16c274 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "12.6.7"; + version = "12.6.8"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R5PlkAs+NtAajWWU0NODC4jaSWPSG9wqoahfSj2GIa4="; + sha256 = "sha256-Tn3XOkNBV6hOAV8SuOKX5ktplTtn/HXc+8hdl96XuJU="; }; vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU="; diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/development/tools/protoc-gen-validate/default.nix index 435386ea45ef4..a9370f50155c1 100644 --- a/pkgs/development/tools/protoc-gen-validate/default.nix +++ b/pkgs/development/tools/protoc-gen-validate/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-validate"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitHub { - owner = "envoyproxy"; + owner = "bufbuild"; repo = "protoc-gen-validate"; rev = "v${version}"; - sha256 = "sha256-JoOTIteE4/IFsVVXcRI1KYpRONjo3veQ6uCtxYFlz8Y="; + sha256 = "sha256-w3qtDMRuMRTjNNjkCBzjgvtzgYABLm/OL94p9M8Db6U="; }; vendorSha256 = "sha256-vFi1DT7o2fyzxO/aZHtdsU1/G/sGmamqZPeql0vQVjs="; diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index e67a6a696d694..243c23ee52d3a 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -1,43 +1,29 @@ { lib , rustPlatform , fetchFromGitHub -, curl , installShellFiles -, pkg-config -, openssl , stdenv -, darwin , nix-update-script , callPackage }: rustPlatform.buildRustPackage rec { pname = "cargo-asm"; - version = "0.1.24"; + version = "0.2.0"; src = fetchFromGitHub { owner = "pacak"; repo = "cargo-show-asm"; rev = version; - hash = "sha256-ahkKUtg5M88qddzEwYxPecDtBofGfPVxKuYKgmsbWYc="; + hash = "sha256-qsr28zuvu+i7P/MpwhDKQFFXTyFFo+vWrjBrpD1V8PY="; }; - cargoHash = "sha256-S7OpHNjiTfQg7aPmHEx6Q/OV5QA9pB29F3MTIeiLAXg="; + cargoHash = "sha256-IL+BB08uZr5fm05ITxpm66jTb+pYYlLKOwQ8uf5rKSs="; nativeBuildInputs = [ - curl.dev installShellFiles - pkg-config ]; - buildInputs = [ - curl - openssl - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreFoundation - SystemConfiguration - ]); - postInstall = '' installShellCompletion --cmd cargo-asm \ --bash <($out/bin/cargo-asm --bpaf-complete-style-bash) \ diff --git a/pkgs/development/tools/tokio-console/default.nix b/pkgs/development/tools/tokio-console/default.nix index 6ff132e8146a7..8c9b2803a0aee 100644 --- a/pkgs/development/tools/tokio-console/default.nix +++ b/pkgs/development/tools/tokio-console/default.nix @@ -6,19 +6,29 @@ rustPlatform.buildRustPackage rec { pname = "tokio-console"; - version = "0.1.3"; + version = "0.1.7"; src = fetchFromGitHub { owner = "tokio-rs"; repo = "console"; rev = "tokio-console-v${version}"; - sha256 = "sha256-v9BxfBLRJug/1AgvDV7P5AOXwZfCu1mNgJjhbipoZNg="; + sha256 = "sha256-yTNLKpBkzzN0X73CjN/UXRGjAGOnCCgJa6A6loA6baM="; }; - cargoSha256 = "sha256-584EC9x7tJE3pHqgQVh6LWKuCgLXuBBEnaPvo1A8RIs="; + cargoSha256 = "sha256-K/auhqlL/K6RYE0lHyvSUqK1cOwJBBZD3QTUevZzLXQ="; nativeBuildInputs = [ protobuf ]; + # uses currently unstable tokio features + RUSTFLAGS = "--cfg tokio_unstable"; + + checkFlags = [ + # tests depend upon git repository at test execution time + "--skip bootstrap" + "--skip config::tests::args_example_changed" + "--skip config::tests::toml_example_changed" + ]; + meta = with lib; { description = "A debugger for asynchronous Rust code"; homepage = "https://github.com/tokio-rs/console"; @@ -26,4 +36,3 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ max-niederman ]; }; } - |