colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2023-05-30 00:13:33 +00:00 committed by GitHub
commit 4e4cf85c95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
115 changed files with 7576 additions and 7841 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maintainers/maintainer-list.nix
View File

@ -6403,6 +6403,15 @@
githubId = 6074754;
name = "Hlodver Sigurdsson";
};
hmajid2301 = {
name = "Haseeb Majid";
email = "hello@haseebmajid.dev";
github = "hmajid2301";
githubId = 998807;
keys = [{
fingerprint = "A236 785D 59F1 9076 1E9C E8EC 7828 3DB3 D233 E1F9";
}];
};
hmenke = {
name = "Henri Menke";
email = "henri@henrimenke.de";

2
nixos/doc/manual/release-notes/rl-2305.section.md
View File

@ -194,6 +194,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `graylog` has been updated to version 5, which can not be upgraded directly from the previously packaged version 3.3. If you had installed the previously packaged version 3.3, please follow the [upgrade path](https://go2docs.graylog.org/5-0/upgrading_graylog/upgrade_path.htm) from 3.3 to 4.0 to 4.3 to 5.0.
- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChrootenv` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs.
- `nushell` has been updated to at least version 0.77.0, which includes potential breaking changes in aliases. The old aliases are now available as `old-alias` but it is recommended you migrate to the new format. See [Reworked aliases](https://www.nushell.sh/blog/2023-03-14-nushell_0_77.html#reworked-aliases-breaking-changes-kubouch).
- `gajim` has been updated to version 1.7.3 which has disabled legacy ciphers. See [changelog for version 1.7.0](https://dev.gajim.org/gajim/gajim/-/releases/1.7.0).

4
nixos/modules/services/misc/pufferpanel.nix
View File

@ -19,7 +19,7 @@ in
services.pufferpanel = {
enable = true;
extraPackages = with pkgs; [ bash curl gawk gnutar gzip ];
package = pkgs.buildFHSUserEnv {
package = pkgs.buildFHSEnv {
name = "pufferpanel-fhs";
runScript = lib.getExe pkgs.pufferpanel;
targetPkgs = pkgs': with pkgs'; [ icu openssl zlib ];
@ -162,7 +162,7 @@ in
PrivateUsers = true;
PrivateDevices = true;
RestrictRealtime = true;
RestrictNamespaces = [ "user" "mnt" ]; # allow buildFHSUserEnv
RestrictNamespaces = [ "user" "mnt" ]; # allow buildFHSEnv
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
LockPersonality = true;
DeviceAllow = [ "" ];

1
nixos/modules/services/x11/window-managers/default.nix
View File

@ -14,6 +14,7 @@ in
./bspwm.nix
./cwm.nix
./clfswm.nix
./dk.nix
./dwm.nix
./e16.nix
./evilwm.nix

27
nixos/modules/services/x11/window-managers/dk.nix Normal file
View File

@ -0,0 +1,27 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.xserver.windowManager.dk;
in
{
options = {
services.xserver.windowManager.dk = {
enable = lib.mkEnableOption (lib.mdDoc "dk");
package = lib.mkPackageOptionMD pkgs "dk" { };
};
};
config = lib.mkIf cfg.enable {
services.xserver.windowManager.session = lib.singleton {
name = "dk";
start = ''
export _JAVA_AWT_WM_NONREPARENTING=1
${cfg.package}/bin/dk &
waitPID=$!
'';
};
environment.systemPackages = [ cfg.package ];
};
}

125
nixos/modules/system/boot/systemd/logind.nix
View File

@ -11,64 +11,145 @@ let
];
in
{
options = {
services.logind.extraConfig = mkOption {
options.services.logind = {
extraConfig = mkOption {
default = "";
type = types.lines;
example = "IdleAction=lock";
description = lib.mdDoc ''
Extra config options for systemd-logind. See
[
logind.conf(5)](https://www.freedesktop.org/software/systemd/man/logind.conf.html) for available options.
Extra config options for systemd-logind.
See [logind.conf(5)](https://www.freedesktop.org/software/systemd/man/logind.conf.html)
for available options.
'';
};
services.logind.killUserProcesses = mkOption {
killUserProcesses = mkOption {
default = false;
type = types.bool;
description = lib.mdDoc ''
Specifies whether the processes of a user should be killed
when the user logs out. If true, the scope unit corresponding
to the session and all processes inside that scope will be
terminated. If false, the scope is "abandoned" (see
[systemd.scope(5)](https://www.freedesktop.org/software/systemd/man/systemd.scope.html#)), and processes are not killed.
terminated. If false, the scope is "abandoned"
(see [systemd.scope(5)](https://www.freedesktop.org/software/systemd/man/systemd.scope.html#)),
and processes are not killed.
See [logind.conf(5)](https://www.freedesktop.org/software/systemd/man/logind.conf.html#KillUserProcesses=)
for more details.
'';
};
services.logind.lidSwitch = mkOption {
powerKey = mkOption {
default = "poweroff";
example = "ignore";
type = logindHandlerType;
description = lib.mdDoc ''
Specifies what to do when the power key is pressed.
'';
};
powerKeyLongPress = mkOption {
default = "ignore";
example = "reboot";
type = logindHandlerType;
description = lib.mdDoc ''
Specifies what to do when the power key is long-pressed.
'';
};
rebootKey = mkOption {
default = "reboot";
example = "ignore";
type = logindHandlerType;
description = lib.mdDoc ''
Specifies what to do when the reboot key is pressed.
'';
};
rebootKeyLongPress = mkOption {
default = "poweroff";
example = "ignore";
type = logindHandlerType;
description = lib.mdDoc ''
Specifies what to do when the reboot key is long-pressed.
'';
};
suspendKey = mkOption {
default = "suspend";
example = "ignore";
type = logindHandlerType;
description = lib.mdDoc ''
Specifies what to be done when the laptop lid is closed.
Specifies what to do when the suspend key is pressed.
'';
};
services.logind.lidSwitchDocked = mkOption {
suspendKeyLongPress = mkOption {
default = "hibernate";
example = "ignore";
type = logindHandlerType;
description = lib.mdDoc ''
Specifies what to do when the suspend key is long-pressed.
'';
};
hibernateKey = mkOption {
default = "hibernate";
example = "ignore";
type = logindHandlerType;
description = lib.mdDoc ''
Specifies what to do when the hibernate key is pressed.
'';
};
hibernateKeyLongPress = mkOption {
default = "ignore";
example = "suspend";
type = logindHandlerType;
description = lib.mdDoc ''
Specifies what to be done when the laptop lid is closed
and another screen is added.
Specifies what to do when the hibernate key is long-pressed.
'';
};
services.logind.lidSwitchExternalPower = mkOption {
lidSwitch = mkOption {
default = "suspend";
example = "ignore";
type = logindHandlerType;
description = lib.mdDoc ''
Specifies what to do when the laptop lid is closed.
'';
};
lidSwitchExternalPower = mkOption {
default = cfg.lidSwitch;
defaultText = literalExpression "services.logind.lidSwitch";
example = "ignore";
type = logindHandlerType;
description = lib.mdDoc ''
Specifies what to do when the laptop lid is closed and the system is
on external power. By default use the same action as specified in
services.logind.lidSwitch.
Specifies what to do when the laptop lid is closed
and the system is on external power. By default use
the same action as specified in services.logind.lidSwitch.
'';
};
lidSwitchDocked = mkOption {
default = "ignore";
example = "suspend";
type = logindHandlerType;
description = lib.mdDoc ''
Specifies what to do when the laptop lid is closed
and another screen is added.
'';
};
};
@ -94,9 +175,17 @@ in
"systemd/logind.conf".text = ''
[Login]
KillUserProcesses=${if cfg.killUserProcesses then "yes" else "no"}
HandlePowerKey=${cfg.powerKey}
HandlePowerKeyLongPress=${cfg.powerKeyLongPress}
HandleRebootKey=${cfg.rebootKey}
HandleRebootKeyLongPress=${cfg.rebootKeyLongPress}
HandleSuspendKey=${cfg.suspendKey}
HandleSuspendKeyLongPress=${cfg.suspendKeyLongPress}
HandleHibernateKey=${cfg.hibernateKey}
HandleHibernateKeyLongPress=${cfg.hibernateKeyLongPress}
HandleLidSwitch=${cfg.lidSwitch}
HandleLidSwitchDocked=${cfg.lidSwitchDocked}
HandleLidSwitchExternalPower=${cfg.lidSwitchExternalPower}
HandleLidSwitchDocked=${cfg.lidSwitchDocked}
${cfg.extraConfig}
'';
};

10
nixos/modules/tasks/network-interfaces-scripted.nix
View File

@ -293,7 +293,7 @@ let
script = ''
# Remove Dead Interfaces
echo "Removing old bridge ${n}..."
ip link show "${n}" >/dev/null 2>&1 && ip link del "${n}"
ip link show dev "${n}" >/dev/null 2>&1 && ip link del "${n}"
echo "Adding bridge ${n}..."
ip link add name "${n}" type bridge
@ -459,7 +459,7 @@ let
path = [ pkgs.iproute2 ];
script = ''
# Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}"
ip link add link "${v.interface}" name "${n}" type macvlan \
${optionalString (v.mode != null) "mode ${v.mode}"}
ip link set "${n}" up
@ -517,7 +517,7 @@ let
path = [ pkgs.iproute2 ];
script = ''
# Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}"
ip link add name "${n}" type sit \
${optionalString (v.remote != null) "remote \"${v.remote}\""} \
${optionalString (v.local != null) "local \"${v.local}\""} \
@ -551,7 +551,7 @@ let
path = [ pkgs.iproute2 ];
script = ''
# Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}"
ip link add name "${n}" type ${v.type} \
${optionalString (v.remote != null) "remote \"${v.remote}\""} \
${optionalString (v.local != null) "local \"${v.local}\""} \
@ -579,7 +579,7 @@ let
path = [ pkgs.iproute2 ];
script = ''
# Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}"
ip link add link "${v.interface}" name "${n}" type vlan id "${toString v.id}"
# We try to bring up the logical VLAN interface. If the master

25
nixos/tests/networking.nix
View File

@ -998,6 +998,31 @@ let
machine.fail("ip address show wlan0 | grep -q ${testMac}")
'';
};
naughtyInterfaceNames = let
ifnames = [
# flags of ip-address
"home" "temporary" "optimistic"
"bridge_slave" "flush"
# flags of ip-route
"up" "type" "nomaster" "address"
# other
"very_loong_name" "lowerUpper" "-"
];
in {
name = "naughtyInterfaceNames";
nodes.machine = { pkgs, ... }: {
networking.useNetworkd = networkd;
networking.bridges = listToAttrs
(flip map ifnames
(name: { inherit name; value.interfaces = []; }));
};
testScript = ''
machine.start()
machine.wait_for_unit("network.target")
for ifname in ${builtins.toJSON ifnames}:
machine.wait_until_succeeds(f"ip link show dev '{ifname}' | grep -q '{ifname}'")
'';
};
caseSensitiveRenaming = {
name = "CaseSensitiveRenaming";
nodes.machine = { pkgs, ... }: {

13
pkgs/applications/audio/furnace/default.nix
View File

@ -10,6 +10,7 @@
, fftw
, fmt_8
, libsndfile
, libX11
, rtmidi
, SDL2
, zlib
@ -21,16 +22,23 @@
stdenv.mkDerivation rec {
pname = "furnace";
version = "0.6pre4-hotfix";
version = "0.6pre5";
src = fetchFromGitHub {
owner = "tildearrow";
repo = "furnace";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-lJtV/0GnWN5mSjv2LaPEMnkuThaNeijBMjLGFPOJX4k=";
sha256 = "sha256-6KiG7nfQUdPW+EkBW3PPM141kOmolAgrrqhEGH/Azg4=";
};
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
# To offer scaling detection on X11, furnace checks if libX11.so is available via dlopen and uses some of its functions
# But it's being linked against a versioned libX11.so.VERSION via SDL, so the unversioned one is not on the rpath
substituteInPlace src/gui/scaling.cpp \
--replace 'libX11.so' '${lib.getLib libX11}/lib/libX11.so'
'';
nativeBuildInputs = [
cmake
pkg-config
@ -97,6 +105,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Multi-system chiptune tracker compatible with DefleMask modules";
homepage = "https://github.com/tildearrow/furnace";
changelog = "https://github.com/tildearrow/furnace/releases/tag/v${version}";
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.all;

6
pkgs/applications/audio/gtkcord4/default.nix
View File

@ -18,13 +18,13 @@
buildGoModule rec {
pname = "gtkcord4";
version = "0.0.10";
version = "0.0.11";
src = fetchFromGitHub {
owner = "diamondburned";
repo = pname;
rev = "v${version}";
hash = "sha256-WrKZRRJAbEzcCRcFUTa7PxahQ3YADhfWaKlB4uJjVk0=";
hash = "sha256-0d656gjfFlgNdKbPJK+6KIU7zvp88j3bGIlGPwJNRdM=";
};
nativeBuildInputs = [
@ -57,7 +57,7 @@ buildGoModule rec {
install -D -m 444 internal/icons/png/logo.png $out/share/icons/hicolor/256x256/apps/gtkcord4.png
'';
vendorHash = "sha256-8Xnu3WjaaWMRkqmnQCxSc/SD65XFMIY0xamWDx4jZbw=";
vendorHash = "sha256-+zbaRaGOF6w8C7lmtd3k5Rh/0a+OnqTL9Qhg1ErTHBo=";
meta = with lib; {
description = "GTK4 Discord client in Go, attempt #4.";

4
pkgs/applications/audio/musikcube/default.nix
View File

@ -32,13 +32,13 @@
stdenv.mkDerivation rec {
pname = "musikcube";
version = "3.0.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "clangen";
repo = pname;
rev = version;
hash = "sha512-W+Zug1SiOGJ+o6FBf2jeDGHFj87vudR4drtjyXiOzdoM8fUCnCj4pp7+70eZGilg6CvBi7CYkbVn53LXJf5qWA==";
hash = "sha512-ahKPmChHRVpOQcgt0fOYumlsMApeN4MWwywE9F0edeN0Xr3Vp830mWGzEBJvMvGI/lnU/1rd7tREaHfm1vCJaw==";
};
outputs = [ "out" "dev" ];

13
pkgs/applications/editors/neovim/default.nix
View File

@ -1,5 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv
, fetchpatch
, libuv, lua, ncurses, pkg-config
, unibilium, gperf
, libvterm-neovim
@ -37,13 +36,13 @@ let
in
stdenv.mkDerivation rec {
pname = "neovim-unwrapped";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "neovim";
repo = "neovim";
rev = "v${version}";
hash = "sha256-4uCPWnjSMU7ac6Q3LT+Em8lVk1MuSegxHMLGQRtFqAs=";
hash = "sha256-G51qD7GklEn0JrneKSSqDDx0Odi7W2FjdQc0ZDE9ZK4=";
};
patches = [
@ -51,14 +50,6 @@ in
# necessary so that nix can handle `UpdateRemotePlugins` for the plugins
# it installs. See https://github.com/neovim/neovim/issues/9413.
./system_rplugin_manifest.patch
# fix bug with the gsub directive
# https://github.com/neovim/neovim/pull/23015
(fetchpatch {
name = "use-the-correct-replacement-args-for-gsub-directive.patch";
url = "https://github.com/neovim/neovim/commit/ccc0980f86c6ef9a86b0e5a3a691f37cea8eb776.patch";
hash = "sha256-sZWM6M8jCL1e72H0bAc51a6FrH0mFFqTV1gGLwKT7Zo=";
})
];
dontFixCmake = true;

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hugo";
version = "0.112.4";
version = "0.112.5";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
hash = "sha256-Iug0Kk7D4Vr5oiq+A3H3ORPiIq+m9R8sj1r4Wp3JlmE=";
hash = "sha256-phtiYh5+xSc4eeK2hM6bHFg4/Owm1EkInRE+NhuQAUA=";
};
vendorHash = "sha256-A4mWrTSkE1NcLj8ozGXQJIrFMvqeoBC7y7eOTeh3ktw=";

6
pkgs/applications/misc/swaynotificationcenter/default.nix
View File

@ -28,13 +28,13 @@
stdenv.mkDerivation (finalAttrs: rec {
pname = "SwayNotificationCenter";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "ErikReider";
repo = "SwayNotificationCenter";
repo = pname;
rev = "v${version}";
hash = "sha256-E9CjNx/xzkkOZ39XbfIb1nJFheZVFpj/lwmITKtpb7A=";
hash = "sha256-mwwSTs4d9jUXUy33nSYJCRFlpH6naCmbRUSpfVacMBE=";
};
nativeBuildInputs = [

6
pkgs/applications/networking/cluster/glooctl/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "glooctl";
version = "1.14.5";
version = "1.14.6";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
hash = "sha256-j20YngPgM/ZUMerX3H7lqYQKvD6w0jAuZC+xFlIWobQ=";
hash = "sha256-rALTZUztLZXBlKA3y9mUe/h9diGD6kOpLcD0nOIHr0w=";
};
subPackages = [ "projects/gloo/cli/cmd" ];
vendorHash = "sha256-z1am0HfRrPAg2H7ZAjinoirfmaCFdF1oavVVVKQ3V8o=";
vendorHash = "sha256-hzfnxtOzSJ1K5UYFPbPJCwrw819KsXK5vTfOS2wdpxg=";
nativeBuildInputs = [ installShellFiles ];

32
pkgs/applications/networking/cluster/k8sgpt/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "k8sgpt";
version = "0.3.5";
src = fetchFromGitHub {
owner = "k8sgpt-ai";
repo = "k8sgpt";
rev = "v${version}";
hash = "sha256-AUUcC9S1+83ZlOH/LEG+QXstxpr8949JbqFMF9hIiVE=";
};
vendorHash = "sha256-tXLt18ryxO9Q7E/MJWDlZy1gmxnMauqfcbmRdF9uUt8=";
CGO_ENABLED = 0;
ldflags = [
"-s" "-w"
"-X main.version=v${version}"
"-X main.commit=${src.rev}"
"-X main.date=1970-01-01-00:00:01"
];
meta = with lib; {
description = "Giving Kubernetes Superpowers to everyone";
homepage = "https://k8sgpt.ai";
changelog = "https://github.com/k8sgpt-ai/k8sgpt/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ developer-guy kranurag7 ];
};
}

4
pkgs/applications/networking/cluster/kyverno/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kyverno";
version = "1.9.4";
version = "1.9.5";
src = fetchFromGitHub {
owner = "kyverno";
repo = "kyverno";
rev = "v${version}";
sha256 = "sha256-rpqhDnXxbWKa1WB7WBS6Ri7XiPWv3e0evCXFSBcaD6c=";
sha256 = "sha256-e/CZ5XiJFvj/HVSBPTyLybu5ZZNVte3Bf/qGhEK7k80=";
};
ldflags = [

1
pkgs/applications/networking/cluster/nixops/default.nix
View File

@ -31,6 +31,7 @@ let
maintainers = with lib.maintainers; [ adisbladis aminechikhaoui eelco rob domenkozar ];
platforms = lib.platforms.unix;
license = lib.licenses.lgpl3;
mainProgram = "nixops";
};
}

12
pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix
View File

@ -5,8 +5,8 @@ self: super: {
_: {
src = pkgs.fetchgit {
url = "https://github.com/NixOS/nixops.git";
rev = "5013072c5ca34247d7dce545c3a7b1954948fd4d";
sha256 = "0417xq7s0qkh9ali8grlahpxl4sgg4dla302dda4768wbp0wagcz";
rev = "fc9b55c55da62f949028143b974f67fdc7f40c8b";
sha256 = "0f5r17rq3rf3ylp16cq50prn8qmfc1gwpqgqfj491w38sr5sspf8";
};
}
);
@ -15,8 +15,8 @@ self: super: {
_: {
src = pkgs.fetchgit {
url = "https://github.com/NixOS/nixops-aws.git";
rev = "d8a6679c413edd1a7075b2fe08017b4c7fa3b3ce";
sha256 = "0aqkaskp6nkcnfxxf1n294xp4ggk36qldj5c3kzfgxim06jap7n5";
rev = "012c94fc128b1cf2497aa5f2bc8fbffd0b52b464";
sha256 = "04lamaszl3llhbpsybi9scd7yrqc51x1h5z38b2w20ik9gv9lgrz";
};
}
);
@ -45,8 +45,8 @@ self: super: {
_: {
src = pkgs.fetchgit {
url = "https://github.com/nix-community/nixops-gce.git";
rev = "712453027486e62e087b9c91e4a8a171eebb6ddd";
sha256 = "0siw2silxvbxdfgb2dcymn11nqdf8an7q43wcq1lyg1ac07w7dwh";
rev = "d13cb794aef763338f544010ceb1816fe31d7f42";
sha256 = "0i57qhiga4nr0ms9gj615l599vxy78lzw7hap4rbzbhl5bl1yijj";
};
}
);

277
pkgs/applications/networking/cluster/nixops/poetry.lock generated
View File

@ -29,18 +29,18 @@ files = [
[[package]]
name = "boto3"
version = "1.26.79"
version = "1.26.141"
description = "The AWS SDK for Python"
category = "main"
optional = false
python-versions = ">= 3.7"
files = [
{file = "boto3-1.26.79-py3-none-any.whl", hash = "sha256:049de631cc03726a14b8eb24ac9ec2a48b0624197796f36166da809fdc9b9a7f"},
{file = "boto3-1.26.79.tar.gz", hash = "sha256:73d7bd1f16118ef0dfe936e0420cd76b02d1aedb75330ebda51168458ab752ac"},
{file = "boto3-1.26.141-py3-none-any.whl", hash = "sha256:a5d6fdcaec863bc7ad2f8133ff9a926d6f06468b83b5fb631cd90bd33b709c45"},
{file = "boto3-1.26.141.tar.gz", hash = "sha256:152def2fcc9854dcc42383d2b53e2ed2c9ccb5ff6cc0f3ada20f1ab54418ede4"},
]
[package.dependencies]
botocore = ">=1.29.79,<1.30.0"
botocore = ">=1.29.141,<1.30.0"
jmespath = ">=0.7.1,<2.0.0"
s3transfer = ">=0.6.0,<0.7.0"
@ -49,14 +49,14 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
[[package]]
name = "botocore"
version = "1.29.79"
version = "1.29.141"
description = "Low-level, data-driven core of boto 3."
category = "main"
optional = false
python-versions = ">= 3.7"
files = [
{file = "botocore-1.29.79-py3-none-any.whl", hash = "sha256:5f254f019e8641f8b2ba6dddc1f7541e8c6d25d976802392710b2fc4bac925b1"},
{file = "botocore-1.29.79.tar.gz", hash = "sha256:c7ded44062bed3b928944cfb09e1578ed3fed0e4c98de4f233f3c2056a8d491e"},
{file = "botocore-1.29.141-py3-none-any.whl", hash = "sha256:b01d156c42765f3f437959e01a8c7f3cb0e29b24aa0b8f373498133408b2e3c7"},
{file = "botocore-1.29.141.tar.gz", hash = "sha256:e86e1633f98838317b9e1b5c874c4d85339b77f6b7e55c2a4d83913f6166f9ad"},
]
[package.dependencies]
@ -69,14 +69,14 @@ crt = ["awscrt (==0.16.9)"]
[[package]]
name = "certifi"
version = "2022.12.7"
version = "2023.5.7"
description = "Python package for providing Mozilla's CA Bundle."
category = "main"
optional = false
python-versions = ">=3.6"
files = [
{file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
{file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
{file = "certifi-2023.5.7-py3-none-any.whl", hash = "sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716"},
{file = "certifi-2023.5.7.tar.gz", hash = "sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7"},
]
[[package]]
@ -158,141 +158,130 @@ pycparser = "*"
[[package]]
name = "charset-normalizer"
version = "3.0.1"
version = "3.1.0"
description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
category = "main"
optional = false
python-versions = "*"
python-versions = ">=3.7.0"
files = [
{file = "charset-normalizer-3.0.1.tar.gz", hash = "sha256:ebea339af930f8ca5d7a699b921106c6e29c617fe9606fa7baa043c1cdae326f"},
{file = "charset_normalizer-3.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:88600c72ef7587fe1708fd242b385b6ed4b8904976d5da0893e31df8b3480cb6"},
{file = "charset_normalizer-3.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c75ffc45f25324e68ab238cb4b5c0a38cd1c3d7f1fb1f72b5541de469e2247db"},
{file = "charset_normalizer-3.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:db72b07027db150f468fbada4d85b3b2729a3db39178abf5c543b784c1254539"},
{file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62595ab75873d50d57323a91dd03e6966eb79c41fa834b7a1661ed043b2d404d"},
{file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ff6f3db31555657f3163b15a6b7c6938d08df7adbfc9dd13d9d19edad678f1e8"},
{file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:772b87914ff1152b92a197ef4ea40efe27a378606c39446ded52c8f80f79702e"},
{file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70990b9c51340e4044cfc394a81f614f3f90d41397104d226f21e66de668730d"},
{file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:292d5e8ba896bbfd6334b096e34bffb56161c81408d6d036a7dfa6929cff8783"},
{file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:2edb64ee7bf1ed524a1da60cdcd2e1f6e2b4f66ef7c077680739f1641f62f555"},
{file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:31a9ddf4718d10ae04d9b18801bd776693487cbb57d74cc3458a7673f6f34639"},
{file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:44ba614de5361b3e5278e1241fda3dc1838deed864b50a10d7ce92983797fa76"},
{file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:12db3b2c533c23ab812c2b25934f60383361f8a376ae272665f8e48b88e8e1c6"},
{file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c512accbd6ff0270939b9ac214b84fb5ada5f0409c44298361b2f5e13f9aed9e"},
{file = "charset_normalizer-3.0.1-cp310-cp310-win32.whl", hash = "sha256:502218f52498a36d6bf5ea77081844017bf7982cdbe521ad85e64cabee1b608b"},
{file = "charset_normalizer-3.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:601f36512f9e28f029d9481bdaf8e89e5148ac5d89cffd3b05cd533eeb423b59"},
{file = "charset_normalizer-3.0.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0298eafff88c99982a4cf66ba2efa1128e4ddaca0b05eec4c456bbc7db691d8d"},
{file = "charset_normalizer-3.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a8d0fc946c784ff7f7c3742310cc8a57c5c6dc31631269876a88b809dbeff3d3"},
{file = "charset_normalizer-3.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:87701167f2a5c930b403e9756fab1d31d4d4da52856143b609e30a1ce7160f3c"},
{file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:14e76c0f23218b8f46c4d87018ca2e441535aed3632ca134b10239dfb6dadd6b"},
{file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c0a590235ccd933d9892c627dec5bc7511ce6ad6c1011fdf5b11363022746c1"},
{file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8c7fe7afa480e3e82eed58e0ca89f751cd14d767638e2550c77a92a9e749c317"},
{file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:79909e27e8e4fcc9db4addea88aa63f6423ebb171db091fb4373e3312cb6d603"},
{file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ac7b6a045b814cf0c47f3623d21ebd88b3e8cf216a14790b455ea7ff0135d18"},
{file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:72966d1b297c741541ca8cf1223ff262a6febe52481af742036a0b296e35fa5a"},
{file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:f9d0c5c045a3ca9bedfc35dca8526798eb91a07aa7a2c0fee134c6c6f321cbd7"},
{file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:5995f0164fa7df59db4746112fec3f49c461dd6b31b841873443bdb077c13cfc"},
{file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4a8fcf28c05c1f6d7e177a9a46a1c52798bfe2ad80681d275b10dcf317deaf0b"},
{file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:761e8904c07ad053d285670f36dd94e1b6ab7f16ce62b9805c475b7aa1cffde6"},
{file = "charset_normalizer-3.0.1-cp311-cp311-win32.whl", hash = "sha256:71140351489970dfe5e60fc621ada3e0f41104a5eddaca47a7acb3c1b851d6d3"},
{file = "charset_normalizer-3.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:9ab77acb98eba3fd2a85cd160851816bfce6871d944d885febf012713f06659c"},
{file = "charset_normalizer-3.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:84c3990934bae40ea69a82034912ffe5a62c60bbf6ec5bc9691419641d7d5c9a"},
{file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74292fc76c905c0ef095fe11e188a32ebd03bc38f3f3e9bcb85e4e6db177b7ea"},
{file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c95a03c79bbe30eec3ec2b7f076074f4281526724c8685a42872974ef4d36b72"},
{file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f4c39b0e3eac288fedc2b43055cfc2ca7a60362d0e5e87a637beac5d801ef478"},
{file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:df2c707231459e8a4028eabcd3cfc827befd635b3ef72eada84ab13b52e1574d"},
{file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:93ad6d87ac18e2a90b0fe89df7c65263b9a99a0eb98f0a3d2e079f12a0735837"},
{file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:59e5686dd847347e55dffcc191a96622f016bc0ad89105e24c14e0d6305acbc6"},
{file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:cd6056167405314a4dc3c173943f11249fa0f1b204f8b51ed4bde1a9cd1834dc"},
{file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:083c8d17153ecb403e5e1eb76a7ef4babfc2c48d58899c98fcaa04833e7a2f9a"},
{file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:f5057856d21e7586765171eac8b9fc3f7d44ef39425f85dbcccb13b3ebea806c"},
{file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:7eb33a30d75562222b64f569c642ff3dc6689e09adda43a082208397f016c39a"},
{file = "charset_normalizer-3.0.1-cp36-cp36m-win32.whl", hash = "sha256:95dea361dd73757c6f1c0a1480ac499952c16ac83f7f5f4f84f0658a01b8ef41"},
{file = "charset_normalizer-3.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:eaa379fcd227ca235d04152ca6704c7cb55564116f8bc52545ff357628e10602"},
{file = "charset_normalizer-3.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3e45867f1f2ab0711d60c6c71746ac53537f1684baa699f4f668d4c6f6ce8e14"},
{file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cadaeaba78750d58d3cc6ac4d1fd867da6fc73c88156b7a3212a3cd4819d679d"},
{file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:911d8a40b2bef5b8bbae2e36a0b103f142ac53557ab421dc16ac4aafee6f53dc"},
{file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:503e65837c71b875ecdd733877d852adbc465bd82c768a067badd953bf1bc5a3"},
{file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a60332922359f920193b1d4826953c507a877b523b2395ad7bc716ddd386d866"},
{file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:16a8663d6e281208d78806dbe14ee9903715361cf81f6d4309944e4d1e59ac5b"},
{file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:a16418ecf1329f71df119e8a65f3aa68004a3f9383821edcb20f0702934d8087"},
{file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:9d9153257a3f70d5f69edf2325357251ed20f772b12e593f3b3377b5f78e7ef8"},
{file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:02a51034802cbf38db3f89c66fb5d2ec57e6fe7ef2f4a44d070a593c3688667b"},
{file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:2e396d70bc4ef5325b72b593a72c8979999aa52fb8bcf03f701c1b03e1166918"},
{file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:11b53acf2411c3b09e6af37e4b9005cba376c872503c8f28218c7243582df45d"},
{file = "charset_normalizer-3.0.1-cp37-cp37m-win32.whl", hash = "sha256:0bf2dae5291758b6f84cf923bfaa285632816007db0330002fa1de38bfcb7154"},
{file = "charset_normalizer-3.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:2c03cc56021a4bd59be889c2b9257dae13bf55041a3372d3295416f86b295fb5"},
{file = "charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:024e606be3ed92216e2b6952ed859d86b4cfa52cd5bc5f050e7dc28f9b43ec42"},
{file = "charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4b0d02d7102dd0f997580b51edc4cebcf2ab6397a7edf89f1c73b586c614272c"},
{file = "charset_normalizer-3.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:358a7c4cb8ba9b46c453b1dd8d9e431452d5249072e4f56cfda3149f6ab1405e"},
{file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81d6741ab457d14fdedc215516665050f3822d3e56508921cc7239f8c8e66a58"},
{file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8b8af03d2e37866d023ad0ddea594edefc31e827fee64f8de5611a1dbc373174"},
{file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9cf4e8ad252f7c38dd1f676b46514f92dc0ebeb0db5552f5f403509705e24753"},
{file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e696f0dd336161fca9adbb846875d40752e6eba585843c768935ba5c9960722b"},
{file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c22d3fe05ce11d3671297dc8973267daa0f938b93ec716e12e0f6dee81591dc1"},
{file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:109487860ef6a328f3eec66f2bf78b0b72400280d8f8ea05f69c51644ba6521a"},
{file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:37f8febc8ec50c14f3ec9637505f28e58d4f66752207ea177c1d67df25da5aed"},
{file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:f97e83fa6c25693c7a35de154681fcc257c1c41b38beb0304b9c4d2d9e164479"},
{file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:a152f5f33d64a6be73f1d30c9cc82dfc73cec6477ec268e7c6e4c7d23c2d2291"},
{file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:39049da0ffb96c8cbb65cbf5c5f3ca3168990adf3551bd1dee10c48fce8ae820"},
{file = "charset_normalizer-3.0.1-cp38-cp38-win32.whl", hash = "sha256:4457ea6774b5611f4bed5eaa5df55f70abde42364d498c5134b7ef4c6958e20e"},
{file = "charset_normalizer-3.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:e62164b50f84e20601c1ff8eb55620d2ad25fb81b59e3cd776a1902527a788af"},
{file = "charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8eade758719add78ec36dc13201483f8e9b5d940329285edcd5f70c0a9edbd7f"},
{file = "charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8499ca8f4502af841f68135133d8258f7b32a53a1d594aa98cc52013fff55678"},
{file = "charset_normalizer-3.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3fc1c4a2ffd64890aebdb3f97e1278b0cc72579a08ca4de8cd2c04799a3a22be"},
{file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:00d3ffdaafe92a5dc603cb9bd5111aaa36dfa187c8285c543be562e61b755f6b"},
{file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c2ac1b08635a8cd4e0cbeaf6f5e922085908d48eb05d44c5ae9eabab148512ca"},
{file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f6f45710b4459401609ebebdbcfb34515da4fc2aa886f95107f556ac69a9147e"},
{file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ae1de54a77dc0d6d5fcf623290af4266412a7c4be0b1ff7444394f03f5c54e3"},
{file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3b590df687e3c5ee0deef9fc8c547d81986d9a1b56073d82de008744452d6541"},
{file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab5de034a886f616a5668aa5d098af2b5385ed70142090e2a31bcbd0af0fdb3d"},
{file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9cb3032517f1627cc012dbc80a8ec976ae76d93ea2b5feaa9d2a5b8882597579"},
{file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:608862a7bf6957f2333fc54ab4399e405baad0163dc9f8d99cb236816db169d4"},
{file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0f438ae3532723fb6ead77e7c604be7c8374094ef4ee2c5e03a3a17f1fca256c"},
{file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:356541bf4381fa35856dafa6a965916e54bed415ad8a24ee6de6e37deccf2786"},
{file = "charset_normalizer-3.0.1-cp39-cp39-win32.whl", hash = "sha256:39cf9ed17fe3b1bc81f33c9ceb6ce67683ee7526e65fde1447c772afc54a1bb8"},
{file = "charset_normalizer-3.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:0a11e971ed097d24c534c037d298ad32c6ce81a45736d31e0ff0ad37ab437d59"},
{file = "charset_normalizer-3.0.1-py3-none-any.whl", hash = "sha256:7e189e2e1d3ed2f4aebabd2d5b0f931e883676e51c7624826e0a4e5fe8a0bf24"},
{file = "charset-normalizer-3.1.0.tar.gz", hash = "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5"},
{file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b"},
{file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60"},
{file = "charset_normalizer-3.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1"},
{file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0"},
{file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f"},
{file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0"},
{file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795"},
{file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:11d3bcb7be35e7b1bba2c23beedac81ee893ac9871d0ba79effc7fc01167db6c"},
{file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203"},
{file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1"},
{file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137"},
{file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce"},
{file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a"},
{file = "charset_normalizer-3.1.0-cp310-cp310-win32.whl", hash = "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448"},
{file = "charset_normalizer-3.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8"},
{file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19"},
{file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017"},
{file = "charset_normalizer-3.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df"},
{file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a"},
{file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41"},
{file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1"},
{file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62"},
{file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b82fab78e0b1329e183a65260581de4375f619167478dddab510c6c6fb04d9b6"},
{file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5"},
{file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be"},
{file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb"},
{file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac"},
{file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324"},
{file = "charset_normalizer-3.1.0-cp311-cp311-win32.whl", hash = "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909"},
{file = "charset_normalizer-3.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-win32.whl", hash = "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23"},
{file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531"},
{file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c"},
{file = "charset_normalizer-3.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14"},
{file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb"},
{file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1"},
{file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b"},
{file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0"},
{file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649"},
{file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326"},
{file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11"},
{file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b"},
{file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd"},
{file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8"},
{file = "charset_normalizer-3.1.0-cp38-cp38-win32.whl", hash = "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0"},
{file = "charset_normalizer-3.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59"},
{file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e"},
{file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31"},
{file = "charset_normalizer-3.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f"},
{file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e"},
{file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f"},
{file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854"},
{file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706"},
{file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e"},
{file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0"},
{file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230"},
{file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7"},
{file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e"},
{file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f"},
{file = "charset_normalizer-3.1.0-cp39-cp39-win32.whl", hash = "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1"},
{file = "charset_normalizer-3.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b"},
{file = "charset_normalizer-3.1.0-py3-none-any.whl", hash = "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d"},
]
[[package]]
name = "cryptography"
version = "3.4.8"
version = "40.0.1"
description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
category = "main"
optional = false
python-versions = ">=3.6"
files = [
{file = "cryptography-3.4.8-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:a00cf305f07b26c351d8d4e1af84ad7501eca8a342dedf24a7acb0e7b7406e14"},
{file = "cryptography-3.4.8-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:f44d141b8c4ea5eb4dbc9b3ad992d45580c1d22bf5e24363f2fbf50c2d7ae8a7"},
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0a7dcbcd3f1913f664aca35d47c1331fce738d44ec34b7be8b9d332151b0b01e"},
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"},
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"},
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"},
{file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d"},
{file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89"},
{file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"},
{file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"},
{file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"},
{file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a305600e7a6b7b855cd798e00278161b681ad6e9b7eca94c721d5f588ab212af"},
{file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:3fa3a7ccf96e826affdf1a0a9432be74dc73423125c8f96a909e3835a5ef194a"},
{file = "cryptography-3.4.8-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:d9ec0e67a14f9d1d48dd87a2531009a9b251c02ea42851c060b25c782516ff06"},
{file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5b0fbfae7ff7febdb74b574055c7466da334a5371f253732d7e2e7525d570498"},
{file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94fff993ee9bc1b2440d3b7243d488c6a3d9724cc2b09cdb297f6a886d040ef7"},
{file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:8695456444f277af73a4877db9fc979849cd3ee74c198d04fc0776ebc3db52b9"},
{file = "cryptography-3.4.8-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:cd65b60cfe004790c795cc35f272e41a3df4631e2fb6b35aa7ac6ef2859d554e"},
{file = "cryptography-3.4.8.tar.gz", hash = "sha256:94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c"},
{file = "cryptography-40.0.1-cp36-abi3-macosx_10_12_universal2.whl", hash = "sha256:918cb89086c7d98b1b86b9fdb70c712e5a9325ba6f7d7cfb509e784e0cfc6917"},
{file = "cryptography-40.0.1-cp36-abi3-macosx_10_12_x86_64.whl", hash = "sha256:9618a87212cb5200500e304e43691111570e1f10ec3f35569fdfcd17e28fd797"},
{file = "cryptography-40.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a4805a4ca729d65570a1b7cac84eac1e431085d40387b7d3bbaa47e39890b88"},
{file = "cryptography-40.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63dac2d25c47f12a7b8aa60e528bfb3c51c5a6c5a9f7c86987909c6c79765554"},
{file = "cryptography-40.0.1-cp36-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:0a4e3406cfed6b1f6d6e87ed243363652b2586b2d917b0609ca4f97072994405"},
{file = "cryptography-40.0.1-cp36-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:1e0af458515d5e4028aad75f3bb3fe7a31e46ad920648cd59b64d3da842e4356"},
{file = "cryptography-40.0.1-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:d8aa3609d337ad85e4eb9bb0f8bcf6e4409bfb86e706efa9a027912169e89122"},
{file = "cryptography-40.0.1-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:cf91e428c51ef692b82ce786583e214f58392399cf65c341bc7301d096fa3ba2"},
{file = "cryptography-40.0.1-cp36-abi3-win32.whl", hash = "sha256:650883cc064297ef3676b1db1b7b1df6081794c4ada96fa457253c4cc40f97db"},
{file = "cryptography-40.0.1-cp36-abi3-win_amd64.whl", hash = "sha256:a805a7bce4a77d51696410005b3e85ae2839bad9aa38894afc0aa99d8e0c3160"},
{file = "cryptography-40.0.1-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:cd033d74067d8928ef00a6b1327c8ea0452523967ca4463666eeba65ca350d4c"},
{file = "cryptography-40.0.1-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:d36bbeb99704aabefdca5aee4eba04455d7a27ceabd16f3b3ba9bdcc31da86c4"},
{file = "cryptography-40.0.1-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:32057d3d0ab7d4453778367ca43e99ddb711770477c4f072a51b3ca69602780a"},
{file = "cryptography-40.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:f5d7b79fa56bc29580faafc2ff736ce05ba31feaa9d4735048b0de7d9ceb2b94"},
{file = "cryptography-40.0.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:7c872413353c70e0263a9368c4993710070e70ab3e5318d85510cc91cce77e7c"},
{file = "cryptography-40.0.1-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:28d63d75bf7ae4045b10de5413fb1d6338616e79015999ad9cf6fc538f772d41"},
{file = "cryptography-40.0.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:6f2bbd72f717ce33100e6467572abaedc61f1acb87b8d546001328d7f466b778"},
{file = "cryptography-40.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:cc3a621076d824d75ab1e1e530e66e7e8564e357dd723f2533225d40fe35c60c"},
{file = "cryptography-40.0.1.tar.gz", hash = "sha256:2803f2f8b1e95f614419926c7e6f55d828afc614ca5ed61543877ae668cc3472"},
]
[package.dependencies]
cffi = ">=1.12"
[package.extras]
docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx_rtd_theme"]
docstest = ["doc8", "pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"]
pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"]
docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"]
docstest = ["pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"]
pep8test = ["black", "check-manifest", "mypy", "ruff"]
sdist = ["setuptools-rust (>=0.11.4)"]
ssh = ["bcrypt (>=3.1.5)"]
test = ["hypothesis (>=1.11.4,!=3.79.2)", "iso8601", "pretend", "pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pytz"]
test = ["iso8601", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-shard (>=0.1.2)", "pytest-subtests", "pytest-xdist"]
test-randomorder = ["pytest-randomly"]
tox = ["tox"]
[[package]]
name = "hcloud"
@ -367,13 +356,13 @@ testing-libs = ["simplejson", "ujson"]
[[package]]
name = "libvirt-python"
version = "9.0.0"
version = "9.3.0"
description = "The libvirt virtualization API python binding"
category = "main"
optional = false
python-versions = "*"
files = [
{file = "libvirt-python-9.0.0.tar.gz", hash = "sha256:49702d33fa8cbcae19fa727467a69f7ae2241b3091324085ca1cc752b2b414ce"},
{file = "libvirt-python-9.3.0.tar.gz", hash = "sha256:9c761d88b4ddcf65b324043944da4f18f82471c74d9371d2372d3b4e0f19861b"},
]
[[package]]
@ -396,7 +385,7 @@ typing-extensions = "^3.7.4"
type = "git"
url = "https://github.com/NixOS/nixops.git"
reference = "master"
resolved_reference = "5013072c5ca34247d7dce545c3a7b1954948fd4d"
resolved_reference = "fc9b55c55da62f949028143b974f67fdc7f40c8b"
[[package]]
name = "nixops-aws"
@ -419,7 +408,7 @@ typing-extensions = "^3.7.4"
type = "git"
url = "https://github.com/NixOS/nixops-aws.git"
reference = "HEAD"
resolved_reference = "d8a6679c413edd1a7075b2fe08017b4c7fa3b3ce"
resolved_reference = "012c94fc128b1cf2497aa5f2bc8fbffd0b52b464"
[[package]]
name = "nixops-digitalocean"
@ -466,13 +455,13 @@ version = "1.0"
description = "NixOps backend for Google Cloud Platform"
category = "main"
optional = false
python-versions = "^3.7"
python-versions = "^3.10"
files = []
develop = false
[package.dependencies]
apache-libcloud = "^3.2.0"
cryptography = "^3.1.1"
apache-libcloud = "^3.7.0"
cryptography = "40.0.1"
nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"}
nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"}
@ -480,7 +469,7 @@ nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-c
type = "git"
url = "https://github.com/nix-community/nixops-gce.git"
reference = "HEAD"
resolved_reference = "712453027486e62e087b9c91e4a8a171eebb6ddd"
resolved_reference = "d13cb794aef763338f544010ceb1816fe31d7f42"
[[package]]
name = "nixops-hercules-ci"
@ -676,21 +665,21 @@ requests = "*"
[[package]]
name = "requests"
version = "2.28.2"
version = "2.31.0"
description = "Python HTTP for Humans."
category = "main"
optional = false
python-versions = ">=3.7, <4"
python-versions = ">=3.7"
files = [
{file = "requests-2.28.2-py3-none-any.whl", hash = "sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa"},
{file = "requests-2.28.2.tar.gz", hash = "sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf"},
{file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"},
{file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"},
]
[package.dependencies]
certifi = ">=2017.4.17"
charset-normalizer = ">=2,<4"
idna = ">=2.5,<4"
urllib3 = ">=1.21.1,<1.27"
urllib3 = ">=1.21.1,<3"
[package.extras]
socks = ["PySocks (>=1.5.6,!=1.5.7)"]
@ -698,14 +687,14 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
[[package]]
name = "s3transfer"
version = "0.6.0"
version = "0.6.1"
description = "An Amazon S3 Transfer Manager"
category = "main"
optional = false
python-versions = ">= 3.7"
files = [
{file = "s3transfer-0.6.0-py3-none-any.whl", hash = "sha256:06176b74f3a15f61f1b4f25a1fc29a4429040b7647133a463da8fa5bd28d5ecd"},
{file = "s3transfer-0.6.0.tar.gz", hash = "sha256:2ed07d3866f523cc561bf4a00fc5535827981b117dd7876f036b0c1aca42c947"},
{file = "s3transfer-0.6.1-py3-none-any.whl", hash = "sha256:3c0da2d074bf35d6870ef157158641178a4204a6e689e82546083e31e0311346"},
{file = "s3transfer-0.6.1.tar.gz", hash = "sha256:640bb492711f4c0c0905e1f62b6aaeb771881935ad27884852411f8e9cacbca9"},
]
[package.dependencies]
@ -757,14 +746,14 @@ files = [
[[package]]
name = "urllib3"
version = "1.26.14"
version = "1.26.16"
description = "HTTP library with thread-safe connection pooling, file post, and more."
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
files = [
{file = "urllib3-1.26.14-py2.py3-none-any.whl", hash = "sha256:75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1"},
{file = "urllib3-1.26.14.tar.gz", hash = "sha256:076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72"},
{file = "urllib3-1.26.16-py2.py3-none-any.whl", hash = "sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f"},
{file = "urllib3-1.26.16.tar.gz", hash = "sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14"},
]
[package.extras]
@ -775,4 +764,4 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
[metadata]
lock-version = "2.0"
python-versions = "^3.10"
content-hash = "e58721318221aacb55ace3d0df65d71382f20147367dfa1466b59a13bda564b4"
content-hash = "3d42a61f93a1a6b6816e317a78f3385271bd838430200f69154ebc5bebeb6162"

6
pkgs/applications/networking/cluster/nixops/pyproject.toml
View File

@ -17,6 +17,12 @@ nixops-hetznercloud = {git = "https://github.com/lukebfox/nixops-hetznercloud.gi
nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"}
nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"}
# poetry lock would download an excessive number of wheels looking for a compatible version, so
# we pin a feasible range here. This does not represent a real constraint on the version and
# would be ok to remove/update/ignore in future upgrades. Note that a botocore wheel is about 50MB.
boto3 = "^1.26"
botocore = "^1.29"
[build-system]
requires = ["poetry>=0.12"]
build-backend = "poetry.masonry.api"

2
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, darwin, fetchFromGitHub, openssl, sqlite }:
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230523";

12
pkgs/applications/networking/instant-messengers/slack/default.nix
View File

@ -45,14 +45,14 @@ let
pname = "slack";
x86_64-darwin-version = "4.29.149";
x86_64-darwin-sha256 = "sha256-E0YnOPnaWFe17gCpFywxu5uHs1pEktA1tUu4QqvKhYw=";
x86_64-darwin-version = "4.32.122";
x86_64-darwin-sha256 = "sha256-aKvMtuo3cNJsw42RNezmETsLAtl6G2yqYGOGp2Pt32U=3";
x86_64-linux-version = "4.29.149";
x86_64-linux-sha256 = "sha256-ulXIGLp2ql47ZS6IeaMuqye39deDtukOB1dxy5BNCwI=";
x86_64-linux-version = "4.32.122";
x86_64-linux-sha256 = "sha256-ViJHG7s7xqnatNOss5mfa7GqqlHbBrLGHBzTqqo7W/w=";
aarch64-darwin-version = "4.29.149";
aarch64-darwin-sha256 = "sha256-Nn+dFD3H/By+aBPLDxnPneNXuFl+tHdLhxJXeYBMORg=";
aarch64-darwin-version = "4.32.122";
aarch64-darwin-sha256 = "sha256-j3PbH/5cKN5+vUiLvXaxyPYilt6GX6FsGo+1hlJKrls=";
version = {
x86_64-darwin = x86_64-darwin-version;

6
pkgs/applications/version-management/lefthook/default.nix
View File

@ -6,7 +6,7 @@
let
pname = "lefthook";
version = "1.4.0";
version = "1.4.1";
in
buildGoModule rec {
inherit pname version;
@ -15,10 +15,10 @@ buildGoModule rec {
owner = "evilmartians";
repo = "lefthook";
rev = "v${version}";
hash = "sha256-nov/0iPlMsqFWh//0Mc7JVNiLzX1I0qmkey0fkm+2k8=";
hash = "sha256-odcgO7n39sPUdLaAEQqxx2dZrgmvH3fpqmUYB41GZAE=";
};
vendorHash = "sha256-dWJ8B51zk3uhe8j60wP0PJz/4YhAL7OJbk/96eoLdSs=";
vendorHash = "sha256-V94g7Ua8GWUOWM8Z4ENXmZlHXRUMHb8cKuoTztjHtnc=";
nativeBuildInputs = [ installShellFiles ];

41
pkgs/applications/video/manim/default.nix
View File

@ -1,5 +1,6 @@
{ lib
, fetchFromGitHub
, fetchPypi
, cairo
, ffmpeg
@ -42,7 +43,30 @@ let
fundus-calligra microtype wasysym physics dvisvgm jknapltx wasy cm-super
babel-english gnu-freefont mathastext cbfonts-fd;
};
in python3.pkgs.buildPythonApplication rec {
python = python3.override {
packageOverrides = self: super: {
networkx = super.networkx.overridePythonAttrs (oldAttrs: rec {
pname = "networkx";
version = "2.8.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-Iw04gRevhw/OVkejxSQB/PdT6Ucg5uprQZelNVZIiF4=";
};
});
watchdog = super.watchdog.overridePythonAttrs (oldAttrs: rec{
pname = "watchdog";
version = "2.3.1";
src = fetchPypi {
inherit pname version;
hash = "sha256-2fntJu0iqdMxggqEMsNoBwfqi1QSHdzJ3H2fLO6zaQY=";
};
});
};
};
in python.pkgs.buildPythonApplication rec {
pname = "manim";
format = "pyproject";
version = "0.16.0.post0";
@ -55,8 +79,8 @@ in python3.pkgs.buildPythonApplication rec {
sha256 = "sha256-iXiPnI6lTP51P1X3iLp75ArRP66o8WAANBLoStPrz4M=";
};
nativeBuildInputs = [
python3.pkgs.poetry-core
nativeBuildInputs = with python.pkgs; [
poetry-core
];
postPatch = ''
@ -69,7 +93,7 @@ in python3.pkgs.buildPythonApplication rec {
buildInputs = [ cairo ];
propagatedBuildInputs = with python3.pkgs; [
propagatedBuildInputs = with python.pkgs; [
click
click-default-group
cloup
@ -106,14 +130,13 @@ in python3.pkgs.buildPythonApplication rec {
])
];
nativeCheckInputs = [
python3.pkgs.pytest-xdist
python3.pkgs.pytestCheckHook
ffmpeg
(texlive.combine manim-tinytex)
];
] ++ (with python.pkgs; [
pytest-xdist
pytestCheckHook
]);
# about 55 of ~600 tests failing mostly due to demand for display
disabledTests = import ./failing_tests.nix;

32
pkgs/applications/video/manim/failing_tests.nix
View File

@ -1,5 +1,5 @@
# reason for failure: tests try to open display
[
# reason for failure: tests try to open display
"test_background_color"
"test_scene_add_remove"
"test_Circle"
@ -46,31 +46,29 @@
"test_force_window_opengl_render_with_format"
"test_get_frame_with_preview_disabled"
"test_get_frame_with_preview_enabled"
] ++
# reason for failure: tests try to reach network
[
# reason for failure: tests try to reach network
"test_logging_to_file"
"test_plugin_function_like"
"test_plugin_no_all"
"test_plugin_with_all"
] ++
# failing with:
# E AssertionError:
# E Not equal to tolerance rtol=1e-07, atol=1.01
# E Frame no -1. You can use --show_diff to visually show the difference.
# E Mismatched elements: 18525 / 1639680 (1.13%)
# E Max absolute difference: 255
# E Max relative difference: 255.
[
# failing with:
# E AssertionError:
# E Not equal to tolerance rtol=1e-07, atol=1.01
# E Frame no -1. You can use --show_diff to visually show the difference.
# E Mismatched elements: 18525 / 1639680 (1.13%)
# E Max absolute difference: 255
# E Max relative difference: 255.
"test_Text2Color"
"test_PointCloudDot"
"test_Torus"
] ++
# failing with:
# TypeError: __init__() got an unexpected keyword argument 'msg' - maybe you meant pytest.mark.skipif?
[
# failing with:
# TypeError: __init__() got an unexpected keyword argument 'msg' - maybe you meant pytest.mark.skipif?
"test_force_window_opengl_render_with_movies"
# mismatching expecation on the new commandline
"test_manim_new_command"
]

4
pkgs/applications/video/obs-studio/plugins/obs-source-clone.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "obs-source-clone";
version = "0.1.3";
version = "0.1.4";
src = fetchFromGitHub {
owner = "exeldro";
repo = "obs-source-clone";
rev = version;
sha256 = "sha256-cgqv2QdeGz4Aeoy4Dncw03l7NWGsZN1lsrZH7uHxGxw=";
sha256 = "sha256-E2pHJO3cdOXmSlTVGsz4tncm9fMaa8Rhsq9YZDNidjs=";
};
nativeBuildInputs = [ cmake ];

11
pkgs/applications/video/srt-live-server/add-ctime-include.patch Normal file
View File

@ -0,0 +1,11 @@
diff --git a/slscore/common.hpp b/slscore/common.hpp
index 30aeeea..bed0e62 100644
--- a/slscore/common.hpp
+++ b/slscore/common.hpp
@@ -29,6 +29,7 @@
#include <stddef.h>
#include <stdint.h>
#include <string>
+#include <ctime>
#include <vector>
#include <unistd.h>

3
pkgs/applications/video/srt-live-server/default.nix
View File

@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
patches = [
# https://github.com/Edward-Wu/srt-live-server/pull/94
./fix-insecure-printfs.patch
# https://github.com/Edward-Wu/srt-live-server/pull/127 # adds `#include <ctime>`
./add-ctime-include.patch
];
buildInputs = [ srt zlib ];

45
pkgs/applications/window-managers/dk/default.nix Normal file
View File

@ -0,0 +1,45 @@
{ lib
, stdenv
, fetchFromBitbucket
, xcbutil
, xcbutilkeysyms
, xcbutilwm
, xcb-util-cursor
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dk";
version = "1.9";
src = fetchFromBitbucket {
owner = "natemaia";
repo = "dk";
rev = "v${finalAttrs.version}";
hash = "sha256-OodD2z9C4oGTK6ynAXRlEZSzzdzIkVjmq5vLdUcht1U=";
};
buildInputs = [
xcbutil
xcbutilkeysyms
xcbutilwm
xcb-util-cursor
];
postPatch = ''
substituteInPlace Makefile \
--replace "-L/usr/X11R6/lib" "" \
--replace "-I/usr/X11R6/include" ""
'';
makeFlags = [ "PREFIX=$(out)" "SES=$(out)/share/xsessions" ];
enableParallelBuilding = true;
meta = {
homepage = "https://bitbucket.org/natemaia/dk";
description = "A list based tiling window manager in the vein of dwm, bspwm, and xmonad";
license = lib.licenses.x11;
maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
platforms = lib.platforms.linux;
};
})

