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; githubId = 30842467;
name = "April John"; name = "April John";
}; };
aqrln = {
email = "nix@aqrln.net";
github = "aqrln";
githubId = 4923335;
name = "Alexey Orlenko";
};
ar1a = { ar1a = {
email = "aria@ar1as.space"; email = "aria@ar1as.space";
github = "ar1a"; github = "ar1a";

View file

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

View file

@ -135,7 +135,7 @@ in {
ExecStart = "${pkgs.sssd}/libexec/sssd/sssd_kcm --uid 0 --gid 0"; ExecStart = "${pkgs.sssd}/libexec/sssd/sssd_kcm --uid 0 --gid 0";
}; };
restartTriggers = [ restartTriggers = [
config.environment.etc."sssd/sssd.conf".source settingsFileUnsubstituted
]; ];
}; };
systemd.sockets.sssd-kcm = { 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 {}; borgbackup = handleTest ./borgbackup.nix {};
botamusique = handleTest ./botamusique.nix {}; botamusique = handleTest ./botamusique.nix {};
bpf = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bpf.nix {}; bpf = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bpf.nix {};
bpftune = handleTest ./bpftune.nix {};
breitbandmessung = handleTest ./breitbandmessung.nix {}; breitbandmessung = handleTest ./breitbandmessung.nix {};
brscan5 = handleTest ./brscan5.nix {}; brscan5 = handleTest ./brscan5.nix {};
btrbk = handleTest ./btrbk.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 { buildGoModule rec {
pname = "go-musicfox"; pname = "go-musicfox";
version = "4.1.2"; version = "4.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "go-musicfox"; owner = "go-musicfox";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ushJZKZPIUo6IO33E9A/CneLHHrE6MtdwpCYR4ivHmo="; hash = "sha256-z4zyLHflmaX5k69KvPTISRIEHVjDmEGZenNXfYd3UUk=";
}; };
deleteVendor = true; deleteVendor = true;
vendorHash = "sha256-xzLUWqzDVT+Htw/BHygOJM16uQvWXopyxxHBZQKcOQ8="; vendorHash = "sha256-S1OIrcn55wm/b7B3lz55guuS+mrv5MswNMO2UyfgjRc=";
subPackages = [ "cmd/musicfox.go" ]; subPackages = [ "cmd/musicfox.go" ];

View file

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

View file

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

View file

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

View file

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

View file

@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles, fetchpatch { lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles
, makeWrapper , makeWrapper
, enableCmount ? true, fuse, macfuse-stubs , enableCmount ? true, fuse, macfuse-stubs
, librclone , librclone
@ -6,25 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "rclone"; pname = "rclone";
version = "1.63.0"; version = "1.63.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ojP1Uf9iP6kOlzW8qsUx1SnMRxFZLsgkjFD4LVH0oTI="; hash = "sha256-H//Y7BFBr3VXAoKZZgjSgU4aA+Af7tvFozhpoj14ba0=";
}; };
patches = [ vendorHash = "sha256-AXgyyI6ZbTepC/TGkHQvHiwpQOjzwG5ung71nKE5d1Y=";
# 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=";
subPackages = [ "." ]; subPackages = [ "." ];

View file

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

View file

@ -4,7 +4,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "qgroundcontrol"; pname = "qgroundcontrol";
version = "4.2.6"; version = "4.2.8";
qtInputs = [ qtInputs = [
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
owner = "mavlink"; owner = "mavlink";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-mMeKDfylVEqLo1i2ucUBu287Og4472Ecp7Cge9Cw3kE="; sha256 = "sha256-EmGtVy/cHiZ2SqOOKmt9vCUQbyT5Sl8XnkRlhn9BdvA=";
fetchSubmodules = true; 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 { stdenv.mkDerivation rec {
pname = "gst-plugins-rs"; pname = "gst-plugins-rs";
version = "0.10.9"; version = "0.10.10";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
owner = "gstreamer"; owner = "gstreamer";
repo = "gst-plugins-rs"; repo = "gst-plugins-rs";
rev = version; 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 # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
postFetch = '' postFetch = ''
sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g' 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="; "ffv1-0.0.0" = "sha256-af2VD00tMf/hkfvrtGrHTjVJqbl+VVpLaR0Ry+2niJE=";
"flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk="; "flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk=";
"gdk4-0.6.6" = "sha256-1WPXxsZJoYEQxVuP/CSpGs2XEZSJD//JJz4Ka2hxXHM="; "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 { stdenv.mkDerivation rec {
pname = "level-zero"; pname = "level-zero";
version = "1.12.0"; version = "1.13.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "oneapi-src"; owner = "oneapi-src";
repo = "level-zero"; repo = "level-zero";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-9XfvU01nVcY2NpCqjUyPEJ+F/+A4YjjE0ktMQyEkr3Q="; hash = "sha256-qV2OM41+DkuT3lDCTHOyNkHixD/HITfCiItBQX6Ewio=";
}; };
nativeBuildInputs = [ cmake addOpenGLRunpath ]; nativeBuildInputs = [ cmake addOpenGLRunpath ];

View file

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

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sofia-sip"; pname = "sofia-sip";
version = "1.13.15"; version = "1.13.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "freeswitch"; owner = "freeswitch";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-mDcXr9JPYtuz2EtonoeuimH1VsEKbNr/Q0gs+a7azTU="; sha256 = "sha256-mYJhA/ylJDr45IL9CxEZ2WJA/DIRj8RDCwkznsi1KcI=";
}; };
buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; 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 { src = fetchurl {
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
hash = "sha512-L9mqjnSmvWIRCYJ9mQkwCtj4+JDYYTdhoyo8hlsHNDXaZLh/b4hR0IoKIBbTKxZuyHQzLopb/+0Rvb69uGV7uA=="; hash = "sha256-0NxYp+W2KbR3xEV2OCXCIL3RqkvLfJHNKgl/PxapVbI=";
}; };
postInstall = with pkgs; '' postInstall = with pkgs; ''
wrapProgram "$out/bin/prisma" \ 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_BINARY ${prisma-engines}/bin/query-engine \
--set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node \ --set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node \
--set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt --set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt

View file

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

View file

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

View file

@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "AMQP implementation using asyncio"; description = "AMQP implementation using asyncio";
homepage = "https://github.com/polyconseil/aioamqp"; homepage = "https://github.com/polyconseil/aioamqp";
license = licenses.bsd3; 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"; description = "Asyncio support for PEP-567 contextvars backport";
homepage = "https://github.com/fantix/aiocontextvars"; homepage = "https://github.com/fantix/aiocontextvars";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.costrouc ]; maintainers = [ ];
}; };
} }

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -45,6 +45,6 @@ buildPythonPackage rec {
homepage = "https://github.com/jonathaneunice/ansiwrap"; homepage = "https://github.com/jonathaneunice/ansiwrap";
changelog = "https://github.com/jonathaneunice/ansiwrap/blob/master/CHANGES.yml"; changelog = "https://github.com/jonathaneunice/ansiwrap/blob/master/CHANGES.yml";
license = licenses.asl20; 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"; description = "A pluggable API specification generator with support for the OpenAPI Specification";
homepage = "https://github.com/marshmallow-code/apispec"; homepage = "https://github.com/marshmallow-code/apispec";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ costrouc ]; maintainers = with maintainers; [ ];
}; };
} }

