diff options
Diffstat (limited to 'pkgs/development')
73 files changed, 722 insertions, 349 deletions
diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 813ddebef43dc..236c54136c8a4 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.24.0"; + version = "0.29.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -19,7 +19,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-fKe6vsY40lexnkUP4PEsc53WFaUAw5LGLEC/zJauogg="; + sha256 = "sha256-BWI7H5HU5ZgXrMWFOZ7WpTfS6syrFpEVRInZW6hC5iE="; rev = version; }; releaseType = "escript"; diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix index 9d1fa9aef0670..18de8cfc72afe 100644 --- a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix +++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -66,11 +66,12 @@ let }; yamerl = builder { name = "yamerl"; - version = "0.8.1"; - src = fetchHex { - pkg = "yamerl"; - version = "0.8.1"; - sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8="; + version = "git"; + src = fetchFromGitHub { + owner = "erlang-ls"; + repo = "yamerl"; + rev = "9a9f7a2e84554992f2e8e08a8060bfe97776a5b7"; + sha256 = "1gb44v27paxwxm443m5f554wiziqi2kd300hgjjdg6fyvy3mvhss"; }; beamDeps = [ ]; }; @@ -130,8 +131,8 @@ let src = fetchFromGitHub { owner = "josefs"; repo = "gradualizer"; - rev = "e93db1c6725760def005c69d72f53b1a889b4c2f"; - sha256 = "0i1mh0dw2qknrjwpbxhgpwspqv12bznylv17sznid3kbb31pslay"; + rev = "6e89b4e1cd489637a848cc5ca55058c8a241bf7d"; + sha256 = "1ix0xgd0267ibx6y68fx4pq8q3j0y7rjs7j3cv3v2gdiy190psy9"; }; beamDeps = [ ]; }; diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix new file mode 100644 index 0000000000000..7642ae4aff265 --- /dev/null +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -0,0 +1,41 @@ +{ stdenv, lib, fetchurl, ocamlPackages, mpfr, ppl }: + +stdenv.mkDerivation rec { + pname = "jasmin-compiler"; + version = "21.0"; + + src = fetchurl { + url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; + sha256 = "sha256:1px17fpc00gca5ayfcr4k008srkyw120c25rnyf7cgzfs1gpylj2"; + }; + + sourceRoot = "jasmin-compiler-v${version}/compiler"; + + nativeBuildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild menhir camlidl ]; + + buildInputs = [ + mpfr + ppl + ] ++ (with ocamlPackages; [ + apron + batteries + menhirLib + yojson + zarith + ]); + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp jasminc.native $out/bin/jasminc + runHook postInstall + ''; + + meta = { + description = "A workbench for high-assurance and high-speed cryptography"; + homepage = "https://github.com/jasmin-lang/jasmin/"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/coq-modules/coqtail-math/default.nix b/pkgs/development/coq-modules/coqtail-math/default.nix index c9c3915414c35..3491e6b21f2f8 100644 --- a/pkgs/development/coq-modules/coqtail-math/default.nix +++ b/pkgs/development/coq-modules/coqtail-math/default.nix @@ -6,7 +6,12 @@ mkCoqDerivation { pname = "coqtail-math"; owner = "coq-community"; inherit version; - defaultVersion = if versions.range "8.11" "8.13" coq.coq-version then "20201124" else null; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.11" "8.15"; out = "8.14"; } + { case = range "8.11" "8.13"; out = "20201124"; } + ] null; + + release."8.14".sha256 = "sha256:1k8f8idjnx0mf4z479vcx55iz42rjxrbplbznv80m2famxakq03c"; release."20201124".rev = "5c22c3d7dcd8cf4c47cf84a281780f5915488e9e"; release."20201124".sha256 = "sha256-wd+Lh7dpAD4zfpyKuztDmSFEZo5ZiFrR8ti2jUCVvoQ="; diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index 14f1bab574ad4..26bd38f72df11 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -4,9 +4,13 @@ with lib; mkCoqDerivation { pname = "metalib"; owner = "plclub"; inherit version; - defaultVersion = if versions.range "8.10" "8.13" coq.coq-version then "20200527" else null; - release."20200527".rev = "597fd7d0c93eb159274e84a39d554f10f1efccf8"; - release."20200527".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.14" "8.15"; out = "8.15"; } + { case = range "8.10" "8.13"; out = "8.10"; } + ] null; + releaseRev = v: "coq${v}"; + release."8.15".sha256 = "0wbp058zwa4bkdjj38aysy2g1avf9nrh8q23a3dil0q00qczi616"; + release."8.10".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; sourceRoot = "source/Metalib"; installFlags = "COQMF_COQLIB=$(out)/lib/coq/${coq.coq-version}"; diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index c514e3d78003a..67886920cd37f 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-7UeL8D+A0pH3TKNO5B8A1nhD7uDWeirHnHaI/YKVwyo="; + sha256 = "sha256-/4lc+/YiLPxrn+7Z67sEapYY0ocLWHPC8yeYD2VI+64="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 7dbc4157f6ee2..4428b077a47d3 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxslt librsvg ]; enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.hostPlatform.isPower64; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index d1c7233f0d488..9b67dd49c82bf 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -13,6 +13,8 @@ gst-plugins-ugly = callPackage ./ugly { inherit CoreFoundation DiskArbitration IOKit; }; + gst-plugins-viperfx = callPackage ./viperfx { }; + gst-rtsp-server = callPackage ./rtsp-server { }; gst-libav = callPackage ./libav { }; diff --git a/pkgs/development/libraries/gstreamer/viperfx/default.nix b/pkgs/development/libraries/gstreamer/viperfx/default.nix new file mode 100644 index 0000000000000..83c7d75e98c1a --- /dev/null +++ b/pkgs/development/libraries/gstreamer/viperfx/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, wrapGAppsHook +, gst_all_1 +, cmake +}: +stdenv.mkDerivation rec { + pname = "gst-plugins-viperfx"; + version = "unstable-2020-9-20"; + + src = fetchFromGitHub { + owner = "Audio4Linux"; + repo = "gst-plugin-viperfx"; + rev = "a5c1b03dfe1ab0822b717a5f9392e9f1237fdba0"; + sha256 = "sha256-0so4jV56nl3tZHuZpvtyMrpOZ4tNJ59Pyj6zbV5bJ5Y="; + }; + + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + + propagatedBuildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; + + installPhase = '' + runHook preInstall + install -D libgstviperfx.so $out/lib/gstreamer-1.0/libgstviperfx.so + install -D $src/COPYING $out/share/licenses/gst-plugins-viperfx/LICENSE + runHook postInstall + ''; + + meta = with lib; { + description = "ViPER FX core wrapper plug-in for GStreamer1"; + homepage = "https://github.com/Audio4Linux/gst-plugin-viperfx"; + license = licenses.unfreeRedistributable; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix index f4eaa9c31993c..06fb0d41b8bc1 100644 --- a/pkgs/development/libraries/libslirp/default.nix +++ b/pkgs/development/libraries/libslirp/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.6.1"; + version = "4.7.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AM6NxO4hjFiUAzRYbXV3fe18xwCBmzdM63n93UOxjKw="; + sha256 = "sha256-avUbgXPPV3IhUwZyARxCvctbVlLqDKWmMhAjdVBA3jY="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/libviperfx/default.nix b/pkgs/development/libraries/libviperfx/default.nix new file mode 100644 index 0000000000000..3c980823f410c --- /dev/null +++ b/pkgs/development/libraries/libviperfx/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "libviperfx"; + version = "unstable-2018-01-15"; + + src = fetchFromGitHub { + owner = "vipersaudio"; + repo = "viperfx_core_binary"; + rev = "6f7d0da725affe854f083baf5d90c70e172e4488"; + sha256 = "sha256-hfX46Kk91eQgiO3uhew91I6eEHxazhdGwSkhfNZ+HvQ="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + install -D libviperfx_x64_linux.so $out/lib/libviperfx.so + install -D README.md $out/share/licenses/libviperfx/LICENSE + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/vipersaudio/viperfx_core_binary"; + description = "The ViPER FX core"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ rewine ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index 1638caa0d1f8b..5a965c3d7d92b 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cutee }: +{ lib, stdenv, fetchurl, fetchpatch, cutee }: stdenv.mkDerivation rec { pname = "mimetic"; @@ -11,7 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ cutee ]; - patches = lib.optional stdenv.isAarch64 ./narrowing.patch; + patches = [ + # Fix build with gcc11 + (fetchpatch { + url = "https://github.com/tat/mimetic/commit/bf84940f9021950c80846e6b1a5f8b0b55991b00.patch"; + sha256 = "sha256-1JW9zPg67BgNsdIjK/jp9j7QMg50eRMz5FsDsbbzBlI="; + }) + ] ++ lib.optional stdenv.isAarch64 ./narrowing.patch; meta = with lib; { description = "MIME handling library"; diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 32bfa6f245841..b26738c9ea154 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libpng libtiff lcms2 ]; - doCheck = (testsSupport && !stdenv.isAarch64); # tests fail on aarch64-linux + doCheck = (testsSupport && !stdenv.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64 checkPhase = '' substituteInPlace ../tools/ctest_scripts/travis-ci.cmake \ --replace "JPYLYZER_EXECUTABLE=" "JPYLYZER_EXECUTABLE=\"${jpylyzer}/bin/jpylyzer\" # " diff --git a/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch b/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch deleted file mode 100644 index 5c2af7a2adc20..0000000000000 --- a/pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/poppler/JPEG2000Stream.cc b/poppler/JPEG2000Stream.cc ---- a/poppler/JPEG2000Stream.cc -+++ b/poppler/JPEG2000Stream.cc -@@ -201,7 +201,7 @@ void JPXStream::init() - if (getDict()) smaskInData = getDict()->lookup("SMaskInData"); - - int bufSize = BUFFER_INITIAL_SIZE; -- if (oLen.isInt()) bufSize = oLen.getInt(); -+ if (oLen.isInt() && oLen.getInt() > 0) bufSize = oLen.getInt(); - - if (cspace.isArray() && cspace.arrayGetLength() > 0) { - -@@ -365,7 +365,7 @@ void JPXStream::init() - } - - int bufSize = BUFFER_INITIAL_SIZE; -- if (oLen.isInt()) bufSize = oLen.getInt(); -+ if (oLen.isInt() && oLen.getInt() > 0) bufSize = oLen.getInt(); - - if (cspace.isArray() && cspace.arrayGetLength() > 0) { diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix deleted file mode 100644 index e46da53f68dc4..0000000000000 --- a/pkgs/development/libraries/poppler/0.61.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, cairo -, cmake -, curl -, fontconfig -, freetype -, lcms -, libiconv -, libintl -, libjpeg -, ninja -, openjpeg -, pkg-config -, zlib -, withData ? true, poppler_data -, qt5Support ? false, qtbase ? null -, introspectionSupport ? false, gobject-introspection ? null -, utils ? false -, minimal ? false, suffix ? "glib" -}: - -let - version = "0.61.1"; - mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; -in -stdenv.mkDerivation rec { - pname = "poppler-${suffix}"; - inherit version; - - src = fetchurl { - url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"; - }; - - outputs = [ "out" "dev" ]; - - patches = [ - # Fix internal crash: a negative number that should not be - (fetchpatch { - name = "CVE-2018-13988"; - url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee"; - sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2"; - }) - # Fix internal crash: a negative number that should not be (not the above!) - ./0.61-CVE-2019-9959.patch - ]; - - nativeBuildInputs = [ - cmake - ninja - pkg-config - ]; - - buildInputs = [ - libiconv - libintl - ] - ++ lib.optional withData poppler_data; - - # TODO: reduce propagation to necessary libs - propagatedBuildInputs = with lib; - [ zlib freetype fontconfig libjpeg openjpeg ] - ++ optionals (!minimal) [ cairo lcms curl ] - ++ optional qt5Support qtbase - ++ optional introspectionSupport gobject-introspection; - - # Not sure when and how to pass it. It seems an upstream bug anyway. - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - - cmakeFlags = [ - (mkFlag true "XPDF_HEADERS") - (mkFlag (!minimal) "GLIB") - (mkFlag (!minimal) "CPP") - (mkFlag (!minimal) "LIBCURL") - (mkFlag utils "UTILS") - (mkFlag qt5Support "QT5") - ]; - - dontWrapQtApps = true; - - meta = with lib; { - homepage = "https://poppler.freedesktop.org/"; - description = "A PDF rendering library"; - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index bafb52be7ffbe..7620844f8d1cd 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssh +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, openssh , mpi, blas, lapack } : @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { passthru = { inherit (blas) isILP64; }; + # upstream patch, remove with next release + patches = [ (fetchpatch { + name = "gcc-10"; + url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/a0f76fc0c1c16646875b454b7d6f8d9d17726b5a.patch"; + sha256 = "0civn149ikghakic30bynqg1bal097hr7i12cm4kq3ssrhq073bp"; + })]; + # Required to activate ILP64. # See https://github.com/Reference-ScaLAPACK/scalapack/pull/19 postPatch = lib.optionalString passthru.isILP64 '' diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 9845f291f5426..b11474232b1b8 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -89,9 +89,6 @@ let pkgs.lib.makeBinPath [ pkgs.nodejs ] } ''; - # See: https://github.com/NixOS/nixpkgs/issues/142196 - # [...]/@hyperspace/cli/node_modules/.bin/node-gyp-build: /usr/bin/env: bad interpreter: No such file or directory - meta.broken = true; }; mdctl-cli = super."@medable/mdctl-cli".override { @@ -366,7 +363,7 @@ let src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-ltCMZAx1i0i9xuPM692Srj8McC665h6E5RqJom999sjtVSccHSD8Z+HSdBN2183h9PJKvC5dapkn78dd0NWMBg=="; + sha512 = "sha512-oO1auBnBtieGdiN+57IgsA9Vr7Sy4HkILi1KSaUG4mpKfEbnkTGnLOxAqjLed+K2nsG/GtE1tJBtB7JxN1a78Q=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1e7cd1f5466e5..b9b1f5f51b0be 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -7672,13 +7672,13 @@ let sha512 = "DiIjtous4XPuR2deTctD3/RVZy/vRzVYBgYYvHV313MmTfkbVP60qLH5txrT3/bYNvnb0poNDelLS6U0kqlvHA=="; }; }; - "@prisma/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" = { + "@prisma/engines-3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980"; + version = "3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980.tgz"; - sha512 = "zULjkN8yhzS7B3yeEz4aIym4E2w1ChrV12i14pht3ePFufvsAvBSoZ+tuXMvfSoNTgBS5E4bolRzLbMmbwkkMQ=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b.tgz"; + sha512 = "Ip9CcCeUocH61eXu4BUGpvl5KleQyhcUVLpWCv+0ZmDv44bFaDpREqjGHHdRupvPN/ugB6gTlD9b9ewdj02yVA=="; }; }; "@prisma/prisma-fmt-wasm-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" = { @@ -67291,6 +67291,15 @@ let sha512 = "hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg=="; }; }; + "ts-pattern-4.0.2" = { + name = "ts-pattern"; + packageName = "ts-pattern"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-pattern/-/ts-pattern-4.0.2.tgz"; + sha512 = "eHqR/7A6fcw05vCOfnL6RwgGJbVi9G/YHTdYdjYmElhDdJ1SMn7pWs+6+YuxygaFwQS/g+cIDlu+UD8IVpur1A=="; + }; + }; "ts-pnp-1.2.0" = { name = "ts-pnp"; packageName = "ts-pnp"; @@ -119159,13 +119168,14 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.12.0.tgz"; - sha512 = "ltCMZAx1i0i9xuPM692Srj8McC665h6E5RqJom999sjtVSccHSD8Z+HSdBN2183h9PJKvC5dapkn78dd0NWMBg=="; + url = "https://registry.npmjs.org/prisma/-/prisma-3.13.0.tgz"; + sha512 = "oO1auBnBtieGdiN+57IgsA9Vr7Sy4HkILi1KSaUG4mpKfEbnkTGnLOxAqjLed+K2nsG/GtE1tJBtB7JxN1a78Q=="; }; dependencies = [ - sources."@prisma/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" + sources."@prisma/engines-3.13.0-17.efdf9b1183dddfd4258cd181a72125755215ab7b" + sources."ts-pattern-4.0.2" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index faa17a838396b..001b750e752dd 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -41,12 +41,12 @@ buildPythonPackage rec { pname = "Nikola"; - version = "8.2.0"; + version = "8.2.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "9998fedfcb932e19e3b54faeb497a49cde8b15163af764c5afe5847fef5ec1ff"; + sha256 = "sha256-+LSnyIVA/lR9xbDIgreLyU+V/Z2pJD8v8agvJj05w94="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-apispec/default.nix b/pkgs/development/python-modules/aiohttp-apispec/default.nix index ffd8e698c58e9..df8c1fffdb918 100644 --- a/pkgs/development/python-modules/aiohttp-apispec/default.nix +++ b/pkgs/development/python-modules/aiohttp-apispec/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiohttp-apispec"; - version = "3.0.0b1"; + version = "3.0.0b2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "maximdanilchenko"; repo = pname; rev = "v${version}"; - hash = "sha256-LGdi5ZhJ1G0GxUJVBZnwW3Q+x3Yo9FRV9b6REPlq7As="; + hash = "sha256-C+/M25oCLTNGGEUj2EyXn3UjcvPvDYFmmUW8IOoF1uU="; }; propagatedBuildInputs = [ @@ -40,11 +40,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "jinja2<3.0" "jinja2" - ''; - pythonImportsCheck = [ "aiohttp_apispec" ]; diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/pkgs/development/python-modules/aiomysql/default.nix index 3432931f93561..b52760d206941 100644 --- a/pkgs/development/python-modules/aiomysql/default.nix +++ b/pkgs/development/python-modules/aiomysql/default.nix @@ -2,55 +2,45 @@ , buildPythonPackage , fetchFromGitHub , pymysql -, pytest -, isPy27 -, fetchpatch +, pythonOlder +, setuptools-scm +, setuptools-scm-git-archive }: buildPythonPackage rec { pname = "aiomysql"; - version = "0.0.21"; - disabled = isPy27; + version = "0.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "1qvy3phbsxp55161dnppjfx2m1kn82v0irc3xzqw0adfd81vaiad"; + hash = "sha256-TNaQ4EKiHwSmPpUco0pA5SBP3fljWQ/Kd5RLs649fu0="; }; - patches = [ - (fetchpatch { - # vendor functions previously provided by pymysql.util - url = "https://github.com/aio-libs/aiomysql/pull/554/commits/919b997a9de7f53d721af76762fba425e306531e.patch"; - sha256 = "V1VYyqr6RwTXoVoGVyMuJst6uqTuuHbpMOpLoVZO1XA="; - }) + nativeBuildInputs = [ + setuptools-scm + setuptools-scm-git-archive ]; propagatedBuildInputs = [ pymysql ]; - checkInputs = [ - pytest - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "PyMySQL>=0.9,<=0.9.3" "PyMySQL" - ''; - - checkPhase = '' - pytest - ''; - - # tests require mysql database + # Tests require MySQL database doCheck = false; + pythonImportsCheck = [ + "aiomysql" + ]; + meta = with lib; { description = "MySQL driver for asyncio"; homepage = "https://github.com/aio-libs/aiomysql"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index d226192164d0d..ec4dd4dfcbeed 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "amqp"; - version = "5.1.0"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-RGs+io68LOr9Qk/8qrHDU4MNSBYSVleO16ZUSOYB6+0="; + hash = "sha256-LBsT/swIk+lGxly9XzZCeGHP+k6iIB2Pb8oi4qNzteI="; }; propagatedBuildInputs = [ @@ -38,8 +38,8 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/celery/py-amqp"; description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; + homepage = "https://github.com/celery/py-amqp"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 1d2bb9505a27e..0e6f26700bcd4 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "5.6.0"; + version = "5.7.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-rNMHMUNBVNo3bO7rQW7hVBzfuOo8ZIAjpVo0yz7K+fM="; + sha256 = "sha256-6AwOdN4XdK2ufAIzskf/crj72LXxBwd9tdC38DcNa4Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 0d6b534b4aa0d..d75351839aa20 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -10,13 +10,14 @@ buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.10.0"; + version = "4.11.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wjrSPFIdgYlVpBUaZ9gVgDGdS/VI09SfQiOuBB/5iJE="; + hash = "sha256-rZqlW2XvKAjrQF9Gz3Tff8twRNXLwmSH+W6y7y5DZpM="; }; propagatedBuildInputs = [ @@ -29,7 +30,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "bs4" ]; + pythonImportsCheck = [ + "bs4" + ]; meta = with lib; { homepage = "http://crummy.com/software/BeautifulSoup/bs4/"; diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix index ed13a3a3a7ba7..e371079b36052 100644 --- a/pkgs/development/python-modules/bsblan/default.nix +++ b/pkgs/development/python-modules/bsblan/default.nix @@ -1,19 +1,16 @@ { lib +, aiohttp +, aresponses , buildPythonPackage , fetchFromGitHub -, pytestCheckHook -, aresponses -, coverage , mypy +, packaging , poetry-core , pydantic , pytest-asyncio -, pytest-cov , pytest-mock +, pytestCheckHook , pythonOlder -, aiohttp -, attrs -, cattrs , yarl }: @@ -22,13 +19,13 @@ buildPythonPackage rec { version = "0.5.5"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "liudger"; repo = "python-bsblan"; rev = "v${version}"; - sha256 = "sha256-kq4cML7D9XC/QRPjGfaWcs0H78OOc2IXGua7qJpWYOQ="; + hash = "sha256-kq4cML7D9XC/QRPjGfaWcs0H78OOc2IXGua7qJpWYOQ="; }; nativeBuildInputs = [ @@ -37,22 +34,26 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - attrs - cattrs + packaging pydantic yarl ]; checkInputs = [ aresponses - coverage mypy pytest-asyncio - pytest-cov pytest-mock pytestCheckHook ]; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace "--cov" "" + ''; + pythonImportsCheck = [ "bsblan" ]; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 433b7644e7a80..20602139d1560 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.15.5"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - sha256 = "sha256-7q9zTuqdIUAiipA5kh8CwQa/TeiXGsKuGGvYYwTjObw="; + sha256 = "sha256-fPojcHuz2d3Im2Ri6iCu79KLuRNucIG/IwWrUo0uYH8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 6ccd3c98c2134..0eb3eec5550e1 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -22,16 +22,16 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.12.0"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "zalando"; + owner = "spec-first"; repo = pname; rev = version; - sha256 = "sha256-JMuI3h0Pg7nCXrJtF0fhSFJTOWelEqcvmqv3ooIfkqM="; + hash = "sha256-QOxvs2z8AAxQ2oSM/PQ6QTD9G4JomviauLSDjay8HyQ="; }; propagatedBuildInputs = [ @@ -56,24 +56,18 @@ buildPythonPackage rec { testfixtures ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "PyYAML>=5.1,<6" "PyYAML>=5.1" \ - --replace "jsonschema>=2.5.1,<4" "jsonschema>=2.5.1" - ''; - - disabledTests = [ - # We have a later PyYAML release - "test_swagger_yaml" - ]; - pythonImportsCheck = [ "connexion" ]; + disabledTests = [ + # AssertionError + "test_headers" + ]; + meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask"; - homepage = "https://github.com/zalando/connexion/"; + homepage = "https://github.com/spec-first/connexion"; license = licenses.asl20; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 12f9a667fef8a..41a6436c3bc9f 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "1.3.4"; + version = "1.3.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = version; - hash = "sha256-g8tMVH1MZihEEHGQjxX/Mcn5Mu3N9VA3AGdk2avlOoE="; + hash = "sha256-sYE7bZcMXsf+4r9Rs4d0XaUqdWVZfDU9/xPqIiiJkUQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index fcd65f1f317a9..419cb74c2cf7e 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.4.10"; + version = "1.4.11"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "sha256-JTNRm/nCQckAZrVTgcJVP3bLE53QPtccdoDcGLbP6BE="; + rev = "refs/tags/${version}"; + sha256 = "sha256-PK8+NFJurJ0nD5coEFj8lXWg4VMcpX0954qDb1GW6Gk="; }; preBuild = '' diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 9b1264e738b4e..f068fab049ac1 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.5.0"; + version = "10.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-p2zPUCc+KrsNxPChdW3ZgkOo+HJB7IcYtqh5Uh0Qnaw="; + sha256 = "sha256-JGk9PdCDXiDkP8Arw2pfpU+sEj/sCHwwHHWVwF3Ofzw="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix new file mode 100644 index 0000000000000..fb67dd34c7b51 --- /dev/null +++ b/pkgs/development/python-modules/http-message-signatures/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, http-sfv +, pytestCheckHook +, pythonOlder +, setuptools-scm +, requests +}: + +buildPythonPackage rec { + pname = "http-message-signatures"; + version = "0.4.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pyauth"; + repo = pname; + rev = "v${version}"; + hash = "sha256-CMF9p913P04Hx/221ck1e0AoAsP7aXkX2UKp4S1nnU0="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + cryptography + http-sfv + ]; + + checkInputs = [ + pytestCheckHook + requests + ]; + + pytestFlagsArray = [ + "test/test.py" + ]; + + pythonImportsCheck = [ + "http_message_signatures" + ]; + + meta = with lib; { + description = "Requests authentication module for HTTP Signature"; + homepage = "https://github.com/pyauth/http-message-signatures"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/http-sfv/default.nix b/pkgs/development/python-modules/http-sfv/default.nix new file mode 100644 index 0000000000000..264065b6efa18 --- /dev/null +++ b/pkgs/development/python-modules/http-sfv/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, typing-extensions +}: + +buildPythonPackage rec { + pname = "http-sfv"; + version = "0.9.5"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mnot"; + repo = "http_sfv"; + rev = "http_sfv-${version}"; + hash = "sha256-hzg5vRX0vNKS/hYLF6n8mLK5qiwP7do4M8YMlBAA66I="; + }; + + propagatedBuildInputs = [ + typing-extensions + ]; + + # Tests require external data (https://github.com/httpwg/structured-field-tests) + doCheck = false; + + pythonImportsCheck = [ + "http_sfv" + ]; + + meta = with lib; { + description = "Module to parse and serialise HTTP structured field values"; + homepage = "https://github.com/mnot/http_sfv"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ismartgate/default.nix b/pkgs/development/python-modules/ismartgate/default.nix index 83d29173243d9..943036ecbd460 100644 --- a/pkgs/development/python-modules/ismartgate/default.nix +++ b/pkgs/development/python-modules/ismartgate/default.nix @@ -18,13 +18,15 @@ buildPythonPackage rec { pname = "ismartgate"; version = "4.0.4"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yh7gPyy3VMdyINBCZo5K2wA0BY7yYgHrKGZRB/pm77U="; + hash = "sha256-yh7gPyy3VMdyINBCZo5K2wA0BY7yYgHrKGZRB/pm77U="; }; propagatedBuildInputs = [ @@ -49,7 +51,15 @@ buildPythonPackage rec { --replace '"pytest-runner>=5.2",' "" ''; - pythonImportsCheck = [ "ismartgate" ]; + pythonImportsCheck = [ + "ismartgate" + ]; + + disabledTestPaths = [ + # Tests are out-dated + "ismartgate/tests/test_init.py" + ]; + meta = with lib; { description = "Python module to work with the ismartgate and gogogate2 API"; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 11534126a18ab..88858b537b280 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.18.6"; + version = "1.18.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yk6Rg9DwilG8OWmT7SF80eYRsRwDwJp+mx2Yv2Gg+ak="; + sha256 = "sha256-1fnkeyfvFHy9/COpFtPdvj8ptUIVxfoBrOFw9Ikf47w="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 27550c30dbfe0..b0672c012a97e 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.3.17"; + version = "2022.4.22"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-sSZFbEDlkc+F0PIwvseVEBoQQZVTFypW2nvLmPDD4u0="; + hash = "sha256-NKRxt25uvMBvSpY8vk4Vr56NmnW2VTpOLBHUzM2j/yc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mwdblib/default.nix b/pkgs/development/python-modules/mwdblib/default.nix index 96c3f193396ef..db81e951cf288 100644 --- a/pkgs/development/python-modules/mwdblib/default.nix +++ b/pkgs/development/python-modules/mwdblib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mwdblib"; - version = "4.1.0"; + version = "4.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "sha256-afqE6zL1uwsLNAuy5XY7OduP1e3W2ueteOOVaFJg3b0="; + hash = "sha256-Wkqvi/buYKDoGi+4C9zkxWEiGynk9Ds8gLsdoaZCdKg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index ede91e7df9135..6f85a797c3743 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-hKEXTzJMSVBRDiqrN90/fETEhirwSWLdgRULRvlQjbY="; + sha256 = "sha256-gHgFEDUji43vTBZp5FLK90H+D44sfH2AuCc7Gu2T1pg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix new file mode 100644 index 0000000000000..8848691079636 --- /dev/null +++ b/pkgs/development/python-modules/nutils/default.nix @@ -0,0 +1,32 @@ +{ lib, python, buildPythonPackage, fetchPypi, numpy, treelog, stringly, coverage }: + +buildPythonPackage rec { + pname = "nutils"; + version = "7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1sw310l2yb8wbcv2qhik8s928zjh2syzz2qxisglbzski9qdw2x6"; + }; + + pythonImportChecks = [ "nutils" ]; + + propagatedBuildInputs = [ + numpy + treelog + stringly + ]; + + checkInputs = [ coverage ]; + + checkPhase = '' + ${python.interpreter} -m unittest + ''; + + meta = with lib; { + description = "Numerical Utilities for Finite Element Analysis"; + homepage = "https://www.nutils.org/"; + license = licenses.mit; + maintainers = [ maintainers.Scriptkiddi ]; + }; +} diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 85a58271b6d38..deb7fcde17958 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.14.9"; + version = "3.14.10"; format = "setuptools"; src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "sha256-8rwWKsOOYUrk2k1piCurb1LkB9zzmSITq52qWdyx4yk="; + hash = "sha256-k3kKAImE1aVlmsSPXpaIkAVspAsAo5Hz6/n7u6+zTzA="; }; buildInputs = [ @@ -31,8 +31,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ apsw - ] ++ lib.optional withPostgres psycopg2 - ++ lib.optional withMysql mysql-connector; + ] ++ lib.optional withPostgres [ + psycopg2 + ] ++ lib.optional withMysql [ + mysql-connector + ]; checkInputs = [ flask diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index bc21d6bf465ed..49a070006671b 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -1,36 +1,48 @@ { lib , buildPythonPackage -, fetchPypi -, pillow -, nose_progressive -, nose +, fetchFromGitHub , mock -, blessings +, pillow +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pilkit"; - version = "2.0"; + version = "unstable-2022-02-17"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "ddb30c2f0198a147e56b151476c3bb9fe045fbfd5b0a0fa2a3148dba62d1559f"; + src = fetchFromGitHub { + owner = "matthewwithanm"; + repo = pname; + rev = "09ffa2ad33318ae5fd3464655c14c7f01ffc2097"; + hash = "sha256-jtnFffKr0yhSv2jBmXzPa6iP2r41MbmGukfmnvgABhk="; }; - preConfigure = '' - substituteInPlace setup.py --replace 'nose==1.2.1' 'nose' - ''; + buildInputs = [ + pillow + ]; - # tests fail, see https://github.com/matthewwithanm/pilkit/issues/9 - doCheck = false; + checkInputs = [ + mock + pytestCheckHook + ]; - buildInputs = [ pillow nose_progressive nose mock blessings ]; + postPatch = '' + substituteInPlace tox.ini \ + --replace " --cov --cov-report term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "pilkit" + ]; meta = with lib; { - homepage = "https://github.com/matthewwithanm/pilkit/"; description = "A collection of utilities and processors for the Python Imaging Libary"; + homepage = "https://github.com/matthewwithanm/pilkit/"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; - } diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index fe364ea0ece80..18d4fec6c1685 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.17.7"; + version = "0.17.8"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-PZoxI7s3LTb60oXFfsOi5mCaLOKzq6ed2yFKap0Q1Ng="; + sha256 = "sha256-ZNlkdubB6E5ak+EaXsEBGa1xpm5ms4Rp3DG/M4/+WOg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index b88bc006bcc1b..6ebe09463e3a7 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "2021.11.0"; + version = "2022.04.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-Cqc3zRJ2VpKKCGF4y+4IYfvfANblCEmh0sJ3tXH1AAA="; + hash = "sha256-qW1rjKc1+w2rTUGackPjb0qgTZpFXh0ZRBqMmf4nDnk="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python3 API for IQVIA data"; + description = "Module for working with IQVIA data"; longDescription = '' pyiqvia is an async-focused Python library for allergen, asthma, and disease data from the IQVIA family of websites (such as https://pollen.com, diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 257cb72b3ec1c..1a101310d4054 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage -, certifi , fetchPypi , flaky +, httpx , importlib-metadata , pytestCheckHook , pythonOlder @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylast"; - version = "4.5.0"; + version = "5.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YoALculx2trEDD1vU4xhiCGdb1OFPdxI1p2fwlZZAY8="; + hash = "sha256-UBi2bCtGMtcavYEDtz5m5N0UxmCaj3un5aomxzbfLfg="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - certifi + httpx ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index e5d7f8d0b9403..17942ca0b19a8 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "pyopenuv"; - version = "2021.11.0"; + version = "2022.04.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - sha256 = "sha256-J0YIq00/GcWEL23UHmN98Jp/imOAz8NLzhMdk8WFozk="; + rev = "refs/tags/${version}"; + hash = "sha256-qPk3XA6ciID6h12102AGLxfaTmE63BzKPLvwFn6F1tM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 921de2e0c7e8e..d5841fca4b978 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "v${version}"; - hash = "sha256-HGF8Tu28ksIfaCKAbnJv6sDmoQrDDjteVLxbJN1HH3U="; + hash = "sha256-d1ciSl0CmQwpg4NXR+hQ2gPZE954hnREYfitdPvKFtA="; }; nativeBuildInputs = [ @@ -36,11 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'pyparsing = "^3.0.7"' 'pyparsing = "*"' \ - ''; - pythonImportsCheck = [ "sigma" ]; diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 46ee0ad00fb2e..c45a32d2f61e4 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , importlib-metadata +, pydantic , poetry-core , pytest-asyncio , pytest-mock @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.4.3"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-r1PoOxFPA4zYFEpw+BakzDAJ13IMfcZpTJWkRt/q4go="; + sha256 = "sha256-9zCUYB+TYgDMoTHpR0u42Usq2EKp8vtzlTgU82eXxl8="; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ asyncclick importlib-metadata + pydantic ]; checkInputs = [ diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 6f11559aad4ce..9e092ca8251a2 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.9.3"; + version = "0.9.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - hash = "sha256-9eA2fx+j6WLbEkLaemwEuoWLUWlS0iF5AkR2YienN5g="; + hash = "sha256-9OlWMom/0OMlbPd3evjIaX75Gjlu+F8vKBJwX4Z58qQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index c51e24e0ac9de..96ade3b45f6d0 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -1,25 +1,37 @@ { lib , buildPythonPackage , fetchFromGitHub -, cryptography +, http-message-signatures +, http-sfv , requests , pytestCheckHook +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "requests-http-signature"; - version = "0.2.0"; + version = "0.7.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "pyauth"; repo = pname; rev = "v${version}"; - hash = "sha256-B45P/loXcRKOChSDeHOnlz+67mtmTeAMYlo21TOmV8s="; + hash = "sha256-sW2vYqT/nY27DvEKHdptc3dUpuqKmD7PLMs+Xp+cpeU="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ - cryptography + http-message-signatures + http-sfv requests ]; diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix index 00277daf8a3eb..fcc4db1fbf0fa 100644 --- a/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -2,18 +2,22 @@ , buildPythonPackage , fetchFromGitHub , pyopenssl +, pythonOlder , requests }: buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.13"; + version = "1.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - sha256 = "0mc9zpa0d9gijf56mxmsxy4qdcm200ixhnm6i3y5xc2yfv9r6xqy"; + hash = "sha256-LZgKjSas0KdJAf4leSVz8sEnRrlJ20Sm9Ka+S5zDOTM="; }; propagatedBuildInputs = [ @@ -23,7 +27,10 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "requests_pkcs12" ]; + + pythonImportsCheck = [ + "requests_pkcs12" + ]; meta = with lib; { description = "PKCS#12 support for the Python requests library"; diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix index f325d40ba92d9..11f31c06550fa 100644 --- a/pkgs/development/python-modules/srvlookup/default.nix +++ b/pkgs/development/python-modules/srvlookup/default.nix @@ -1,24 +1,41 @@ -{ lib, fetchPypi, buildPythonPackage +{ lib +, buildPythonPackage , dnspython -, mock, nose +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "srvlookup"; - version = "2.0.0"; + version = "3.0.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "1zf1v04zd5phabyqh0nhplr5a8vxskzfrzdh4akljnz1yk2n2a0b"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "gmr"; + repo = pname; + rev = "refs/tags/${version}"; + sha256 = "sha256-iXbi25HsoNX0hnhwZoFik5ddlJ7i+xml3HGaezj3jgY="; }; - propagatedBuildInputs = [ dnspython ]; - checkInputs = [ mock nose ]; + propagatedBuildInputs = [ + dnspython + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "srvlookup" + ]; meta = with lib; { + description = "Wrapper for dnspython to return SRV records for a given host, protocol, and domain name"; homepage = "https://github.com/gmr/srvlookup"; - license = [ licenses.bsd3 ]; - description = "A small wrapper for dnspython to return SRV records for a given host, protocol, and domain name as a list of namedtuples."; - maintainers = [ maintainers.mmlb ]; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ mmlb ]; }; } diff --git a/pkgs/development/python-modules/stringly/default.nix b/pkgs/development/python-modules/stringly/default.nix new file mode 100644 index 0000000000000..777fc11ed37f5 --- /dev/null +++ b/pkgs/development/python-modules/stringly/default.nix @@ -0,0 +1,28 @@ +{ lib , python, buildPythonPackage , fetchPypi, typing-extensions }: + +buildPythonPackage rec { + pname = "stringly"; + version = "1.0b2"; + + src = fetchPypi { + inherit pname version; + sha256 = "09fi9dgf27v4qi0mwwms7hpwim9qpyalckd66p7nlmfp6c8bzppq"; + }; + + pythonImportsCheck = [ "stringly" ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + checkPhase = '' + ${python.interpreter} -m unittest + ''; + + meta = with lib; { + description = "Stringly: Human Readable Object Serialization"; + homepage = "https://github.com/evalf/stringly"; + license = licenses.mit; + maintainers = [ maintainers.Scriptkiddi ]; + }; +} diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 5cd0044bb5947..278bf7187ad16 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "2.0.3"; + version = "2.1.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-EVSKBsIhYm5UqFEZ3snKF1aEW3+JjE0Kzs3gYnFQsUc="; + sha256 = "sha256-wkE1kgu3yMjH98BBmpz+ZQMg140i0wka4VrBUkJHkxk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/treelog/default.nix b/pkgs/development/python-modules/treelog/default.nix new file mode 100644 index 0000000000000..e3b85cd64fb8f --- /dev/null +++ b/pkgs/development/python-modules/treelog/default.nix @@ -0,0 +1,28 @@ +{ lib , python, buildPythonPackage , fetchPypi, typing-extensions }: + +buildPythonPackage rec { + pname = "treelog"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hnivz4p4llky6djxgcsr9r3j4vr46mkjvp0ksybhpx0fsnhdi81"; + }; + + pythonImportsCheck = [ "treelog" ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + checkPhase = '' + ${python.interpreter} -m unittest + ''; + + meta = with lib; { + description = "Logging framework that organizes messages in a tree structure"; + homepage = "https://github.com/evalf/treelog"; + license = licenses.mit; + maintainers = [ maintainers.Scriptkiddi ]; + }; +} diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 0810acd1ea470..c3a6a4af9e58d 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.10.8"; + version = "3.11.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SFG3wGGFxzZKfNyIQrpDGblL2vC0pQguWIYdwF0Mg5A="; + sha256 = "sha256-7booFScN2qNqldPdBmxH1pTUz2+u7JMmPmX0tJojaeI="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 541eda6185e79..33d0bea9b8389 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -4,18 +4,22 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder , zigpy }: buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.72"; + version = "0.0.73"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; - rev = version; - sha256 = "sha256-tVCvmQR9tGhSDB4OztNaSCj2BTxPdrX3Gw9WZopRo8k="; + rev = "refs/tags/${version}"; + hash = "sha256-vC1kkh9t2fWmSqmKQz9ON8Y+tBFhTxrprLNzOldQR+A="; }; propagatedBuildInputs = [ @@ -28,7 +32,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "zhaquirks" ]; + pythonImportsCheck = [ + "zhaquirks" + ]; meta = with lib; { description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/pkgs/development/tools/analysis/brakeman/Gemfile.lock index 257d8a7fba1cb..e11251a468198 100644 --- a/pkgs/development/tools/analysis/brakeman/Gemfile.lock +++ b/pkgs/development/tools/analysis/brakeman/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - brakeman (5.1.1) + brakeman (5.2.2) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES brakeman BUNDLED WITH - 2.2.24 + 2.3.9 diff --git a/pkgs/development/tools/analysis/brakeman/gemset.nix b/pkgs/development/tools/analysis/brakeman/gemset.nix index ea241dbf6e708..2d1ceb0393aa2 100644 --- a/pkgs/development/tools/analysis/brakeman/gemset.nix +++ b/pkgs/development/tools/analysis/brakeman/gemset.nix @@ -4,9 +4,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y71fqqd0azy5rn78fwiz9px0mql23zrl0ij0dzdkx22l4cscpb0"; + sha256 = "1bk1xz5w29cq84svnrlgcrwvy1lpkwqrv6cmkkivs3yrym09av14"; type = "gem"; }; - version = "5.1.1"; + version = "5.2.2"; }; } diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 9b1472f53b417..b97ed2b67672e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1084"; + version = "2.0.1088"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-bzmXLqjtl742UcjBpYQdtiTKO6Oe/x7lGoJZh+uJzUo="; + hash = "sha256-g4kn8tdLgTnOFmeX8nywBvmAXL7WqCfX6ylgp7Z6Alk="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 097fd30ea9a81..3a39ee75369dd 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lQo3rhPjKZV9XuuKYxd3jXqSiElj+O0DdERtmsMZMEw="; + sha256 = "sha256-W08EyKSMz0ZCqvPBB9xQ4WHxsK2FjgwC/GvEqOwGGQ4="; }; ldflags = [ @@ -21,7 +21,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorSha256 = "sha256-n93ZP6sIyL5Q9UeDRXxm8KleDfUf2wd6JcTgSPtBGWg="; + vendorSha256 = "sha256-wEsWnmCv3hoQ1QkOQfo4ShmSgf27yEc8FKC7SC4gs8k="; subPackages = [ "cmd/tfsec" diff --git a/pkgs/development/tools/build-managers/alibuild/default.nix b/pkgs/development/tools/build-managers/alibuild/default.nix index ad9813cde6fb4..4baa144fa815b 100644 --- a/pkgs/development/tools/build-managers/alibuild/default.nix +++ b/pkgs/development/tools/build-managers/alibuild/default.nix @@ -1,18 +1,21 @@ -{ lib, python}: +{ lib, python }: python.pkgs.buildPythonApplication rec { pname = "alibuild"; - version = "1.5.5"; + version = "1.11.2"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "1sh02avpab4qlyin3p928xw91l4fgs8x5x2rzl623ayqsnfjv19j"; + hash = "sha256-wq2H2inUf2CjPD45krCNdjw2s4FXsEDlfOHqW8VaVKg="; }; doCheck = false; - propagatedBuildInputs = [ - python.pkgs.requests - python.pkgs.pyyaml + propagatedBuildInputs = with python.pkgs; [ + requests + pyyaml + boto3 + jinja2 + distro ]; meta = with lib; { diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 73af1bde5ea2c..b3c5c1b0dd097 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -13,19 +13,19 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-lIHE63XIPutvTS2cid0+tuo+JMSKMGuSUcnFv1mCRrM="; + sha256 = "sha256-+Ug4tOaqUaqcEoMv20CKE8JrjIdW34VSn20gXZYX92k="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-SkI+GLHknC+CGhGo7KiZahBxMp/JCIukTe2C0mMTdjY="; + cargoSha256 = "sha256-V2G++BYLRGVM4leB2jkM+HcFiCIdf2wA3dfYdtlq7XI="; nativeBuildInputs = [ pkg-config ]; @@ -62,3 +62,15 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ pamplemousse pimeys superherointj ]; }; } + +### Troubleshooting +# Here's an example application using Prisma with Nix: https://github.com/pimeys/nix-prisma-example +# At example's `flake.nix` shellHook, notice the requirement of defining environment variables for prisma, it's values will show on `prisma --version`. +# Read the example's README: https://github.com/pimeys/nix-prisma-example/blob/main/README.md +# Prisma requires 2 packages, `prisma-engines` and `nodePackages.prisma`, to be at *exact* same versions. +# Certify at `package.json` that dependencies "@prisma/client" and "prisma" are equal, meaning no caret (`^`) in version. +# Configure NPM to use exact version: `npm config set save-exact=true` +# Delete `package-lock.json`, delete `node_modules` directory and run `npm install`. +# Run prisma client from `node_modules/.bin/prisma`. +# Run `./node_modules/.bin/prisma --version` and check if both prisma packages versions are equal, current platform is `linux-nixos`, and other keys equal to the prisma environment variables you defined for prisma. +# Test prisma with `generate`, `db push`, etc. It should work. If not, open an issue. diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index a394ee6157732..d105dd61665b7 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -89,6 +89,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://wiki.gnome.org/Apps/DFeet"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ ktosiek ]; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index bfd5515700901..57a5f4d462ab1 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mkcert"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "FiloSottile"; repo = pname; rev = "v${version}"; - sha256 = "0q0069ripnpb027krc4yk47552xl5rp0ymxf1j2mln9wdmfq65ba"; + sha256 = "sha256-FMAXjRL+kJ/hwGmaWBy8ecON+JCMgRytfpryeLWsSVc="; }; - vendorSha256 = "133vlx825g4zay88ppylsz93q4gnd9ari12x1h57qvk45rwxqx95"; + vendorSha256 = "sha256-DdA7s+N5S1ivwUgZ+M2W/HCp/7neeoqRQL0umn3m6Do="; doCheck = false; diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/default.nix index caa790e9fd497..c54cda1ad27d7 100644 --- a/pkgs/development/tools/mysql-shell/default.nix +++ b/pkgs/development/tools/mysql-shell/default.nix @@ -31,7 +31,6 @@ , CoreServices , developer_cmds , DarwinTools -, testVersion , mysql-shell }: diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index c5820018bb6b2..cb083bd06c75f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -39,6 +39,7 @@ tree-sitter-hjson = lib.importJSON ./tree-sitter-hjson.json; tree-sitter-html = lib.importJSON ./tree-sitter-html.json; tree-sitter-http = lib.importJSON ./tree-sitter-http.json; + tree-sitter-janet-simple = lib.importJSON ./tree-sitter-janet-simple.json; tree-sitter-java = lib.importJSON ./tree-sitter-java.json; tree-sitter-javascript = lib.importJSON ./tree-sitter-javascript.json; tree-sitter-jsdoc = lib.importJSON ./tree-sitter-jsdoc.json; @@ -57,6 +58,7 @@ tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json; tree-sitter-org-nvim = lib.importJSON ./tree-sitter-org-nvim.json; tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json; + tree-sitter-pgn = lib.importJSON ./tree-sitter-pgn.json; tree-sitter-php = lib.importJSON ./tree-sitter-php.json; tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json; tree-sitter-prisma = lib.importJSON ./tree-sitter-prisma.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json new file mode 100644 index 0000000000000..10b524747a398 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/sogaiu/tree-sitter-janet-simple", + "rev": "e6c04e4b243cf3e5aca8f201e48926a72cc18334", + "date": "2022-03-29T10:00:03+09:00", + "path": "/nix/store/4ynwhc2s20xm093inlpyxgdb6pbc753m-tree-sitter-janet-simple", + "sha256": "1anbd0bx8vcg1rb6mr8hknnd5f9f6zr3h7kn98x8s7znyvlj4w6q", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json new file mode 100644 index 0000000000000..786fec353d5f9 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/rolandwalker/tree-sitter-pgn", + "rev": "e26ee30850f0cb81541480cf1e2c70385bdb013a", + "date": "2021-08-25T17:57:38-04:00", + "path": "/nix/store/fj882ab2hl3qrz45zvq366na6d2gqv8v-tree-sitter-pgn", + "sha256": "1c4602jmq3p7p7splzip76863l1z3rgbjlbksqv0diqjxp7c42gq", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 57bf5c0a13c19..e1491ee81da8d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -181,6 +181,10 @@ let orga = "bkegley"; repo = "tree-sitter-graphql"; }; + "tree-sitter-pgn" = { + orga = "rolandwalker"; + repo = "tree-sitter-pgn"; + }; "tree-sitter-perl" = { orga = "ganezdragon"; repo = "tree-sitter-perl"; @@ -277,6 +281,10 @@ let orga = "uyha"; repo = "tree-sitter-cmake"; }; + "tree-sitter-janet-simple" = { + orga = "sogaiu"; + repo = "tree-sitter-janet-simple"; + }; "tree-sitter-json5" = { orga = "joakker"; repo = "tree-sitter-json5"; diff --git a/pkgs/development/tools/protolint/default.nix b/pkgs/development/tools/protolint/default.nix new file mode 100644 index 0000000000000..dee2f9c28f5cd --- /dev/null +++ b/pkgs/development/tools/protolint/default.nix @@ -0,0 +1,39 @@ +{ lib, buildGoModule, fetchFromGitHub }: +buildGoModule rec { + pname = "protolint"; + version = "0.37.1"; + + src = fetchFromGitHub { + owner = "yoheimuta"; + repo = pname; + rev = "6aa30515838cc0adf7c76a9461f52bdc713f2e9f"; + sha256 = "sha256-oKGA5FZpT3E5G7oREGAojdu4Xn8JPd7IYwfueK9QA34="; + }; + + vendorSha256 = "sha256-iLQwx3B5n21ZXefWiGBBL9roa9LIFByzB8KXLywhvKs="; + + # Something about the way we run tests causes issues. It doesn't happen + # when using "go test" directly: + # === RUN TestEnumFieldNamesPrefixRule_Apply_fix/no_fix_for_a_correct_proto + # util_test.go:35: open : no such file or directory + # === RUN TestEnumFieldNamesPrefixRule_Apply_fix/fix_for_an_incorrect_proto + # util_test.go:35: open : no such file or directory + excludedPackages = [ "internal" ]; + + ldflags = let + rev = builtins.substring 0 7 src.rev; + in [ + "-X github.com/yoheimuta/protolint/internal/cmd.version=${version}" + "-X github.com/yoheimuta/protolint/internal/cmd.revision=${rev}" + "-X github.com/yoheimuta/protolint/internal/cmd/protocgenprotolint.version=${version}" + "-X github.com/yoheimuta/protolint/internal/cmd/protocgenprotolint.revision=${rev}" + ]; + + meta = with lib; { + description = "A pluggable linter and fixer to enforce Protocol Buffer style and conventions"; + homepage = "https://github.com/yoheimuta/protolint"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.zane ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 2e2ff56fd0503..46738f7cf45ea 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.10"; + version = "0.35.11"; src = fetchCrate { inherit pname version; - sha256 = "sha256-l34sThvzhAW8VfxVuv+UGVil7yOvsOiWSqr/N91V8C8="; + sha256 = "sha256-NzhEXt0z+0/6F3pgGmQwjnexBA2icWV3dCifZ8BxnOQ="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-974Gqtv+g32iHrIqIzqwBsE8frzmjF0Ma/hSMGzMaGs="; + cargoSha256 = "sha256-+FGl0JhaRu+KLQJGAcMXv9vP6pmRzdTDtNA3h6A1jcY="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/development/tools/snazy/default.nix new file mode 100644 index 0000000000000..c284c18d015d2 --- /dev/null +++ b/pkgs/development/tools/snazy/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "snazy"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "chmouel"; + repo = pname; + rev = version; + sha256 = "sha256-Pv+vLdbMTbDbdUVQhA07WY+o1PwtCiqdAXCj+UlP/ZQ="; + }; + cargoSha256 = "sha256-96xgpkkWHsyb3kxEXM5f5jFSjbO+VEmX2uHltGJUPGk="; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/snazy --help + $out/bin/snazy --version | grep "snazy ${version}" + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://github.com/chmouel/snazy/"; + changelog = "https://github.com/chmouel/snazy/releases/tag/v${version}"; + description = "A snazzy json log viewer"; + longDescription = '' + Snazy is a simple tool to parse json logs and output them in a nice format + with nice colors. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index f49ee01deafa0..27606f998d5a4 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "3.1.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-P0ga7uXwxkihpuLdjT1VNbuspbYpOh3+U60u1Blppo4="; + sha256 = "sha256-rxferVxTWmclviDshHhBmbCezOI+FvcfUW3gAkBQNHQ="; fetchSubmodules = true; }; diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 7f3dce2d70cf2..3c90b7f665a02 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -8,15 +8,9 @@ let in buildNodejs { inherit enableNpm; - version = "16.14.2"; - sha256 = "sha256-6SLiFcxo61+U0z6KC2HiyGO3cxzIYAq5VdOCLakP+NE="; + version = "16.15.0"; + sha256 = "sha256-oPgS78Q/eDIeygiVeWCkj15r+XAE1QWMjdOwPGRupPc="; patches = [ ./disable-darwin-v8-system-instrumentation.patch - # Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL. - # https://github.com/nodejs/node/pull/40965 - (fetchpatch { - url = "https://github.com/nodejs/node/commit/65119a89586b94b0dd46b45f6d315c9d9f4c9261.patch"; - sha256 = "sha256-dihKYEdK68sQIsnfTRambJ2oZr0htROVbNZlFzSAL+I="; - }) ]; } |