13
pkgs/build-support/trivial-builders/default.nix
View File

@ -135,9 +135,15 @@ rec {
, allowSubstitutes ? false
, preferLocalBuild ? true
}:
let
matches = builtins.match "/bin/([^/]+)" destination;
in
runCommand name
{ inherit text executable checkPhase meta allowSubstitutes preferLocalBuild;
{ inherit text executable checkPhase allowSubstitutes preferLocalBuild;
passAsFile = [ "text" ];
meta = lib.optionalAttrs (toString executable != "" && matches != null) {
mainProgram = lib.head matches;
} // meta;
}
''
target=$out${lib.escapeShellArg destination}
@ -230,7 +236,7 @@ rec {
*/
writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}"; meta.mainProgram = name;};
writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";};
/*
Similar to writeScript. Writes a Shell script and checks its syntax.
@ -288,7 +294,6 @@ rec {
checkPhase = ''
${stdenv.shellDryRun} "$target"
'';
meta.mainProgram = name;
};
/*
@ -351,8 +356,6 @@ rec {
runHook postCheck
''
else checkPhase;
meta.mainProgram = name;
};
# Create a C binary

90
pkgs/development/compilers/dtc/0001-Depend-on-.a-instead-of-.so-when-building-static.patch
View File

@ -1,90 +0,0 @@
From c1d426bdd477ffeb3dfa03501de089a341b85d0b Mon Sep 17 00:00:00 2001
From: Tero Tervala <tero.tervala@unikie.com>
Date: Wed, 15 Jun 2022 13:44:55 +0300
Subject: [PATCH] Depend on .a instead of .so when building static
Static build needs to be indicated with environment variable:
STATIC_BUILD=1
Checks are skipped on static builds
Signed-off-by: Tero Tervala <tero.tervala@unikie.com>
---
Makefile | 12 +++++++++---
tests/Makefile.tests | 11 ++++++++---
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index ee77115..9f550b4 100644
--- a/Makefile
+++ b/Makefile
@@ -198,6 +198,12 @@ LIBFDT_lib = $(LIBFDT_dir)/$(LIBFDT_LIB)
LIBFDT_include = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_INCLUDES))
LIBFDT_version = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_VERSION))
+ifeq ($(STATIC_BUILD),1)
+ LIBFDT_dep = $(LIBFDT_archive)
+else
+ LIBFDT_dep = $(LIBFDT_lib)
+endif
+
include $(LIBFDT_dir)/Makefile.libfdt
.PHONY: libfdt
@@ -261,11 +267,11 @@ convert-dtsv0: $(CONVERT_OBJS)
fdtdump: $(FDTDUMP_OBJS)
-fdtget: $(FDTGET_OBJS) $(LIBFDT_lib)
+fdtget: $(FDTGET_OBJS) $(LIBFDT_dep)
-fdtput: $(FDTPUT_OBJS) $(LIBFDT_lib)
+fdtput: $(FDTPUT_OBJS) $(LIBFDT_dep)
-fdtoverlay: $(FDTOVERLAY_OBJS) $(LIBFDT_lib)
+fdtoverlay: $(FDTOVERLAY_OBJS) $(LIBFDT_dep)
dist:
git archive --format=tar --prefix=dtc-$(dtc_version)/ HEAD \
diff --git a/tests/Makefile.tests b/tests/Makefile.tests
index 2f78952..f13b16d 100644
--- a/tests/Makefile.tests
+++ b/tests/Makefile.tests
@@ -60,17 +60,17 @@ TESTS_CLEANDIRS = $(TESTS_CLEANDIRS_L:%=$(TESTS_PREFIX)%)
.PHONY: tests
tests: $(TESTS) $(TESTS_TREES)
-$(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_lib)
+$(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_dep)
# Not necessary on all platforms; allow -ldl to be excluded instead of forcing
# other platforms to patch it out.
LIBDL = -ldl
-$(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_lib)
+$(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_dep)
@$(VECHO) LD [libdl] $@
$(LINK.c) -o $@ $^ $(LIBDL)
$(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \
- util.o $(LIBFDT_lib)
+ util.o $(LIBFDT_dep)
$(TESTS_PREFIX)dumptrees: $(TESTS_PREFIX)trees.o
@@ -83,8 +83,13 @@ tests_clean:
rm -f $(TESTS_CLEANFILES)
rm -rf $(TESTS_CLEANDIRS)
+ifeq ($(STATIC_BUILD),1)
+check:
+ @echo Skipping checks for static build
+else
check: tests ${TESTS_BIN} $(TESTS_PYLIBFDT)
cd $(TESTS_PREFIX); ./run_tests.sh
+endif
ifeq ($(NO_VALGRIND),1)
checkm:
--
2.33.3

61
pkgs/development/compilers/dtc/default.nix
View File

@ -2,6 +2,8 @@
, lib
, fetchgit
, fetchpatch
, meson
, ninja
, flex
, bison
, pkg-config
@ -14,35 +16,68 @@
stdenv.mkDerivation rec {
pname = "dtc";
version = "1.6.1";
version = "1.7.0";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
rev = "refs/tags/v${version}";
sha256 = "sha256-gx9LG3U9etWhPxm7Ox7rOu9X5272qGeHqZtOe68zFs4=";
sha256 = "sha256-FMh3VvlY3fUK8fbd0M+aCmlUrmG9YegiOOQ7MOByffc=";
};
patches = [
# fix python 3.10 compatibility
# based on without requiring the setup.py rework
# https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=383e148b70a47ab15f97a19bb999d54f9c3e810f
./python-3.10.patch
# meson: Fix cell overflow tests when running from meson
(fetchpatch {
url = "https://github.com/dgibson/dtc/commit/32174a66efa4ad19fc6a2a6422e4af2ae4f055cb.patch";
sha256 = "sha256-C7OzwY0zq+2CV3SB5unI7Ill2M3deF7FXeQE3B/Kx2s=";
})
# fix dtc static building
./0001-Depend-on-.a-instead-of-.so-when-building-static.patch
# meson.build: bump version to 1.7.0
(fetchpatch {
url = "https://github.com/dgibson/dtc/commit/64a907f08b9bedd89833c1eee674148cff2343c6.patch";
sha256 = "sha256-p2KGS5GW+3uIPgXfuIx6aDC54csM+5FZDkK03t58AL8=";
})
# Fix version in libfdt/meson.build
(fetchpatch {
url = "https://github.com/dgibson/dtc/commit/723545ebe9933b90ea58dc125e4987c6bcb04ade.patch";
sha256 = "sha256-5Oq7q+62ZObj3e7rguN9jhSpYoQkwjSfo/N893229dQ=";
})
# Use #ifdef NO_VALGRIND
(fetchpatch {
url = "https://github.com/dgibson/dtc/commit/41821821101ad8a9f83746b96b163e5bcbdbe804.patch";
sha256 = "sha256-7QEFDtap2DWbUGqtyT/RgJZJFldKB8oSubKiCtLZ0w4=";
})
];
nativeBuildInputs = [ flex bison pkg-config which ]
++ lib.optionals pythonSupport [ python swig ];
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
meson
ninja
flex
bison
pkg-config
which
] ++ lib.optionals pythonSupport [
python
python.pkgs.setuptools-scm
swig
];
buildInputs = [ libyaml ];
postPatch = ''
patchShebangs pylibfdt/
patchShebangs setup.py
'';
makeFlags = [ "PYTHON=python" "STATIC_BUILD=${toString stdenv.hostPlatform.isStatic}" ];
installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ];
# Required for installation of Python library and is innocuous otherwise.
env.DESTDIR = "/";
mesonAutoFeatures = "auto";
mesonFlags = [
(lib.mesonBool "static-build" stdenv.hostPlatform.isStatic)
];
postFixup = lib.optionalString stdenv.isDarwin ''
install_name_tool -id $out/lib/libfdt.dylib $out/lib/libfdt-${version}.dylib

28
pkgs/development/compilers/dtc/python-3.10.patch
View File

@ -1,28 +0,0 @@
diff --git a/pylibfdt/libfdt.i b/pylibfdt/libfdt.i
index 51ee801..075ef70 100644
--- a/pylibfdt/libfdt.i
+++ b/pylibfdt/libfdt.i
@@ -1044,9 +1044,9 @@ typedef uint32_t fdt32_t;
$result = Py_None;
else
%#if PY_VERSION_HEX >= 0x03000000
- $result = Py_BuildValue("y#", $1, *arg4);
+ $result = Py_BuildValue("y#", $1, (Py_ssize_t)*arg4);
%#else
- $result = Py_BuildValue("s#", $1, *arg4);
+ $result = Py_BuildValue("s#", $1, (Py_ssize_t)*arg4);
%#endif
}
diff --git a/pylibfdt/setup.py b/pylibfdt/setup.py
index ef40f15..81e161a 100755
--- a/pylibfdt/setup.py
+++ b/pylibfdt/setup.py
@@ -42,6 +42,7 @@ def get_version():
libfdt_module = Extension(
'_libfdt',
sources=[os.path.join(srcdir, 'libfdt.i')],
+ define_macros=[('PY_SSIZE_T_CLEAN', None)],
include_dirs=[os.path.join(srcdir, '../libfdt')],
libraries=['fdt'],
library_dirs=[os.path.join(top_builddir, 'libfdt')],

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

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "ftxui";
version = "4.1.0";
version = "4.1.1";
src = fetchFromGitHub {
owner = "ArthurSonzogni";
repo = "ftxui";
rev = "v${version}";
sha256 = "sha256-6uPlJXuWcTUnpk+xe6EWDYvDLsfy7hGkEMO/2j3Dz0o=";
sha256 = "sha256-qFgCLV7sgGxlL18sThqpl+vyXL68GXcbYqMG7mXhsB4=";
};
nativeBuildInputs = [

13
pkgs/development/libraries/gl2ps/default.nix
View File

@ -1,11 +1,13 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, cmake
, zlib
, libpng
, libGL
, libGLU
, libpng
, freeglut
, darwin
}:
stdenv.mkDerivation rec {
@ -23,10 +25,13 @@ stdenv.mkDerivation rec {
buildInputs = [
zlib
libpng
] ++ lib.optionals (!stdenv.isDarwin) [
libGL
libGLU
libpng
freeglut
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.OpenGL
];
meta = with lib; {
@ -34,6 +39,6 @@ stdenv.mkDerivation rec {
description = "An OpenGL to PostScript printing library";
platforms = platforms.all;
license = licenses.lgpl2;
maintainers = with maintainers; [raskin twhitehead];
maintainers = with maintainers; [ raskin twhitehead ];
};
}

3
pkgs/development/libraries/gstreamer/rs/default.nix
View File

@ -96,6 +96,7 @@ let
[
"audiofx" # tests have race-y failure, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/337
"csound" # tests have weird failure on x86, does not currently work on arm or darwin
"livesync" # tests have suspicious intermittent failure, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/357
] ++ lib.optionals stdenv.isDarwin [
"reqwest" # tests hang on darwin
"threadshare" # tests cannot bind to localhost on darwin
@ -210,7 +211,7 @@ stdenv.mkDerivation rec {
checkPhase = ''
runHook preCheck
meson test --no-rebuild --verbose --timeout-multiplier 6
meson test --no-rebuild --verbose --timeout-multiplier 12
runHook postCheck
'';

2
pkgs/development/libraries/vtk/generic.nix
View File

@ -68,7 +68,9 @@ in stdenv.mkDerivation rec {
"-DCMAKE_CXX_FLAGS=-fPIC"
"-D${if lib.versionOlder version "9.0" then "VTK_USE_SYSTEM_PNG" else "VTK_MODULE_USE_EXTERNAL_vtkpng"}=ON"
"-D${if lib.versionOlder version "9.0" then "VTK_USE_SYSTEM_TIFF" else "VTK_MODULE_USE_EXTERNAL_vtktiff"}=1"
] ++ lib.optionals (!stdenv.isDarwin) [
"-DOPENGL_INCLUDE_DIR=${libGL}/include"
] ++ [
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_INSTALL_BINDIR=bin"

6
pkgs/development/libraries/wxwidgets/wxGTK31.nix
View File

@ -1,8 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, gnome2
, gst_all_1
, gtk3
, libGL
@ -17,7 +15,7 @@
, compat30 ? true
, unicode ? true
, withEGL ? true
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, withMesa ? !stdenv.isDarwin
, withWebKit ? stdenv.isDarwin
, webkitgtk
, setfile
@ -96,7 +94,7 @@ stdenv.mkDerivation rec {
"--enable-webviewwebkit"
];
SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib ";
SEARCH_LIB = lib.optionalString (!stdenv.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib ";
preConfigure = ''
substituteInPlace configure --replace \

7
pkgs/development/libraries/wxwidgets/wxGTK32.nix
View File

@ -2,9 +2,6 @@
, stdenv
, expat
, fetchFromGitHub
, fetchpatch
, fetchurl
, gnome2
, gst_all_1
, gtk3
, libGL
@ -23,7 +20,7 @@
, compat28 ? false
, compat30 ? true
, unicode ? true
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, withMesa ? !stdenv.isDarwin
, withWebKit ? stdenv.isDarwin
, webkitgtk
, setfile
@ -115,7 +112,7 @@ stdenv.mkDerivation rec {
"--enable-webviewwebkit"
];
SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib";
SEARCH_LIB = lib.optionalString (!stdenv.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib";
preConfigure = ''
cp -r ${catch}/* 3rdparty/catch/

20
pkgs/development/lisp-modules/packages.nix
View File

@ -322,13 +322,27 @@ let
};
buildScript = pkgs.writeText "build-stumpwm.lisp" ''
(load "${super.stumpwm.asdfFasl}/asdf.${super.stumpwm.faslExt}")
(asdf:load-system 'stumpwm/build)
(asdf:load-system 'stumpwm)
;; Prevents package conflict error
(when (uiop:version<= "3.1.5" (asdf:asdf-version))
(uiop:symbol-call '#:asdf '#:register-immutable-system :stumpwm)
(dolist (system-name (uiop:symbol-call '#:asdf
'#:system-depends-on
(asdf:find-system :stumpwm)))
(uiop:symbol-call '#:asdf '#:register-immutable-system system-name)))
;; Prevents "cannot create /homeless-shelter" error
(asdf:disable-output-translations)
(sb-ext:save-lisp-and-die
"stumpwm"
:executable t
:purify t
#+sb-core-compression :compression
#+sb-core-compression t
:toplevel #'stumpwm:main)
:toplevel #'stumpwm:stumpwm)
'';
installPhase = ''
mkdir -p $out/bin
@ -336,6 +350,8 @@ let
'';
});
stumpwm-unwrapped = super.stumpwm;
ltk = super.ltk.overrideLispAttrs (o: {
src = pkgs.fetchzip {
url = "https://github.com/uthar/ltk/archive/f19162e76d6c7c2f51bd289b811d9ba20dd6555e.tar.gz";

4
pkgs/development/node-packages/node-packages.json
View File

@ -7,7 +7,9 @@
, "@commitlint/config-conventional"
, "@emacs-eask/cli"
, "@forge/cli"
, "@maizzle/cli"
, "@medable/mdctl-cli"
, "@mermaid-js/mermaid-cli"
, "@microsoft/rush"
, "@nerdwallet/shepherd"
, "@shopify/cli"
@ -212,6 +214,7 @@
, "lua-fmt"
, "lv_font_conv"
, "madoko"
, "mailwind"
, "markdownlint-cli"
, "markdownlint-cli2"
, "markdown-link-check"
@ -219,7 +222,6 @@
, "mastodon-bot"
, "mathjax"
, "meat"
, "@mermaid-js/mermaid-cli"
, "mocha"
, "multi-file-swagger"
, "musescore-downloader"

13331
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/ocaml-modules/gapi-ocaml/default.nix
View File

@ -5,7 +5,7 @@
buildDunePackage rec {
pname = "gapi-ocaml";
version = "0.4.3";
version = "0.4.4";
duneVersion = "3";
minimalOCamlVersion = "4.08";
@ -14,7 +14,7 @@ buildDunePackage rec {
owner = "astrada";
repo = pname;
rev = "v${version}";
sha256 = "sha256-V0GB9Bd06IdcI5PDFHGVZ0Y/qi7tTs/4ITqPXUOxCLs=";
hash = "sha256-+UNFW5tmIh5dVyTDEOfOmy1j+gV4P28jlnBTdpQNAjE=";
};
propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ];
@ -24,7 +24,7 @@ buildDunePackage rec {
meta = {
description = "OCaml client for google services";
inherit (src.meta) homepage;
homepage = "https://github.com/astrada/gapi-ocaml";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bennofs ];
};

4
pkgs/development/ocaml-modules/ocamlfuse/default.nix
View File

@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "ocamlfuse";
version = "2.7.1_cvs7";
version = "2.7.1_cvs8";
src = fetchFromGitHub {
owner = "astrada";
repo = "ocamlfuse";
rev = "v${version}";
sha256 = "6nmPXZx38hBGlg+gV9nnlRpPfeSAqDj4zBPcjUNvTRo=";
hash = "sha256-Cm9mdYzpKnYoNyAJvjJkiDBP/O4n1JiTkhXQO3w7+hA=";
};
nativeBuildInputs = [ camlidl ];

8
pkgs/development/ocaml-modules/oseq/default.nix
View File

@ -1,21 +1,19 @@
{ lib, fetchFromGitHub, buildDunePackage
, seq
, containers, qcheck
}:
buildDunePackage rec {
version = "0.4";
version = "0.5";
pname = "oseq";
src = fetchFromGitHub {
owner = "c-cube";
repo = pname;
rev = "v${version}";
hash = "sha256-FoCBvvPwa/dUCrgDEd0clEKAO7EcpedjaO4v+yUO874=";
hash = "sha256-JMIcRyciNvLOE1Gpin7CpcDNSmGYFxZWsDN0X6D/NVI=";
};
propagatedBuildInputs = [ seq ];
minimalOCamlVersion = "4.08";
duneVersion = "3";
doCheck = true;

8
pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix
View File

@ -2,17 +2,15 @@
buildDunePackage rec {
pname = "ppx_yojson_conv_lib";
version = "0.15.0";
version = "0.16.0";
useDune2 = true;
minimumOCamlVersion = "4.02.3";
minimalOCamlVersion = "4.02.3";
src = fetchFromGitHub {
owner = "janestreet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Hpg4AKAe7Q5P5UkBpH+5l1nZbIVA2Dr1Q30D4zkrjGo=";
hash = "sha256-TOf6DKyvc+RsSWsLi//LXW+J0sd5uJtF/HFQllcL7No=";
};
propagatedBuildInputs = [ yojson ];

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

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, hatchling
, freezegun
, graphql-core
, opentracing
@ -17,7 +18,7 @@
buildPythonPackage rec {
pname = "ariadne";
version = "0.18.1";
format = "setuptools";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -28,6 +29,10 @@ buildPythonPackage rec {
hash = "sha256-E7uC+l0Yjol8UPLF4CV+PN49tOUJXNUS5yYdF1oyfwU=";
};
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
graphql-core
starlette
@ -55,6 +60,12 @@ buildPythonPackage rec {
"test_attempt_parse_non_json_request_body_raises_bad_request_error"
];
disabledTestPaths = [
# missing graphql-sync-dataloader test dep
"tests/test_dataloaders.py"
"tests/wsgi/test_configuration.py"
];
meta = with lib; {
description = "Python library for implementing GraphQL servers using schema-first approach";
homepage = "https://ariadnegraphql.org";

14
pkgs/development/python-modules/boa-api/default.nix
View File

@ -1,24 +1,34 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "boa-api";
version = "0.1.14";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "boalang";
repo = "api-python";
rev = "v${version}";
rev = "refs/tags/v${version}";
sha256 = "sha256-8tt68NLi5ewSKiHdu3gDawTBPylbDmB4zlUUqa7EQuY=";
};
pythonImportsCheck = [ "boaapi" ];
# upstream has no tests
doCheck = false;
pythonImportsCheck = [
"boaapi"
];
meta = {
homepage = "https://github.com/boalang/api-python";
description = "Python client API for communicating with Boa's (https://boa.cs.iastate.edu/) XML-RPC based services";
changelog = "https://github.com/boalang/api-python/blob/${src.rev}/Changes.txt";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ swflint ];
};

6
pkgs/development/python-modules/bx-py-utils/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
@ -72,11 +73,16 @@ buildPythonPackage rec {
disabledTestPaths = [
"bx_py_utils_tests/tests/test_project_setup.py"
] ++ lib.optionals stdenv.isDarwin [
# processify() doesn't work under darwin
# https://github.com/boxine/bx_py_utils/issues/80
"bx_py_utils_tests/tests/test_processify.py"
];
meta = {
description = "Various Python utility functions";
homepage = "https://github.com/boxine/bx_py_utils";
changelog = "https://github.com/boxine/bx_py_utils/releases/tag/${src.rev}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};

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

@ -1,32 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, numpy
, scipy
, matplotlib
, pytest
, pytestCheckHook
, isPy3k
}:
buildPythonPackage rec {
version = "1.4.5";
buildPythonPackage {
pname = "filterpy";
version = "unstable-2022-08-23";
format = "setuptools";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "4f2a4d39e4ea601b9ab42b2db08b5918a9538c168cff1c6895ae26646f3d73b1";
src = fetchFromGitHub {
owner = "rlabbe";
repo = "filterpy";
rev = "3b51149ebcff0401ff1e10bf08ffca7b6bbc4a33";
hash = "sha256-KuuVu0tqrmQuNKYmDmdy+TU6BnnhDxh4G8n9BGzjGag=";
};
nativeCheckInputs = [ pytest ];
propagatedBuildInputs = [ numpy scipy matplotlib ];
nativeCheckInputs = [
pytestCheckHook
];
# single test fails (even on master branch of repository)
# project does not use CI
checkPhase = ''
pytest --ignore=filterpy/common/tests/test_discretization.py
'';
propagatedBuildInputs = [
numpy
scipy
matplotlib
];
meta = with lib; {
homepage = "https://github.com/rlabbe/filterpy";

3
pkgs/development/python-modules/jupyterhub/default.nix
View File

@ -154,8 +154,7 @@ buildPythonPackage rec {
];
meta = with lib; {
# darwin: E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
broken = lib.versionAtLeast sqlalchemy.version "2.0";
description = "Serves multiple Jupyter notebook instances";
homepage = "https://jupyter.org/";
changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/changelog.md";

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

@ -74,7 +74,7 @@
buildPythonPackage rec {
pname = "langchain";
version = "0.0.180";
version = "0.0.183";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -83,7 +83,7 @@ buildPythonPackage rec {
owner = "hwchase17";
repo = "langchain";
rev = "refs/tags/v${version}";
hash = "sha256-5ZA5CXS9+NCyOXGbjgGk+iNCF/B2Wm4xRpR6t5uJ+yg=";
hash = "sha256-AE3OKrp+F6z7j5rGaqeo+hwN5Wi6ik638WrxCtAJ7Ro=";
};
postPatch = ''

3
pkgs/development/python-modules/libsixel/default.nix
View File

@ -1,5 +1,6 @@
{ buildPythonPackage
, lib
, stdenv
, libsixel
}:
@ -13,7 +14,7 @@ buildPythonPackage rec {
prePatch = ''
substituteInPlace libsixel/__init__.py --replace \
'from ctypes.util import find_library' \
'find_library = lambda _x: "${lib.getLib libsixel}/lib/libsixel.so"'
'find_library = lambda _x: "${lib.getLib libsixel}/lib/libsixel${stdenv.hostPlatform.extensions.sharedLibrary}"'
'';
# no tests

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "neo4j";
version = "5.8.1";
version = "5.9.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "neo4j";
repo = "neo4j-python-driver";
rev = "refs/tags/${version}";
hash = "sha256-kcZtfK4OogHvnZT789LfF7yi9jSWSCXPp0QC2RWAe+I=";
hash = "sha256-HyoIr2ZIOAzFlMrkIDV71JJAFwrxCqExMFXF3U2p9Po=";
};
propagatedBuildInputs = [

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

@ -65,6 +65,8 @@ buildPythonPackage rec {
# Network access
"test_fail_sign_on_upload_fail"
"test_successfully_sign"
# calls git log, but our fetcher removes .git
"test_git_error"
];
pythonImportsCheck = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pydaikin";
version = "2.9.0";
version = "2.9.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "mustang51";
repo = pname;
rev = "v${version}";
hash = "sha256-cJkrBt4HRH2SX4YWo+gK4rd7uyZRzLUvFXJ6L5nxzeM=";
hash = "sha256-HWJ+VHrSwdVN+PNp5NoqmDTVqb6RJy2Sr3zlrDuSBgA=";
};
propagatedBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyezviz";
version = "0.2.0.12";
version = "0.2.0.15";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "baqs";
repo = "pyEzviz";
rev = "refs/tags/${version}";
hash = "sha256-RHwsKNbjKPMp0Ddc3eEsJbLwCAgbFd+5hpzUABYnTso=";
hash = "sha256-za3LVCOsF5Nw/hvhqKWRkXw5o7ozqJnTbd274x113IE=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/pytest-md-report/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pytest-md-report";
version = "0.3.0";
version = "0.3.1";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ra88WXG6+xHSjOcy6tdYjvpKpNlvu6lq+sZckLadAlU=";
hash = "sha256-muQ8lb00tdhAvaLaNupuHh6YqbDEvkaGFbnb4tR2Wes=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pytorch-metric-learning/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pytorch-metric-learning";
version = "2.1.1";
version = "2.1.2";
disabled = isPy27;
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "KevinMusgrave";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-XQ7lHhtcsqANuNVmjNMRjVdvwVo5hIVqTeNrnMF80uE=";
hash = "sha256-B2gDPOQSJGg29xjJbZsWUrSalBnn+S8h+2j8NQ4tfTM=";
};
propagatedBuildInputs = [

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

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "shlib";
version = "1.5";
version = "1.6";
src = fetchFromGitHub {
owner = "KenKundert";
repo = "shlib";
rev = "v${version}";
hash = "sha256-2fwRxa64QXKJuhYwt9Z4BxhTeq1iwbd/IznfxPUjeSM=";
rev = "refs/tags/v${version}";
hash = "sha256-f2jJgpjybutCpYnIT+RihtoA1YlXdhTs+MvV8bViSMQ=";
};
pythonImportsCheck = [ "shlib" ];

36
pkgs/development/python-modules/slixmpp/0001-xep_0030-allow-extra-args-in-get_info_from_domain.patch
View File

@ -1,36 +0,0 @@
From 7b5ac168892dedc5bd6be4244b18dc32d37d00fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Fri, 22 Apr 2022 15:26:05 +0200
Subject: [PATCH] xep_0030: allow extra args in get_info_from_domain
Aftermath of ea2d851a.
http_upload from xep_0363 is now forwarding all its extra input args
to get_info_from_domain. Sadly for us, get_info_from_domain won't
accept any extra args passed that way and will yield a "got an
unexpected keyword argument".
Modifying get_info_from_domain to accept these extra args.
I hit this bug by passing a timeout_callback argument to http_upload.
Adding this scenario to the relevant integration test.
---
itests/test_httpupload.py | 1 +
slixmpp/plugins/xep_0030/disco.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/slixmpp/plugins/xep_0030/disco.py b/slixmpp/plugins/xep_0030/disco.py
index 37d453aa..9f9a45f2 100644
--- a/slixmpp/plugins/xep_0030/disco.py
+++ b/slixmpp/plugins/xep_0030/disco.py
@@ -307,7 +307,7 @@ class XEP_0030(BasePlugin):
return self.api['has_identity'](jid, node, ifrom, data)
async def get_info_from_domain(self, domain=None, timeout=None,
- cached=True, callback=None):
+ cached=True, callback=None, **iqkwargs):
"""Fetch disco#info of specified domain and one disco#items level below
"""
--
2.35.1

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "slixmpp";
version = "1.8.3";
version = "1.8.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-rJtZqq7tZ/VFk4fMpDZYyTQRa1Pokmn2aw6LA+FBGXw=";
hash = "sha256-QG8fS6t+dXPdVZpEECfT3jPRe7o1S88g3caq+6JyKGs=";
};
propagatedBuildInputs = [
@ -39,8 +39,6 @@ buildPythonPackage rec {
src = ./hardcode-gnupg-path.patch;
inherit gnupg;
})
# Upstream MR: https://lab.louiz.org/poezio/slixmpp/-/merge_requests/198
./0001-xep_0030-allow-extra-args-in-get_info_from_domain.patch
];
disabledTestPaths = [
@ -56,6 +54,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library for XMPP";
homepage = "https://slixmpp.readthedocs.io/";
changelog = "https://lab.louiz.org/poezio/slixmpp/-/tags/slix-${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

21
pkgs/development/python-modules/solax/default.nix
View File

@ -6,22 +6,31 @@
, pytest-cov
, pytest-httpserver
, pytestCheckHook
, pythonOlder
, setuptools-scm
, voluptuous
}:
buildPythonPackage rec {
pname = "solax";
version = "0.3.0";
version = "0.3.1";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-lqzFY2Rfmc/9KUuFfq07DZkIIS2cJ1JqZ/8gP3+pu5U=";
hash = "sha256-kseU6JK00GTPyqdWku2ceT5/mChMVVPgEEib3BmjI/g=";
};
nativeBuildInputs = [ setuptools-scm ];
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [ aiohttp voluptuous ];
propagatedBuildInputs = [
aiohttp
voluptuous
];
nativeCheckInputs = [
pytest-asyncio
@ -30,7 +39,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "solax" ];
pythonImportsCheck = [
"solax"
];
meta = with lib; {
description = "Python wrapper for the Solax Inverter API";

28
pkgs/development/python-modules/tftpy/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
}:
buildPythonPackage rec {
pname = "tftpy";
version = "0.8.2";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-4dGmgO/YjroXazURdYRCUwZzkqmw+LgViOP/K557u1s=";
};
nativeBuildInputs = [ setuptools ];
pythonImportsCheck = [ "tftpy" ];
meta = {
description = "Pure Python TFTP library";
homepage = "https://github.com/msoulier/tftpy";
changelog = "https://github.com/msoulier/tftpy/releases/tag/${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ otavio ];
};
}

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

@ -6,26 +6,24 @@
, docopt
, pythonOlder
, urllib3
, pythonRelaxDepsHook
}:
buildPythonPackage rec {
pname = "tubeup";
version = "0.0.35";
version = "28.5.2023";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "006aea68bb8d967a7427c58ee7862e3f2481dae667c2bbcfb1a1f2fd80e665d1";
sha256 = "sha256-wsYap8OspTPW3BBtFF3a2oyRgmu3W/dywbkFuNjvzhg=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "internetarchive==3.0.2" "internetarchive" \
--replace "urllib3==1.26.13" "urllib3" \
--replace "docopt==0.6.2" "docopt"
'';
nativeBuildInputs = [
pythonRelaxDepsHook
];
propagatedBuildInputs = [
internetarchive
@ -34,6 +32,12 @@ buildPythonPackage rec {
yt-dlp
];
pythonRelaxDeps = [
"internetarchive"
"urllib3"
"docopt"
];
pythonImportsCheck = [
"tubeup"
];

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "xknx";
version = "2.9.0";
version = "2.10.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "XKNX";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-1Nt69lIle4vKSXfsTKWry1DXqCBEvBJz2JOOWrUYdX4=";
hash = "sha256-3eSS3V1EgLRf8lB3icG4pNGq0VbXjfgwEQ91mMRKyAE=";
};
nativeBuildInputs = [

4
pkgs/development/tools/analysis/checkstyle/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
version = "10.11.0";
version = "10.12.0";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
sha256 = "sha256-Fw8sG3iAnFXbdzGgbDJEoGGGdd+dSxCrS4KTLunEyjA=";
sha256 = "sha256-pA1K58kBZ3lZVgzg0NFYt+vA1JHOW+yW41t0ARlqvJE=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/development/tools/bearer/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "bearer";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "bearer";
repo = "bearer";
rev = "refs/tags/v${version}";
hash = "sha256-RwLYBz51zfJltsHOqRi7GJLP2ncPiqRqo229wv5jvdc=";
hash = "sha256-5Vd6knHm9r2VicHuvPKE7jzRGcNog8THNwDQmW2MJ5Q=";
};
vendorHash = "sha256-FRB01Tfz87MZp4V0HPeiEgYV8KEPcbzkeUM0uIBh6DU=";

4
pkgs/development/tools/kustomize/kustomize-sops.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kustomize-sops";
version = "4.2.0";
version = "4.2.1";
src = fetchFromGitHub {
owner = "viaduct-ai";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vIFq42wp5Do4+Wc52D+abxRxtk+NrJ+mRxRzIY7ZcQA=";
sha256 = "sha256-Jm4mA91fyXQ8eScvRGDAmCBFVqT2GP57XIBZQo/bApg=";
};
vendorHash = "sha256-tNYPgXFDJuNRlrVE0ywg77goNzfoWHFVzOG9mHqK3q8=";

6
pkgs/development/tools/language-servers/pylyzer/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "pylyzer";
version = "0.0.28";
version = "0.0.29";
src = fetchFromGitHub {
owner = "mtshiba";
repo = "pylyzer";
rev = "v${version}";
hash = "sha256-+i35dkYtvGrjN3KWtCfr6W4TkNmV0T8CF+WcaodPbX4=";
hash = "sha256-9oZAkbA/KCP0fIzsC91xTrEnqiID1knxvY7Y2syfK+o=";
};
cargoHash = "sha256-y/CZDh7TURi6VBko+/3U2HQ41asn1IWJF/1WPD0DyT4=";
cargoHash = "sha256-MRoCPoxv8mhoxty04f5aLVgb0U4WEmkRWZmCOy9zTf0=";
nativeBuildInputs = [
git

6
pkgs/development/tools/mani/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mani";
version = "0.23.0";
version = "0.24.0";
src = fetchFromGitHub {
owner = "alajmo";
repo = "mani";
rev = "v${version}";
sha256 = "sha256-PuoGuweuDcSM1qfjXABSdoqbMLc5a+lYGFr0kZZkgVE=";
sha256 = "sha256-ROFqeRa43qDjO+xwC68gJJqLeLSRiX+L/gf2o8kURaI=";
};
vendorHash = "sha256-9DP6SRcvHtZhkk2XoYesC1mhfq06KsLs0X02AG9vwJ8=";
vendorHash = "sha256-mFan09oJ+BPVJHAxoROj282WJ+4e7TD0ZqeQH1kDabQ=";
nativeBuildInputs = [ installShellFiles makeWrapper ];

6
pkgs/development/tools/misc/indent/default.nix
View File

@ -16,8 +16,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ texinfo ];
pkgsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
"-Wno-implicit-function-declaration";
env.NIX_CFLAGS_COMPILE = toString (
lib.optional stdenv.cc.isClang "-Wno-implicit-function-declaration"
++ lib.optional (stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc) "13") "-Wno-unused-but-set-variable"
);
hardeningDisable = [ "format" ];

4
pkgs/development/tools/okteto/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "okteto";
version = "2.15.3";
version = "2.15.4";
src = fetchFromGitHub {
owner = "okteto";
repo = "okteto";
rev = version;
hash = "sha256-BzyKmM5Yp9zdNonkDZoJBAmy8jSDwt85Wr9/1nbD7V8=";
hash = "sha256-sTlbub315MePIUjXKrdBUTplcOk10yIz0N8RejOf2FQ=";
};
vendorHash = "sha256-dZ6gzW5R5na5qcHFQqQvKfYb0Bu0kVvVMOaRdtTgkhE=";

6
pkgs/development/tools/rust/cargo-expand/default.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.51";
version = "1.0.52";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "sha256-hVJFVmMfdUNkieN7Xog+UjtcQ7nws0ETipJpeYArTM8=";
sha256 = "sha256-xPVS1pynqUiCmM5n+GGgzemOulfM280Zx6GRbvRm0lM=";
};
cargoHash = "sha256-Y1FzWIcHAA0aL4NG2ENVBoNzHcxA40IIA2gdmLKh/o0=";
cargoHash = "sha256-9T5Ro9tX9az23leVaKTz3aMQHN33cxdVTRgvVjLEbeU=";
meta = with lib; {
description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";

4
pkgs/development/web/insomnia/default.nix
View File

@ -16,12 +16,12 @@ let
];
in stdenv.mkDerivation rec {
pname = "insomnia";
version = "2023.2.0";
version = "2023.2.2";
src = fetchurl {
url =
"https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";
sha256 = "sha256-RI7i/yfGfwmube3Utuidw9Y3OqC+5htsyx1Vi1730WQ=";
sha256 = "sha256-XM7OLr5ety95jjlVqNuQp3rD9laoe1uC1HNP66HJe5M=";
};
nativeBuildInputs = [

7
pkgs/games/BeatSaberModManager/default.nix
View File

@ -13,6 +13,8 @@
libICE,
libSM,
fontconfig,
xdg-utils,
}:
buildDotnetModule rec {
@ -47,6 +49,11 @@ buildDotnetModule rec {
fontconfig
];
# Required for OneClick
makeWrapperArgs = [
''--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}"''
];
meta = with lib; {
description = "Yet another mod installer for Beat Saber, heavily inspired by ModAssistant";
homepage = "https://github.com/affederaffe/BeatSaberModManager";

20
pkgs/games/alephone/apotheosis-x/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ alephone, requireFile }:
alephone.makeWrapper rec {
pname = "apotheosis-x";
version = "1.1";
desktopName = "Marathon-Apotheosis-X";
zip = requireFile {
name = "Apotheosis_X_1.1.zip";
url = "https://www.moddb.com/mods/apotheosis-x/downloads";
sha256 = "sha256-4Y/RQQeN4VTpig8ZyxUpVHwzN8W8ciTBCkSzND8SMbs=";
};
sourceRoot = "Apotheosis X 1.1";
meta = {
description = "Total conversion for Marathon Infinity running on the Aleph One engine";
homepage = "https://simplici7y.com/items/apotheosis-x-5";
};
}

19
pkgs/games/alephone/default.nix
View File

@ -1,23 +1,24 @@
{ lib, stdenv, fetchurl, boost, curl, ffmpeg_4, icoutils, libGLU, libmad, libogg
, libpng, libsndfile, libvorbis, lua, pkg-config, SDL2, SDL2_image, SDL2_net
, SDL2_ttf, smpeg, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip
, alephone }:
{ lib, stdenv, fetchurl, alsa-lib, boost, curl, ffmpeg_4, icoutils, libGLU
, libmad, libogg, libpng, libsndfile, libvorbis, lua, miniupnpc, pkg-config
, SDL2, SDL2_image, SDL2_net, SDL2_ttf, speex, zziplib, zlib, makeWrapper
, makeDesktopItem, unzip, alephone }:
let
self = stdenv.mkDerivation rec {
outputs = [ "out" "icons" ];
pname = "alephone";
version = "1.4";
version = "1.6.1";
src = fetchurl {
url = let date = "20210408";
url = let date = "20230119";
in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2";
sha256 = "sha256-tMwATUhUpo8W2oSWxGSZcAHVkj1PWEvUR/rpMZwWCWA=";
sha256 = "sha256-rC9RfWUolsKjKGsJaGj0PaO+J4HNF/gQhd56XapcMCY=";
};
nativeBuildInputs = [ pkg-config icoutils ];
buildInputs = [
alsa-lib
boost
curl
ffmpeg_4
@ -28,17 +29,17 @@ let
libpng
libvorbis
lua
miniupnpc
SDL2
SDL2_image
SDL2_net
SDL2_ttf
smpeg
speex
zziplib
zlib
];
configureFlags = [ "--with-boost=${boost}" ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
makeFlags = [ "AR:=$(AR)" ];
enableParallelBuilding = true;

6
pkgs/games/alephone/durandal/default.nix
View File

@ -3,13 +3,13 @@
alephone.makeWrapper rec {
pname = "durandal";
desktopName = "Marathon-Durandal";
version = "20150620";
version = "20230119";
icon = alephone.icons + "/marathon2.png";
zip = fetchurl {
url =
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon2-${version}-Data.zip";
sha256 = "1gpg0dk3z8irvdkm4nj71v14lqx77109chqr2ly594jqf6j9wwqv";
sha256 = "sha256-Vbfk5wLgvNEZW2BohMY5mPXaRbNlHxJdWLYTsE8CSwI=";
};
meta = {
@ -18,7 +18,7 @@ alephone.makeWrapper rec {
Fresh from your triumph on the starship Marathon, you are seized by the rogue computer Durandal to do his bidding in a distant part of the galaxy. Within the ruins of an ancient civilization, you must seek the remnants of a lost clan and uncover their long-buried secrets. Battle opponents ancient and terrible, with sophisticated weapons and devious strategies, all the while struggling to escape the alien nightmare…
This release of Marathon 2: Durandal includes the classic graphics, and revamped high-definition textures and monsters from the Xbox Live Arcade edition.
'';
'';
homepage = "https://alephone.lhowon.org/games/marathon2.html";
};

4
pkgs/games/alephone/infinity/default.nix
View File

@ -3,13 +3,13 @@
alephone.makeWrapper rec {
pname = "marathon-infinity";
desktopName = "Marathon-Infinity";
version = "20220115";
version = "20230119";
icon = alephone.icons + "/marathon-infinity.png";
zip = fetchurl {
url =
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip";
sha256 = "sha256-00Wp+y+b82uZZ8fNeU3N5UAKlk0Sd1SfAEGL6RpyVf8=";
sha256 = "sha256-0+xokhzWdXM+L4DBjWnfNVXZve4n1X/Aq6rxNGAFb3Q=";
};
meta = {

7
pkgs/games/alephone/marathon/default.nix
View File

@ -3,12 +3,13 @@
alephone.makeWrapper rec {
pname = "marathon";
desktopName = "Marathon";
version = "20210408";
version = "20230119";
icon = alephone.icons + "/marathon.png";
zip = fetchurl {
url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip";
sha256 = "sha256-WM5c0X/BGeDu8d7hME3LiZavkgJll6rc3Beat/2bsdg=";
url =
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip";
sha256 = "sha256-uz/1ZW9epd1HP/pzTNN3d2EEbOzjj0qpdMkrVoxb8Aw=";
};
meta = {

18
pkgs/games/alephone/yuge/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ alephone, fetchurl }:
alephone.makeWrapper rec {
pname = "yuge";
version = "0";
desktopName = "Marathon-Yuge";
zip = fetchurl {
url = "https://lochnits.com/marathon/yuge/files/Mararthon_Yuge.zip";
sha256 = "sha256-dZHInYThB/4igpAXbUadXwPvh2Fl3XGZ4ficg7IEnNc=";
};
meta = {
description =
"30 level Marathon scenario, plus 225 secret levels for many extra hours of gameplay";
homepage = "https://lochnits.com/marathon/yuge/";
};
}

24
pkgs/games/shattered-pixel-dungeon/default.nix
View File

@ -2,7 +2,7 @@
, makeWrapper
, fetchFromGitHub
, nixosTests
, gradle_6
, gradle
, perl
, jre
, libpulseaudio
@ -10,17 +10,19 @@
let
pname = "shattered-pixel-dungeon";
version = "1.1.2";
version = "2.0.2";
src = fetchFromGitHub {
owner = "00-Evan";
repo = "shattered-pixel-dungeon";
# NOTE: always use the commit sha, not the tag. Tags _will_ disappear!
# https://github.com/00-Evan/shattered-pixel-dungeon/issues/596
rev = "5d1a2dce6b554b40f6737ead45d411fd98f4c67d";
sha256 = "sha256-Vu7K0NnqFY298BIQV9AwNEahV0eJl14tAeq+rw6KrtM=";
rev = "v${version}";
sha256 = "sha256-gg8FHLkw964mYejXvK5GClTvTLGK3FyXR8Kkxjl/pRs=";
};
patches = [
./disable-beryx.patch
];
postPatch = ''
# disable gradle plugins with native code and their targets
perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle
@ -32,8 +34,8 @@ let
# fake build to pre-download deps into fixed-output derivation
deps = stdenv.mkDerivation {
pname = "${pname}-deps";
inherit version src postPatch;
nativeBuildInputs = [ gradle_6 perl ];
inherit version src patches postPatch;
nativeBuildInputs = [ gradle perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
# https://github.com/gradle/gradle/issues/4426
@ -47,13 +49,13 @@ let
| sh
'';
outputHashMode = "recursive";
outputHash = "sha256-UI5/ZJbUtEz1Fr+qn6a8kzi9rrP+lVrpBbuDv8TG5y0=";
outputHash = "sha256-ojwvs6j3R31723lfRlKdeyR5+txnetyK3foJTLqy28Q=";
};
in stdenv.mkDerivation rec {
inherit pname version src postPatch;
inherit pname version src patches postPatch;
nativeBuildInputs = [ gradle_6 perl makeWrapper ];
nativeBuildInputs = [ gradle perl makeWrapper ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)

47
pkgs/games/shattered-pixel-dungeon/disable-beryx.patch Normal file
View File

@ -0,0 +1,47 @@
diff --git a/desktop/build.gradle b/desktop/build.gradle
index 97f35f7..afd5116 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -1,6 +1,7 @@
-plugins {
- id 'org.beryx.runtime' version '1.12.7'
-}
+//plugins {
+// id 'org.beryx.runtime' version '1.12.7'
+//}
+apply plugin: "java"
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
sourceCompatibility = targetCompatibility = appJavaCompatibility
@@ -43,11 +44,11 @@ task release(type: Jar) {
attributes 'Implementation-Version': appVersionCode
}
}
-installDist.dependsOn release
-startScripts.dependsOn release
-jpackageImage.dependsOn release
+//installDist.dependsOn release
+//startScripts.dependsOn release
+//jpackageImage.dependsOn release
-runtime {
+/*runtime {
modules = ['java.base',
'java.desktop',
'jdk.unsupported',
@@ -102,7 +103,7 @@ runtime {
}
}
-}
+}*/
dependencies {
implementation project(':core')
@@ -123,4 +124,4 @@ dependencies {
implementation project(':services:updates:githubUpdates')
implementation project(':services:news:shatteredNews')
-}
\ No newline at end of file
+}

7
pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
View File

@ -71,7 +71,12 @@ let
stdenvs = {
stdenv = mkStdenv stdenv;
} // builtins.listToAttrs (map
(v: { name = "clang${v}Stdenv"; value = mkStdenv pkgs."llvmPackages_${v}".stdenv; })
(v: {
name = "llvmPackages_${v}";
value = pkgs."llvmPackages_${v}" // {
stdenv = mkStdenv pkgs."llvmPackages_${v}".stdenv;
};
})
[ "12" "13" "14" "15" "16" ]
);