View file

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

View file

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

View file

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

View file

@ -86,6 +86,6 @@ buildPythonPackage rec {
description = "Atomistic Manipulation Toolkit"; description = "Atomistic Manipulation Toolkit";
homepage = "https://github.com/usnistgov/atomman/"; homepage = "https://github.com/usnistgov/atomman/";
license = licenses.mit; 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"; 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"; description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.costrouc ]; maintainers = [ ];
}; };
} }

View file

@ -52,6 +52,6 @@ buildPythonPackage rec {
homepage = "https://github.com/auth0/auth0-python"; homepage = "https://github.com/auth0/auth0-python";
changelog = "https://github.com/auth0/auth0-python/blob/${version}/CHANGELOG.md"; changelog = "https://github.com/auth0/auth0-python/blob/${version}/CHANGELOG.md";
license = licenses.mit; 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"; description = "A spawner for Jupyterhub to spawn notebooks using batch resource managers";
homepage = "https://jupyter.org"; homepage = "https://jupyter.org";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.costrouc ]; maintainers = [ ];
}; };
} }

View file

@ -53,6 +53,6 @@ buildPythonPackage rec {
description = "Band-structure interpolator and transport coefficient calculator"; description = "Band-structure interpolator and transport coefficient calculator";
homepage = "http://www.boltztrap.org/"; homepage = "http://www.boltztrap.org/";
license = licenses.gpl3Plus; 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 future infrastructural services offered by Amazon Web
Services. This includes S3, SQS, EC2, among others. 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"; description = "Python bindings for Oracle Berkeley DB";
homepage = "https://www.jcea.es/programacion/pybsddb.htm"; homepage = "https://www.jcea.es/programacion/pybsddb.htm";
license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x 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"; homepage = "https://github.com/williamh/pybugz";
description = "Command line interface for Bugzilla"; description = "Command line interface for Bugzilla";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.costrouc ]; maintainers = [ ];
}; };
} }

