diff options
Diffstat (limited to 'pkgs/development')
53 files changed, 150 insertions, 931 deletions
diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index ffeedd93d3ff3..f5fc821e46702 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "sha256-+Ah3D+cgGfunX46Fqv6NSNAOzVwrRdZz6oJKP+tHCmU="; + sha256 = "sha256-nmSNG5o2Ck80OG4ZGYIayVdnw3Z2fn1VkUIuI9RYfL8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index 24c00dd891be0..72fdbc4c02195 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmodbus"; - version = "3.1.9"; + version = "3.1.10"; src = fetchFromGitHub { owner = "stephane"; repo = "libmodbus"; rev = "v${version}"; - hash = "sha256-aq8JB7CgzK6idU9AAJWkMXyYDXRynSTlNBMyPrNdpLw="; + hash = "sha256-e2lB5D41a5MOmz9M90ZXfIltSOxNDOrQUpRNU2yYd1k="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index 2edbc35aa899f..0a384b03bb2ab 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -2,18 +2,23 @@ stdenv.mkDerivation rec { pname = "ois"; - version = "1.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = "wgois"; repo = "OIS"; rev = "v${version}"; - sha256 = "0g8krgq5bdx2rw7ig0xva4kqv4x815672i7z6lljp3n8847wmypa"; + sha256 = "sha256-ir6p+Tzf8L5VOW/rsG4yelsth7INbhABO2T7pfMHcFo="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ]; + buildInputs = lib.optionals stdenv.isLinux [ libX11 ] + ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; meta = with lib; { description = "Object-oriented C++ input system"; diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/development/libraries/physics/clhep/default.nix index f5327edef6f1e..a7c38ce3f0f91 100644 --- a/pkgs/development/libraries/physics/clhep/default.nix +++ b/pkgs/development/libraries/physics/clhep/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clhep"; - version = "2.4.6.1"; + version = "2.4.6.2"; src = fetchurl { url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; - hash = "sha256-FwFhuOSYVV91xt55Nq/elWqT/JqhIaFtd56mAgh6Mjk="; + hash = "sha256-re1z5JushaW06G9koO49bzz+VVGw93MceLbY+drG6Nw="; }; prePatch = '' diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index c8f0b37e0659f..b9563346ada4c 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -30,7 +30,11 @@ stdenv.mkDerivation rec { "-DCBLAS=ON" "-DBUILD_TESTING=ON" ] ++ lib.optional shared "-DBUILD_SHARED_LIBS=ON" - ++ lib.optional blas64 "-DBUILD_INDEX64=ON"; + ++ lib.optional blas64 "-DBUILD_INDEX64=ON" + # Tries to run host platform binaries during the build + # Will likely be disabled by default in 3.12, see: + # https://github.com/Reference-LAPACK/lapack/issues/757 + ++ lib.optional (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) "-DTEST_FORTRAN_COMPILER=OFF"; passthru = { inherit blas64; }; diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 60be72379565c..dabe3f748a924 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.185"; + version = "0.6.186"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vxU+UDPnW4OfhEs66ynN7tFbi8aIHIgLFx/jx+2Fp2w="; + sha256 = "sha256-h8PUxSjC21BsjqFgOOvDPClFLwOTFTTEB57zxUtbuTw="; }; vendorSha256 = "sha256-uaLoh1VhJAT5liGqL77DLhAWviy5Ci8B16LuzCWuek8="; diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index 13c5089d822b8..1e81f7dce2a09 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -7,13 +7,13 @@ buildDunePackage rec { pname = "carton"; - version = "0.4.4"; + version = "0.6.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz"; - sha256 = "sha256-7mgCgu87Cn4XhjEhonlz9lhgTw0Cu5hnxNJ1wXr+Qhw="; + sha256 = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; }; # remove changelogs for mimic and the git* packages diff --git a/pkgs/development/ocaml-modules/carton/git.nix b/pkgs/development/ocaml-modules/carton/git.nix index 2cc6b1336de29..7e08e69543d7a 100644 --- a/pkgs/development/ocaml-modules/carton/git.nix +++ b/pkgs/development/ocaml-modules/carton/git.nix @@ -1,6 +1,6 @@ { buildDunePackage, carton, carton-lwt -, bigarray-compat, bigstringaf, lwt, fpath, result -, mmap, fmt, decompress, astring +, bigstringaf, lwt, fpath, result +, fmt, decompress, astring , alcotest, alcotest-lwt, cstruct, logs , mirage-flow, rresult, ke }: @@ -13,12 +13,10 @@ buildDunePackage { propagatedBuildInputs = [ carton carton-lwt - bigarray-compat bigstringaf lwt fpath result - mmap fmt decompress astring diff --git a/pkgs/development/ocaml-modules/carton/lwt.nix b/pkgs/development/ocaml-modules/carton/lwt.nix index 2aeee63dbf1ea..33ee70ef348de 100644 --- a/pkgs/development/ocaml-modules/carton/lwt.nix +++ b/pkgs/development/ocaml-modules/carton/lwt.nix @@ -1,8 +1,8 @@ { buildDunePackage, carton , lwt, decompress, optint, bigstringaf , alcotest, alcotest-lwt, cstruct, fmt, logs -, mirage-flow, result, rresult, bigarray-compat -, ke, base64, bos, checkseum, digestif, fpath, mmap +, mirage-flow, result, rresult +, ke, base64, bos, checkseum, digestif, fpath , stdlib-shims , git-binary # pkgs.git }: @@ -31,14 +31,12 @@ buildDunePackage { mirage-flow result rresult - bigarray-compat ke base64 bos checkseum digestif fpath - mmap stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/git/paf.nix b/pkgs/development/ocaml-modules/git/paf.nix index 476364a52fb95..4806909962c09 100644 --- a/pkgs/development/ocaml-modules/git/paf.nix +++ b/pkgs/development/ocaml-modules/git/paf.nix @@ -13,7 +13,6 @@ , rresult , tls , uri -, bigarray-compat , bigstringaf , domain-name , httpaf @@ -43,7 +42,6 @@ buildDunePackage { mirage-time tls uri - bigarray-compat bigstringaf domain-name httpaf diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 96ef1037cf698..c7b9d930bd6f0 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -1,26 +1,25 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, result }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }: let pname = "otfm"; - version = "0.3.0"; + version = "0.4.0"; webpage = "https://erratique.ch/software/${pname}"; in -assert lib.versionAtLeast ocaml.version "4.01.0"; - stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + pname = "ocaml${ocaml.version}-${pname}"; + inherit version; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "054s82539k3kc9na6s47g3scsl04icjahpas7pv5351jmsgqcq3k"; + hash = "sha256-02U23mYTy0ZJgSObDoyygPTGEMC4/Zge5bux4wshaEE="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; - propagatedBuildInputs = [ uutf result ]; + propagatedBuildInputs = [ uutf ]; strictDeps = true; diff --git a/pkgs/development/python-modules/aionanoleaf/default.nix b/pkgs/development/python-modules/aionanoleaf/default.nix index 40686bf7d113a..e819431a4220c 100644 --- a/pkgs/development/python-modules/aionanoleaf/default.nix +++ b/pkgs/development/python-modules/aionanoleaf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aionanoleaf"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "milanmeu"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-bz568DlodWtSu2WTTd/QMhdiX9IkllW7UYVXuNlKFaY="; + rev = "refs/tags/v${version}"; + hash = "sha256-f0TyXhuAzI0s0n6sXH9mKWA4nad2YchZkQ0+jw/Bmv0="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for the Nanoleaf API"; homepage = "https://github.com/milanmeu/aionanoleaf"; + changelog = "https://github.com/milanmeu/aionanoleaf/releases/tag/v${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index b3cb92b95fe6d..0a779bd7478a7 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "5.1.0"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jhoPgwydB/DZx7hC16XgM0UBhmByVZRT5b7BDETA+FY="; + hash = "sha256-6HUykGN0zx97K4372dU1RPncajJt2n20zp2FhrJG1sM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index 37ca7ebe7bdb0..8dd16f32602e2 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "authlib"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "lepture"; repo = "authlib"; rev = "refs/tags/v${version}"; - hash = "sha256-UTsQRAgmYu4BwT0WWE6XOjTYyGWZIt8bMH9qJ8KLOWA="; + hash = "sha256-OYfvfPnpWE9g7L9cFXUD95B/9+OZy55ZVbmFhFgguUg="; }; propagatedBuildInputs = [ @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for building OAuth and OpenID Connect servers"; homepage = "https://github.com/lepture/authlib"; + changelog = "https://github.com/lepture/authlib/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/calver/default.nix b/pkgs/development/python-modules/calver/default.nix new file mode 100644 index 0000000000000..13377419c174c --- /dev/null +++ b/pkgs/development/python-modules/calver/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: +let + pname = "calver"; + version = "2022.6.26"; + +in +buildPythonPackage { + inherit pname version; + + src = fetchPypi { + inherit pname version; + hash = "sha256-4FSTo7F1F+8XSPvmENoR8QSF+qfEFrnTP9SlLXSJT4s="; + }; + + meta = { + description = "Setuptools extension for CalVer package versions"; + homepage = "https://github.com/di/calver"; + license = lib.licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index d68ec8f4b75eb..013df4dc0faef 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.2.4"; + version = "3.2.5"; # the wheel comes with pre-built assets, allowing us to avoid fighting # with npm/webpack/gettext to build them ourselves. @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "django_hijack"; dist = "py3"; python = "py3"; - sha256 = "sha256-tSIovIPEszq00Y0PMl/Wlx5YK5MTxLhCpNpHFZDi9rQ="; + sha256 = "sha256-8BHnC3uK6zmSWKfvtDJuTjAKwQlL75G/QwRPgtNJYkE="; }; propagatedBuildInputs = [ django django_compat ]; diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix index d7d2e8789ae76..06a336be08143 100644 --- a/pkgs/development/python-modules/django_classytags/default.nix +++ b/pkgs/development/python-modules/django_classytags/default.nix @@ -2,27 +2,37 @@ , buildPythonPackage , fetchPypi , django -, six +, pythonOlder }: buildPythonPackage rec { pname = "django-classy-tags"; - version = "3.0.1"; + version = "4.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0iK0VQKsmeVQpWZmeDnvrvlUucc2amST8UOGKqvqyHg="; + hash = "sha256-25/Hxe0I3CYZzEwZsZUUzawT3bYYJ4qwcJTGJtKO7w0="; }; - propagatedBuildInputs = [ django six ]; + propagatedBuildInputs = [ + django + ]; # pypi version doesn't include runtest.py, needed to run tests doCheck = false; + pythonImportsCheck = [ + "classytags" + ]; + meta = with lib; { description = "Class based template tags for Django"; homepage = "https://github.com/divio/django-classy-tags"; + changelog = "https://github.com/django-cms/django-classy-tags/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index 930077939818c..ca7fcae7406e6 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -2,13 +2,16 @@ , lib , fetchPypi , buildPythonPackage -, isPy3k , python +, pythonOlder }: buildPythonPackage rec { pname = "docutils"; version = "0.19"; + + disabled = pythonOlder "3.7"; + format = "setuptools"; src = fetchPypi { @@ -18,7 +21,7 @@ buildPythonPackage rec { # Only Darwin needs LANG, but we could set it in general. # It's done here conditionally to prevent mass-rebuilds. - checkPhase = lib.optionalString (isPy3k && stdenv.isDarwin) ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + '' + checkPhase = lib.optionalString stdenv.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + '' ${python.interpreter} test/alltests.py ''; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 1d4326f74ee3f..ca4fb75af3041 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -5,7 +5,6 @@ , setuptools , six , appdirs -, scandir ? null , backports_os ? null , typing ? null , pytz @@ -36,7 +35,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ six appdirs pytz setuptools ] ++ lib.optionals (!isPy3k) [ backports_os ] ++ lib.optionals (!pythonAtLeast "3.6") [ typing ] - ++ lib.optionals (!pythonAtLeast "3.5") [ scandir ] ++ lib.optionals (!pythonAtLeast "3.5") [ enum34 ]; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index de424d8afdf92..1f23192eaaf15 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -1,10 +1,10 @@ { lib , aiohttp , aioresponses +, aqipy-atmotech , buildPythonPackage , dacite , fetchFromGitHub -, aqipy-atmotech , orjson , pytest-asyncio , pytest-error-for-skips @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to get air quality data from Nettigo Air Monitor devices"; homepage = "https://github.com/bieniu/nettigo-air-monitor"; + changelog = "https://github.com/bieniu/nettigo-air-monitor/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/parameterizedtestcase/default.nix b/pkgs/development/python-modules/parameterizedtestcase/default.nix deleted file mode 100644 index 9d277af8d1a9c..0000000000000 --- a/pkgs/development/python-modules/parameterizedtestcase/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python -, isPy27 -}: - -buildPythonPackage rec { - pname = "parameterizedtestcase"; - version = "0.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "4ccc1d15d7e7ef153619a6a9cd45b170268cf82c67fdd336794c75139aae127e"; - }; - - checkPhase = '' - runHook preCheck - ${python.interpreter} -m parameterizedtestcase.tests - runHook postCheck - ''; - - doCheck = isPy27; - - meta = with lib; { - description = "Parameterized tests for Python's unittest module"; - homepage = "https://github.com/msabramo/python_unittest_parameterized_test_case"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - broken = python.isPy3k; # uses use_2to3 - }; -} diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index f0f0163652ca0..c382f74ae22b8 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -3,7 +3,6 @@ , fetchPypi , six , pythonOlder -, scandir ? null , glibcLocales , mock , typing @@ -19,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six ] - ++ lib.optionals (pythonOlder "3.5") [ scandir typing ]; + ++ lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ glibcLocales ] ++ lib.optional (pythonOlder "3.3") mock; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix deleted file mode 100644 index 14acb15e03b57..0000000000000 --- a/pkgs/development/python-modules/pygobject/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }: - -buildPythonPackage rec { - pname = "pygobject"; - version = "2.28.7"; - format = "other"; - disabled = pythonAtLeast "3.9"; - - src = fetchurl { - url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz"; - sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv"; - }; - - outputs = [ "out" "devdoc" ]; - - patches = lib.optionals stdenv.isDarwin [ - ./pygobject-2.0-fix-darwin.patch - (fetchpatch { - url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch"; - sha256 = "sha256-mtlyu+La3+iC5iQAmVJzDA5E35XGaRQy/EKXzvrWRCg="; - extraPrefix = ""; - }) - ]; - - configureFlags = [ "--disable-introspection" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ]; - - # in a "normal" setup, pygobject and pygtk are installed into the - # same site-packages: we need a pth file for both. pygtk.py would be - # used to select a specific version, in our setup it should have no - # effect, but we leave it in case somebody expects and calls it. - postInstall = lib.optionalString (!isPy3k) '' - mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth} - - # Prevent wrapping of codegen files as these are meant to be - # executed by the python program - chmod a-x $out/share/pygobject/*/codegen/*.py - ''; - - meta = with lib; { - homepage = "https://pygobject.readthedocs.io/"; - description = "Python bindings for GLib"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 41f4ea8103afb..48bed6efb8b51 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.22.0"; + version = "0.23.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-/FECjJ/iVx4CTtOgxpPBF0lZCctghmD4qUrQQYwmAkQ="; + hash = "sha256-vBXOZ+AhhqWUD6XukmkHF4wjjJxXbK7r0V+qCuZGc6s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index 92c6c03eb992e..1f04a3a14b2d9 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2T2C2bIOAdxppZxqI+QGE2R/+46LoqB7eNdlt4sVAd8="; + hash = "sha256-J5B5THfB/yPG1JSCpO2HTHTH0jn0nbKFzXpZMGJ/dKA="; }; propagatedBuildInputs = [ @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module with file-system utilities"; homepage = "https://github.com/fabiocaccamo/python-fsutil"; + changelog = "https://github.com/fabiocaccamo/python-fsutil/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 35df2ced7e89d..88946ce878d54 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.4.1"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RPCzxcuD57ma306GLYsxxvvvZ0e8RTd/KxOeMSaQQQQ="; + hash = "sha256-mjKbCy4WalB3kRk1x6bTBLARCW0vrUbSdcvvDP//TzM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 50fbb2400f933..661d3ce8c7a18 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "65.6.0.0"; + version = "65.6.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MnC+rbmbxvpLmlzDUQbnFEpcMwKM5ImSsQ50rcjMXII="; + sha256 = "sha256-rWDM8B1ibel2IiREjzbBPgZg6GOv1twR2Xmzc5psfSQ="; }; # Module doesn't have tests diff --git a/pkgs/development/python2-modules/Pygments/default.nix b/pkgs/development/python2-modules/Pygments/default.nix deleted file mode 100644 index aa59c370d2e7d..0000000000000 --- a/pkgs/development/python2-modules/Pygments/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, fetchpatch -, docutils -}: - -buildPythonPackage rec { - pname = "Pygments"; - version = "2.5.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe"; - }; - - patches = [ - (fetchpatch { - name = "CVE-2021-27291.patch"; - url = "https://github.com/pygments/pygments/commit/2e7e8c4a7b318f4032493773732754e418279a14.patch"; - sha256 = "0ap7jgkmvkkzijabsgnfrwl376cjsxa4jmzvqysrkwpjq3q4rxpa"; - excludes = ["CHANGES"]; - }) - ]; - - propagatedBuildInputs = [ docutils ]; - - # Circular dependency with sphinx - doCheck = false; - - meta = { - homepage = "https://pygments.org/"; - description = "A generic syntax highlighter"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/development/python2-modules/boto3/default.nix b/pkgs/development/python2-modules/boto3/default.nix deleted file mode 100644 index c8b8210f65037..0000000000000 --- a/pkgs/development/python2-modules/boto3/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, botocore -, jmespath -, s3transfer -, futures ? null -, docutils -, nose -, mock -, isPy3k -}: - -buildPythonPackage rec { - pname = "boto3"; - version = "1.17.97"; # N.B: if you change this, change botocore and awscli to a matching version - - src = fetchPypi { - inherit pname version; - sha256 = "0ab5afc51461c30f27aebef944211d16f47697b98ff8d2e2f6e49e59584853bb"; - }; - - propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ docutils nose mock ]; - - checkPhase = '' - runHook preCheck - # This method is not in mock. It might have appeared in some versions. - sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \ - tests/unit/resources/test_factory.py - nosetests -d tests/unit --verbose - runHook postCheck - ''; - - # Network access - doCheck = false; - - pythonImportsCheck = [ "boto3" ]; - - meta = { - homepage = "https://github.com/boto/boto3"; - license = lib.licenses.asl20; - description = "AWS SDK for Python"; - longDescription = '' - Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for - Python, which allows Python developers to write software that makes use of - services like Amazon S3 and Amazon EC2. - ''; - }; -} diff --git a/pkgs/development/python2-modules/botocore/default.nix b/pkgs/development/python2-modules/botocore/default.nix deleted file mode 100644 index f23a10579c6ee..0000000000000 --- a/pkgs/development/python2-modules/botocore/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python-dateutil -, jmespath -, docutils -, simplejson -, mock -, nose -, urllib3 -}: - -buildPythonPackage rec { - pname = "botocore"; - version = "1.20.97"; # N.B: if you change this, change boto3 and awscli to a matching version - - src = fetchPypi { - inherit pname version; - sha256 = "f7e119cf3e0f4a36100f0e983583afa91a84fb27c479a1716820aee4f2e190ab"; - }; - - propagatedBuildInputs = [ - python-dateutil - jmespath - docutils - simplejson - urllib3 - ]; - - checkInputs = [ mock nose ]; - - checkPhase = '' - nosetests -v - ''; - - # Network access - doCheck = false; - - pythonImportsCheck = [ "botocore" ]; - - meta = with lib; { - homepage = "https://github.com/boto/botocore"; - license = licenses.asl20; - description = "A low-level interface to a growing number of Amazon Web Services"; - }; -} diff --git a/pkgs/development/python2-modules/certifi/default.nix b/pkgs/development/python2-modules/certifi/default.nix deleted file mode 100644 index 529d5b1fb996e..0000000000000 --- a/pkgs/development/python2-modules/certifi/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, fetchPypi -, buildPythonPackage -, python3 -}: - -let - inherit (python3.pkgs) certifi; - -in buildPythonPackage rec { - pname = "certifi"; - version = "2019.11.28"; - - src = fetchPypi { - inherit pname version; - sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"; - }; - - postPatch = '' - cp ${certifi.src}/certifi/cacert.pem certifi/cacert.pem - ''; - - pythonImportsCheck = [ "certifi" ]; - - # no tests implemented - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/certifi/python-certifi"; - description = "Python package for providing Mozilla's CA Bundle"; - license = licenses.isc; - maintainers = with maintainers; [ ]; # NixOps team - }; -} diff --git a/pkgs/development/python2-modules/chardet/default.nix b/pkgs/development/python2-modules/chardet/default.nix deleted file mode 100644 index 5f6fe0a672a7a..0000000000000 --- a/pkgs/development/python2-modules/chardet/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch -, pytest, pytest-runner, hypothesis }: - -buildPythonPackage rec { - pname = "chardet"; - version = "3.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; - }; - - patches = [ - # Add pytest 4 support. See: https://github.com/chardet/chardet/pull/174 - (fetchpatch { - url = "https://github.com/chardet/chardet/commit/0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4.patch"; - sha256 = "1y1xhjf32rdhq9sfz58pghwv794f3w2f2qcn8p6hp4pc8jsdrn2q"; - }) - ]; - - checkInputs = [ pytest pytest-runner hypothesis ]; - - meta = with lib; { - homepage = "https://github.com/chardet/chardet"; - description = "Universal encoding detector"; - license = licenses.lgpl2; - maintainers = with maintainers; [ domenkozar ]; - }; -} diff --git a/pkgs/development/python2-modules/google-apputils/default.nix b/pkgs/development/python2-modules/google-apputils/default.nix deleted file mode 100644 index 225adf348d1a2..0000000000000 --- a/pkgs/development/python2-modules/google-apputils/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPy3k -, pytz -, gflags -, python-dateutil -, mox -, python -}: - -buildPythonPackage rec { - pname = "google-apputils"; - version = "0.4.2"; - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "0afw0gxmh0yw5g7xsmw49gs8bbp0zyhbh6fr1b0h48f3a439v5a7"; - }; - - preConfigure = '' - sed -i '/ez_setup/d' setup.py - ''; - - propagatedBuildInputs = [ pytz gflags python-dateutil mox ]; - - checkPhase = '' - ${python.executable} setup.py google_test - ''; - - # ERROR:root:Trying to access flag test_tmpdir before flags were parsed. - doCheck = false; - - meta = with lib; { - description = "Google Application Utilities for Python"; - homepage = "https://github.com/google/google-apputils"; - license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/python2-modules/gtkme/default.nix b/pkgs/development/python2-modules/gtkme/default.nix deleted file mode 100644 index bc23854d95c82..0000000000000 --- a/pkgs/development/python2-modules/gtkme/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pkg-config -, gobject-introspection -, pygobject3 -, gtk3 -, glib -}: - -buildPythonPackage rec { - pname = "gtkme"; - version = "1.5.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-NIUgnbfcHjbPfsH3CF2Bywo8owrdsi1wqDoMxOa+2U4="; - }; - - nativeBuildInputs = [ pkg-config gobject-introspection gtk3 ]; - buildInputs = [ pygobject3 glib ]; - propagatedBuildInputs = [ gtk3 ]; - - pythonImportsCheck = [ - "gtkme" - ]; - - meta = with lib; { - description = "Manages an Application with Gtk windows, forms, lists and other complex items easily"; - homepage = "https://gitlab.com/doctormo/gtkme"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ - revol-xut - ]; - }; -} diff --git a/pkgs/development/python2-modules/idna/default.nix b/pkgs/development/python2-modules/idna/default.nix deleted file mode 100644 index 9a1c1dc271f19..0000000000000 --- a/pkgs/development/python2-modules/idna/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "idna"; - version = "2.10"; - - src = fetchPypi { - inherit pname version; - sha256 = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"; - }; - - checkInputs = [ pytestCheckHook ]; - - meta = { - homepage = "https://github.com/kjd/idna/"; - description = "Internationalized Domain Names in Applications (IDNA)"; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/python2-modules/marisa/default.nix b/pkgs/development/python2-modules/marisa/default.nix deleted file mode 100644 index 93a4ccb959f79..0000000000000 --- a/pkgs/development/python2-modules/marisa/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, marisa, swig -, isPy3k -}: - -buildPythonPackage rec { - pname = "marisa"; - version = "1.3.40"; - - disabled = isPy3k; - - src = fetchFromGitHub { - owner = "s-yata"; - repo = "marisa-trie"; - rev = "8dba9850b89d7828ebf33b8ab84df2b54d31260b"; - sha256 = "0pkp9fggk53lxlicfwrskgx33qplc4v6njbavlnz4x4z63zd4933"; - }; - - nativeBuildInputs = [ swig marisa ]; - buildInputs = [ marisa ]; - - sourceRoot = "${src.name}/bindings/python"; - - meta = with lib; { - description = "Python binding for marisa package (do not confuse with marisa-trie python bindings)"; - homepage = "https://github.com/s-yata/marisa-trie"; - license = with licenses; [ bsd2 lgpl2 ]; - maintainers = with maintainers; [ vanzef ]; - }; -} diff --git a/pkgs/development/python2-modules/protobuf/default.nix b/pkgs/development/python2-modules/protobuf/default.nix deleted file mode 100644 index 30e9fbf9ea75b..0000000000000 --- a/pkgs/development/python2-modules/protobuf/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ buildPackages -, lib -, fetchpatch -, python -, buildPythonPackage -, isPy37 -, protobuf -, google-apputils ? null -, six -, pyext -, isPy27 -, disabled -, doCheck ? true -}: - -buildPythonPackage { - inherit (protobuf) pname src version; - inherit disabled; - doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 - - propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ]; - propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. - nativeBuildInputs = [ pyext ] ++ lib.optionals isPy27 [ google-apputils ]; - buildInputs = [ protobuf ]; - - patches = lib.optional (isPy37 && (lib.versionOlder protobuf.version "3.6.1.2")) - # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2) - (fetchpatch { - url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch"; - sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1"; - stripLen = 1; - }) - ; - - prePatch = '' - while [ ! -d python ]; do - cd * - done - cd python - ''; - - setupPyGlobalFlags = lib.optional (lib.versionAtLeast protobuf.version "2.6.0") - "--cpp_implementation"; - - pythonImportsCheck = [ - "google.protobuf" - ] ++ lib.optionals (lib.versionAtLeast protobuf.version "2.6.0") [ - "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked - ]; - - meta = with lib; { - description = "Protocol Buffers are Google's data interchange format"; - homepage = "https://developers.google.com/protocol-buffers/"; - license = licenses.bsd3; - maintainers = with maintainers; [ knedlsepp ]; - }; - - passthru.protobuf = protobuf; -} diff --git a/pkgs/development/python2-modules/pygobject/default.nix b/pkgs/development/python2-modules/pygobject/default.nix index ce9410eaf8b59..2a09002976b23 100644 --- a/pkgs/development/python2-modules/pygobject/default.nix +++ b/pkgs/development/python2-modules/pygobject/default.nix @@ -1,33 +1,48 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, -pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome }: +{ lib, stdenv, fetchurl, fetchpatch, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }: buildPythonPackage rec { pname = "pygobject"; - version = "3.36.1"; - + version = "2.28.7"; format = "other"; + disabled = pythonAtLeast "3.9"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8="; + url = "mirror://gnome/sources/pygobject/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "devdoc" ]; - mesonFlags = [ - "-Dpython=python${if isPy3k then "3" else "2" }" + patches = lib.optionals stdenv.isDarwin [ + ./pygobject-2.0-fix-darwin.patch + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch"; + sha256 = "sha256-mtlyu+La3+iC5iQAmVJzDA5E35XGaRQy/EKXzvrWRCg="; + extraPrefix = ""; + }) ]; - nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ]; - buildInputs = [ glib gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ which ncurses ]; - propagatedBuildInputs = [ pycairo cairo ]; + configureFlags = [ "--disable-introspection" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glib ]; + + # in a "normal" setup, pygobject and pygtk are installed into the + # same site-packages: we need a pth file for both. pygtk.py would be + # used to select a specific version, in our setup it should have no + # effect, but we leave it in case somebody expects and calls it. + postInstall = lib.optionalString (!isPy3k) '' + mv $out/${python.sitePackages}/{pygtk.pth,${pname}-${version}.pth} + + # Prevent wrapping of codegen files as these are meant to be + # executed by the python program + chmod a-x $out/share/pygobject/*/codegen/*.py + ''; meta = with lib; { homepage = "https://pygobject.readthedocs.io/"; - description = "Python bindings for Glib"; + description = "Python bindings for GLib"; license = licenses.gpl2; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch b/pkgs/development/python2-modules/pygobject/pygobject-2.0-fix-darwin.patch index 7fef05262f4d9..7fef05262f4d9 100644 --- a/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch +++ b/pkgs/development/python2-modules/pygobject/pygobject-2.0-fix-darwin.patch diff --git a/pkgs/development/python2-modules/pyroma/default.nix b/pkgs/development/python2-modules/pyroma/default.nix deleted file mode 100644 index 9fee5ec56c0e6..0000000000000 --- a/pkgs/development/python2-modules/pyroma/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, docutils, pygments, setuptools -}: - -buildPythonPackage rec { - pname = "pyroma"; - version = "2.6.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "2527423e3a24ccd56951f3ce1b0ebbcc4fa0518c82fca882e696c78726ab9c2f"; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "pygments < 2.6" "pygments" - ''; - - propagatedBuildInputs = [ docutils pygments setuptools ]; - - meta = with lib; { - description = "Test your project's packaging friendliness"; - homepage = "https://github.com/regebro/pyroma"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/pysqlite/default.nix b/pkgs/development/python2-modules/pysqlite/default.nix deleted file mode 100644 index 09cc312223ad2..0000000000000 --- a/pkgs/development/python2-modules/pysqlite/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv -, buildPythonPackage -, fetchPypi -, isPy3k -, pkgs -}: - -buildPythonPackage rec { - pname = "pysqlite"; - version = "2.8.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "17d3335863e8cf8392eea71add33dab3f96d060666fe68ab7382469d307f4490"; - }; - - # Need to use the builtin sqlite3 on Python 3 - disabled = isPy3k; - - # Since the `.egg' file is zipped, the `NEEDED' of the `.so' files - # it contains is not taken into account. Thus, we must explicitly make - # it a propagated input. - propagatedBuildInputs = [ pkgs.sqlite ]; - - patchPhase = '' - substituteInPlace "setup.cfg" \ - --replace "/usr/local/include" "${pkgs.sqlite.dev}/include" \ - --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib" - ${lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''} - ''; - - meta = with lib; { - homepage = "https://pysqlite.org/"; - description = "Python bindings for the SQLite embedded relational database engine"; - longDescription = '' - pysqlite is a DB-API 2.0-compliant database interface for SQLite. - - SQLite is a relational database management system contained in - a relatively small C library. It is a public domain project - created by D. Richard Hipp. Unlike the usual client-server - paradigm, the SQLite engine is not a standalone process with - which the program communicates, but is linked in and thus - becomes an integral part of the program. The library - implements most of SQL-92 standard, including transactions, - triggers and most of complex queries. - - pysqlite makes this powerful embedded SQL engine available to - Python programmers. It stays compatible with the Python - database API specification 2.0 as much as possible, but also - exposes most of SQLite's native API, so that it is for example - possible to create user-defined SQL functions and aggregates - in Python. - ''; - license = licenses.bsd3; - }; - -} diff --git a/pkgs/development/python2-modules/pytest-runner/default.nix b/pkgs/development/python2-modules/pytest-runner/default.nix deleted file mode 100644 index bea83146c37d9..0000000000000 --- a/pkgs/development/python2-modules/pytest-runner/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: - -buildPythonPackage rec { - pname = "pytest-runner"; - version = "5.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b"; - }; - - nativeBuildInputs = [ setuptools-scm pytest ]; - - postPatch = '' - rm pytest.ini - ''; - - checkPhase = '' - py.test tests - ''; - - # Fixture not found - doCheck = false; - - meta = with lib; { - description = "Invoke py.test as distutils command with dependency resolution"; - homepage = "https://github.com/pytest-dev/pytest-runner"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/s3transfer/default.nix b/pkgs/development/python2-modules/s3transfer/default.nix deleted file mode 100644 index 4fd0fe346add9..0000000000000 --- a/pkgs/development/python2-modules/s3transfer/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, fetchPypi -, pythonOlder -, buildPythonPackage -, docutils -, mock -, nose -, coverage -, wheel -, botocore -, futures ? null -}: - -buildPythonPackage rec { - pname = "s3transfer"; - version = "0.4.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI="; - }; - - propagatedBuildInputs = - [ - botocore - ] ++ lib.optional (pythonOlder "3") futures; - - buildInputs = [ - docutils - mock - nose - coverage - wheel - ]; - - checkPhase = '' - pushd s3transfer/tests - nosetests -v unit/ functional/ - popd - ''; - - # version on pypi has no tests/ dir - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/boto/s3transfer"; - license = licenses.asl20; - description = "A library for managing Amazon S3 transfers"; - }; -} diff --git a/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch b/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch deleted file mode 100644 index 1b35a0b950ce2..0000000000000 --- a/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/scandir.py b/scandir.py -index 3f602fb..40af3e5 100644 ---- a/scandir.py -+++ b/scandir.py -@@ -23,6 +23,7 @@ from os import listdir, lstat, stat, strerror - from os.path import join, islink - from stat import S_IFDIR, S_IFLNK, S_IFREG - import collections -+import platform - import sys - - try: -@@ -432,6 +433,15 @@ elif sys.platform.startswith(('linux', 'darwin', 'sunos5')) or 'bsd' in sys.plat - ('__d_padding', ctypes.c_uint8 * 4), - ('d_name', ctypes.c_char * 256), - ) -+ elif 'darwin' in sys.platform and 'arm64' in platform.machine(): -+ _fields_ = ( -+ ('d_ino', ctypes.c_uint64), -+ ('d_off', ctypes.c_uint64), -+ ('d_reclen', ctypes.c_uint16), -+ ('d_namlen', ctypes.c_uint16), -+ ('d_type', ctypes.c_uint8), -+ ('d_name', ctypes.c_char * 1024), -+ ) - else: - _fields_ = ( - ('d_ino', ctypes.c_uint32), # must be uint32, not ulong diff --git a/pkgs/development/python2-modules/scandir/default.nix b/pkgs/development/python2-modules/scandir/default.nix deleted file mode 100644 index e712cca8348d1..0000000000000 --- a/pkgs/development/python2-modules/scandir/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, python, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "scandir"; - version = "1.10.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd"; - }; - - patches = [ - ./add-aarch64-darwin-dirent.patch - ]; - - checkPhase = "${python.interpreter} test/run_tests.py"; - - meta = with lib; { - description = "A better directory iterator and faster os.walk()"; - homepage = "https://github.com/benhoyt/scandir"; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/python2-modules/sphinx/default.nix b/pkgs/development/python2-modules/sphinx/default.nix deleted file mode 100644 index 80dec05310854..0000000000000 --- a/pkgs/development/python2-modules/sphinx/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -, simplejson -, mock -, glibcLocales -, html5lib -, pythonOlder -, enum34 -, python -, docutils -, jinja2 -, pygments -, alabaster -, babel -, snowballstemmer -, six -, sqlalchemy -, whoosh -, imagesize -, requests -, typing -, sphinxcontrib-websupport -, setuptools -}: - -buildPythonPackage rec { - pname = "sphinx"; - version = "1.8.5"; - src = fetchPypi { - pname = "Sphinx"; - inherit version; - sha256 = "c7658aab75c920288a8cf6f09f244c6cfdae30d82d803ac1634d9f223a80ca08"; - }; - LC_ALL = "en_US.UTF-8"; - - checkInputs = [ pytest ]; - buildInputs = [ simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34; - # Disable two tests that require network access. - checkPhase = '' - cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored' - ''; - propagatedBuildInputs = [ - docutils - jinja2 - pygments - alabaster - babel - setuptools - snowballstemmer - six - sphinxcontrib-websupport - sqlalchemy - whoosh - imagesize - requests - ] ++ lib.optional (pythonOlder "3.5") typing; - - # Lots of tests. Needs network as well at some point. - doCheck = false; - - patches = [ - # Since pygments 2.5, PythonLexer refers to python3. If we want to use - # python2, we need to explicitly specify Python2Lexer. - # Not upstreamed since there doesn't seem to be any upstream maintenance - # branch for 1.8 (and this patch doesn't make any sense for 2.x). - ./python2-lexer.patch - ]; - # https://github.com/NixOS/nixpkgs/issues/22501 - # Do not run `python sphinx-build arguments` but `sphinx-build arguments`. - postPatch = '' - substituteInPlace sphinx/make_mode.py --replace "sys.executable, " "" - ''; - - meta = { - description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; - homepage = "http://sphinx.pocoo.org/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/development/python2-modules/sphinx/python2-lexer.patch b/pkgs/development/python2-modules/sphinx/python2-lexer.patch deleted file mode 100644 index cf4a243315a23..0000000000000 --- a/pkgs/development/python2-modules/sphinx/python2-lexer.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py -index ac2bd1b06..63ca52de2 100644 ---- a/sphinx/highlighting.py -+++ b/sphinx/highlighting.py -@@ -16,7 +16,7 @@ from pygments.filters import ErrorToken - from pygments.formatters import HtmlFormatter, LatexFormatter - from pygments.lexer import Lexer # NOQA - from pygments.lexers import get_lexer_by_name, guess_lexer --from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \ -+from pygments.lexers import Python2Lexer, Python3Lexer, PythonConsoleLexer, \ - CLexer, TextLexer, RstLexer - from pygments.styles import get_style_by_name - from pygments.util import ClassNotFound -@@ -40,7 +40,7 @@ logger = logging.getLogger(__name__) - - lexers = dict( - none = TextLexer(stripnl=False), -- python = PythonLexer(stripnl=False), -+ python = Python2Lexer(stripnl=False), - python3 = Python3Lexer(stripnl=False), - pycon = PythonConsoleLexer(stripnl=False), - pycon3 = PythonConsoleLexer(python3=True, stripnl=False), diff --git a/pkgs/development/python2-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python2-modules/sphinxcontrib-websupport/default.nix deleted file mode 100644 index b1bdf6a0dff62..0000000000000 --- a/pkgs/development/python2-modules/sphinxcontrib-websupport/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, six -}: - -buildPythonPackage rec { - pname = "sphinxcontrib-websupport"; - version = "1.1.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc"; - }; - - propagatedBuildInputs = [ six ]; - - doCheck = false; - - meta = { - description = "Sphinx API for Web Apps"; - homepage = "http://sphinx-doc.org/"; - license = lib.licenses.bsd2; - }; -} diff --git a/pkgs/development/python2-modules/typing/default.nix b/pkgs/development/python2-modules/typing/default.nix deleted file mode 100644 index a835be985ff49..0000000000000 --- a/pkgs/development/python2-modules/typing/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, isPyPy, unittestCheckHook -, pythonAtLeast }: - -let - testDir = if isPy3k then "src" else "python2"; - -in buildPythonPackage rec { - pname = "typing"; - version = "3.10.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; - }; - - disabled = pythonAtLeast "3.5"; - - # Error for Python3.6: ImportError: cannot import name 'ann_module' - # See https://github.com/python/typing/pull/280 - # Also, don't bother on PyPy: AssertionError: TypeError not raised - doCheck = pythonOlder "3.6" && !isPyPy; - - checkInputs = [ unittestCheckHook ]; - - unittestFlagsArray = [ "-s" testDir ]; - - meta = with lib; { - description = "Backport of typing module to Python versions older than 3.5"; - homepage = "https://docs.python.org/3/library/typing.html"; - license = licenses.psfl; - }; -} diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index e7c38c1b02347..0c2b2005ba846 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -3,18 +3,18 @@ , fetchurl , fetchpatch , getopt -, tzdata , ksh +, tzdata , pkgsMusl # for passthru.tests }: stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20220726"; + version = "20220928"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-G/N3B4lyJyHcp7C/+K/EqVINog8CGbt7xSNQrwEz8KA="; + hash = "sha256-yAS3feP+uOMd7ipMn7Hp7CTFo0dk56KBXIi07QFlDpA="; }; # Make tests work with musl @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "separate-tests.patch"; url = "https://raw.githubusercontent.com/alpinelinux/aports/2a36f7b79df44136c4d2b8e9512f908af65adfee/community/bmake/separate-tests.patch"; - sha256 = "00s76jwyr83c6rkvq67b1lxs8jhm0gj2rjgy77xazqr5400slj9a"; + hash = "sha256-KkmqASAl46/6Of7JLOQDFUqkOw3rGLxnNmyg7Lk0RwM="; }) # add a shebang to bmake's install(1) replacement (fetchpatch { name = "install-sh.patch"; url = "https://raw.githubusercontent.com/alpinelinux/aports/34cd8c45397c63c041cf3cbe1ba5232fd9331196/community/bmake/install-sh.patch"; - sha256 = "0z8icd6akb96r4cksqnhynkn591vbxlmrrs4w6wil3r6ggk6mwa6"; + hash = "sha256-RvFq5nsmDxq54UTnXGlfO6Rip/XQYj0ZySatqUxjEX0="; }) ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix index d175bfe01f30f..da0e6e1683f3f 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix @@ -52,5 +52,8 @@ poetry2nix.mkPoetryApplication { meta = with lib; { inherit (python.meta) platforms; maintainers = with maintainers; [ adisbladis jakewaksbaum ]; + knownVulnerabilities = [ + "CVE-2022-42966" # cleo version in poetry.lock is vulnerable + ]; }; } diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 8c5a00f9ca61a..4129b30035bd7 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -1,21 +1,21 @@ -{ lib, rustPlatform, fetchCrate, stdenv, DiskArbitration, Foundation, IOKit }: +{ lib, rustPlatform, fetchCrate, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.17"; + version = "1.0.18"; src = fetchCrate { inherit pname version; - sha256 = "sha256-vtVE7BITzYP9vhSj7HfDm0Mar2bRPmeW1/mE977vvrA="; + sha256 = "sha256-BlWPdZb85XaTGV6ZE3XRVKHJyXimfrezhRyqJVmCFMY="; }; - cargoSha256 = "sha256-VHlnRk5EXZjf+EW/clDOFA+ohh9SqJiRvq1xQcP0Wrk="; + cargoSha256 = "sha256-1qtlsItLP8MdxebgktzTr3R4Kq+PBIAiHGaikbQ796E="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration Foundation IOKit - ]; + ]); meta = with lib; { description = "Graph the number of crates that depend on your crate over time"; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 55b5f0dda210b..815351d48220b 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.2.2"; + version = "0.3.0"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - sha256 = "IIy5ZEx/+StAhtRcGqM3uvvEqu4wGzGUls0K/ot4jRI="; + sha256 = "CPoSo8Kqu87c0bF4J2KSoamz6bsfS/DnkYqRi+XL8Qw="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "5cScLXujNm14+SCr8OcO93RDL3EfAjsuAzfcwj+EMKs="; + sha256 = "0ymZ4cYJn3Qth4jiTeXuAAsY0wFrYO2OHumY5WLamME="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "3PdLVz4qTJQHmM9laL413xnZaSuD6xlaSy8cuJ9M8us="; + sha256 = "8f5w+wu1vId0R7UQsdbi/yopw1R00lR9ibEAOYwUglI="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "eVEopSvyjzY8J3q52wowTlSVHZ4s1lIc8/yU6Ya+0QU="; + sha256 = "bnuz+n8pAhBUgQKImCUKRZCwIqGHHaB3KtZOVfqy4Zw="; }; }; updateScript = writeShellScript "update-bun" '' |