1
pkgs/os-specific/darwin/openwith/default.nix
View File

@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
license = licenses.unlicense;
maintainers = with maintainers; [ zowoq ];
platforms = [ "aarch64-darwin" "x86_64-darwin" ];
broken = stdenv.isx86_64; # https://hydra.nixos.org/build/219354133/nixlog/3
};
}

4
pkgs/os-specific/darwin/raycast/default.nix
View File

@ -6,7 +6,7 @@
stdenvNoCC.mkDerivation rec {
pname = "raycast";
version = "1.52.0";
version = "1.52.1";
src = fetchurl {
# https://github.com/NixOS/nixpkgs/pull/223495
@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
# to host GitHub Actions to periodically check for updates
# and re-release the `.dmg` file to Internet Archive (https://archive.org/details/raycast)
url = "https://archive.org/download/raycast/raycast-${version}.dmg";
sha256 = "sha256-Xg3kdODBy0PSZ33C/Ye9Srbnuq6HVJbSFgddunAQD1I=";
sha256 = "sha256-BaZZxzbaDJrC/hrBIQbz/w6kZxBn5hFd7UhEjolmKgM=";
};
dontPatch = true;

6
pkgs/os-specific/linux/qc71_laptop/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qc71_laptop";
version = "unstable-2022-06-01";
version = "unstable-2023-03-02";
src = fetchFromGitHub {
owner = "pobrn";
repo = "qc71_laptop";
rev = "28106e0602807d78d1f5fa220ab6148dd6477c1c";
hash = "sha256-3bhw2HbEVuxPfGMt/eE2nCuMLHzYHRY3nRWPzZxKHro=";
rev = "8805dc5639f6659addf153a295ad4bbaa2483fa3";
hash = "sha256-wg7APGArjrl9DEAHTG6BknOBx+UbtNrzziwmLueKPfA=";
};
nativeBuildInputs = kernel.moduleBuildDependencies;

24
pkgs/servers/akkoma/emoji/blobs_gg.nix
View File

@ -1,15 +1,29 @@
{ lib, fetchzip }:
{ lib, stdenvNoCC, fetchurl, unzip }:
let
rev = "e764ba00b9c34524e3ff3ffd19a44fa2a5c296a5";
in fetchzip {
in
stdenvNoCC.mkDerivation {
pname = "blobs.gg";
version = "unstable-2019-07-24";
url = "https://git.pleroma.social/pleroma/emoji-index/-/raw/${rev}/packs/blobs_gg.zip";
hash = "sha256-dnOwW93xTyJKRnYgvPgsqZHNWod4y80aNhBSVKNk6do=";
src = fetchurl {
url = "https://git.pleroma.social/pleroma/emoji-index/-/raw/${rev}/packs/blobs_gg.zip";
hash = "sha256-OhLzoYFnjVs1hKYglUEbDWCjNRGBNZENh5kg+K3lpX8=";
};
stripRoot = false;
sourceRoot = ".";
nativeBuildInputs = [ unzip ];
installPhase = ''
runHook preInstall
mkdir -p $out
cp *.png LICENSE $out
runHook postInstall
'';
meta = with lib; {
description = "Blob emoji from blobs.gg repacked as APNG";

8
pkgs/servers/http/nginx/modules.nix
View File

@ -1004,15 +1004,15 @@ let self = {
name = "vts";
owner = "vozlt";
repo = "nginx-module-vts";
rev = "v0.2.1";
sha256 = "sha256-x4ry5ljPeJQY+7Mp04/xYIGf22d6Nee7CSqHezdK4gQ=";
rev = "v0.2.2";
sha256 = "sha256-ReTmYGVSOwtnYDMkQDMWwxw09vT4iHYfYZvgd8iBotk=";
};
meta = with lib; {
description = "Virtual host traffic status module";
homepage = "https://github.com/vozlt/nginx-module-vts";
license = with licenses; [ bsd2 ];
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
};
@ -1032,7 +1032,7 @@ let self = {
description = "Nginx modules for the Zstandard compression";
homepage = "https://github.com/tokers/zstd-nginx-module";
license = with licenses; [ bsd2 ];
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
};
}; in self // lib.optionalAttrs config.allowAliases {

4
pkgs/servers/http/pomerium/default.nix
View File

@ -14,12 +14,12 @@ let
in
buildGoModule rec {
pname = "pomerium";
version = "0.22.1";
version = "0.22.2";
src = fetchFromGitHub {
owner = "pomerium";
repo = "pomerium";
rev = "v${version}";
sha256 = "sha256-Z3mnBPFF354QQ/oswzvlsHoBmQ4QRYltAnsBKmjQ3Hc=";
sha256 = "sha256-EcAzj2VLbBPu5afKZcf2fGBbw2kTOYGgSemD70msrqw=";
};
vendorSha256 = "sha256-xe8as7OY1+tTSqgpwk2Q1jcBnn89latJpMyx4KG7zg8=";

55
pkgs/servers/mir/default.nix
View File

@ -3,6 +3,7 @@
, fetchFromGitHub
, fetchpatch
, gitUpdater
, testers
, cmake
, pkg-config
, python3
@ -35,26 +36,17 @@
, gtest
, umockdev
, wlcs
, validatePkgConfig
}:
let
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
pythonEnv = python3.withPackages(ps: with ps; [
pillow
] ++ lib.optionals doCheck [
pygobject3
python-dbusmock
]);
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mir";
version = "2.13.0";
src = fetchFromGitHub {
owner = "MirServer";
repo = "mir";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-Ip8p4mjcgmZQJTU4MNvWkTTtSJc+cCL3x1mMDFlZrVY=";
};
@ -109,7 +101,13 @@ stdenv.mkDerivation rec {
libxslt
lttng-ust # lttng-gen-tp
pkg-config
pythonEnv
(python3.withPackages (ps: with ps; [
pillow
] ++ lib.optionals finalAttrs.doCheck [
pygobject3
python-dbusmock
]))
validatePkgConfig
];
buildInputs = [
@ -138,21 +136,23 @@ stdenv.mkDerivation rec {
xorg.libXcursor
xorg.xorgproto
xwayland
] ++ lib.optionals doCheck [
gtest
umockdev
wlcs
];
nativeCheckInputs = [
dbus
];
checkInputs = [
gtest
umockdev
wlcs
];
buildFlags = [ "all" "doc" ];
cmakeFlags = [
"-DMIR_PLATFORM='gbm-kms;x11;eglstream-kms;wayland'"
"-DMIR_ENABLE_TESTS=${if doCheck then "ON" else "OFF"}"
"-DMIR_ENABLE_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}"
# BadBufferTest.test_truncated_shm_file *doesn't* throw an error as the test expected, mark as such
# https://github.com/MirServer/mir/pull/1947#issuecomment-811810872
"-DMIR_SIGBUS_HANDLER_ENVIRONMENT_BROKEN=ON"
@ -163,7 +163,7 @@ stdenv.mkDerivation rec {
"-DMIR_BUILD_PLATFORM_TEST_HARNESS=OFF"
];
inherit doCheck;
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
preCheck = ''
# Needs to be exactly /tmp so some failing tests don't get run, don't know why they fail yet
@ -174,6 +174,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "doc" ];
passthru = {
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
updateScript = gitUpdater {
rev-prefix = "v";
};
@ -190,8 +191,22 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A display server and Wayland compositor developed by Canonical";
homepage = "https://mir-server.io";
changelog = "https://github.com/MirServer/mir/releases/tag/v${finalAttrs.version}";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ onny OPNA2608 ];
platforms = platforms.linux;
pkgConfigModules = [
"miral"
"mircommon"
"mircookie"
"mircore"
"miroil"
"mirplatform"
"mir-renderer-gl-dev"
"mirrenderer"
"mirserver"
"mirtest"
"mirwayland"
];
};
}
})