View file

@ -69,6 +69,6 @@ buildPythonPackage rec {
homepage = "https://github.com/ionrock/cachecontrol"; homepage = "https://github.com/ionrock/cachecontrol";
changelog = "https://github.com/psf/cachecontrol/releases/tag/v${version}"; changelog = "https://github.com/psf/cachecontrol/releases/tag/v${version}";
license = licenses.asl20; 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"; description = "Parametric scripting language for creating and traversing CAD models";
homepage = "https://github.com/CadQuery/cadquery"; homepage = "https://github.com/CadQuery/cadquery";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ costrouc marcus7070 ]; maintainers = with maintainers; [ marcus7070 ];
}; };
} }

View file

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "casbin"; pname = "casbin";
version = "1.21.0"; version = "1.22.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = pname; owner = pname;
repo = "pycasbin"; repo = "pycasbin";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Zp1JNAm1BpbgsctKDOcoDds5hEHtqi9+a5srZqE7288="; hash = "sha256-+DoXjIRbXhX3lAOWnDEwG3e0bF9T3dVEU33JMLMAO6Y=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -39,6 +39,6 @@ buildPythonPackage rec {
homepage = "https://github.com/casbin/pycasbin"; homepage = "https://github.com/casbin/pycasbin";
changelog = "https://github.com/casbin/pycasbin/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/casbin/pycasbin/blob/v${version}/CHANGELOG.md";
license = licenses.asl20; 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"; description = "C/C++ source generation from an AST";
homepage = "https://github.com/inducer/cgen"; homepage = "https://github.com/inducer/cgen";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.costrouc ]; maintainers = [ ];
}; };
} }

View file

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

View file

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

View file

@ -62,6 +62,6 @@ buildPythonPackage rec {
description = "Numerical Geometric Algebra Module"; description = "Numerical Geometric Algebra Module";
homepage = "https://clifford.readthedocs.io"; homepage = "https://clifford.readthedocs.io";
license = licenses.bsd3; 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"; homepage = "https://github.com/cloudflare/python-cloudflare";
changelog = "https://github.com/cloudflare/python-cloudflare/blob/${version}/CHANGELOG.md"; changelog = "https://github.com/cloudflare/python-cloudflare/blob/${version}/CHANGELOG.md";
license = licenses.mit; 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"; description = "Library for Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization";
homepage = "https://github.com/CMA-ES/pycma"; homepage = "https://github.com/CMA-ES/pycma";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ]; maintainers = with maintainers; [ ];
}; };
} }

View file

@ -45,6 +45,6 @@ buildPythonPackage rec {
description = "Collection of perceptually uniform colormaps"; description = "Collection of perceptually uniform colormaps";
homepage = "https://colorcet.pyviz.org"; homepage = "https://colorcet.pyviz.org";
license = licenses.cc-by-40; 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"; homepage = "https://github.com/mozilla-services/cornice";
description = "Build Web Services with Pyramid"; description = "Build Web Services with Pyramid";
license = licenses.mpl20; license = licenses.mpl20;
maintainers = [ maintainers.costrouc ]; maintainers = [ ];
}; };
} }

View file

@ -39,6 +39,6 @@ buildPythonPackage rec {
homepage = "https://github.com/kiorky/croniter"; homepage = "https://github.com/kiorky/croniter";
changelog = "https://github.com/kiorky/croniter/blob/${version}/CHANGELOG.rst"; changelog = "https://github.com/kiorky/croniter/blob/${version}/CHANGELOG.rst";
license = licenses.mit; 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"; description = "A multi-tenant server for securely deploying and managing multiple Dask clusters";
homepage = "https://gateway.dask.org/"; homepage = "https://gateway.dask.org/";
license = licenses.bsd3; 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"; description = "A client library for interacting with a dask-gateway server";
homepage = "https://gateway.dask.org/"; homepage = "https://gateway.dask.org/";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ]; maintainers = with maintainers; [ ];
}; };
} }

View file

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

View file

