Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-07-18 12:01:37 +00:00 committed by GitHub
commit 1e4fbbcda3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
283 changed files with 9441 additions and 4461 deletions

View File

@ -1237,6 +1237,12 @@
githubId = 30842467;
name = "April John";
};
aqrln = {
email = "nix@aqrln.net";
github = "aqrln";
githubId = 4923335;
name = "Alexey Orlenko";
};
ar1a = {
email = "aria@ar1as.space";
github = "ar1a";

View File

@ -1142,6 +1142,7 @@
./services/security/vaultwarden/default.nix
./services/security/yubikey-agent.nix
./services/system/automatic-timezoned.nix
./services/system/bpftune.nix
./services/system/cachix-agent/default.nix
./services/system/cachix-watch-store.nix
./services/system/cloud-init.nix

View File

@ -135,7 +135,7 @@ in {
ExecStart = "${pkgs.sssd}/libexec/sssd/sssd_kcm --uid 0 --gid 0";
};
restartTriggers = [
config.environment.etc."sssd/sssd.conf".source
settingsFileUnsubstituted
];
};
systemd.sockets.sssd-kcm = {

View File

@ -0,0 +1,22 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.bpftune;
in
{
meta = {
maintainers = with lib.maintainers; [ nickcao ];
};
options = {
services.bpftune = {
enable = lib.mkEnableOption (lib.mdDoc "bpftune BPF driven auto-tuning");
package = lib.mkPackageOptionMD pkgs "bpftune" { };
};
};
config = lib.mkIf cfg.enable {
systemd.packages = [ cfg.package ];
systemd.services.bpftune.wantedBy = [ "multi-user.target" ];
};
}

View File

@ -138,6 +138,7 @@ in {
borgbackup = handleTest ./borgbackup.nix {};
botamusique = handleTest ./botamusique.nix {};
bpf = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bpf.nix {};
bpftune = handleTest ./bpftune.nix {};
breitbandmessung = handleTest ./breitbandmessung.nix {};
brscan5 = handleTest ./brscan5.nix {};
btrbk = handleTest ./btrbk.nix {};

20
nixos/tests/bpftune.nix Normal file
View File

@ -0,0 +1,20 @@
import ./make-test-python.nix ({ lib, pkgs, ... }: {
name = "bpftune";
meta = {
maintainers = with lib.maintainers; [ nickcao ];
};
nodes = {
machine = { pkgs, ... }: {
services.bpftune.enable = true;
};
};
testScript = ''
machine.wait_for_unit("bpftune.service")
machine.wait_for_console_text("bpftune works")
'';
})

View File

@ -9,18 +9,18 @@
buildGoModule rec {
pname = "go-musicfox";
version = "4.1.2";
version = "4.1.4";
src = fetchFromGitHub {
owner = "go-musicfox";
repo = pname;
rev = "v${version}";
hash = "sha256-ushJZKZPIUo6IO33E9A/CneLHHrE6MtdwpCYR4ivHmo=";
hash = "sha256-z4zyLHflmaX5k69KvPTISRIEHVjDmEGZenNXfYd3UUk=";
};
deleteVendor = true;
vendorHash = "sha256-xzLUWqzDVT+Htw/BHygOJM16uQvWXopyxxHBZQKcOQ8=";
vendorHash = "sha256-S1OIrcn55wm/b7B3lz55guuS+mrv5MswNMO2UyfgjRc=";
subPackages = [ "cmd/musicfox.go" ];

View File

@ -40,13 +40,13 @@
stdenv.mkDerivation rec {
pname = "keepassxc";
version = "2.7.4";
version = "2.7.5";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = version;
sha256 = "sha256-amedKK9nplLVJTldeabN3/c+g/QesrdH+qx+rba2/4s=";
sha256 = "sha256-OBEjczUIkY3pQXJfsuNj9Bm2TIbVWEHqMSolQnSfvLE=";
};
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [

View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "istioctl";
version = "1.18.0";
version = "1.18.1";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
sha256 = "sha256-vC8EE9v3U6FNbjxWb3At+gL4DUgBIb7MY2xBu7WNMKw=";
sha256 = "sha256-+225LfSp9VP7J63kkbyi2Vj6UAFfb6jr+LLsFVe0ZcY=";
};
vendorHash = "sha256-YgRW/sVRQLqrtEFxC+bGHZEQoEro5bzNzqKv7c7iO4Y=";
vendorHash = "sha256-tuiQ11pcfoTOu+OVey+YmU4tTOj5C7p5bKP2ylEkUug=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "edge";
version = "23.7.1";
sha256 = "1lvangia0hllnlccxv0f9mlp3ym8l54wmqihicd44p9nyxbwbx3d";
vendorSha256 = "sha256-1ir+IjyT9P+D3AbPo/7wWyZRFiKqZLJ/hoFUM1jtM0A=";
version = "23.7.2";
sha256 = "0wc829dzk0in0srq0vbcagrd5ylz2d758032anzlzkf4m3lr9hdw";
vendorSha256 = "sha256-16j5B96UDZITY1LEWZKtfAnww7ZcUjKh/cARLaYy9wk=";
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "rke";
version = "1.4.6";
version = "1.4.7";
src = fetchFromGitHub {
owner = "rancher";
repo = pname;
rev = "v${version}";
hash = "sha256-P/VvRoTcJuuRuoTT0zhebibBQrM6sz9Vv+qPrWY+B9Y=";
hash = "sha256-XiFXFd9pZBrZdYggVoHhxdu4cH+IyDtDNr7ztM+Zskk=";
};
vendorHash = "sha256-MFXNwEEXtsEwB0Hcx8gn/Pz9dZM1zUUKhNYp5BlRUEk=";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles, fetchpatch
{ lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles
, makeWrapper
, enableCmount ? true, fuse, macfuse-stubs
, librclone
@ -6,25 +6,16 @@
buildGoModule rec {
pname = "rclone";
version = "1.63.0";
version = "1.63.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-ojP1Uf9iP6kOlzW8qsUx1SnMRxFZLsgkjFD4LVH0oTI=";
hash = "sha256-H//Y7BFBr3VXAoKZZgjSgU4aA+Af7tvFozhpoj14ba0=";
};
patches = [
# Fix build on aarch64-darwin. Remove with the next release.
# https://github.com/rclone/rclone/pull/7099
(fetchpatch {
url = "https://github.com/rclone/rclone/commit/fb5125ecee4ae1061ff933bb3b9b19243e022241.patch";
hash = "sha256-3SzU9iiQM8zeL7VQhmq0G6e0km8WBRz4BSplRLE1vpM=";
})
];
vendorSha256 = "sha256-AXgyyI6ZbTepC/TGkHQvHiwpQOjzwG5ung71nKE5d1Y=";
vendorHash = "sha256-AXgyyI6ZbTepC/TGkHQvHiwpQOjzwG5ung71nKE5d1Y=";
subPackages = [ "." ];

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "sumo";
version = "1.17.0";
version = "1.18.0";
src = fetchFromGitHub {
owner = "eclipse";
repo = "sumo";
rev = "v${lib.replaceStrings ["."] ["_"] version}";
sha256 = "sha256-Br5ugEyGu3zLeylCvoVE92zOCpB5cuXLv1dGLpM3FwI=";
sha256 = "sha256-/MKhec4nhz6juTCc5dNrrDAlzldodGjili4vWkzafPM=";
fetchSubmodules = true;
};

View File

@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
pname = "qgroundcontrol";
version = "4.2.6";
version = "4.2.8";
qtInputs = [
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
owner = "mavlink";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mMeKDfylVEqLo1i2ucUBu287Og4472Ecp7Cge9Cw3kE=";
sha256 = "sha256-EmGtVy/cHiZ2SqOOKmt9vCUQbyT5Sl8XnkRlhn9BdvA=";
fetchSubmodules = true;
};

View File

@ -0,0 +1,65 @@
{ cairo
, cmake
, fetchFromGitHub
, ffmpeg
, freetype
, ghostscript
, glfw
, lib
, libjpeg
, libtiff
, nix-update-script
, qhull
, qtbase
, stdenv
, wrapQtAppsHook
, xorg
, zeromq
}:
stdenv.mkDerivation rec {
pname = "gr-framework";
version = "0.72.9";
src = fetchFromGitHub {
owner = "sciapp";
repo = "gr";
rev = "v${version}";
hash = "sha256-4rOcrMn0sxTeRQqiQMAWULzUV39i6J96Mb096Lyblns=";
};
nativeBuildInputs = [
cmake
wrapQtAppsHook
];
buildInputs = [
cairo
ffmpeg
freetype
ghostscript
glfw
libjpeg
libtiff
qhull
qtbase
xorg.libX11
xorg.libXft
xorg.libXt
zeromq
];
preConfigure = ''
echo ${version} > version.txt
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "GR framework is a graphics library for visualisation applications";
homepage = "https://gr-framework.org";
maintainers = [ lib.maintainers.paveloom ];
license = lib.licenses.mit;
platforms = lib.platforms.unix;
};
}

File diff suppressed because it is too large Load Diff

View File

@ -130,7 +130,7 @@ in
stdenv.mkDerivation rec {
pname = "gst-plugins-rs";
version = "0.10.9";
version = "0.10.10";
outputs = [ "out" "dev" ];
@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
owner = "gstreamer";
repo = "gst-plugins-rs";
rev = version;
hash = "sha256-pUvcPazg6/SsD7sqML2tb+ZVWDqO1MRIcj3CQioePZY=";
hash = "sha256-ZsE1Pz2N0XSQFDyIeEUg9+eFN94mdSmge2Tvw57RLZ4=";
# TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
postFetch = ''
sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g'
@ -169,7 +169,7 @@ stdenv.mkDerivation rec {
"ffv1-0.0.0" = "sha256-af2VD00tMf/hkfvrtGrHTjVJqbl+VVpLaR0Ry+2niJE=";
"flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk=";
"gdk4-0.6.6" = "sha256-1WPXxsZJoYEQxVuP/CSpGs2XEZSJD//JJz4Ka2hxXHM=";
"gstreamer-0.20.6" = "sha256-nG+4nak0l1j29S5rddrMu38lfFq12Bjw16uaj61QiQs=";
"gstreamer-0.20.7" = "sha256-o4o4mPFAZOshNNkCkykjG/b+UtT2z6TNLOEzJsfs+Mk=";
};
};

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "level-zero";
version = "1.12.0";
version = "1.13.1";
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "level-zero";
rev = "refs/tags/v${version}";
hash = "sha256-9XfvU01nVcY2NpCqjUyPEJ+F/+A4YjjE0ktMQyEkr3Q=";
hash = "sha256-qV2OM41+DkuT3lDCTHOyNkHixD/HITfCiItBQX6Ewio=";
};
nativeBuildInputs = [ cmake addOpenGLRunpath ];

View File

@ -8,7 +8,9 @@ let
ext = stdenv.hostPlatform.extensions.sharedLibrary;
in buildGoModule rec {
pname = "librclone";
inherit (rclone) version src patches vendorSha256;
inherit (rclone) version src vendorHash;
patches = rclone.patches or [ ];
buildPhase = ''
runHook preBuild

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sofia-sip";
version = "1.13.15";
version = "1.13.16";
src = fetchFromGitHub {
owner = "freeswitch";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mDcXr9JPYtuz2EtonoeuimH1VsEKbNr/Q0gs+a7azTU=";
sha256 = "sha256-mYJhA/ylJDr45IL9CxEZ2WJA/DIRj8RDCwkznsi1KcI=";
};
buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration;

File diff suppressed because it is too large Load Diff

View File

@ -404,11 +404,12 @@ final: prev: {
src = fetchurl {
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
hash = "sha512-L9mqjnSmvWIRCYJ9mQkwCtj4+JDYYTdhoyo8hlsHNDXaZLh/b4hR0IoKIBbTKxZuyHQzLopb/+0Rvb69uGV7uA==";
hash = "sha256-0NxYp+W2KbR3xEV2OCXCIL3RqkvLfJHNKgl/PxapVbI=";
};
postInstall = with pkgs; ''
wrapProgram "$out/bin/prisma" \
--set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/migration-engine \
--set PRISMA_SCHEMA_ENGINE_BINARY ${prisma-engines}/bin/schema-engine \
--set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/schema-engine \
--set PRISMA_QUERY_ENGINE_BINARY ${prisma-engines}/bin/query-engine \
--set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node \
--set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt

View File

@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "dtools";
version = "0.4.4";
version = "0.4.5";
minimalOCamlVersion = "4.05";
@ -10,7 +10,7 @@ buildDunePackage rec {
owner = "savonet";
repo = "ocaml-dtools";
rev = "v${version}";
sha256 = "1xbgnij63crikfr2jvar6sf6c7if47qarg5yycdfidip21vhmawf";
sha256 = "sha256-NLQkQx3ZgxU1zvaQjOi+38nSeX+zKCXW40zOxVNekZA=";
};
meta = with lib; {

View File

@ -75,6 +75,6 @@ buildPythonPackage rec {
description = "Accurate sums and dot products for Python";
homepage = "https://github.com/nschloe/accupy";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "AMQP implementation using asyncio";
homepage = "https://github.com/polyconseil/aioamqp";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "Asyncio support for PEP-567 contextvars backport";
homepage = "https://github.com/fantix/aiocontextvars";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -46,6 +46,6 @@ buildPythonPackage rec {
description = "Python FTP client/server for asyncio";
homepage = "https://github.com/aio-libs/aioftp";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -68,6 +68,6 @@ buildPythonPackage rec {
homepage = "https://aiokafka.readthedocs.org";
changelog = "https://github.com/aio-libs/aiokafka/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -41,6 +41,6 @@ buildPythonPackage rec {
description = "MySQL driver for asyncio";
homepage = "https://github.com/aio-libs/aiomysql";
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -44,6 +44,6 @@ buildPythonPackage rec {
homepage = "https://github.com/cjrh/aiorun";
changelog = "https://github.com/cjrh/aiorun/blob/v${version}/CHANGES";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -44,6 +44,6 @@ buildPythonPackage rec {
homepage = "https://github.com/jreese/aiosqlite";
changelog = "https://github.com/omnilib/aiosqlite/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -38,6 +38,6 @@ buildPythonPackage rec {
description = "Test asyncio code more easily";
homepage = "https://github.com/kwarunek/aiounittest";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -55,6 +55,6 @@ buildPythonPackage rec {
description = "An Ansible kernel for Jupyter";
homepage = "https://github.com/ansible/ansible-jupyter-kernel";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -105,6 +105,6 @@ buildPythonPackage rec {
description = "Helps when interfacing with Ansible";
homepage = "https://github.com/ansible/ansible-runner";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -45,6 +45,6 @@ buildPythonPackage rec {
homepage = "https://github.com/jonathaneunice/ansiwrap";
changelog = "https://github.com/jonathaneunice/ansiwrap/blob/master/CHANGES.yml";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -54,6 +54,6 @@ buildPythonPackage rec {
description = "A pluggable API specification generator with support for the OpenAPI Specification";
homepage = "https://github.com/marshmallow-code/apispec";
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -27,6 +27,6 @@ buildPythonPackage rec {
description = "Draws ASCII trees";
homepage = "https://github.com/mbr/asciitree";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -93,6 +93,6 @@ buildPythonPackage rec {
description = "Python tools to handle ASDF files";
homepage = "https://github.com/asdf-format/asdf";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "Atomic Simulation Environment";
homepage = "https://wiki.fysik.dtu.dk/ase/";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -86,6 +86,6 @@ buildPythonPackage rec {
description = "Atomistic Manipulation Toolkit";
homepage = "https://github.com/usnistgov/atomman/";
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -57,6 +57,6 @@ buildPythonPackage rec {
homepage = "https://github.com/mjdrushton/atsim-potentials";
description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -52,6 +52,6 @@ buildPythonPackage rec {
homepage = "https://github.com/auth0/auth0-python";
changelog = "https://github.com/auth0/auth0-python/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "A spawner for Jupyterhub to spawn notebooks using batch resource managers";
homepage = "https://jupyter.org";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -53,6 +53,6 @@ buildPythonPackage rec {
description = "Band-structure interpolator and transport coefficient calculator";
homepage = "http://www.boltztrap.org/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -51,6 +51,6 @@ buildPythonPackage rec {
future infrastructural services offered by Amazon Web
Services. This includes S3, SQS, EC2, among others.
'';
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -32,7 +32,7 @@ buildPythonPackage rec {
description = "Python bindings for Oracle Berkeley DB";
homepage = "https://www.jcea.es/programacion/pybsddb.htm";
license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -20,7 +20,7 @@ buildPythonPackage {
homepage = "https://github.com/williamh/pybugz";
description = "Command line interface for Bugzilla";
license = licenses.gpl2;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -69,6 +69,6 @@ buildPythonPackage rec {
homepage = "https://github.com/ionrock/cachecontrol";
changelog = "https://github.com/psf/cachecontrol/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -98,6 +98,6 @@ in
description = "Parametric scripting language for creating and traversing CAD models";
homepage = "https://github.com/CadQuery/cadquery";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc marcus7070 ];
maintainers = with maintainers; [ marcus7070 ];
};
}

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "casbin";
version = "1.21.0";
version = "1.22.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "refs/tags/v${version}";
hash = "sha256-Zp1JNAm1BpbgsctKDOcoDds5hEHtqi9+a5srZqE7288=";
hash = "sha256-+DoXjIRbXhX3lAOWnDEwG3e0bF9T3dVEU33JMLMAO6Y=";
};
propagatedBuildInputs = [
@ -39,6 +39,6 @@ buildPythonPackage rec {
homepage = "https://github.com/casbin/pycasbin";
changelog = "https://github.com/casbin/pycasbin/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "C/C++ source generation from an AST";
homepage = "https://github.com/inducer/cgen";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -105,6 +105,6 @@ buildPythonPackage rec {
homepage = "https://github.com/aws/chalice";
changelog = "https://github.com/aws/chalice/blob/${version}/CHANGELOG.rst";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "chiavdf";
version = "1.0.8";
version = "1.0.9";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ilT7tCdX8ak3qmpXJ0LITf0ZGAdFSN4tm6GKw06A/m8=";
hash = "sha256-G4npp0G8TNk2y/T6myNr8NCfkBdcknsWds+XBZiNnQY=";
};
patches = [

View File

@ -62,6 +62,6 @@ buildPythonPackage rec {
description = "Numerical Geometric Algebra Module";
homepage = "https://clifford.readthedocs.io";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -43,6 +43,6 @@ buildPythonPackage rec {
homepage = "https://github.com/cloudflare/python-cloudflare";
changelog = "https://github.com/cloudflare/python-cloudflare/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -37,6 +37,6 @@ buildPythonPackage rec {
description = "Library for Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization";
homepage = "https://github.com/CMA-ES/pycma";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -45,6 +45,6 @@ buildPythonPackage rec {
description = "Collection of perceptually uniform colormaps";
homepage = "https://colorcet.pyviz.org";
license = licenses.cc-by-40;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -26,6 +26,6 @@ buildPythonPackage rec {
homepage = "https://github.com/mozilla-services/cornice";
description = "Build Web Services with Pyramid";
license = licenses.mpl20;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -39,6 +39,6 @@ buildPythonPackage rec {
homepage = "https://github.com/kiorky/croniter";
changelog = "https://github.com/kiorky/croniter/blob/${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -70,6 +70,6 @@ buildPythonPackage rec {
description = "A multi-tenant server for securely deploying and managing multiple Dask clusters";
homepage = "https://gateway.dask.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -39,6 +39,6 @@ buildPythonPackage rec {
description = "A client library for interacting with a dask-gateway server";
homepage = "https://gateway.dask.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -63,6 +63,6 @@ buildPythonPackage rec {
description = "Generalized Linear Models with Dask";
homepage = "https://github.com/dask/dask-glm/";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -48,6 +48,6 @@ buildPythonPackage rec {
description = "Distributed image processing";
homepage = "https://github.com/dask/dask-image";
license = licenses.bsdOriginal;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -82,6 +82,6 @@ buildPythonPackage rec {
description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE";
homepage = "https://github.com/dask/dask-jobqueue";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -58,6 +58,6 @@ buildPythonPackage rec {
description = "Scalable Machine Learn with Dask";
homepage = "https://github.com/dask/dask-ml";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -36,6 +36,6 @@ buildPythonPackage rec {
description = "Deploy Dask using mpi4py";
homepage = "https://github.com/dask/dask-mpi";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -77,7 +77,7 @@ buildPythonPackage rec {
homepage = "https://github.com/encode/databases";
changelog = "https://github.com/encode/databases/releases/tag/${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
# https://github.com/encode/databases/issues/530
broken = lib.versionAtLeast sqlalchemy.version "2.0.0";
};

View File

@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML";
homepage = "https://github.com/usnistgov/DataModelDict/";
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -102,6 +102,6 @@ buildPythonPackage rec {
description = "Multi-tool for exploring and publishing data";
homepage = "https://datasette.io/";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -98,6 +98,6 @@ buildPythonPackage rec {
description = "Data visualization toolchain based on aggregating into a grid";
homepage = "https://datashader.org";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -30,6 +30,6 @@ buildPythonPackage rec {
homepage = "https://github.com/micheles/decorator";
description = "Better living through Python with decorators";
license = licenses.bsd2;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -1,8 +1,10 @@
{ lib
{ stdenv
, lib
, buildPythonPackage
, fetchFromGitHub
, pythonRelaxDepsHook
, ninja
, which
# build inputs
, pillow
, matplotlib
@ -17,8 +19,10 @@
, iopath
, omegaconf
, hydra-core
, black
, packaging
, torch
, pydot
, black
# optional dependencies
, fairscale
, timm
@ -26,10 +30,16 @@
, shapely
, pygments
, psutil
# check inputs
, pytestCheckHook
, torchvision
, av
, opencv4
, pytest-mock
}:
let
name = "detectron2";
pname = "detectron2";
version = "0.6";
optional-dependencies = {
all = [
@ -43,11 +53,12 @@ let
};
in
buildPythonPackage {
inherit name version;
inherit pname version;
format = "setuptools";
src = fetchFromGitHub {
owner = "facebookresearch";
repo = name;
repo = "detectron2";
rev = "v${version}";
sha256 = "1w6cgvc8r2lwr72yxicls650jr46nriv1csivp2va9k1km8jx2sf";
};
@ -55,12 +66,9 @@ buildPythonPackage {
nativeBuildInputs = [
pythonRelaxDepsHook
ninja
which
];
dontUseNinjaBuild = true;
dontUseNinjaInstall = true;
dontUseNinjaCheck = true;
pythonRelaxDeps = [
"black"
];
@ -79,14 +87,78 @@ buildPythonPackage {
iopath
omegaconf
hydra-core
black
packaging
] ++ optional-dependencies.all;
black
torch # not explicitly declared in setup.py because they expect you to install it yourself
pydot # no idea why this is not in their setup.py
];
passthru.optional-dependencies = optional-dependencies;
# disable the tests for now until someone can check on a linux machine.
# doCheck = false;
nativeCheckInputs = [
av
opencv4
pytest-mock
pytestCheckHook
torchvision
];
preCheck = ''
# prevent import errors for C extension modules
rm -r detectron2
'';
pytestFlagsArray = [
# prevent include $sourceRoot/projects/*/tests
"tests"
];
disabledTestPaths = [
# try import caffe2
"tests/test_export_torchscript.py"
"tests/test_model_analysis.py"
"tests/modeling/test_backbone.py"
"tests/modeling/test_roi_heads.py"
"tests/modeling/test_rpn.py"
"tests/structures/test_instances.py"
# hangs for some reason
"tests/modeling/test_model_e2e.py"
];
disabledTests = [
# fails for some reason
"test_checkpoint_resume"
"test_map_style"
# requires shapely
"test_resize_and_crop"
# require caffe2
"test_predict_boxes_tracing"
"test_predict_probs_tracing"
"testMaskRCNN"
"testRetinaNet"
# require coco dataset
"test_default_trainer"
"test_unknown_category"
"test_build_dataloader_train"
"test_build_iterable_dataloader_train"
# require network access
"test_opencv_exif_orientation"
"test_read_exif_orientation"
# use deprecated api, numpy.bool
"test_BWmode_nomask"
"test_draw_binary_mask"
"test_draw_empty_mask_predictions"
"test_draw_instance_predictions"
"test_draw_no_metadata"
"test_overlay_instances"
"test_overlay_instances_no_boxes"
"test_get_bounding_box"
] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
"test_build_batch_dataloader_inference"
"test_build_dataloader_inference"
"test_build_iterable_dataloader_inference"
"test_to_iterable"
];
pythonImportsCheck = [ "detectron2" ];

View File

@ -55,6 +55,6 @@ buildPythonPackage rec {
description = "Disk and file backed persistent cache";
homepage = "http://www.grantjenks.com/docs/diskcache/";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -78,6 +78,6 @@ buildPythonPackage rec {
homepage = "https://distributed.readthedocs.io/";
changelog = "https://github.com/dask/distributed/blob/${version}/docs/source/changelog.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ teh costrouc ];
maintainers = with maintainers; [ teh ];
};
}

View File

@ -28,6 +28,6 @@ buildPythonPackage rec {
description = "Use an URL to configure email backend settings in your Django Application";
homepage = "https://github.com/migonzalvar/dj-email-url";
license = licenses.bsd0;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -16,7 +16,7 @@ buildPythonPackage rec {
homepage = "https://github.com/dstufft/dj-search-url";
description = "Use Search URLs in your Django Haystack Application";
license = licenses.bsd0;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -26,6 +26,6 @@ buildPythonPackage rec {
homepage = "https://github.com/epicserve/django-cache-url";
description = "Use Cache URLs in your Django application";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -60,6 +60,6 @@ buildPythonPackage rec {
description = "A helper for organizing Django settings";
homepage = "https://django-configurations.readthedocs.io/";
license = licenses.bsd0;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -30,6 +30,6 @@ buildPythonPackage rec {
description = "Dockerspawner: A custom spawner for Jupyterhub";
homepage = "https://jupyter.org";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -28,6 +28,6 @@ buildPythonPackage rec {
description = "Python package for docstring repetition";
homepage = "https://github.com/Chilipp/docrep";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ costrouc ];
maintainers = with lib.maintainers; [ ];
};
}

View File

@ -52,6 +52,6 @@ buildPythonPackage rec {
description = "Access HMI, AIA and MDI data with Python";
homepage = "https://github.com/sunpy/drms";
license = licenses.bsd2;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -63,6 +63,6 @@ buildPythonPackage rec {
description = "Python binding for DuckDB";
homepage = "https://duckdb.org/";
license = licenses.mit;
maintainers = with maintainers; [ costrouc cpcloud ];
maintainers = with maintainers; [ cpcloud ];
};
}

View File

@ -40,6 +40,6 @@ buildPythonPackage rec {
description = "Pythonic remote execution";
homepage = "https://www.fabfile.org/";
license = licenses.bsd2;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -27,6 +27,6 @@ buildPythonPackage rec {
description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK";
homepage = "https://github.com/pythonforfacebook/facebook-sdk";
license = licenses.asl20 ;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -36,6 +36,6 @@ buildPythonPackage {
homepage = "https://github.com/rlabbe/filterpy";
description = "Kalman filtering and optimal estimation library";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -62,6 +62,6 @@ buildPythonPackage rec {
description = "A Finite Volume PDE Solver Using Python";
changelog = "https://github.com/usnistgov/fipy/blob/${version}/CHANGELOG.rst";
license = licenses.free;
maintainers = with maintainers; [ costrouc wd15 ];
maintainers = with maintainers; [ wd15 ];
};
}

View File

@ -108,6 +108,6 @@ buildPythonPackage rec {
homepage = "https://github.com/flask-admin/flask-admin/";
changelog = "https://github.com/flask-admin/flask-admin/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -83,7 +83,7 @@ buildPythonPackage rec {
homepage = "https://github.com/dpgaspar/flask-appbuilder/";
changelog = "https://github.com/dpgaspar/Flask-AppBuilder/blob/v${version}/CHANGELOG.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
# Support for flask-sqlalchemy >= 3.0 is missing, https://github.com/dpgaspar/Flask-AppBuilder/pull/1940
broken = true;
};

View File

@ -50,6 +50,6 @@ buildPythonPackage rec {
description = "Adds i18n/l10n support to Flask applications";
homepage = "https://github.com/mrjoes/flask-babelex";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -32,6 +32,6 @@ buildPythonPackage rec {
description = "Brcrypt hashing for Flask";
homepage = "https://github.com/maxcountryman/flask-bcrypt";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -66,6 +66,6 @@ buildPythonPackage rec {
homepage = "https://github.com/mongoengine/flask-mongoengine";
changelog = "https://github.com/MongoEngine/flask-mongoengine/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "OpenID support for Flask";
homepage = "https://pythonhosted.org/Flask-OpenID/";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -155,6 +155,6 @@ buildPythonPackage rec {
homepage = "https://github.com/fsspec/filesystem_spec";
changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -23,6 +23,6 @@ buildPythonPackage rec {
description = "C/C++ source generation from an AST";
homepage = "https://github.com/inducer/genpy";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -49,6 +49,6 @@ buildPythonPackage rec {
description = "An async GitHub API library";
homepage = "https://github.com/brettcannon/gidgethub";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -21,6 +21,6 @@ buildPythonPackage rec {
description = "Version of the glob module that can capture patterns and supports recursive wildcards";
homepage = "https://github.com/miracle2k/python-glob2/";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

View File

@ -61,6 +61,6 @@ buildPythonPackage rec {
homepage = "https://github.com/quintusdias/glymur";
changelog = "https://github.com/quintusdias/glymur/blob/v${version}/CHANGES.txt";
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -65,6 +65,6 @@ buildPythonPackage rec {
homepage = "https://github.com/googleapis/python-bigtable";
changelog = "https://github.com/googleapis/python-bigtable/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
maintainers = with maintainers; [ ];
};
}

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "griffe";
version = "0.32.0";
version = "0.32.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mkdocstrings";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-mGvoB05GJCoqkGJRpc85eAChU7LDW1w2FTHa6oIbz5k=";
hash = "sha256-CNUv2R1Jkq3LSGtEBAi8F04TpARZxOkYN7fUMcXh5P8=";
};
postPatch = ''

View File

@ -19,6 +19,6 @@ buildPythonPackage rec {
description = "gRPC extensions for Google Cloud Platform";
homepage = "https://grpc.io";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
maintainers = [ ];
};
}

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