6
pkgs/servers/nitter/default.nix
View File

@ -7,13 +7,13 @@
nimPackages.buildNimPackage rec {
pname = "nitter";
version = "unstable-2023-04-21";
version = "unstable-2023-05-19";
src = fetchFromGitHub {
owner = "zedeus";
repo = "nitter";
rev = "2254a0728c587ebcec51ff08da0bf145606a629e";
hash = "sha256-d4KYBCcYbfvEtOqa1umcXmYsBRvhLgpHVoCUfY0XdXI=";
rev = "e3b3b38a2d43a83b5fc2239ab41e864ee686fb2f";
hash = "sha256-1BEZcrraPc9qOWLy3Bq8M8G5P4fUmb2IX+T+cStHpmQ=";
};
patches = [

3
pkgs/tools/audio/botamusique/default.nix
View File

@ -60,7 +60,8 @@ stdenv.mkDerivation rec {
# configuration.default.ini, which is in the installation directory
# after all. So we need to counter-patch it here so it can find it absolutely
substituteInPlace mumbleBot.py \
--replace "configuration.default.ini" "$out/share/botamusique/configuration.default.ini"
--replace "configuration.default.ini" "$out/share/botamusique/configuration.default.ini" \
--replace "version = 'git'" "version = '${version}'"
'';
NODE_OPTIONS = "--openssl-legacy-provider";

6
pkgs/tools/filesystems/xfsprogs/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildPackages, fetchurl, autoconf, automake, gettext, libtool, pkg-config
{ lib, stdenv, buildPackages, fetchurl, gettext, pkg-config
, icu, libuuid, readline, inih, liburcu
, nixosTests
}:
@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [
autoconf automake libtool gettext pkg-config
gettext pkg-config
libuuid # codegen tool uses libuuid
liburcu # required by crc32selftest
];
buildInputs = [ readline icu inih liburcu ];
propagatedBuildInputs = [ libuuid ]; # Dev headers include <uuid/uuid.h>
@ -33,7 +34,6 @@ stdenv.mkDerivation rec {
substituteInPlace "$file" \
--replace '@sbindir@' '/run/current-system/sw/bin'
done
make configure
patchShebangs ./install-sh
'';

4
pkgs/tools/graphics/ueberzugpp/default.nix
View File

@ -32,13 +32,13 @@
stdenv.mkDerivation rec {
pname = "ueberzugpp";
version = "2.8.5";
version = "2.8.6";
src = fetchFromGitHub {
owner = "jstkdng";
repo = "ueberzugpp";
rev = "v${version}";
hash = "sha256-WnrKwbh7m84xlKMuixkB8LLw8Pzb8+mZV9cHWiI6cBY=";
hash = "sha256-FNDFNPNiTLAB90dRpVX3XmbzB5pkkJmnhENmsPRldVE=";
};
# error: no member named 'ranges' in namespace 'std'

8
pkgs/tools/graphics/vkbasalt/default.nix
View File

@ -33,6 +33,14 @@ stdenv.mkDerivation (finalAttrs: {
"$out/share/vulkan/implicit_layer.d/vkBasalt32.json"
'';
# We need to give the different layers separate names or else the loader
# might try the 32-bit one first, fail and not attempt to load the 64-bit
# layer under the same name.
postFixup = ''
substituteInPlace "$out/share/vulkan/implicit_layer.d/vkBasalt.json" \
--replace "VK_LAYER_VKBASALT_post_processing" "VK_LAYER_VKBASALT_post_processing_${toString stdenv.hostPlatform.parsed.cpu.bits}"
'';
meta = with lib; {
description = "A Vulkan post processing layer for Linux";
homepage = "https://github.com/DadSchoorse/vkBasalt";

39
pkgs/tools/misc/charasay/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ lib
, rustPlatform
, fetchFromGitHub
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
pname = "charasay";
version = "2.0.0";
src = fetchFromGitHub {
owner = "latipun7";
repo = pname;
rev = "v${version}";
hash = "sha256-99lMXgSHgxKc0GHnRRciMoZ+rQJyMAx+27fj6NkXxds=";
};
cargoHash = "sha256-0la16XinseOXPH2mvdYD7ZquvF2dju4UPBwl5VrTEZA=";
nativeBuildInputs = [ installShellFiles ];
postPatch = ''
rm .cargo/config.toml
'';
postInstall = ''
installShellCompletion --cmd himalaya \
--bash <($out/bin/chara completion --shell bash) \
--fish <($out/bin/chara completion --shell fish) \
--zsh <($out/bin/chara completion --shell zsh)
'';
meta = with lib; {
description = "The future of cowsay - Colorful characters saying something";
homepage = "https://github.com/latipun7/charasay";
license = licenses.mit;
maintainers = with maintainers; [ hmajid2301 ];
};
}

4
pkgs/tools/misc/esphome/default.nix
View File

@ -16,14 +16,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2023.5.4";
version = "2023.5.5";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-TjPlvp4neGWgPTpvG/I0JGVw8qK/wxa3qC65PvZH9OA=";
hash = "sha256-PV+uqJKXqnSMItWVg8iZVOQwxHrDHthezqyvciRq5+M=";
};
postPatch = ''

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