@ -48,6 +48,6 @@ buildPythonPackage rec {
description = "Distributed image processing"; description = "Distributed image processing";
homepage = "https://github.com/dask/dask-image"; homepage = "https://github.com/dask/dask-image";
license = licenses.bsdOriginal; 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"; description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE";
homepage = "https://github.com/dask/dask-jobqueue"; homepage = "https://github.com/dask/dask-jobqueue";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ]; maintainers = with maintainers; [ ];
}; };
} }

View file

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

View file

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

View file

@ -77,7 +77,7 @@ buildPythonPackage rec {
homepage = "https://github.com/encode/databases"; homepage = "https://github.com/encode/databases";
changelog = "https://github.com/encode/databases/releases/tag/${version}"; changelog = "https://github.com/encode/databases/releases/tag/${version}";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ]; maintainers = with maintainers; [ ];
# https://github.com/encode/databases/issues/530 # https://github.com/encode/databases/issues/530
broken = lib.versionAtLeast sqlalchemy.version "2.0.0"; 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"; description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML";
homepage = "https://github.com/usnistgov/DataModelDict/"; homepage = "https://github.com/usnistgov/DataModelDict/";
license = licenses.mit; 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"; description = "Multi-tool for exploring and publishing data";
homepage = "https://datasette.io/"; homepage = "https://datasette.io/";
license = licenses.asl20; 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"; description = "Data visualization toolchain based on aggregating into a grid";
homepage = "https://datashader.org"; homepage = "https://datashader.org";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ]; maintainers = with maintainers; [ ];
}; };
} }

View file

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

View file

@ -1,8 +1,10 @@
{ lib { stdenv
, lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pythonRelaxDepsHook , pythonRelaxDepsHook
, ninja , ninja
, which
# build inputs # build inputs
, pillow , pillow
, matplotlib , matplotlib
@ -17,8 +19,10 @@
, iopath , iopath
, omegaconf , omegaconf
, hydra-core , hydra-core
, black
, packaging , packaging
, torch
, pydot
, black
# optional dependencies # optional dependencies
, fairscale , fairscale
, timm , timm
@ -26,10 +30,16 @@
, shapely , shapely
, pygments , pygments
, psutil , psutil
# check inputs
, pytestCheckHook
, torchvision
, av
, opencv4
, pytest-mock
}: }:
let let
name = "detectron2"; pname = "detectron2";
version = "0.6"; version = "0.6";
optional-dependencies = { optional-dependencies = {
all = [ all = [
@ -43,11 +53,12 @@ let
}; };
in in
buildPythonPackage { buildPythonPackage {
inherit name version; inherit pname version;
format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebookresearch"; owner = "facebookresearch";
repo = name; repo = "detectron2";
rev = "v${version}"; rev = "v${version}";
sha256 = "1w6cgvc8r2lwr72yxicls650jr46nriv1csivp2va9k1km8jx2sf"; sha256 = "1w6cgvc8r2lwr72yxicls650jr46nriv1csivp2va9k1km8jx2sf";
}; };
@ -55,12 +66,9 @@ buildPythonPackage {
nativeBuildInputs = [ nativeBuildInputs = [
pythonRelaxDepsHook pythonRelaxDepsHook
ninja ninja
which
]; ];
dontUseNinjaBuild = true;
dontUseNinjaInstall = true;
dontUseNinjaCheck = true;
pythonRelaxDeps = [ pythonRelaxDeps = [
"black" "black"
]; ];
@ -79,14 +87,78 @@ buildPythonPackage {
iopath iopath
omegaconf omegaconf
hydra-core hydra-core
black
packaging 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; passthru.optional-dependencies = optional-dependencies;
# disable the tests for now until someone can check on a linux machine. nativeCheckInputs = [
# doCheck = false; 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" ]; pythonImportsCheck = [ "detectron2" ];

View file

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

View file

@ -78,6 +78,6 @@ buildPythonPackage rec {
homepage = "https://distributed.readthedocs.io/"; homepage = "https://distributed.readthedocs.io/";
changelog = "https://github.com/dask/distributed/blob/${version}/docs/source/changelog.rst"; changelog = "https://github.com/dask/distributed/blob/${version}/docs/source/changelog.rst";
license = licenses.bsd3; 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"; description = "Use an URL to configure email backend settings in your Django Application";
homepage = "https://github.com/migonzalvar/dj-email-url"; homepage = "https://github.com/migonzalvar/dj-email-url";
license = licenses.bsd0; 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"; homepage = "https://github.com/dstufft/dj-search-url";
description = "Use Search URLs in your Django Haystack Application"; description = "Use Search URLs in your Django Haystack Application";
license = licenses.bsd0; license = licenses.bsd0;
maintainers = [ maintainers.costrouc ]; maintainers = [ ];
}; };
} }

View file

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

View file

@ -60,6 +60,6 @@ buildPythonPackage rec {
description = "A helper for organizing Django settings"; description = "A helper for organizing Django settings";
homepage = "https://django-configurations.readthedocs.io/"; homepage = "https://django-configurations.readthedocs.io/";
license = licenses.bsd0; 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"; description = "Dockerspawner: A custom spawner for Jupyterhub";
homepage = "https://jupyter.org"; homepage = "https://jupyter.org";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.costrouc ]; maintainers = [ ];
}; };
} }

