Merge staging-next into staging

main
github-actions[bot] 2 years ago committed by GitHub
commit c74d28156f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      maintainers/maintainer-list.nix
  2. 2
      nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
  3. 5
      nixos/doc/manual/release-notes/rl-2211.section.md
  4. 12
      pkgs/applications/audio/petrifoo/default.nix
  5. 9
      pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix
  6. 10
      pkgs/applications/misc/gnome-firmware/default.nix
  7. 8
      pkgs/applications/networking/cluster/clusterctl/default.nix
  8. 2
      pkgs/applications/networking/cluster/terraform-providers/default.nix
  9. 8
      pkgs/applications/networking/cluster/terraform-providers/providers.json
  10. 8
      pkgs/applications/networking/siproxd/default.nix
  11. 73
      pkgs/desktops/gnome/extensions/extensions.json
  12. 6
      pkgs/development/compilers/ocaml/4.00.1.nix
  13. 6
      pkgs/development/compilers/ocaml/4.01.0.nix
  14. 6
      pkgs/development/compilers/ocaml/4.02.nix
  15. 6
      pkgs/development/compilers/ocaml/4.03.nix
  16. 6
      pkgs/development/compilers/ocaml/4.04.nix
  17. 6
      pkgs/development/compilers/ocaml/4.05.nix
  18. 6
      pkgs/development/compilers/ocaml/4.06.nix
  19. 6
      pkgs/development/compilers/ocaml/4.07.nix
  20. 6
      pkgs/development/compilers/ocaml/4.08.nix
  21. 5
      pkgs/development/java-modules/jogl/default.nix
  22. 14
      pkgs/development/libraries/libdigidocpp/default.nix
  23. 8
      pkgs/development/libraries/libipfix/default.nix
  24. 5
      pkgs/development/libraries/vaapi-intel-hybrid/default.nix
  25. 6
      pkgs/development/pharo/vm/build-vm-legacy.nix
  26. 7
      pkgs/development/pharo/vm/build-vm.nix
  27. 57
      pkgs/development/python-modules/aiosmtplib/default.nix
  28. 72
      pkgs/development/python-modules/fastapi-mail/default.nix
  29. 3
      pkgs/development/python-modules/pylint/default.nix
  30. 4
      pkgs/development/python-modules/pypoolstation/default.nix
  31. 4
      pkgs/development/python-modules/pyrogram/default.nix
  32. 49
      pkgs/development/python-modules/sqlalchemy-utils/default.nix
  33. 98
      pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch
  34. 4
      pkgs/development/tools/analysis/checkov/default.nix
  35. 10
      pkgs/shells/fish/default.nix
  36. 35
      pkgs/tools/audio/nanotts/default.nix
  37. 6
      pkgs/tools/filesystems/sasquatch/default.nix
  38. 6
      pkgs/tools/filesystems/svnfs/default.nix
  39. 6
      pkgs/tools/text/silver-searcher/default.nix
  40. 2
      pkgs/top-level/all-packages.nix
  41. 4
      pkgs/top-level/python-packages.nix

