nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-31 06:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge remote-tracking branch 'origin/python-unstable' into staging-next"

Browse Source 
This reverts commit b041b2e1b2, reversing
changes made to 5b6c2380ad.
This commit is contained in:
Martin Weinelt 2021-09-05 15:02:25 +02:00
parent b041b2e1b2
commit 7f732aca66
381 changed files with 1554 additions and 2632 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/ImageMagick/7.0.nix
View File

@ -18,13 +18,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imagemagick"; pname = "imagemagick";
version = "7.1.0-5"; version = "7.1.0-4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ImageMagick"; owner = "ImageMagick";
repo = "ImageMagick"; repo = "ImageMagick";
rev = version; rev = version;
sha256 = "sha256-iXE3kVpJHMuZ+H6aaZ1GuOUHnP0lO/Q1F5yK8sPPS3M="; sha256 = "sha256-CvrSeoKaTigR+4egelwLRr2++CQ5OWUePwX9e1/G1GM=";
}; };
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

21
pkgs/applications/misc/bottles/default.nix
View File

@ -3,18 +3,18 @@
, desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy , desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy
, python3Packages, gettext , python3Packages, gettext
, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3 , appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3
, steam-run, xdg-utils, pciutils, cabextract, wineWowPackages , steam-run-native
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "bottles"; pname = "bottles";
version = "2021.7.28-treviso-2"; version = "2021.7.14-treviso";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bottlesdevs"; owner = "bottlesdevs";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0kvwcajm9izvkwfg7ir7bks39bpc665idwa8mc8d536ajyjriysn"; sha256 = "0xhfk1ll8vacgrr0kkhynq4bryjhfjs29j824bark5mj9b6lkbix";
}; };
postPatch = '' postPatch = ''
@ -52,14 +52,7 @@ python3Packages.buildPythonApplication rec {
dbus-python dbus-python
gst-python gst-python
liblarch liblarch
patool ] ++ [ steam-run-native ];
] ++ [
steam-run
xdg-utils
pciutils
cabextract
wineWowPackages.minimal
];
format = "other"; format = "other";
strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943
@ -69,10 +62,8 @@ python3Packages.buildPythonApplication rec {
substituteInPlace build-aux/meson/postinstall.py \ substituteInPlace build-aux/meson/postinstall.py \
--replace "'update-desktop-database'" "'${desktop-file-utils}/bin/update-desktop-database'" --replace "'update-desktop-database'" "'${desktop-file-utils}/bin/update-desktop-database'"
substituteInPlace src/runner.py \ substituteInPlace src/runner.py \
--replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ --replace " {runner}" " ${steam-run-native}/bin/steam-run {runner}" \
--replace " {dxvk_setup}" " ${steam-run}/bin/steam-run {dxvk_setup}" --replace " {dxvk_setup}" " ${steam-run-native}/bin/steam-run {dxvk_setup}"
substituteInPlace src/runner_utilities.py \
--replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \
''; '';
preFixup = '' preFixup = ''

8
pkgs/applications/misc/plover/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, python27Packages, python3Packages, wmctrl, { lib, fetchurl, python27Packages, python36Packages, wmctrl,
qtbase, mkDerivationWith }: qtbase, mkDerivationWith }:
{ {
@ -24,9 +24,9 @@
]; ];
}; };
dev = with python3Packages; mkDerivationWith buildPythonPackage rec { dev = with python36Packages; mkDerivationWith buildPythonPackage rec {
pname = "plover"; pname = "plover";
version = "4.0.0.dev10"; version = "4.0.0.dev8";
meta = with lib; { meta = with lib; {
description = "OpenSteno Plover stenography software"; description = "OpenSteno Plover stenography software";
@ -36,7 +36,7 @@
src = fetchurl { src = fetchurl {
url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
sha256 = "sha256-Eun+ZgmOIjYw6FS/2OGoBvYh52U/Ue0+NtIqrvV2Tqc="; sha256 = "1wxkmik1zyw5gqig5r0cas5v6f5408fbnximzw610rdisqy09rxp";
}; };
# I'm not sure why we don't find PyQt5 here but there's a similar # I'm not sure why we don't find PyQt5 here but there's a similar

4
pkgs/applications/misc/variety/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub { stdenv, lib, fetchFromGitHub
, python3Packages , python37Packages
, fehSupport ? false, feh , fehSupport ? false, feh
, imagemagickSupport ? true, imagemagick , imagemagickSupport ? true, imagemagick
, intltool , intltool
@ -13,7 +13,7 @@
, makeWrapper , makeWrapper
}: }:
with python3Packages; with python37Packages;
buildPythonApplication rec { buildPythonApplication rec {
pname = "variety"; pname = "variety";

7
pkgs/applications/networking/appgate-sdp/default.nix
View File

@ -32,7 +32,8 @@
, openssl , openssl
, pango , pango
, procps , procps
, python3 , python37
, python37Packages
, stdenv , stdenv
, systemd , systemd
, xdg-utils , xdg-utils
@ -100,8 +101,8 @@ stdenv.mkDerivation rec {
dontBuild = true; dontBuild = true;
buildInputs = [ buildInputs = [
python3 python37
python3.pkgs.dbus-python python37Packages.dbus-python
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

35
pkgs/applications/version-management/git-and-tools/bump2version/default.nix
View File

@ -1,37 +1,22 @@
{ lib { buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }:
, buildPythonApplication
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, testfixtures
}:
buildPythonApplication rec { buildPythonApplication rec {
pname = "bump2version"; pname = "bump2version";
version = "1.0.1"; version = "1.0.0";
disabled = isPy27;
disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "c4urself"; owner = "c4urself";
repo = pname; repo = pname;
rev = "v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU="; sha256 = "10p7rg569rk3qvzs5kjj17894bqlsg3ihhbln6ciwwfhkfq1kpja";
}; };
checkInputs = [ checkInputs = [ pytest testfixtures ];
pytestCheckHook # X's in pytest are git tests which won't run in sandbox
testfixtures checkPhase = ''
]; pytest tests/ -k 'not usage_string_fork'
'';
disabledTests = [
# X's in pytest are git tests which won't run in sandbox
"usage_string_fork"
"test_usage_string"
"test_defaults_in_usage_with_config"
];
pythonImportsCheck = [ "bumpversion" ];
meta = with lib; { meta = with lib; {
description = "Version-bump your software with a single command"; description = "Version-bump your software with a single command";

2
pkgs/build-support/alternatives/blas/default.nix
View File

@ -83,7 +83,7 @@ stdenv.mkDerivation {
patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libblas${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libblas${canonicalExtension}
'' else if stdenv.hostPlatform.isDarwin then '' '' else if stdenv.hostPlatform.isDarwin then ''
install_name_tool \ install_name_tool \
-id $out/lib/libblas${canonicalExtension} \ -id libblas${canonicalExtension} \
-add_rpath ${lib.getLib blasProvider}/lib \ -add_rpath ${lib.getLib blasProvider}/lib \
$out/lib/libblas${canonicalExtension} $out/lib/libblas${canonicalExtension}
'' else "") + '' '' else "") + ''

2
pkgs/build-support/setup-hooks/move-docs.sh
View File

@ -6,7 +6,7 @@ preFixupHooks+=(_moveToShare)
_moveToShare() { _moveToShare() {
forceShare=${forceShare:=man doc info} forceShare=${forceShare:=man doc info}
if [[ -z "$out" ]]; then return; fi if [ -z "$forceShare" -o -z "$out" ]; then return; fi
for d in $forceShare; do for d in $forceShare; do
if [ -d "$out/$d" ]; then if [ -d "$out/$d" ]; then

2
pkgs/data/misc/shared-mime-info/default.nix
View File

@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
pname = "shared-mime-info"; pname = "shared-mime-info";
version = "2.1"; version = "2.1";
outputs = [ "out" "dev" ];
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.freedesktop.org"; domain = "gitlab.freedesktop.org";
owner = "xdg"; owner = "xdg";

12
pkgs/development/compilers/vala/default.nix
View File

@ -116,18 +116,18 @@ in rec {
}; };
vala_0_48 = generic { vala_0_48 = generic {
version = "0.48.19"; version = "0.48.18";
sha256 = "sha256-gLdlijfZhE/NG0Mdr8WATeYWpYGW5PHxGeWyrraLSgE="; sha256 = "1pbz4nyrrf9wp8rp953sczx545s4g0h5mars9ynkn788dzs2h3wy";
}; };
vala_0_50 = generic { vala_0_50 = generic {
version = "0.50.10"; version = "0.50.9";
sha256 = "sha256-vnIf8/AYHqttM+zKzygfZvMI+qHl5VTwj99nFZpFlRU="; sha256 = "0w5ngs90rq7vy21nqfq8drqyb33kxm17j161qvakwpsbjsidv1mn";
}; };
vala_0_52 = generic { vala_0_52 = generic {
version = "0.52.5"; version = "0.52.4";
sha256 = "sha256-hKG7MSs+Xcrkt7JcRVmNN14stpIzzvtZoV0jUMdr3ZE="; sha256 = "0cfz3xshc9azxx4fn25x9gadnph6jvf1r2wzd7p5krk0a4755ppc";
}; };
vala = vala_0_52; vala = vala_0_52;

3
pkgs/development/embedded/platformio/chrootenv.nix
View File

@ -23,8 +23,7 @@ in buildFHSUserEnv {
name = "platformio"; name = "platformio";
targetPkgs = pio-pkgs; targetPkgs = pio-pkgs;
# disabled temporarily because fastdiff no longer support 32bit multiPkgs = pio-pkgs;
# multiPkgs = pio-pkgs;
meta = with lib; { meta = with lib; {
description = "An open source ecosystem for IoT development"; description = "An open source ecosystem for IoT development";

22
pkgs/development/embedded/platformio/core.nix
View File

@ -1,6 +1,5 @@
{ stdenv, lib, python3 { stdenv, lib, python3
, fetchFromGitHub , fetchFromGitHub
, fetchPypi
, git , git
, spdx-license-list-data , spdx-license-list-data
, version, src , version, src
@ -21,15 +20,6 @@ let
doCheck = false; doCheck = false;
}); });
ajsonrpc = super.ajsonrpc.overridePythonAttrs (oldAttrs: rec {
pname = "ajsonrpc";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-CgHCtW0gxZho7ZavvEaODNc+KbFW4sAsHtM2Xk5Cuaw=";
};
});
click = super.click.overridePythonAttrs (oldAttrs: rec { click = super.click.overridePythonAttrs (oldAttrs: rec {
version = "7.1.2"; version = "7.1.2";
src = oldAttrs.src.override { src = oldAttrs.src.override {
@ -38,18 +28,6 @@ let
}; };
}); });
starlette = super.starlette.overridePythonAttrs (oldAttrs: rec {
pname = "starlette";
version = "0.14.2";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
sha256 = "sha256-Ki5jTEr5w6CrGK6F60E9uvdUlGx8pxdHMpxHvj9D4js=";
};
doCheck = false;
});
uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec { uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec {
version = "0.13.2"; version = "0.13.2";
src = fetchFromGitHub { src = fetchFromGitHub {

4
pkgs/development/interpreters/rakudo/zef.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zef"; pname = "zef";
version = "0.11.11"; version = "0.11.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ugexe"; owner = "ugexe";
repo = "zef"; repo = "zef";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-IOConYPH+t84INXaHw8OVp0mLNucSDS2RT2AlZOUoEs="; sha256 = "sha256-snnvREM2RLssmE55Ea0Imcw12pmyD6+/11ZXmmUY36U=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

2
pkgs/development/interpreters/tcl/8.5.nix
View File

@ -4,8 +4,6 @@ callPackage ./generic.nix (args // rec {
release = "8.5"; release = "8.5";
version = "${release}.18"; version = "${release}.18";
# Note: when updating, the hash in pkgs/development/libraries/tk/8.5.nix must also be updated!
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
sha256 = "1jfkqp2fr0xh6xvaqx134hkfa5kh7agaqbxm6lhjbpvvc1xfaaq3"; sha256 = "1jfkqp2fr0xh6xvaqx134hkfa5kh7agaqbxm6lhjbpvvc1xfaaq3";

2
pkgs/development/interpreters/tcl/8.6.nix
View File

@ -4,8 +4,6 @@ callPackage ./generic.nix (args // rec {
release = "8.6"; release = "8.6";
version = "${release}.11"; version = "${release}.11";
# Note: when updating, the hash in pkgs/development/libraries/tk/8.6.nix must also be updated!
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
sha256 = "0n4211j80mxr6ql0xx52rig8r885rcbminfpjdb2qrw6hmk8c14c"; sha256 = "0n4211j80mxr6ql0xx52rig8r885rcbminfpjdb2qrw6hmk8c14c";

4
pkgs/development/libraries/boxfort/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, python3Packages }: { lib, stdenv, fetchFromGitHub, meson, ninja, python37Packages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "unstable-2019-10-09"; version = "unstable-2019-10-09";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
patchShebangs ci/isdir.py patchShebangs ci/isdir.py
''; '';
checkInputs = with python3Packages; [ cram ]; checkInputs = with python37Packages; [ cram ];
doCheck = true; doCheck = true;

4
pkgs/development/libraries/c-blosc/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "c-blosc"; pname = "c-blosc";
version = "1.21.0"; version = "1.20.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Blosc"; owner = "Blosc";
repo = "c-blosc"; repo = "c-blosc";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-B8SFOc1oGgU5AGAbkqe5oz045H08TnymNAbzz2oOKoo="; sha256 = "0a3yrig78plzjbazfqcfrzqhnw17xd0dcayvp4z4kp415kgs2a3s";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/criterion/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext { lib, stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext
, dyncall , nanomsg, python3Packages }: , dyncall , nanomsg, python37Packages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.3.3"; version = "2.3.3";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nanomsg nanomsg
]; ];
checkInputs = with python3Packages; [ cram ]; checkInputs = with python37Packages; [ cram ];
cmakeFlags = [ "-DCTESTS=ON" ]; cmakeFlags = [ "-DCTESTS=ON" ];
doCheck = true; doCheck = true;

4
pkgs/development/libraries/glib/default.nix
View File

@ -45,11 +45,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "glib"; pname = "glib";
version = "2.68.4"; version = "2.68.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-Yv0GHQinVJJhfmJac+LAXiWfgxrLuOH4ucgfI/eZOjs="; sha256 = "0f1iprj7v0b5wn9njj39dkl25g6filfs7i4ybk20jq821k1a7qg7";
}; };
patches = optionals stdenv.isDarwin [ patches = optionals stdenv.isDarwin [

BIN
pkgs/development/libraries/glibc/2.33-master.patch.gz
View File

Binary file not shown.

4
pkgs/development/libraries/glibc/common.nix
View File

@ -42,7 +42,7 @@
let let
version = "2.33"; version = "2.33";
patchSuffix = "-50"; patchSuffix = "-49";
sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8=";
in in
@ -61,7 +61,7 @@ stdenv.mkDerivation ({
[ [
/* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
$ git fetch --all -p && git checkout origin/release/2.33/master && git describe $ git fetch --all -p && git checkout origin/release/2.33/master && git describe
glibc-2.33-50-gc6cadbf83a glibc-2.33-49-g22d37364ae
$ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz
To compare the archive contents zdiff can be used. To compare the archive contents zdiff can be used.

6
pkgs/development/libraries/harfbuzz/default.nix
View File

@ -32,8 +32,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "harfbuzz${optionalString withIcu "-icu"}"; name = "harfbuzz${optionalString withIcu "-icu"}-${version}";
inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "harfbuzz"; owner = "harfbuzz";
@ -43,7 +42,8 @@ stdenv.mkDerivation {
}; };
postPatch = '' postPatch = ''
patchShebangs src/*.py test patchShebangs src/*.py
patchShebangs test
'' + lib.optionalString stdenv.isDarwin '' '' + lib.optionalString stdenv.isDarwin ''
# ApplicationServices.framework headers have cast-align warnings. # ApplicationServices.framework headers have cast-align warnings.
substituteInPlace src/hb.hh \ substituteInPlace src/hb.hh \

4
pkgs/development/libraries/imlib2/default.nix
View File

@ -12,11 +12,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imlib2"; pname = "imlib2";
version = "1.7.3"; version = "1.7.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2";
sha256 = "sha256-FY0LjCC8ESIa+ed6ZKEW/KcFGwPN6ixPMdMfRpOC+Zc="; sha256 = "sha256-Ul1OMYknRxveRSB4bcJVC1mriFM4SNstdcYPW05YIaE=";
}; };
buildInputs = [ buildInputs = [

4
pkgs/development/libraries/libglvnd/default.nix
View File

@ -5,14 +5,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libglvnd"; pname = "libglvnd";
version = "1.3.4"; version = "1.3.3";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.freedesktop.org"; domain = "gitlab.freedesktop.org";
owner = "glvnd"; owner = "glvnd";
repo = "libglvnd"; repo = "libglvnd";
rev = "v${version}"; rev = "v${version}";
sha256 = "0phvgg2h3pcz3x39gaymwb37bnw1s26clq9wsj0zx398zmp3dwpk"; sha256 = "0gjk6m3gkdm12bmih2jflp0v5s1ibkixk7mrzrk0cj884m3hy1z6";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ];

6
pkgs/development/libraries/libssh/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libssh"; pname = "libssh";
version = "0.9.6"; version = "0.8.9";
src = fetchurl { src = fetchurl {
url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz";
sha256 = "sha256-hrz4hb2bgEZv4OBUU8WLh332GvqLqUeljDVtfw+rgps="; sha256 = "09b8w9m5qiap8wbvz4613nglsynpk8hn0q9b929ny2y4l2fy2nc5";
}; };
postPatch = '' postPatch = ''

4
pkgs/development/libraries/science/math/caffe2/default.nix
View File

@ -139,9 +139,5 @@ stdenv.mkDerivation rec {
platforms = with lib.platforms; linux; platforms = with lib.platforms; linux;
license = lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ yuriaisaka ]; maintainers = with lib.maintainers; [ yuriaisaka ];
# fails to compile with
# error: invalid conversion from 'const char*' to 'char*'
# TODO: Remove usage of python2, protobuf overwrite
broken = true;
}; };
} }

2
pkgs/development/libraries/tk/8.6.nix
View File

@ -4,7 +4,7 @@ callPackage ./generic.nix (args // {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x
sha256 = "1gh9k7l76qg9l0sb78ijw9xz4xl1af47aqbdifb6mjpf3cbsnv00"; sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg";
}; };
patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ];

13
pkgs/development/python-modules/Cython/default.nix
View File

@ -12,7 +12,8 @@
}: }:
let let
excludedTests = [ "reimport_from_subinterpreter" ] excludedTests = []
++ [ "reimport_from_subinterpreter" ]
# cython's testsuite is not working very well with libc++ # cython's testsuite is not working very well with libc++
# We are however optimistic about things outside of testsuite still working # We are however optimistic about things outside of testsuite still working
++ lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ] ++ lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ]
@ -25,21 +26,19 @@ let
in buildPythonPackage rec { in buildPythonPackage rec {
pname = "Cython"; pname = "Cython";
version = "0.29.24"; version = "0.29.22";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-zfBNB8NgCGDowuuq1Oj1KsP+shJFPBdkpJrAjIJ+hEM="; sha256 = "sha256-32uDx6bR2WfqiaKQPkqTE3djSil0WWUuRVFzTEgZVAY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
]; ];
checkInputs = [ checkInputs = [
gdb numpy ncurses gdb numpy ncurses
]; ];
buildInputs = [ glibcLocales ]; buildInputs = [ glibcLocales ];
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
@ -72,7 +71,9 @@ in buildPythonPackage rec {
# https://github.com/cython/cython/issues/2785 # https://github.com/cython/cython/issues/2785
# Temporary solution # Temporary solution
doCheck = false; doCheck = false;
# doCheck = !stdenv.isDarwin;
# doCheck = !stdenv.isDarwin;
meta = { meta = {
description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; description = "An optimising static compiler for both the Python programming language and the extended Cython programming language";

23
pkgs/development/python-modules/Fabric/default.nix
View File

@ -1,11 +1,9 @@
{ lib { lib, buildPythonPackage, fetchPypi
, buildPythonPackage
, fetchPypi
, cryptography , cryptography
, invoke , invoke
, mock , mock
, paramiko , paramiko
, pytestCheckHook , pytest
, pytest-relaxed , pytest-relaxed
}: }:
@ -25,21 +23,20 @@ buildPythonPackage rec {
''; '';
propagatedBuildInputs = [ invoke paramiko cryptography ]; propagatedBuildInputs = [ invoke paramiko cryptography ];
checkInputs = [ pytest mock pytest-relaxed ];
checkInputs = [ pytestCheckHook pytest-relaxed mock ]; # requires pytest_relaxed, which doesnt have official support for pytest>=5
# https://github.com/bitprophet/pytest-relaxed/issues/12
# ==================================== ERRORS ====================================
# ________________________ ERROR collecting test session _________________________
# Direct construction of SpecModule has been deprecated, please use SpecModule.from_parent
# See https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent for more details.
doCheck = false; doCheck = false;
checkPhase = ''
pytest tests
'';
pythonImportsCheck = [ "fabric" ]; pythonImportsCheck = [ "fabric" ];
meta = with lib; { meta = with lib; {
description = "Pythonic remote execution"; description = "Pythonic remote execution";
homepage = "https://www.fabfile.org/"; homepage = "https://www.fabfile.org/";
license = licenses.bsd2; license = licenses.bsd2;
maintainers = [ maintainers.costrouc ]; maintainers = [ maintainers.costrouc ];
}; };
} }

4
pkgs/development/python-modules/Mako/default.nix
View File

@ -9,11 +9,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Mako"; pname = "Mako";
version = "1.1.5"; version = "1.1.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "169fa52af22a91900d852e937400e79f535496191c63712e3b9fda5a9bed6fc3"; sha256 = "17831f0b7087c313c0ffae2bcbbd3c1d5ba9eeac9c38f2eb7b50e8c99fe9d5ab";
}; };
propagatedBuildInputs = [ markupsafe ]; propagatedBuildInputs = [ markupsafe ];

4
pkgs/development/python-modules/Pygments/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Pygments"; pname = "Pygments";
version = "2.10.0"; version = "2.9.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"; sha256 = "a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f";
}; };
propagatedBuildInputs = [ docutils ]; propagatedBuildInputs = [ docutils ];

4
pkgs/development/python-modules/ROPGadget/default.nix
View File

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ROPGadget"; pname = "ROPGadget";
version = "6.6"; version = "6.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "dc61186e0114ec67ec7ce374df8fd2ddc2a7cba129a1242338e900a7483fba22"; sha256 = "4c0e56f2ba0aef13b2c8ca286aad663525b92020b11bacd16791f5236247905c";
}; };
propagatedBuildInputs = [ capstone ]; propagatedBuildInputs = [ capstone ];

20
pkgs/development/python-modules/acme-tiny/default.nix
View File

@ -1,35 +1,27 @@
{ lib { lib, buildPythonPackage, fetchPypi, setuptools-scm, fusepy, fuse
, buildPythonPackage , openssl }:
, fetchPypi
, setuptools-scm
, fusepy
, fuse
, openssl
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "acme-tiny"; pname = "acme-tiny";
version = "4.1.1"; version = "4.1.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "b7050b9428d45319e14ab9ea77f0ff4eb40451e5a68325d4c5358a87cff0e793"; sha256 = "0jmg525n4n98hwy3hf303jbnq23z79sqwgliji9j7qcnph47gkgq";
}; };
patchPhase = '' patchPhase = ''
substituteInPlace acme_tiny.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' substituteInPlace acme_tiny.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"'
substituteInPlace tests/monkey.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"'
substituteInPlace tests/test_module.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' substituteInPlace tests/test_module.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"'
substituteInPlace tests/utils.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf substituteInPlace tests/monkey.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf
''; '';
buildInputs = [ setuptools-scm ]; buildInputs = [ setuptools-scm ];
checkInputs = [ fusepy fuse ]; checkInputs = [ fusepy fuse ];
doCheck = false; # seems to hang, not sure doCheck = false; # seems to hang, not sure
pythonImportsCheck = [ "acme_tiny" ];
meta = with lib; { meta = with lib; {
description = "A tiny script to issue and renew TLS certs from Let's Encrypt"; description = "A tiny script to issue and renew TLS certs from Let's Encrypt";
homepage = "https://github.com/diafygi/acme-tiny"; homepage = "https://github.com/diafygi/acme-tiny";

47
pkgs/development/python-modules/acoustics/default.nix
View File

@ -1,57 +1,32 @@
{ lib { lib, buildPythonPackage, fetchPypi
, buildPythonPackage , pytest, numpy, scipy, matplotlib, pandas, tabulate, pythonOlder }:
, fetchPypi
, matplotlib
, numpy
, pandas
, pytestCheckHook
, pythonOlder
, scipy
, tabulate
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "acoustics"; pname = "acoustics";
version = "0.2.4.post0"; version = "0.2.4.post0";
disabled = pythonOlder "3.6"; checkInputs = [ pytest ];
propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ];
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "a162625e5e70ed830fab8fab0ddcfe35333cb390cd24b0a827bcefc5bbcae97d"; sha256 = "a162625e5e70ed830fab8fab0ddcfe35333cb390cd24b0a827bcefc5bbcae97d";
}; };
propagatedBuildInputs = [ checkPhase = ''
matplotlib
numpy
pandas
scipy
tabulate
];
checkInputs = [
pytestCheckHook
];
preCheck = ''
export HOME=$TMPDIR export HOME=$TMPDIR
mkdir -p $HOME/.matplotlib mkdir -p $HOME/.matplotlib
echo "backend: ps" > $HOME/.matplotlib/matplotlibrc echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
pushd tests
py.test -Wignore::DeprecationWarning ./.
popd
''; '';
pytestFlagsArray = [ disabled = pythonOlder "3.6";
"-Wignore::DeprecationWarning"
];
disabledTestPaths = [
# All tests fail with TypeError
"tests/test_aio.py"
];
pythonImportsCheck = [ "acoustics" ];
meta = with lib; { meta = with lib; {
description = "Python package for acousticians"; description = "A package for acousticians";
maintainers = with maintainers; [ fridh ]; maintainers = with maintainers; [ fridh ];
license = with licenses; [ bsd3 ]; license = with licenses; [ bsd3 ];
homepage = "https://github.com/python-acoustics/python-acoustics"; homepage = "https://github.com/python-acoustics/python-acoustics";

4
pkgs/development/python-modules/agate-excel/default.nix
View File

@ -4,11 +4,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "agate-excel"; pname = "agate-excel";
version = "0.2.5"; version = "0.2.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "62315708433108772f7f610ca769996b468a4ead380076dbaf6ffe262831b153"; sha256 = "8f255ef2c87c436b7132049e1dd86c8e08bf82d8c773aea86f3069b461a17d52";
}; };
propagatedBuildInputs = [ agate openpyxl xlrd ]; propagatedBuildInputs = [ agate openpyxl xlrd ];

4
pkgs/development/python-modules/aiobotocore/default.nix
View File

@ -10,12 +10,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiobotocore"; pname = "aiobotocore";
version = "1.4.1"; version = "1.3.1";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "09f06723d1d69c6d407d9a356ca65ab42a5b7b73a45be4b1ed0ed1a6b6057a9f"; sha256 = "8ecee55346651e0f4cbda883e3e16cfe11460b8d7adcc08d0017cbb867636ae1";
}; };
# relax version constraints: aiobotocore works with newer botocore versions # relax version constraints: aiobotocore works with newer botocore versions

2
pkgs/development/python-modules/aioprocessing/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioprocessing"; pname = "aioprocessing";
version = "2.0.0"; version = "2.0.0";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

17
pkgs/development/python-modules/aioredis/default.nix
View File

@ -1,27 +1,20 @@
{ lib { lib, buildPythonPackage, fetchPypi
, buildPythonPackage , pkgs, async-timeout, hiredis, isPyPy, isPy27
, fetchPypi
, async-timeout
, typing-extensions
, hiredis
, isPyPy
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioredis"; pname = "aioredis";
version = "2.0.0"; version = "1.3.1";
disabled = pythonOlder "3.6"; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db"; sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
async-timeout async-timeout
typing-extensions
] ++ lib.optional (!isPyPy) hiredis; ] ++ lib.optional (!isPyPy) hiredis;
# Wants to run redis-server, hardcoded FHS paths, too much trouble. # Wants to run redis-server, hardcoded FHS paths, too much trouble.

4
pkgs/development/python-modules/ajsonrpc/default.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ajsonrpc"; pname = "ajsonrpc";
version = "1.2.0"; version = "1.1.0";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "791bac18f0bf0dee109194644f151cf8b7ff529c4b8d6239ac48104a3251a19f"; sha256 = "1b5r8975wdnk3qnc1qjnn4lkxmqcir3brbwnxml9ii90dnsw408a";
}; };
checkInputs = [ pytestCheckHook ]; checkInputs = [ pytestCheckHook ];

48
pkgs/development/python-modules/alembic/default.nix
View File

@ -1,56 +1,26 @@
{ lib { lib, buildPythonPackage, fetchPypi
, buildPythonPackage , pytest, pytest-cov, mock, coverage, setuptools
, fetchPypi , Mako, sqlalchemy, python-editor, python-dateutil
, pythonOlder
, Mako
, python-dateutil
, sqlalchemy
, importlib-metadata
, importlib-resources
, pytest-xdist
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "alembic"; pname = "alembic";
version = "1.7.1"; version = "1.6.5";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "aea964d3dcc9c205b8759e4e9c1c3935ea3afeee259bffd7ed8414f8085140fb"; sha256 = "a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51";
}; };
propagatedBuildInputs = [ buildInputs = [ pytest pytest-cov mock coverage ];
Mako propagatedBuildInputs = [ Mako sqlalchemy python-editor python-dateutil setuptools ];
python-dateutil
sqlalchemy
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
pythonImportsCheck = [ # no traditional test suite
"alembic" doCheck = false;
];
checkInputs = [
pytestCheckHook
pytest-xdist
];
pytestFlagsArray = [
"--numprocesses" "auto"
];
meta = with lib; { meta = with lib; {
homepage = "https://bitbucket.org/zzzeek/alembic"; homepage = "https://bitbucket.org/zzzeek/alembic";
description = "A database migration tool for SQLAlchemy"; description = "A database migration tool for SQLAlchemy";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ];
}; };
} }

4
pkgs/development/python-modules/ansi2html/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm }: { lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm, toml }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "ansi2html"; pname = "ansi2html";
@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596"; sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596";
}; };
nativeBuildInputs = [ setuptools-scm ]; nativeBuildInputs = [ setuptools-scm toml ];
propagatedBuildInputs = [ six setuptools ]; propagatedBuildInputs = [ six setuptools ];
preCheck = "export PATH=$PATH:$out/bin"; preCheck = "export PATH=$PATH:$out/bin";

4
pkgs/development/python-modules/ansible-runner/default.nix
View File

@ -14,11 +14,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ansible-runner"; pname = "ansible-runner";
version = "2.0.2"; version = "1.4.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "c02b690803ec0be4453411c53743cd3fdca1dfc66dfa075794e14e717c5b61b3"; sha256 = "1bb56f9061c3238d89ec8871bc842f5b8d0e868f892347e8455c98d5b6fa58a1";
}; };
checkInputs = [ pytest mock ]; checkInputs = [ pytest mock ];

4
pkgs/development/python-modules/apispec/default.nix
View File

@ -12,12 +12,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "apispec"; pname = "apispec";
version = "5.1.0"; version = "4.7.1";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9ac7a7a6000339a02d05404ef561e013375f170de01d8b238782f8fb83082b5b"; sha256 = "1yf71c9nq1rfb5pkgmfw486fvywi1bjnmgwxcly7y3basf3980kr";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/arrow/default.nix
View File

@ -12,13 +12,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "arrow"; pname = "arrow";
version = "1.1.1"; version = "1.1.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "dee7602f6c60e3ec510095b5e301441bc56288cb8f51def14dcb3079f623823a"; sha256 = "1n2vzyrirfj7fp0zn6iipm3i8bch0g4m14z02nrvlyjiyfmi7zmq";
}; };
postPatch = '' postPatch = ''

45
pkgs/development/python-modules/asn1/default.nix
View File

@ -1,45 +0,0 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, future
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "asn1";
version = "2.4.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "andrivet";
repo = "python-asn1";
rev = "v${version}";
sha256 = "0g2d5cr1pxsm5ackba7padf7gvlgrgv807kh0312s5axjd2cww2l";
};
propagatedBuildInputs = [
future
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py \
--replace "enum-compat" ""
'';
pytestFlagsArray = [ "tests/test_asn1.py" ];
pythonImportsCheck = [ "asn1" ];
meta = with lib; {
description = "Python ASN.1 encoder and decoder";
homepage = "https://github.com/andrivet/python-asn1";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/astroid/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "astroid"; pname = "astroid";
version = "2.7.3"; # Check whether the version is compatible with pylint version = "2.5.6"; # Check whether the version is compatible with pylint
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "PyCQA"; owner = "PyCQA";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "08qxw58cdyglkni6ahyil4cmnb48zz0wr4v05gzqk4r5ifs4gl2m"; sha256 = "sha256-/nWXzuWkerUDvFT/tJTZuhfju46MAM0cwosVH9BXoY8=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION=version; SETUPTOOLS_SCM_PRETEND_VERSION=version;

34
pkgs/development/python-modules/asttokens/default.nix
View File

@ -1,35 +1,29 @@
{ lib { lib, fetchPypi, fetchpatch, buildPythonPackage,
, fetchPypi setuptools-scm, toml, six, astroid, pytest
, buildPythonPackage
, setuptools-scm
, six
, astroid
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "asttokens"; pname = "asttokens";
version = "2.0.5"; version = "2.0.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-mlTBFPAsepSA1WVQkyVGo/H+cdigLxvHzNDuPuNc9NU="; sha256 = "0a2ixiz04aw4p0aivxh47k3fa9ql804l3y5iv5gcih9aizi5fbm4";
}; };
nativeBuildInputs = [ patches = [
setuptools-scm # Fixes compatibility with python 3.9, will be included in the next release
# after 2.0.4
(fetchpatch {
url = "https://github.com/gristlabs/asttokens/commit/d8ff80ee7d2e64c5e1daf50cc38eb99663f1b1ac.patch";
sha256 = "19y8n8vpzr2ijldbq5rh19sf0vz5azqqpkb9bx0ljjg98h6k7kjj";
excludes = [ "setup.cfg" ];
})
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [ setuptools-scm toml six astroid ];
six
astroid
];
checkInputs = [ checkInputs = [ pytest ];
pytestCheckHook
];
pythonImportsCheck = [ "asttokens" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/gristlabs/asttokens"; homepage = "https://github.com/gristlabs/asttokens";

4
pkgs/development/python-modules/auth0-python/default.nix
View File

@ -9,11 +9,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "auth0-python"; pname = "auth0-python";
version = "3.17.0"; version = "3.16.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "7b21bf91859ea56ac3b665efe5e73340c65dfd30de01081ff334a18a35a188a6"; sha256 = "sha256-Slpwml1GDdxAZ4P6Vn2brrupRofiOHvmQF26l0gtTJM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/authcaptureproxy/default.nix
View File

@ -15,14 +15,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "authcaptureproxy"; pname = "authcaptureproxy";
version = "1.0.2"; version = "1.0.1";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alandtse"; owner = "alandtse";
repo = "auth_capture_proxy"; repo = "auth_capture_proxy";
rev = "v${version}"; rev = "v${version}";
sha256 = "1cg63qhf823nf785kyl96r7vyxfl6dlbwsmhcpny8vb65pl9gng5"; sha256 = "1fbrmh6qa3dm3q3zdxaa0fls94wardbcvnjgwxk686wpjgs1xrs4";
}; };
postPatch = '' postPatch = ''

4
pkgs/development/python-modules/awscrt/default.nix
View File

@ -2,7 +2,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "awscrt"; pname = "awscrt";
version = "0.12.0"; version = "0.11.24";
buildInputs = lib.optionals stdenv.isDarwin buildInputs = lib.optionals stdenv.isDarwin
(with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]);
@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "65fa09ce78902319392bbb62991ddd3b33cebc0e3bbc81ad2c176072ab40de52"; sha256 = "b8aa68bca404bf0085be0570eff5b542d01f7e8e3c0f9b0859abfe5e070162ff";
}; };
meta = with lib; { meta = with lib; {

4
pkgs/development/python-modules/azure-core/default.nix
View File

@ -15,14 +15,14 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "1.17.0"; version = "1.16.0";
pname = "azure-core"; pname = "azure-core";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "25407390dde142d3e41ecf78bb18cedda9b7f7a0af558d082dec711c4a334f46"; sha256 = "b1c7d2e01846074f258c8b2e592239aef836a2b1c27d8d0e8491a2c7e2906ef4";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

6
pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix
View File

@ -6,25 +6,23 @@
, msrest , msrest
, msrestazure , msrestazure
, azure-common , azure-common
, azure-mgmt-core
, azure-mgmt-nspkg , azure-mgmt-nspkg
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-iothubprovisioningservices"; pname = "azure-mgmt-iothubprovisioningservices";
version = "1.0.0"; version = "0.2.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9"; sha256 = "8c37acfd1c33aba845f2e0302ef7266cad31cba503cc990a48684659acb7b91d";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
msrest msrest
msrestazure msrestazure
azure-common azure-common
azure-mgmt-core
azure-mgmt-nspkg azure-mgmt-nspkg
]; ];

4
pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix
View File

@ -5,13 +5,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "2.1.0"; version = "0.3.0";
pname = "azure-mgmt-apimanagement"; pname = "azure-mgmt-apimanagement";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94"; sha256 = "ec363581ef950945447e45d259441cb690a4b790057c7b8470ad8a6eeca04feb";
extension = "zip"; extension = "zip";
}; };

4
pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
View File

@ -11,12 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-recoveryservices"; pname = "azure-mgmt-recoveryservices";
version = "2.0.0"; version = "1.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "a7d3137d5c460f50ac2d44061d60a70b4f2779d4ca844b77419b5725e65e09be"; sha256 = "ab87108c0d5ce27d80583b4bfad966ad07049dcbc0e9ac28c64aa6bbdae64e22";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

30
pkgs/development/python-modules/backports-entry-points-selectable/default.nix
View File

@ -1,30 +0,0 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, importlib-metadata }:
buildPythonPackage rec {
pname = "backports-entry-points-selectable";
version = "1.1.0";
src = fetchPypi {
pname = "backports.entry_points_selectable";
inherit version;
sha256 = "988468260ec1c196dab6ae1149260e2f5472c9110334e5d51adcb77867361f6a";
};
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
# no tests
doCheck = false;
pythonImportsCheck = [ "backports.entry_points_selectable" ];
meta = with lib; {
description = "Compatibility shim providing selectable entry points for older implementations";
homepage = "https://github.com/jaraco/backports.entry_points_selectable";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

7
pkgs/development/python-modules/bellows/default.nix
View File

@ -46,9 +46,10 @@ buildPythonPackage rec {
]; ];
disabledTests = [ disabledTests = [
# AssertionError: assert 65534 is None # RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited
# https://github.com/zigpy/bellows/issues/436 #"test_remigrate_forcibly_downgraded_v4"
"test_startup_nwk_params" # RuntimeError: Event loop is closed
"test_thread_already_stopped"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [

4
pkgs/development/python-modules/beniget/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "beniget"; pname = "beniget";
version = "0.4.1"; version = "0.4.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c"; sha256 = "72bbd47b1ae93690f5fb2ad3902ce1ae61dcd868ce6cfbf33e9bad71f9ed8749";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/block-io/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "block-io"; pname = "block-io";
version = "2.0.4"; version = "1.1.15";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "817c9cd2ff76659caca4bb3d6758d5782a85f8c0ea13b08c4e14f0c2a8b7586d"; sha256 = "97ea037a67af72037cb08cec7e0a9f7866ecdfaa1a8c8ebcc0f4b9359a1516d7";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/bokeh/default.nix
View File

@ -34,11 +34,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bokeh"; pname = "bokeh";
# update together with panel which is not straightforward # update together with panel which is not straightforward
version = "2.3.3"; version = "2.3.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "a5fdcc181835561447fcc5a371300973fce4114692d5853addec284d1cdeb677"; sha256 = "fcc0d0a3129ae457cdb0a4f503843a4d13d1f5d07af7748424ea8c7ddfc321f1";
}; };
patches = [ patches = [

4
pkgs/development/python-modules/boto3/default.nix
View File

@ -13,11 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "boto3"; pname = "boto3";
version = "1.17.106"; # N.B: if you change this, change botocore and awscli to a matching version version = "1.17.97"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-wHQDeLkTylP1/A26kemadSxaMK57WKDF5U4+KmjfJsU="; sha256 = "0ab5afc51461c30f27aebef944211d16f47697b98ff8d2e2f6e49e59584853bb";
}; };
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

4
pkgs/development/python-modules/botocore/default.nix
View File

@ -13,11 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "botocore"; pname = "botocore";
version = "1.20.106"; # N.B: if you change this, change boto3 and awscli to a matching version version = "1.20.97"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-bVyYOAix0AQ39W0MCEEr2C2fgBL9t35VX5cneh/U1d8="; sha256 = "f7e119cf3e0f4a36100f0e983583afa91a84fb27c479a1716820aee4f2e190ab";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/braintree/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "braintree"; pname = "braintree";
version = "4.12.0"; version = "4.10.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "946abd50fe2843eec586ac3cec285d27dfae0cc5a43a64b505e8a2800b8a74a6"; sha256 = "f934a329c7a2b3f7058d5c733cc95da694f66afb5a789162ec701ba4d26a0d90";
}; };
propagatedBuildInputs = [ requests ]; propagatedBuildInputs = [ requests ];

20
pkgs/development/python-modules/brotli/default.nix
View File

@ -1,7 +1,4 @@
{ lib { lib, buildPythonPackage, fetchFromGitHub, pytest }:
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "brotli"; pname = "brotli";
@ -19,18 +16,15 @@ buildPythonPackage rec {
dontConfigure = true; dontConfigure = true;
checkInputs = [ checkInputs = [ pytest ];
pytestCheckHook
];
pytestFlagsArray = [ checkPhase = ''
"python/tests" pytest python/tests
]; '';
meta = with lib; { meta = {
homepage = "https://github.com/google/brotli"; homepage = "https://github.com/google/brotli";
description = "Generic-purpose lossless compression algorithm"; description = "Generic-purpose lossless compression algorithm";
license = licenses.mit; license = lib.licenses.mit;
maintainers = with maintainers; [ ];
}; };
} }

20
pkgs/development/python-modules/canonicaljson/default.nix
View File

@ -1,11 +1,5 @@
{ lib { lib, buildPythonPackage, fetchPypi
, buildPythonPackage , frozendict, simplejson, six, isPy27
, fetchPypi
, frozendict
, simplejson
, six
, isPy27
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -19,15 +13,7 @@ buildPythonPackage rec {
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
frozendict frozendict simplejson six
simplejson
six
];
checkInputs = [ pytestCheckHook ];
disabledTests = [
"test_frozen_dict"
]; ];
meta = with lib; { meta = with lib; {

4
pkgs/development/python-modules/casbin/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "casbin"; pname = "casbin";
version = "1.7.0"; version = "0.20.0";
disabled = isPy27; disabled = isPy27;
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = pname; owner = pname;
repo = "pycasbin"; repo = "pycasbin";
rev = "v${version}"; rev = "v${version}";
sha256 = "1qwns8ph8w5bb26hzkk1dadm2bjq74g65wm6g971llb5jdq9a8z9"; sha256 = "1j7kd4rvf4myg4x4sm4njlhzkxm2m3cva9wmp9vx0nnpfdlyb67f";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/cffi/default.nix
View File

@ -2,11 +2,11 @@
if isPyPy then null else buildPythonPackage rec { if isPyPy then null else buildPythonPackage rec {
pname = "cffi"; pname = "cffi";
version = "1.14.6"; version = "1.14.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"; sha256 = "fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

4
pkgs/development/python-modules/cfn-lint/default.nix
View File

@ -21,13 +21,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cfn-lint"; pname = "cfn-lint";
version = "0.53.1"; version = "0.53.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aws-cloudformation"; owner = "aws-cloudformation";
repo = "cfn-python-lint"; repo = "cfn-python-lint";
rev = "v${version}"; rev = "v${version}";
sha256 = "1wj2pzrrmrdf3mkhnz1qx41rshvfpgwlrxrb80d63r098pnq6df8"; sha256 = "sha256-UHcbbBoByoxW7+AUxu5mQmcvC3irHPQvBv4CbBXPTNo=";
}; };
postPatch = '' postPatch = ''

35
pkgs/development/python-modules/charset-normalizer/default.nix
View File

@ -1,35 +0,0 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "charset-normalizer";
version = "2.0.1";
src = fetchFromGitHub {
owner = "Ousret";
repo = "charset_normalizer";
rev = version;
sha256 = "04rnyrqay11kma9pzagi1mzhc0sq37ggpv39kad2d4ynm35v2hfq";
};
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.cfg \
--replace " --cov=charset_normalizer --cov-report=term-missing" ""
'';
pythonImportsCheck = [ "charset_normalizer" ];
meta = with lib; {
description = "Python module for encoding and language detection";
homepage = "https://charset-normalizer.readthedocs.io/";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/chart-studio/default.nix
View File

@ -10,14 +10,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "chart-studio"; pname = "chart-studio";
version = "5.3.0"; version = "4.14.3";
# chart-studio was split from plotly # chart-studio was split from plotly
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "plotly"; owner = "plotly";
repo = "plotly.py"; repo = "plotly.py";
rev = "v${version}"; rev = "v${version}";
sha256 = "059rq278r5zb2sngby7jzh8kd9c48sd82b6b7s5bbrmzj42sds3n"; sha256 = "1yrrcn9032r3l8y2cc1wvpydg4rkqvgkpyv1s7znby5mrxa1rjma";
}; };
sourceRoot = "source/packages/python/chart-studio"; sourceRoot = "source/packages/python/chart-studio";

4
pkgs/development/python-modules/cliff/default.nix
View File

@ -16,11 +16,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cliff"; pname = "cliff";
version = "3.9.0"; version = "3.8.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "95363e9b43e2ec9599e33b5aea27a6953beda2d0673557916fa4f5796857daa3"; sha256 = "8dd215d0a84c9a3ab2fa2aa700849f4e7b786639f66caa0ad4108c85dca95a7c";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

83
pkgs/development/python-modules/cmd2/default.nix
View File

@ -1,58 +1,21 @@
{ lib { lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k
, stdenv , pyperclip, six, pyparsing, vim, wcwidth, colorama, attrs
, attrs , contextlib2 ? null, typing ? null, setuptools-scm
, buildPythonPackage , pytest, mock ? null, pytest-mock
, colorama , which, glibcLocales
, fetchPypi
, glibcLocales
, importlib-metadata
, pyperclip
, pytest-mock
, pytestCheckHook
, pythonOlder
, setuptools-scm
, typing-extensions
, vim
, wcwidth
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "cmd2"; pname = "cmd2";
version = "2.1.2"; version = "1.5.0";
disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "25dbb2e9847aaa686a8a21e84e3d101db8b79f5cb992e044fc54210ab8c0ad41"; sha256 = "701a8c9975c4abc45e5d13906ab149f959f812869106347323a3f89ac0e82a62";
}; };
LC_ALL = "en_US.UTF-8"; LC_ALL="en_US.UTF-8";
buildInputs = [ postPatch = lib.optionalString stdenv.isDarwin ''
setuptools-scm
];
propagatedBuildInputs = [
attrs
colorama
pyperclip
wcwidth
] ++ lib.optionals (pythonOlder "3.8") [
typing-extensions
importlib-metadata
];
checkInputs = [
pytestCheckHook
glibcLocales
pytest-mock
vim
];
postPatch = ''
sed -i "/--cov/d" setup.cfg
'' + lib.optionalString stdenv.isDarwin ''
# Fake the impure dependencies pbpaste and pbcopy # Fake the impure dependencies pbpaste and pbcopy
mkdir bin mkdir bin
echo '#!${stdenv.shell}' > bin/pbpaste echo '#!${stdenv.shell}' > bin/pbpaste
@ -61,9 +24,33 @@ buildPythonPackage rec {
export PATH=$(realpath bin):$PATH export PATH=$(realpath bin):$PATH
''; '';
doCheck = !stdenv.isDarwin; disabled = !isPy3k;
pythonImportsCheck = [ "cmd2" ]; buildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
colorama
pyperclip
six
pyparsing
wcwidth
attrs
]
++ lib.optionals (pythonOlder "3.5") [contextlib2 typing]
;
doCheck = !stdenv.isDarwin;
# pytest-cov
# argcomplete will generate errors
checkInputs= [ pytest mock which vim glibcLocales pytest-mock ]
++ lib.optional (pythonOlder "3.6") [ mock ];
checkPhase = ''
# test_path_completion_user_expansion might be fixed in the next release
py.test -k 'not test_path_completion_user_expansion'
'';
meta = with lib; { meta = with lib; {
description = "Enhancements for standard library's cmd module"; description = "Enhancements for standard library's cmd module";

4
pkgs/development/python-modules/colorlog/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "colorlog"; pname = "colorlog";
version = "6.4.1"; version = "5.0.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "af99440154a01f27c09256760ea3477982bf782721feaa345904e806879df4d8"; sha256 = "sha256-8XwBOgaWKwL0RJ7gfP2+ayh98p78LJoVFbSjdvTliOo=";
}; };
checkInputs = [ pytestCheckHook ]; checkInputs = [ pytestCheckHook ];

4
pkgs/development/python-modules/commoncode/default.nix
View File

@ -14,11 +14,11 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "commoncode"; pname = "commoncode";
version = "21.8.27"; version = "21.6.11";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "789ee1798cd74ab4516d2e547473d69717d3b2ed7ee180ab2746e0bdfd0d88a4"; sha256 = "d6c8c985746a541913d5bb534c770f2422e5b4ac7a4ef765abc05c287a40ff4b";
}; };
dontConfigure = true; dontConfigure = true;

6
pkgs/development/python-modules/configargparse/default.nix
View File

@ -7,13 +7,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "configargparse"; pname = "configargparse";
version = "1.5.2"; version = "1.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bw2"; owner = "bw2";
repo = "ConfigArgParse"; repo = "ConfigArgParse";
rev = version; rev = "v${version}";
sha256 = "1hgd0gfxycfnlddwsr8sl6ybxzp8rqhin16vphbl8q32wp5hhjd2"; sha256 = "sha256-hzhjrdrXxjksvbHlTnQVsT350g0yuG1F21fElv6bLSA=";
}; };
checkInputs = [ checkInputs = [

6
pkgs/development/python-modules/configparser/default.nix
View File

@ -1,4 +1,6 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm }: { lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm
, toml
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "configparser"; pname = "configparser";
@ -12,7 +14,7 @@ buildPythonPackage rec {
# No tests available # No tests available
doCheck = false; doCheck = false;
nativeBuildInputs = [ setuptools-scm ]; nativeBuildInputs = [ setuptools-scm toml ];
preConfigure = '' preConfigure = ''
export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8

23
pkgs/development/python-modules/contextlib2/0.nix
View File

@ -1,23 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, unittest2
}:
buildPythonPackage rec {
pname = "contextlib2";
version = "0.6.0.post1";
src = fetchPypi {
inherit pname version;
sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e";
};
checkInputs = [ unittest2 ];
meta = {
description = "Backports and enhancements for the contextlib module";
homepage = "https://contextlib2.readthedocs.org/";
license = lib.licenses.psfl;
};
}

4
pkgs/development/python-modules/contextlib2/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "contextlib2"; pname = "contextlib2";
version = "21.6.0"; version = "0.6.0.post1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869"; sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e";
}; };
checkInputs = [ unittest2 ]; checkInputs = [ unittest2 ];

4
pkgs/development/python-modules/cryptacular/default.nix
View File

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cryptacular"; pname = "cryptacular";
version = "1.6.2"; version = "1.5.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "7b529cb2b8a3c7e5be77921bf1ebc653d4d3a8f791375cc6f971b20db2404176"; sha256 = "fb4d48716e88e4d050255ff0f065f6d437caa358ceef16ba5840c95cece224f9";
}; };
buildInputs = [ coverage nose ]; buildInputs = [ coverage nose ];

6
pkgs/development/python-modules/cryptography/default.nix
View File

@ -23,18 +23,18 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cryptography"; pname = "cryptography";
version = "3.4.8"; # Also update the hash in vectors.nix version = "3.4.7"; # Also update the hash in vectors.nix
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "072awar70cwfd2hnx0pvp1dkc7gw45mbm3wcyddvxz5frva5xk4l"; sha256 = "04x7bhjkglxpllad10821vxddlmxdkd3gjvp35iljmnj2s0xw41x";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
sourceRoot = "${pname}-${version}/${cargoRoot}"; sourceRoot = "${pname}-${version}/${cargoRoot}";
name = "${pname}-${version}"; name = "${pname}-${version}";
sha256 = "01h511h6l4qvjxbaw662m1l84pb4wrhwxmnb3qj6ik13mx2m477m"; sha256 = "1m6smky4nahwlp4hn6yzibrcxlbsw4nx162dsq48vlw8h1lgjl62";
}; };
cargoRoot = "src/rust"; cargoRoot = "src/rust";

2
pkgs/development/python-modules/cryptography/vectors.nix
View File

@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1wl0ynh3lzhc6q59g8mybvijmnp195x7fjxlb3h3sgcraw14312c"; sha256 = "1hh4j88ywil3jf62ppj1blygmdirbqz86pynd9lqfijiaym3mb57";
}; };
# No tests included # No tests included

4
pkgs/development/python-modules/cupy/default.nix
View File

@ -7,12 +7,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cupy"; pname = "cupy";
version = "9.4.0"; version = "8.6.0";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "4402bd33a051e82f6888dab088a8d657714ca6d1e945b513dcc513a95a435bd5"; sha256 = "f3ed02ba18e38b4f3ed2c324fa08967e6714f59357ccb0b28badd9572e77500b";
}; };
preConfigure = '' preConfigure = ''

4
pkgs/development/python-modules/cx_freeze/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cx_Freeze"; pname = "cx_Freeze";
version = "6.7"; version = "6.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "050f1dd133a04810bd7f38ac7ae3b290054acb2ff4f6e73f7a286266d153495d"; sha256 = "c4af8ad3f7e7d71e291c1dec5d0fb26bbe92df834b098ed35434c901fbd6762f";
}; };
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";

4
pkgs/development/python-modules/cxxfilt/default.nix
View File

@ -6,11 +6,11 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "cxxfilt"; pname = "cxxfilt";
version = "0.3.0"; version = "0.2.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "7df6464ba5e8efbf0d8974c0b2c78b32546676f06059a83515dbdfa559b34214"; sha256 = "ef6810e76d16c95c11b96371e2d8eefd1d270ec03f9bcd07590e8dcc2c69e92b";
}; };
postPatch = let postPatch = let

4
pkgs/development/python-modules/dask-jobqueue/default.nix
View File

@ -8,12 +8,12 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.7.3"; version = "0.7.2";
pname = "dask-jobqueue"; pname = "dask-jobqueue";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "682d7cc0e6b319b6ab83a7a898680c12e9c77ddc77df380b40041290f55d4e79"; sha256 = "1767f4146b2663d9d2eaef62b882a86e1df0bccdb8ae68ae3e5e546aa6796d35";
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];

4
pkgs/development/python-modules/dask-xgboost/default.nix
View File

@ -7,12 +7,12 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.2.0"; version = "0.1.11";
pname = "dask-xgboost"; pname = "dask-xgboost";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "6d9c491dc4099f74a0df66c4d439d296c0f1fba97009fe93e21b2350f295b4ca"; sha256 = "3fbe1bf4344dc74edfbe9f928c7e3e6acc26dc57cefd8da8ae56a15469c6941c";
}; };
propagatedBuildInputs = [ xgboost dask distributed ]; propagatedBuildInputs = [ xgboost dask distributed ];

58
pkgs/development/python-modules/dask/default.nix
View File

@ -2,51 +2,44 @@
, stdenv , stdenv
, bokeh , bokeh
, buildPythonPackage , buildPythonPackage
, cloudpickle
, distributed
, fetchFromGitHub , fetchFromGitHub
, fsspec , fsspec
, jinja2 , pytestCheckHook
, pytest-rerunfailures
, pythonOlder
, cloudpickle
, numpy , numpy
, packaging , toolz
, dill
, pandas , pandas
, partd , partd
, pytest-rerunfailures
, pytest-xdist , pytest-xdist
, pytestCheckHook
, pythonOlder
, pyyaml
, toolz
, withExtraComplete ? false , withExtraComplete ? false
, distributed
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "dask"; pname = "dask";
version = "2021.08.1"; version = "2021.06.2";
format = "setuptools"; disabled = pythonOlder "3.5";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dask"; owner = "dask";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-HnrHOp3Y/iLYaK3KVp6NJrK68BMqX8lTl/wLosiGc7k="; sha256 = "sha256-qvfjdijzlqaJQrDztRAVr5PudTaVd3WOTBid2ElZQgg=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
cloudpickle
fsspec
packaging
partd
pyyaml
toolz
pandas
jinja2
bokeh bokeh
cloudpickle
dill
fsspec
numpy numpy
] ++ lib.optionals (withExtraComplete) [ pandas
# infinite recursion between distributed and dask partd
toolz
] ++ lib.optionals withExtraComplete [
distributed distributed
]; ];
@ -70,11 +63,7 @@ buildPythonPackage rec {
''; '';
pytestFlagsArray = [ pytestFlagsArray = [
# parallelize "-n $NIX_BUILD_CORES"
"--numprocesses auto"
# rerun failed tests up to three times
"--reruns 3"
# don't run tests that require network access
"-m 'not network'" "-m 'not network'"
]; ];
@ -92,16 +81,7 @@ buildPythonPackage rec {
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
pythonImportsCheck = [ pythonImportsCheck = [ "dask.dataframe" "dask" "dask.array" ];
"dask"
"dask.array"
"dask.bag"
"dask.bytes"
"dask.dataframe"
"dask.dataframe.io"
"dask.dataframe.tseries"
"dask.diagnostics"
];
meta = with lib; { meta = with lib; {
description = "Minimal task scheduling abstraction"; description = "Minimal task scheduling abstraction";

25
pkgs/development/python-modules/dateutils/default.nix
View File

@ -1,25 +0,0 @@
{ lib, buildPythonPackage, fetchPypi, python-dateutil, pytz }:
buildPythonPackage rec {
pname = "dateutils";
version = "0.6.12";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-A92QvLIVQb1OtLATY35PG1+USIHEbMbktnpgWeNw4/E=";
};
propagatedBuildInputs = [
python-dateutil
pytz
];
pythonImportsCheck = [ "dateutils" ];
meta = with lib; {
description = "Utilities for working with datetime objects.";
homepage = "https://github.com/jmcantrell/python-dateutils";
license = licenses.bsd0;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

2
pkgs/development/python-modules/debugpy/default.nix
View File

@ -62,7 +62,7 @@ buildPythonPackage rec {
"x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib";
"i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib";
"aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch arm64 -o attach_arm64.dylib"; "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch arm64 -o attach_arm64.dylib";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")} }.${stdenv.hostPlatform.system}}
)''; )'';
checkInputs = [ checkInputs = [

21
pkgs/development/python-modules/decorator/4.nix
View File

@ -1,21 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "decorator";
version = "4.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "1rxzhk5zwiggk45hl53zydvy70lk654kg0nc1p54090p402jz9p3";
};
meta = with lib; {
homepage = "https://pypi.python.org/pypi/decorator";
description = "Better living through Python with decorators";
license = lib.licenses.mit;
maintainers = [ maintainers.costrouc ];
};
}

4
pkgs/development/python-modules/decorator/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "decorator"; pname = "decorator";
version = "5.0.9"; version = "4.4.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "72ecfba4320a893c53f9706bebb2d55c270c1e51a28789361aa93e4a21319ed5"; sha256 = "1rxzhk5zwiggk45hl53zydvy70lk654kg0nc1p54090p402jz9p3";
}; };
meta = with lib; { meta = with lib; {

4
pkgs/development/python-modules/distributed/default.nix
View File

@ -19,13 +19,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "distributed"; pname = "distributed";
version = "2021.8.1"; version = "2021.6.2";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
# get full repository need conftest.py to run tests # get full repository need conftest.py to run tests
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "c13ac10ecd9ee5f0ff67f5697149062d6e483f23a079918df1ab2e19b11fa77d"; sha256 = "sha256-19ESqGqwSdzvo7If0brqQhKiwD0iwkvVWtONIaf10Ug=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/distro/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "distro"; pname = "distro";
version = "1.6.0"; version = "1.5.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424"; sha256 = "0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92";
}; };
# tests are very targeted at individual linux distributions # tests are very targeted at individual linux distributions

4
pkgs/development/python-modules/django-cacheops/default.nix
View File

@ -9,11 +9,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-cacheops"; pname = "django-cacheops";
version = "6.0"; version = "5.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "78e161ebd96a32e28e19ec7da31f2afed9e62a79726b8b5f0ed12dd16c2e5841"; sha256 = "sha256-1YUc178whzhKH87PqN3bj1UDDu39b98SciW3W8oPmd0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/django_environ/default.nix
View File

@ -7,11 +7,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-environ"; pname = "django-environ";
version = "0.5.0"; version = "0.4.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "a8726675c1ebefa4706b36398c4d3c5c790d335ffe55c4a10378f6bfd57ad8d0"; sha256 = "6c9d87660142608f63ec7d5ce5564c49b603ea8ff25da595fd6098f6dc82afde";
}; };
# The testsuite fails to modify the base environment # The testsuite fails to modify the base environment

4
pkgs/development/python-modules/django_taggit/default.nix
View File

@ -11,12 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-taggit"; pname = "django-taggit";
version = "1.5.1"; version = "1.4.0";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "e5bb62891f458d55332e36a32e19c08d20142c43f74bc5656c803f8af25c084a"; sha256 = "b9ed6e94bad0bed3bf062a6be7ee3db117fda02c6419c680d614197364ea018b";
}; };
propagatedBuildInputs = [ isort django ]; propagatedBuildInputs = [ isort django ];

4
pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "djangorestframework_simplejwt"; pname = "djangorestframework_simplejwt";
version = "4.8.0"; version = "4.7.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "153c973c5c154baf566be431de8527c2bd62557fde7373ebcb0f02b73b28e07a"; sha256 = "c0e9b617da337becb55e67935eb992fad84f861418e7ab5fb3e77a3fd18d4137";
}; };
propagatedBuildInputs = [ django djangorestframework pyjwt ]; propagatedBuildInputs = [ django djangorestframework pyjwt ];

4
pkgs/development/python-modules/dpkt/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dpkt"; pname = "dpkt";
version = "1.9.7.2"; version = "1.9.7.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "80f977667ebbad2b5c4f7b7f45ee8bea6622fb71723f68a9a8fe6274520c853b"; sha256 = "74899d557ec4e337db29cecc80548b23a1205384d30ee407397cfb9ab178e3d4";
}; };
# Project has no tests # Project has no tests

4
pkgs/development/python-modules/elmax/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "elmax"; pname = "elmax";
version = "0.1.3"; version = "0.1.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "home-assistant-ecosystem"; owner = "home-assistant-ecosystem";
repo = "python-elmax"; repo = "python-elmax";
rev = version; rev = version;
sha256 = "sha256-OiVPjWqQw1u0OL6/uYlT+FP2XDh7l3OZyVtQfycHICI="; sha256 = "sha256-Aq/OHxOmtUUmBNlFPu892C8AkTX+Ee0oca7D79InPXQ=";
}; };
nativeBuildInputs = [ poetry-core ]; nativeBuildInputs = [ poetry-core ];

5
pkgs/development/python-modules/executing/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, setuptools-scm
, asttokens , asttokens
}: }:
@ -16,10 +15,6 @@ buildPythonPackage rec {
sha256 = "1hqx94h6l2wg9sljiaajfay2nr62sqa819w3bxrz8cdki1abdygv"; sha256 = "1hqx94h6l2wg9sljiaajfay2nr62sqa819w3bxrz8cdki1abdygv";
}; };
nativeBuildInputs = [
setuptools-scm
];
preBuild = '' preBuild = ''
export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
''; '';

4
pkgs/development/python-modules/extractcode/default.nix
View File

@ -11,11 +11,11 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "extractcode"; pname = "extractcode";
version = "21.7.23"; version = "21.6.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "58aa16d60cfcbd3695d7ea84a1e30d5ba9fa6f614b2ef4a6d0565b2ac5d4f757"; sha256 = "e665501438fedeb6e75335d880c8913a8cd894fd8adcf9c243eb6d48fad2d01c";
}; };
dontConfigure = true; dontConfigure = true;

Some files were not shown because too many files have changed in this diff Show More