View file

@ -28,6 +28,6 @@ buildPythonPackage rec {
description = "Python package for docstring repetition"; description = "Python package for docstring repetition";
homepage = "https://github.com/Chilipp/docrep"; homepage = "https://github.com/Chilipp/docrep";
license = lib.licenses.gpl2; 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"; description = "Access HMI, AIA and MDI data with Python";
homepage = "https://github.com/sunpy/drms"; homepage = "https://github.com/sunpy/drms";
license = licenses.bsd2; license = licenses.bsd2;
maintainers = with maintainers; [ costrouc ]; maintainers = with maintainers; [ ];
}; };
} }

View file

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

View file

@ -40,6 +40,6 @@ buildPythonPackage rec {
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 = [ ];
}; };
} }

View file

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

View file

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

View file

@ -62,6 +62,6 @@ buildPythonPackage rec {
description = "A Finite Volume PDE Solver Using Python"; description = "A Finite Volume PDE Solver Using Python";
changelog = "https://github.com/usnistgov/fipy/blob/${version}/CHANGELOG.rst"; changelog = "https://github.com/usnistgov/fipy/blob/${version}/CHANGELOG.rst";
license = licenses.free; 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/"; homepage = "https://github.com/flask-admin/flask-admin/";
changelog = "https://github.com/flask-admin/flask-admin/releases/tag/v${version}"; changelog = "https://github.com/flask-admin/flask-admin/releases/tag/v${version}";
license = licenses.bsd3; 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/"; homepage = "https://github.com/dpgaspar/flask-appbuilder/";
changelog = "https://github.com/dpgaspar/Flask-AppBuilder/blob/v${version}/CHANGELOG.rst"; changelog = "https://github.com/dpgaspar/Flask-AppBuilder/blob/v${version}/CHANGELOG.rst";
license = licenses.bsd3; 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 # Support for flask-sqlalchemy >= 3.0 is missing, https://github.com/dpgaspar/Flask-AppBuilder/pull/1940
broken = true; broken = true;
}; };

View file

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

View file

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

View file

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

View file

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

View file

@ -155,6 +155,6 @@ buildPythonPackage rec {
homepage = "https://github.com/fsspec/filesystem_spec"; homepage = "https://github.com/fsspec/filesystem_spec";
changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst"; changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst";
license = licenses.bsd3; 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"; description = "C/C++ source generation from an AST";
homepage = "https://github.com/inducer/genpy"; homepage = "https://github.com/inducer/genpy";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.costrouc ]; maintainers = [ ];
}; };
} }

View file

@ -49,6 +49,6 @@ buildPythonPackage rec {
description = "An async GitHub API library"; description = "An async GitHub API library";
homepage = "https://github.com/brettcannon/gidgethub"; homepage = "https://github.com/brettcannon/gidgethub";
license = licenses.asl20; 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"; description = "Version of the glob module that can capture patterns and supports recursive wildcards";
homepage = "https://github.com/miracle2k/python-glob2/"; homepage = "https://github.com/miracle2k/python-glob2/";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.costrouc ]; maintainers = [ ];
}; };
} }

View file

@ -61,6 +61,6 @@ buildPythonPackage rec {
homepage = "https://github.com/quintusdias/glymur"; homepage = "https://github.com/quintusdias/glymur";
changelog = "https://github.com/quintusdias/glymur/blob/v${version}/CHANGES.txt"; changelog = "https://github.com/quintusdias/glymur/blob/v${version}/CHANGES.txt";
license = licenses.mit; 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"; homepage = "https://github.com/googleapis/python-bigtable";
changelog = "https://github.com/googleapis/python-bigtable/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/googleapis/python-bigtable/blob/v${version}/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ costrouc ]; maintainers = with maintainers; [ ];
}; };
} }

View file

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

View file

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

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