@ -12257,6 +12257,12 @@
githubId = 48666;
name = "Matthew \"strager\" Glazar";
};
strikerlulu = {
email = "strikerlulu7@gmail.com";
github = "strikerlulu";
githubId = 38893265;
name = "StrikerLulu";
};
stumoss = {
email = "samoss@gmail.com";
github = "stumoss";

@ -89,7 +89,7 @@
</section>
<section xml:id="sec-release-22.11-notable-changes">
<title>Other Notable Changes</title>
<itemizedlist spacing="compact">
<itemizedlist>
<listitem>
<para>
A new module was added for the Saleae Logic device family,

@ -44,7 +44,8 @@ In addition to numerous new and upgraded packages, this release has the followin
## Other Notable Changes {#sec-release-22.11-notable-changes}
* A new module was added for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`.
* Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.
- A new module was added for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`.
- Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, alsa-lib, cmake, gtk2, libjack2, libgnomecanvas
{ lib, stdenv, fetchurl, fetchpatch, alsa-lib, cmake, gtk2, libjack2, libgnomecanvas
, libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
, pkg-config, openssl }:
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh";
};
patches = [
# Pull patch pending upstream inclusion for -fno-common toollchain support:
# https://github.com/petri-foo/Petri-Foo/pull/43
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/petri-foo/Petri-Foo/commit/6a3256c9b619b1fed18ad15063f110e8d91aa6fe.patch";
sha256 = "05yc4g22iwnd054jmvihrl461yr0cxnghslfrbhan6bac6fcvlal";
})
];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ alsa-lib gtk2 libjack2 libgnomecanvas libpthreadstubs

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, bison
, git
, python2
@ -71,6 +72,14 @@ stdenv.mkDerivation rec {
patches = [
./force-gcc-as-linker.patch
./system-libuv.patch
# Pull upstream fix for -fno-common toolchains:
# https://github.com/mruby-zest/mruby-zest-build/issues/25
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/mruby-zest/mruby-zest-build/commit/4eb88250f22ee684acac95d4d1f114df504e37a7.patch";
sha256 = "0wg7qy1vg0mzcxagf35bv35dlr0q17pxjicigpf86yqppvgrzrsb";
})
];
# Add missing dependencies of deps/mruby-dir-glob/mrbgem.rake

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitLab
, gitUpdater
, appstream-glib
, desktop-file-utils
, fwupd
@ -19,14 +20,14 @@
stdenv.mkDerivation rec {
pname = "gnome-firmware";
version = "42.1";
version = "42.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "gnome-firmware";
rev = version;
sha256 = "9QZ98EElENWsME/jXoj9YJl2e+ipyLm0g4grQUwmnuE=";
sha256 = "L0R2lXU69I6NI7Srq5s+8N9261Ic8B7FVaaXNjz2Ll0=";
};
nativeBuildInputs = [
@ -53,6 +54,11 @@ stdenv.mkDerivation rec {
"-Dconsolekit=false"
];
passthru.updateScript = gitUpdater {
inherit pname version;
ignoredVersions = "(alpha|beta|rc).*";
};
meta = with lib; {
homepage = "https://gitlab.gnome.org/World/gnome-firmware";
description = "Tool for installing firmware on devices";

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clusterctl";
version = "1.1.3";
version = "1.1.4";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "cluster-api";
rev = "v${version}";
sha256 = "sha256-0njXmYhZM4DXFeK9KboXnVw8uHdz4PFJ2aJxwhgyEc8=";
sha256 = "sha256-0hQ+FicY74I5Fpl4FQsYMtQyBgzRnUeXl/vsNQ6GHZw=";
};
vendorSha256 = "sha256-JVRLPsfI1ITilAOkVIAa2IjjuAlJ2PCpvYEkhnTzRDA=";
vendorSha256 = "sha256-PLUN9d+oo7vHUUpiIBUgU1snPlsHOMt+8q+jQZzZC+8=";
subPackages = [ "cmd/clusterctl" ];
@ -25,7 +25,7 @@ buildGoModule rec {
postInstall = ''
# errors attempting to write config to read-only $HOME
export HOME=$(mktemp -d)
export HOME=$TMPDIR
installShellCompletion --cmd clusterctl \
--bash <($out/bin/clusterctl completion bash) \

@ -1,5 +1,6 @@
{ lib
, buildGoModule
, buildGo118Module
, fetchFromGitHub
, callPackage
, config
@ -59,6 +60,7 @@ let
{
# Packages that don't fit the default model
brightbox = automated-providers.brightbox.override { mkProviderGoModule = buildGo118Module; };
# mkisofs needed to create ISOs holding cloud-init data,
# and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });

@ -176,10 +176,10 @@
"owner": "brightbox",
"provider-source-address": "registry.terraform.io/brightbox/brightbox",
"repo": "terraform-provider-brightbox",
"rev": "v2.2.0",
"sha256": "1n0gdfsj8ylmm5pqsjs3dvjvj8larc30x5p9jq546xvi2idvl39n",
"vendorSha256": "03761vl8xcirmas38q8xivx2r312c07fmg1y80lklmswbd8d0f71",
"version": "2.2.0"
"rev": "v3.0.4",
"sha256": "sha256-UUDL1w/3IEa+Na77FoYReevJLT3AJq5giHYS6Bq4DQs=",
"vendorSha256": "sha256-M/S7gRRcAs53Ctx1oecHrlTxYxI1Kpr3ygTZLHG/9pY=",
"version": "3.0.4"
},
"buildkite": {
"owner": "buildkite",

@ -1,17 +1,17 @@
{ lib, stdenv, fetchurl, libosip }:
{ lib, stdenv, fetchurl, libosip, sqlite }:
stdenv.mkDerivation rec {
pname = "siproxd";
version = "0.8.2";
version = "0.8.3";
src = fetchurl {
url = "mirror://sourceforge/siproxd/siproxd-${version}.tar.gz";
sha256 = "1l6cyxxhra825jiiw9npa7jrbfgbyfpk4966cqkrw66cn28y8v2j";
sha256 = "0dkpl3myxz3gvj2n2qpqrd19dip9il0vf7qybdvn5wgznrmplvcs";
};
patches = [ ./cheaders.patch ];
buildInputs = [ libosip ];
buildInputs = [ libosip sqlite ];
meta = {
homepage = "http://siproxd.sourceforge.net/";

File diff suppressed because one or more lines are too long

@ -21,6 +21,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256:07g9q9sjk4xsbqix7jxggfp36v15pmqw4bms80g5car0hfbszirn";
})];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of
# `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
prefixKey = "-prefix ";
configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];

@ -10,4 +10,10 @@ import ./generic.nix {
sha256 = "sha256:08mpy7lsiwv8m5qrqc4xzyiv2hri5713gz2qs1nfz02hz1bd79mc"; }
];
sha256 = "03d7ida94s1gpr3gadf4jyhmh5rrszd5s4m4z59daaib25rvfyv7";
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of
# `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
}

@ -10,4 +10,10 @@ import ./generic.nix {
sha256 = "sha256:12sw512kpwk0xf2g6j0h5vqgd8xcmgrvgyilx6fxbd6bnfv1yib9"; }
];
sha256 = "1qwwvy8nzd87hk8rd9sm667nppakiapnx4ypdwcrlnav2dz6kil3";
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of
# `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
}

@ -9,4 +9,10 @@ import ./generic.nix {
{ url = "https://github.com/ocaml/ocaml/commit/a8b2cc3b40f5269ce8525164ec2a63b35722b22b.patch";
sha256 = "sha256:1rrknmrk86xrj2k3hznnjk1gwnliyqh125zabg1hvy6dlvml9b0x"; }
];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of
# `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
}

@ -12,4 +12,10 @@ import ./generic.nix {
{ url = "https://github.com/ocaml/ocaml/commit/6bcff7e6ce1a43e088469278eb3a9341e6a2ca5b.patch";
sha256 = "sha256:1hd45f7mwwrrym2y4dbcwklpv0g94avbz7qrn81l7w8mrrj3bngi"; }
];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of
# `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
}

@ -12,4 +12,10 @@ import ./generic.nix {
{ url = "https://github.com/ocaml/ocaml/commit/50c2d1275e537906ea144bd557fde31e0bf16e5f.patch";
sha256 = "sha256:0ck9b2dpgg5k2p9ndbgniql24h35pn1bbpxjvk69j715lswzy4mh"; }
];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of
# `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
}

@ -12,4 +12,10 @@ import ./generic.nix {
{ url = "https://github.com/ocaml/ocaml/commit/137a4ad167f25fe1bee792977ed89f30d19bcd74.patch";
sha256 = "sha256:0izsf6rm3677vbbx0snkmn9pkfcsayrdwz3ipiml5wjiaysnchjz"; }
];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of
# `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
}

@ -12,4 +12,10 @@ import ./generic.nix {
{ url = "https://github.com/ocaml/ocaml/commit/00b8c4d503732343d5d01761ad09650fe50ff3a0.patch";
sha256 = "sha256:02cfya5ff5szx0fsl5x8ax76jyrla9zmf3qxavf3adhwq5ssrfcv"; }
];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of
# `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
}

@ -15,4 +15,10 @@ import ./generic.nix {
{ url = "https://github.com/ocaml/ocaml/commit/17df117b4939486d3285031900587afce5262c8c.patch";
sha256 = "sha256:1b3jc6sj2k23yvfwrv6nc1f4x2n2biqbhbbp74aqb6iyqyjsq35n"; }
];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of
# `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
}

@ -32,6 +32,11 @@
nativeBuildInputs = [ jdk8 ant git ];
buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
# Workaround build failure on -fno-common toolchains:
# ld: ../obj/Bindingtest1p1Impl_JNI.o:(.bss+0x8): multiple definition of
# `unsigned_size_t_1'; ../obj/TK_Surface_JNI.o:(.bss+0x8): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
buildPhase = ''
cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen
chmod -R +w $NIX_BUILD_TOP/gluegen

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, makeWrapper, minizip, pcsclite, opensc, openssl
{ lib, stdenv, fetchurl, fetchpatch, cmake, makeWrapper, minizip, pcsclite, opensc, openssl
, xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }:
stdenv.mkDerivation rec {
@ -10,6 +10,18 @@ stdenv.mkDerivation rec {
sha256 = "sha256-U5i5IAyJF4359q6M6mQemEuG7+inPYIXqLy8GHv4dkg=";
};
patches = [
(fetchpatch {
# fix runtime crashes when signing with OpenSSL>1.1.1l
# https://github.com/open-eid/libdigidocpp/issues/474 asks for a new release
url = "https://github.com/open-eid/libdigidocpp/commit/42a8cfd834c10bdd206fe784a13217df222b1c8e.patch";
sha256 = "sha256-o3ZT0dXhIu79C5ZR+2HPdLMZ3YwPG1v3vly5bseuxtU=";
excludes = [
".github/workflows/build.yml" # failed hunk
];
})
];
nativeBuildInputs = [ cmake makeWrapper pkg-config xxd ];
buildInputs = [

@ -7,6 +7,14 @@ stdenv.mkDerivation {
url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz";
sha256 = "0h7v0sxjjdc41hl5vq2x0yhyn04bczl11bqm97825mivrvfymhn6";
};
# Workaround build failure on -fno-common toolchains:
# ld: ../libmisc/libmisc.a(mlog.o):/build/libipfix_110209/libmisc/misc.h:111: multiple definition of
# `ht_globals'; collector.o:/build/libipfix_110209/collector/../libmisc/misc.h:111: first defined here
# TODO: drop the workaround when fix ix released:
# https://sourceforge.net/p/libipfix/code/ci/a501612c6b8ac6f2df16b366f7a92211382bae6b/
NIX_CFLAGS_COMPILE = "-fcommon";
meta = with lib; {
homepage = "http://libipfix.sourceforge.net/";
description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF";

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.0.2";
src = fetchFromGitHub {
owner = "01org";
owner = "intel";
repo = "intel-hybrid-driver";
rev = version;
sha256 = "sha256-uYX7RoU1XVzcC2ea3z/VBjmT47xmzK67Y4LaiFXyJZ8=";
@ -25,6 +25,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# Workaround build failure on -fno-common toolchains like upstream gcc-10.
NIX_CFLAGS_COMPILE = "-fcommon";
configureFlags = [
"--enable-drm"
"--enable-x11"

@ -40,6 +40,12 @@ stdenv.mkDerivation rec {
cd build/
'';
# -fcommon is a workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: CMakeFiles/pharo.dir/build/pharo-vm-2016.02.18/src/vm/gcc3x-cointerp.c.o:(.bss+0x88): multiple definition of
# `sendTrace'; CMakeFiles/pharo.dir/build/pharo-vm-2016.02.18/src/vm/cogit.c.o:(.bss+0x84): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
installPhase = ''
mkdir -p "$prefix/lib/$name"

@ -85,6 +85,13 @@ stdenv.mkDerivation rec {
configureFlags = [ "--without-npsqueak"
"--with-vmversion=5.0"
"--with-src=${vm}" ];
# -fcommon is a workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: vm/vm.a(cogit.o):/build/source/spur64src/vm/cointerp.h:358: multiple definition of `checkAllocFiller';
# vm/vm.a(gcc3x-cointerp.o):/build/source/spur64src/vm/cointerp.h:358: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
CFLAGS = "-DPharoVM -DIMMUTABILITY=1 -msse2 -D_GNU_SOURCE -DCOGMTVM=0 -g -O2 -DNDEBUG -DDEBUGVM=0";
LDFLAGS = "-Wl,-z,now";

@ -0,0 +1,57 @@
{ lib
, aiosmtpd
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, hypothesis
, poetry-core
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "aiosmtplib";
version = "1.1.6";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "cole";
repo = pname;
rev = "v${version}";
hash = "sha256-bo+u3I+ZX95UYkEam2TB6d6rvbYKa5Qu/9oNX5le478=";
};
nativeBuildInputs = [
poetry-core
];
checkInputs = [
aiosmtpd
hypothesis
pytest-asyncio
pytestCheckHook
];
patches = [
# Switch to poetry-core, https://github.com/cole/aiosmtplib/pull/183
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/cole/aiosmtplib/commit/3aba1c132d9454e05d4281f4c8aa618b4e1b783d.patch";
hash = "sha256-KlA46gD6swfJ/3OLO3xWZWa66Gx1/izmUMQ60PQy0po=";
})
];
pythonImportsCheck = [
"aiosmtplib"
];
meta = with lib; {
description = "Module which provides a SMTP client";
homepage = "https://github.com/cole/aiosmtplib";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

@ -0,0 +1,72 @@
{ lib
, aioredis
, aiosmtplib
, blinker
, buildPythonPackage
, email_validator
, fakeredis
, fastapi
, fetchFromGitHub
, httpx
, jinja2
, poetry-core
, pydantic
, pytest-asyncio
, pytestCheckHook
, python-multipart
, pythonOlder
}:
buildPythonPackage rec {
pname = "fastapi-mail";
version = "1.0.8";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "sabuhish";
repo = pname;
rev = version;
hash = "sha256-PkA7qkdDUd7mrtvb6IbCzFRq6X0M3iKY+FKuNConJ5A=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aioredis
aiosmtplib
blinker
email_validator
fakeredis
fastapi
httpx
jinja2
pydantic
python-multipart
];
checkInputs = [
pytest-asyncio
pytestCheckHook
];
disabledTests = [
# Tests require access to /etc/resolv.conf
"test_default_checker"
"test_redis_checker"
];
pythonImportsCheck = [
"fastapi_mail"
];
meta = with lib; {
description = "Module for sending emails and attachments";
homepage = "https://github.com/sabuhish/fastapi-mail";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

@ -13,7 +13,6 @@
, tomli
, typing-extensions
, GitPython
, pytest-benchmark
, pytest-timeout
, pytest-xdist
, pytestCheckHook
@ -58,7 +57,6 @@ buildPythonPackage rec {
checkInputs = [
GitPython
# https://github.com/PyCQA/pylint/blob/main/requirements_test_min.txt
pytest-benchmark
pytest-timeout
pytest-xdist
pytestCheckHook
@ -74,6 +72,7 @@ buildPythonPackage rec {
'';
disabledTestPaths = [
"tests/benchmark"
# tests miss multiple input files
# FileNotFoundError: [Errno 2] No such file or directory
"tests/pyreverse/test_writer.py"

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pypoolstation";
version = "0.4.4";
version = "0.4.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyPoolstation";
inherit version;
sha256 = "sha256-MG2V7/AqgH4OVcOEDdhwQswt96URJBQtoi1i+n4IV7Y=";
sha256 = "sha256-cf2KUdvsuC7fplg7O9Jqqb86rOjNicV+vGVBwWvvs90=";
};
nativeBuildInputs = [

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyrogram";
version = "2.0.25";
version = "2.0.26";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pyrogram";
repo = "pyrogram";
rev = "v${version}";
hash = "sha256-DOSZgi+y4gm7VZr50/linJHNdNWIKhdm/tuv2iXdviA=";
hash = "sha256-R6EPraYusA3WVW9AGHpf6JkaX3dJ/ioL0lXgH0J3Kg8=";
};
propagatedBuildInputs = [

@ -1,7 +1,19 @@
{ lib, fetchPypi, buildPythonPackage
, six, sqlalchemy
, mock, pytz, isort, flake8, jinja2, pg8000, pyodbc, pytest, pymysql, python-dateutil
, docutils, flexmock, psycopg2, pygments }:
{ lib
, buildPythonPackage
, fetchPypi
, six
, sqlalchemy
, colour
, flexmock
, jinja2
, mock
, pg8000
, phonenumbers
, pygments
, pymysql
, pytestCheckHook
, python-dateutil
}:
buildPythonPackage rec {
pname = "sqlalchemy-utils";
@ -13,33 +25,32 @@ buildPythonPackage rec {
sha256 = "9e01d6d3fb52d3926fcd4ea4a13f3540701b751aced0316bff78264402c2ceb4";
};
patches = [
# We don't run MySQL, MSSQL, or PostgreSQL
./skip-database-tests.patch
];
propagatedBuildInputs = [
six
sqlalchemy
];
# Attempts to access localhost and there's also no database access
doCheck = false;
checkInputs = [
mock
pytz
isort
flake8
colour
flexmock
jinja2
mock
pg8000
pyodbc
pytest
phonenumbers
pygments
pymysql
pytestCheckHook
python-dateutil
docutils
flexmock
psycopg2
pygments
];
checkPhase = ''
pytest tests
'';
disabledTests = [
"test_literal_bind"
];
meta = with lib; {
homepage = "https://github.com/kvesteri/sqlalchemy-utils";

@ -0,0 +1,98 @@
diff --git a/conftest.py b/conftest.py
index 9e146cd..8dbc9a5 100644
--- a/conftest.py
+++ b/conftest.py
@@ -61,16 +61,12 @@ def mysql_db_user():
@pytest.fixture
def postgresql_dsn(postgresql_db_user, postgresql_db_password, db_name):
- return 'postgresql://{0}:{1}@localhost/{2}'.format(
- postgresql_db_user,
- postgresql_db_password,
- db_name
- )
+ pytest.skip()
@pytest.fixture
def mysql_dsn(mysql_db_user, db_name):
- return 'mysql+pymysql://{0}@localhost/{1}'.format(mysql_db_user, db_name)
+ pytest.skip()
@pytest.fixture
@@ -108,8 +104,7 @@ def mssql_db_driver():
@pytest.fixture
def mssql_dsn(mssql_db_user, mssql_db_password, mssql_db_driver, db_name):
- return 'mssql+pyodbc://{0}:{1}@localhost/{2}?driver={3}'\
- .format(mssql_db_user, mssql_db_password, db_name, mssql_db_driver)
+ pytest.skip()
@pytest.fixture
diff --git a/tests/functions/test_database.py b/tests/functions/test_database.py
index 0ad6721..83f208d 100644
--- a/tests/functions/test_database.py
+++ b/tests/functions/test_database.py
@@ -76,28 +76,6 @@ class TestDatabasePostgres(DatabaseTest):
"TEMPLATE my_template") in str(excinfo.value)
-class TestDatabasePostgresPg8000(DatabaseTest):
-
- @pytest.fixture
- def dsn(self, postgresql_db_user, postgresql_db_password):
- return 'postgresql+pg8000://{0}:{1}@localhost/{2}'.format(
- postgresql_db_user,
- postgresql_db_password,
- 'db_to_test_create_and_drop_via_pg8000_driver'
- )
-
-
-class TestDatabasePostgresPsycoPG2CFFI(DatabaseTest):
-
- @pytest.fixture
- def dsn(self, postgresql_db_user, postgresql_db_password):
- return 'postgresql+psycopg2cffi://{0}:{1}@localhost/{2}'.format(
- postgresql_db_user,
- postgresql_db_password,
- 'db_to_test_create_and_drop_via_psycopg2cffi_driver'
- )
-
-
@pytest.mark.usefixtures('postgresql_dsn')
class TestDatabasePostgresWithQuotedName(DatabaseTest):
@@ -116,31 +94,6 @@ class TestDatabasePostgresWithQuotedName(DatabaseTest):
'TEMPLATE "my-template"') in str(excinfo.value)
-class TestDatabasePostgresCreateDatabaseCloseConnection(object):
- def test_create_database_twice(
- self,
- postgresql_db_user,
- postgresql_db_password
- ):
- dsn_list = [
- 'postgresql://{0}:{1}@localhost/db_test_sqlalchemy-util-a'.format(
- postgresql_db_user,
- postgresql_db_password
- ),
- 'postgresql://{0}:{1}@localhost/db_test_sqlalchemy-util-b'.format(
- postgresql_db_user,
- postgresql_db_password
- ),
- ]
- for dsn_item in dsn_list:
- assert not database_exists(dsn_item)
- create_database(dsn_item, template="template1")
- assert database_exists(dsn_item)
- for dsn_item in dsn_list:
- drop_database(dsn_item)
- assert not database_exists(dsn_item)
-
-
@pytest.mark.usefixtures('mssql_dsn')
class TestDatabaseMssql(DatabaseTest):

@ -32,14 +32,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.1186";
version = "2.0.1188";
format = "setuptools";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-5EFB/BgSJny3AdgtgsmIszcM5Wum/dtdmmP/40/sH0Y=";
hash = "sha256-TK2In3FlcjrJjwfS0flgmgbd7nVv4g69v/ZZfWmbkr4=";
};
nativeBuildInputs = with py.pkgs; [

@ -147,6 +147,16 @@ let
sha256 = "sha256-tvI7OEOwTbawqQ/qH28NDkDMAntKcyCYIAhj8oZKlOo=";
};
patches = [
# merged https://github.com/fish-shell/fish-shell/pull/8978
# "create_manpage_completions.py: Do not overstrip commands with dots"
(fetchpatch {
name = "fix-cmdname-completeion-generator.patch";
url = "https://github.com/fish-shell/fish-shell/commit/32d646a5483844e9b1fae4b73f252a34ec0d4c76.patch";
sha256 = "sha256-51hqgPHQ7oQbl1i3SfqvGsbkYMe2Jh+sEwCRu2kiv1U=";
})
];
# Fix FHS paths in tests
postPatch = ''
# src/fish_tests.cpp

@ -0,0 +1,35 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt, alsaLib }:
stdenv.mkDerivation {
pname = "nano-tts";
version = "unstable-2021-02-22";
src = fetchFromGitHub {
repo = "nanotts";
owner = "gmn";
rev = "d8b91f3d9d524c30f6fe8098ea7a0a638c889cf9";
sha256 = "sha256-bFu3U50zc90iQeWkqOsCipkueJUZI3cW5342jjYSnGI=";
};
strictDeps = true;
nativeBuildInputs = [ autoconf automake libtool ];
buildInputs = [ popt alsaLib ];
patchPhase = ''
substituteInPlace "src/main.cpp" --replace "/usr/share/pico/lang" "$out/share/lang"
echo "" > update_build_version.sh
'';
installPhase = ''
install -Dm755 -t $out/bin nanotts
install -Dm644 -t $out/share/lang $src/lang/*
'';
meta = {
description = "Speech synthesizer commandline utility that improves pico2wave, included with SVOX PicoTTS";
homepage = "https://github.com/gmn/nanotts";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.strikerlulu ];
platforms = lib.platforms.linux;
};
}

@ -49,6 +49,12 @@ stdenv.mkDerivation rec {
cd squashfs-tools
'';
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: unsquashfs_xattr.o:/build/squashfs4.4/squashfs-tools/error.h:34: multiple definition of
# `verbose'; unsquashfs.o:/build/squashfs4.4/squashfs-tools/error.h:34: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
installFlags = [ "INSTALL_DIR=\${out}/bin" ];
makeFlags = [

@ -27,7 +27,11 @@ stdenv.mkDerivation rec {
export LD_LIBRARY_PATH=${subversion.out}/lib
'';
NIX_CFLAGS_COMPILE="-I ${subversion.dev}/include/subversion-1";
# -fcommon: workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: svnclient.o:/build/svnfs-0.4/src/svnfs.h:40: multiple definition of
# `dirbuf'; svnfs.o:/build/svnfs-0.4/src/svnfs.h:40: first defined here
NIX_CFLAGS_COMPILE="-I ${subversion.dev}/include/subversion-1 -fcommon";
NIX_LDFLAGS="-lsvn_client-1 -lsvn_subr-1";
meta = {

@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
patches = [ ./bash-completion.patch ];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: src/zfile.o:/build/source/src/log.h:12: multiple definition of
# `print_mtx'; src/ignore.o:/build/source/src/log.h:12: first defined here
# TODO: remove once next release has https://github.com/ggreer/the_silver_searcher/pull/1377
NIX_CFLAGS_COMPILE = "-fcommon";
NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
nativeBuildInputs = [ autoreconfHook pkg-config ];

@ -19722,6 +19722,8 @@ with pkgs;
nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { };
nanotts = callPackage ../tools/audio/nanotts { };
ncnn = callPackage ../development/libraries/ncnn { };
ndpi = callPackage ../development/libraries/ndpi { };

@ -411,6 +411,8 @@ in {
aiosmtpd = callPackage ../development/python-modules/aiosmtpd { };
aiosmtplib = callPackage ../development/python-modules/aiosmtplib { };
aiosqlite = callPackage ../development/python-modules/aiosqlite { };
aiosteamist = callPackage ../development/python-modules/aiosteamist { };
@ -2915,6 +2917,8 @@ in {
fastapi = callPackage ../development/python-modules/fastapi { };
fastapi-mail = callPackage ../development/python-modules/fastapi-mail { };
fastavro = callPackage ../development/python-modules/fastavro { };
fastbencode = callPackage ../development/python-modules/fastbencode { };

Loading…
Cancel
Save