Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-08-14 12:01:43 +00:00 committed by GitHub
commit a732780b6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
51 changed files with 646 additions and 315 deletions

View File

@ -140,6 +140,8 @@
- Emacs macport version 29 was introduced. - Emacs macport version 29 was introduced.
- The `html-proofer` package has been updated from major version 3 to major version 5, which includes [breaking changes](https://github.com/gjtorikian/html-proofer/blob/v5.0.8/UPGRADING.md).
## Other Notable Changes {#sec-release-23.11-notable-changes} ## Other Notable Changes {#sec-release-23.11-notable-changes}
- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration. - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.

View File

@ -6,6 +6,7 @@ let
im = config.i18n.inputMethod; im = config.i18n.inputMethod;
cfg = im.fcitx5; cfg = im.fcitx5;
fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; }; fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; };
settingsFormat = pkgs.formats.ini { };
in in
{ {
options = { options = {
@ -40,6 +41,44 @@ in
''; '';
description = lib.mdDoc "Quick phrase files."; description = lib.mdDoc "Quick phrase files.";
}; };
settings = {
globalOptions = lib.mkOption {
type = lib.types.submodule {
freeformType = settingsFormat.type;
};
default = { };
description = lib.mdDoc ''
The global options in `config` file in ini format.
'';
};
inputMethod = lib.mkOption {
type = lib.types.submodule {
freeformType = settingsFormat.type;
};
default = { };
description = lib.mdDoc ''
The input method configure in `profile` file in ini format.
'';
};
addons = lib.mkOption {
type = with lib.types; (attrsOf anything);
default = { };
description = lib.mdDoc ''
The addon configures in `conf` folder in ini format with global sections.
Each item is written to the corresponding file.
'';
example = literalExpression "{ pinyin.globalSection.EmojiEnabled = \"True\"; }";
};
};
ignoreUserConfig = lib.mkOption {
type = lib.types.bool;
default = false;
description = lib.mdDoc ''
Ignore the user configures. **Warning**: When this is enabled, the
user config files are totally ignored and the user dict can't be saved
and loaded.
'';
};
}; };
}; };
@ -61,12 +100,30 @@ in
(name: value: lib.nameValuePair ("share/fcitx5/data/quickphrase.d/${name}.mb") value) (name: value: lib.nameValuePair ("share/fcitx5/data/quickphrase.d/${name}.mb") value)
cfg.quickPhraseFiles)) cfg.quickPhraseFiles))
]; ];
environment.etc =
let
optionalFile = p: f: v: lib.optionalAttrs (v != { }) {
"xdg/fcitx5/${p}".text = f v;
};
in
lib.attrsets.mergeAttrsList [
(optionalFile "config" (lib.generators.toINI { }) sts.globalOptions)
(optionalFile "profile" (lib.generators.toINI { }) sts.inputMethod)
(lib.concatMapAttrs
(name: value: optionalFile
"conf/${name}.conf"
(lib.generators.toINIWithGlobalSection { })
value)
sts.addons)
];
environment.variables = { environment.variables = {
GTK_IM_MODULE = "fcitx"; GTK_IM_MODULE = "fcitx";
QT_IM_MODULE = "fcitx"; QT_IM_MODULE = "fcitx";
XMODIFIERS = "@im=fcitx"; XMODIFIERS = "@im=fcitx";
QT_PLUGIN_PATH = [ "${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}" ]; QT_PLUGIN_PATH = [ "${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}" ];
} // lib.optionalAttrs cfg.ignoreUserConfig {
SKIP_FCITX_USER_PATH = "1";
}; };
}; };
} }

View File

@ -14,11 +14,12 @@ let
# inherit testsForPackage; # inherit testsForPackage;
}; };
testsForPackage = lib.makeOverridable (args: lib.recurseIntoAttrs { testsForPackage = args: lib.recurseIntoAttrs {
legacyNetwork = testLegacyNetwork args; legacyNetwork = testLegacyNetwork args;
}); passthru.override = args': testsForPackage (args // args');
};
testLegacyNetwork = { nixopsPkg }: pkgs.nixosTest ({ testLegacyNetwork = { nixopsPkg, ... }: pkgs.nixosTest ({
name = "nixops-legacy-network"; name = "nixops-legacy-network";
nodes = { nodes = {
deployer = { config, lib, nodes, pkgs, ... }: { deployer = { config, lib, nodes, pkgs, ... }: {
@ -52,7 +53,7 @@ let
chmod 0400 ~/.ssh/id_ed25519 chmod 0400 ~/.ssh/id_ed25519
''; '';
serverNetworkJSON = pkgs.writeText "server-network.json" serverNetworkJSON = pkgs.writeText "server-network.json"
(builtins.toJSON nodes.server.config.system.build.networkConfig); (builtins.toJSON nodes.server.system.build.networkConfig);
in in
'' ''
import shlex import shlex

View File

@ -1,19 +1,19 @@
# Generated by ./update.sh - do not update manually! # Generated by ./update.sh - do not update manually!
# Last updated: 2023-08-02 # Last updated: 2023-08-14
{ {
compatList = { compatList = {
rev = "95617e06f8f19e3dcd76b694d6ba87408011cd4d"; rev = "fbecbb568ce45c2d118a76ff41f9e817a8b899e6";
hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";
}; };
mainline = { mainline = {
version = "1515"; version = "1522";
hash = "sha256:0w9kg2rq43x9khws2yx6p7qad4xw6vkd04adiw021hjv1scajrlm"; hash = "sha256:15ka5lg9mdfgwngmsjm3dk74c64hxak2zkf36jdgqcjlwxdx81qk";
}; };
ea = { ea = {
version = "3788"; version = "3805";
distHash = "sha256:0w8jm51b2fwfbr5rmqdagjkay4kams2g12qqkqla6n696zn302jx"; distHash = "sha256:1hxq4aifnncilnxmymgbz73m558y8v5f72cpgdfaqr450vlc5sks";
fullHash = "sha256:1fdv7645ijnl58749f4qa5ni7bag4chmm1c8gvji5408grfp0ldq"; fullHash = "sha256:1psivknzv1kycpnl81g0b9d9ck70lxddkn1gaimic37a7kxpg395";
}; };
} }

View File

@ -92,7 +92,7 @@ let
} }
).python; ).python;
pkg = interpreter.pkgs.nixops.withPlugins(ps: [ pkg = (interpreter.pkgs.nixops.withPlugins(ps: [
ps.nixops-aws ps.nixops-aws
ps.nixops-digitalocean ps.nixops-digitalocean
ps.nixops-encrypted-links ps.nixops-encrypted-links
@ -102,11 +102,10 @@ let
ps.nixopsvbox ps.nixopsvbox
ps.nixops-virtd ps.nixops-virtd
ps.nixops-hetznercloud ps.nixops-hetznercloud
]) // rec { ])).overrideAttrs (finalAttrs: prevAttrs: {
# Workaround for https://github.com/NixOS/nixpkgs/issues/119407 passthru = prevAttrs.passthru or {} // {
# TODO after #1199407: Use .overrideAttrs(pkg: old: { passthru.tests = .....; }) tests = prevAttrs.passthru.tests or {} //
tests = nixosTests.nixops.unstable.override { nixopsPkg = pkg; }; nixosTests.nixops.unstable.passthru.override { nixopsPkg = pkg; };
# Not strictly necessary, but probably expected somewhere; part of the workaround: };
passthru.tests = tests; });
};
in pkg in pkg

View File

@ -15,8 +15,8 @@ self: super: {
_: { _: {
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://github.com/NixOS/nixops-aws.git"; url = "https://github.com/NixOS/nixops-aws.git";
rev = "012c94fc128b1cf2497aa5f2bc8fbffd0b52b464"; rev = "8802d1cda9004ec1362815292c2a8ab95e6d64e8";
sha256 = "04lamaszl3llhbpsybi9scd7yrqc51x1h5z38b2w20ik9gv9lgrz"; sha256 = "1rf2dxn4gdm9a91jji4f100y62ap3p3svs6qhxf78319phba6hlb";
}; };
} }
); );

View File

@ -1,10 +1,9 @@
# This file is automatically @generated by Poetry and should not be changed by hand. # This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand.
[[package]] [[package]]
name = "apache-libcloud" name = "apache-libcloud"
version = "3.7.0" version = "3.7.0"
description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see https://libcloud.apache.org" description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see https://libcloud.apache.org"
category = "main"
optional = false optional = false
python-versions = ">=3.6, <4" python-versions = ">=3.6, <4"
files = [ files = [
@ -19,7 +18,6 @@ requests = ">=2.26.0"
name = "boto" name = "boto"
version = "2.49.0" version = "2.49.0"
description = "Amazon Web Services Library" description = "Amazon Web Services Library"
category = "main"
optional = false optional = false
python-versions = "*" python-versions = "*"
files = [ files = [
@ -29,18 +27,17 @@ files = [
[[package]] [[package]]
name = "boto3" name = "boto3"
version = "1.26.141" version = "1.28.22"
description = "The AWS SDK for Python" description = "The AWS SDK for Python"
category = "main"
optional = false optional = false
python-versions = ">= 3.7" python-versions = ">= 3.7"
files = [ files = [
{file = "boto3-1.26.141-py3-none-any.whl", hash = "sha256:a5d6fdcaec863bc7ad2f8133ff9a926d6f06468b83b5fb631cd90bd33b709c45"}, {file = "boto3-1.28.22-py3-none-any.whl", hash = "sha256:0c1c1d19232018ac49fd2c0a94aa0b802f5d222e89448ff50734626bce454b32"},
{file = "boto3-1.26.141.tar.gz", hash = "sha256:152def2fcc9854dcc42383d2b53e2ed2c9ccb5ff6cc0f3ada20f1ab54418ede4"}, {file = "boto3-1.28.22.tar.gz", hash = "sha256:af1ce129f462cdc8dfb1a1c559d7ed725e51344fb0ae4a56d9453196bf416555"},
] ]
[package.dependencies] [package.dependencies]
botocore = ">=1.29.141,<1.30.0" botocore = ">=1.31.22,<1.32.0"
jmespath = ">=0.7.1,<2.0.0" jmespath = ">=0.7.1,<2.0.0"
s3transfer = ">=0.6.0,<0.7.0" s3transfer = ">=0.6.0,<0.7.0"
@ -49,14 +46,13 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
[[package]] [[package]]
name = "botocore" name = "botocore"
version = "1.29.141" version = "1.31.22"
description = "Low-level, data-driven core of boto 3." description = "Low-level, data-driven core of boto 3."
category = "main"
optional = false optional = false
python-versions = ">= 3.7" python-versions = ">= 3.7"
files = [ files = [
{file = "botocore-1.29.141-py3-none-any.whl", hash = "sha256:b01d156c42765f3f437959e01a8c7f3cb0e29b24aa0b8f373498133408b2e3c7"}, {file = "botocore-1.31.22-py3-none-any.whl", hash = "sha256:b91025ca1a16b13ae662bdb46e7c16d2c53619df23bf3583a43791519da14870"},
{file = "botocore-1.29.141.tar.gz", hash = "sha256:e86e1633f98838317b9e1b5c874c4d85339b77f6b7e55c2a4d83913f6166f9ad"}, {file = "botocore-1.31.22.tar.gz", hash = "sha256:d193ab0742ddc4af3a3994af4ec993acf5ac75460f298880fe869765e7bc578d"},
] ]
[package.dependencies] [package.dependencies]
@ -65,25 +61,23 @@ python-dateutil = ">=2.1,<3.0.0"
urllib3 = ">=1.25.4,<1.27" urllib3 = ">=1.25.4,<1.27"
[package.extras] [package.extras]
crt = ["awscrt (==0.16.9)"] crt = ["awscrt (==0.16.26)"]
[[package]] [[package]]
name = "certifi" name = "certifi"
version = "2023.5.7" version = "2023.7.22"
description = "Python package for providing Mozilla's CA Bundle." description = "Python package for providing Mozilla's CA Bundle."
category = "main"
optional = false optional = false
python-versions = ">=3.6" python-versions = ">=3.6"
files = [ files = [
{file = "certifi-2023.5.7-py3-none-any.whl", hash = "sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716"}, {file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"},
{file = "certifi-2023.5.7.tar.gz", hash = "sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7"}, {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"},
] ]
[[package]] [[package]]
name = "cffi" name = "cffi"
version = "1.15.1" version = "1.15.1"
description = "Foreign Function Interface for Python calling C code." description = "Foreign Function Interface for Python calling C code."
category = "main"
optional = false optional = false
python-versions = "*" python-versions = "*"
files = [ files = [
@ -158,94 +152,92 @@ pycparser = "*"
[[package]] [[package]]
name = "charset-normalizer" name = "charset-normalizer"
version = "3.1.0" version = "3.2.0"
description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
category = "main"
optional = false optional = false
python-versions = ">=3.7.0" python-versions = ">=3.7.0"
files = [ files = [
{file = "charset-normalizer-3.1.0.tar.gz", hash = "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5"}, {file = "charset-normalizer-3.2.0.tar.gz", hash = "sha256:3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace"},
{file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b"}, {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b87549028f680ca955556e3bd57013ab47474c3124dc069faa0b6545b6c9710"},
{file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60"}, {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7c70087bfee18a42b4040bb9ec1ca15a08242cf5867c58726530bdf3945672ed"},
{file = "charset_normalizer-3.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1"}, {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a103b3a7069b62f5d4890ae1b8f0597618f628b286b03d4bc9195230b154bfa9"},
{file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0"}, {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94aea8eff76ee6d1cdacb07dd2123a68283cb5569e0250feab1240058f53b623"},
{file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f"}, {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:db901e2ac34c931d73054d9797383d0f8009991e723dab15109740a63e7f902a"},
{file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0"}, {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b0dac0ff919ba34d4df1b6131f59ce95b08b9065233446be7e459f95554c0dc8"},
{file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795"}, {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad"},
{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.2.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09393e1b2a9461950b1c9a45d5fd251dc7c6f228acab64da1c9c0165d9c7765c"},
{file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203"}, {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:baacc6aee0b2ef6f3d308e197b5d7a81c0e70b06beae1f1fcacffdbd124fe0e3"},
{file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1"}, {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:bf420121d4c8dce6b889f0e8e4ec0ca34b7f40186203f06a946fa0276ba54029"},
{file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137"}, {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c04a46716adde8d927adb9457bbe39cf473e1e2c2f5d0a16ceb837e5d841ad4f"},
{file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce"}, {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:aaf63899c94de41fe3cf934601b0f7ccb6b428c6e4eeb80da72c58eab077b19a"},
{file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a"}, {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62e51710986674142526ab9f78663ca2b0726066ae26b78b22e0f5e571238dd"},
{file = "charset_normalizer-3.1.0-cp310-cp310-win32.whl", hash = "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448"}, {file = "charset_normalizer-3.2.0-cp310-cp310-win32.whl", hash = "sha256:04e57ab9fbf9607b77f7d057974694b4f6b142da9ed4a199859d9d4d5c63fe96"},
{file = "charset_normalizer-3.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8"}, {file = "charset_normalizer-3.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:48021783bdf96e3d6de03a6e39a1171ed5bd7e8bb93fc84cc649d11490f87cea"},
{file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19"}, {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:4957669ef390f0e6719db3613ab3a7631e68424604a7b448f079bee145da6e09"},
{file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017"}, {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:46fb8c61d794b78ec7134a715a3e564aafc8f6b5e338417cb19fe9f57a5a9bf2"},
{file = "charset_normalizer-3.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df"}, {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac"},
{file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a"}, {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f25c229a6ba38a35ae6e25ca1264621cc25d4d38dca2942a7fce0b67a4efe918"},
{file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41"}, {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2efb1bd13885392adfda4614c33d3b68dee4921fd0ac1d3988f8cbb7d589e72a"},
{file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1"}, {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f30b48dd7fa1474554b0b0f3fdfdd4c13b5c737a3c6284d3cdc424ec0ffff3a"},
{file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62"}, {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6"},
{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.2.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9bd9b3b31adcb054116447ea22caa61a285d92e94d710aa5ec97992ff5eb7cf3"},
{file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5"}, {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:8c2f5e83493748286002f9369f3e6607c565a6a90425a3a1fef5ae32a36d749d"},
{file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be"}, {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:3170c9399da12c9dc66366e9d14da8bf7147e1e9d9ea566067bbce7bb74bd9c2"},
{file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb"}, {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:7a4826ad2bd6b07ca615c74ab91f32f6c96d08f6fcc3902ceeedaec8cdc3bcd6"},
{file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac"}, {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:3b1613dd5aee995ec6d4c69f00378bbd07614702a315a2cf6c1d21461fe17c23"},
{file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324"}, {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9e608aafdb55eb9f255034709e20d5a83b6d60c054df0802fa9c9883d0a937aa"},
{file = "charset_normalizer-3.1.0-cp311-cp311-win32.whl", hash = "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909"}, {file = "charset_normalizer-3.2.0-cp311-cp311-win32.whl", hash = "sha256:f2a1d0fd4242bd8643ce6f98927cf9c04540af6efa92323e9d3124f57727bfc1"},
{file = "charset_normalizer-3.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755"}, {file = "charset_normalizer-3.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:681eb3d7e02e3c3655d1b16059fbfb605ac464c834a0c629048a30fad2b27489"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373"}, {file = "charset_normalizer-3.2.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c57921cda3a80d0f2b8aec7e25c8aa14479ea92b5b51b6876d975d925a2ea346"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"}, {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41b25eaa7d15909cf3ac4c96088c1f266a9a93ec44f87f1d13d4a0e86c81b982"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9"}, {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f058f6963fd82eb143c692cecdc89e075fa0828db2e5b291070485390b2f1c9c"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f"}, {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a7647ebdfb9682b7bb97e2a5e7cb6ae735b1c25008a70b906aecca294ee96cf4"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28"}, {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eef9df1eefada2c09a5e7a40991b9fc6ac6ef20b1372abd48d2794a316dc0449"},
{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.2.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e03b8895a6990c9ab2cdcd0f2fe44088ca1c65ae592b8f795c3294af00a461c3"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d"}, {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ee4006268ed33370957f55bf2e6f4d263eaf4dc3cfc473d1d90baff6ed36ce4a"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d"}, {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c4983bf937209c57240cff65906b18bb35e64ae872da6a0db937d7b4af845dd7"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6"}, {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:3bb7fda7260735efe66d5107fb7e6af6a7c04c7fce9b2514e04b7a74b06bf5dd"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84"}, {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:72814c01533f51d68702802d74f77ea026b5ec52793c791e2da806a3844a46c3"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c"}, {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:70c610f6cbe4b9fce272c407dd9d07e33e6bf7b4aa1b7ffb6f6ded8e634e3592"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-win32.whl", hash = "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974"}, {file = "charset_normalizer-3.2.0-cp37-cp37m-win32.whl", hash = "sha256:a401b4598e5d3f4a9a811f3daf42ee2291790c7f9d74b18d75d6e21dda98a1a1"},
{file = "charset_normalizer-3.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23"}, {file = "charset_normalizer-3.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:c0b21078a4b56965e2b12f247467b234734491897e99c1d51cee628da9786959"},
{file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531"}, {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:95eb302ff792e12aba9a8b8f8474ab229a83c103d74a750ec0bd1c1eea32e669"},
{file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c"}, {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a100c6d595a7f316f1b6f01d20815d916e75ff98c27a01ae817439ea7726329"},
{file = "charset_normalizer-3.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14"}, {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6339d047dab2780cc6220f46306628e04d9750f02f983ddb37439ca47ced7149"},
{file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb"}, {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4b749b9cc6ee664a3300bb3a273c1ca8068c46be705b6c31cf5d276f8628a94"},
{file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1"}, {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a38856a971c602f98472050165cea2cdc97709240373041b69030be15047691f"},
{file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b"}, {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa"},
{file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0"}, {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89f1b185a01fe560bc8ae5f619e924407efca2191b56ce749ec84982fc59a32a"},
{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.2.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e1c8a2f4c69e08e89632defbfabec2feb8a8d99edc9f89ce33c4b9e36ab63037"},
{file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326"}, {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2f4ac36d8e2b4cc1aa71df3dd84ff8efbe3bfb97ac41242fbcfc053c67434f46"},
{file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11"}, {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a386ebe437176aab38c041de1260cd3ea459c6ce5263594399880bbc398225b2"},
{file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b"}, {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:ccd16eb18a849fd8dcb23e23380e2f0a354e8daa0c984b8a732d9cfaba3a776d"},
{file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd"}, {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:e6a5bf2cba5ae1bb80b154ed68a3cfa2fa00fde979a7f50d6598d3e17d9ac20c"},
{file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8"}, {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:45de3f87179c1823e6d9e32156fb14c1927fcc9aba21433f088fdfb555b77c10"},
{file = "charset_normalizer-3.1.0-cp38-cp38-win32.whl", hash = "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0"}, {file = "charset_normalizer-3.2.0-cp38-cp38-win32.whl", hash = "sha256:1000fba1057b92a65daec275aec30586c3de2401ccdcd41f8a5c1e2c87078706"},
{file = "charset_normalizer-3.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59"}, {file = "charset_normalizer-3.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:8b2c760cfc7042b27ebdb4a43a4453bd829a5742503599144d54a032c5dc7e9e"},
{file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e"}, {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:855eafa5d5a2034b4621c74925d89c5efef61418570e5ef9b37717d9c796419c"},
{file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31"}, {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:203f0c8871d5a7987be20c72442488a0b8cfd0f43b7973771640fc593f56321f"},
{file = "charset_normalizer-3.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f"}, {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e857a2232ba53ae940d3456f7533ce6ca98b81917d47adc3c7fd55dad8fab858"},
{file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e"}, {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e86d77b090dbddbe78867a0275cb4df08ea195e660f1f7f13435a4649e954e5"},
{file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f"}, {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c4fb39a81950ec280984b3a44f5bd12819953dc5fa3a7e6fa7a80db5ee853952"},
{file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854"}, {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2dee8e57f052ef5353cf608e0b4c871aee320dd1b87d351c28764fc0ca55f9f4"},
{file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706"}, {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8700f06d0ce6f128de3ccdbc1acaea1ee264d2caa9ca05daaf492fde7c2a7200"},
{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.2.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1920d4ff15ce893210c1f0c0e9d19bfbecb7983c76b33f046c13a8ffbd570252"},
{file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0"}, {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c1c76a1743432b4b60ab3358c937a3fe1341c828ae6194108a94c69028247f22"},
{file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230"}, {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f7560358a6811e52e9c4d142d497f1a6e10103d3a6881f18d04dbce3729c0e2c"},
{file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7"}, {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:c8063cf17b19661471ecbdb3df1c84f24ad2e389e326ccaf89e3fb2484d8dd7e"},
{file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e"}, {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:cd6dbe0238f7743d0efe563ab46294f54f9bc8f4b9bcf57c3c666cc5bc9d1299"},
{file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f"}, {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1249cbbf3d3b04902ff081ffbb33ce3377fa6e4c7356f759f3cd076cc138d020"},
{file = "charset_normalizer-3.1.0-cp39-cp39-win32.whl", hash = "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1"}, {file = "charset_normalizer-3.2.0-cp39-cp39-win32.whl", hash = "sha256:6c409c0deba34f147f77efaa67b8e4bb83d2f11c8806405f76397ae5b8c0d1c9"},
{file = "charset_normalizer-3.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b"}, {file = "charset_normalizer-3.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:7095f6fbfaa55defb6b733cfeb14efaae7a29f0b59d8cf213be4e7ca0b857b80"},
{file = "charset_normalizer-3.1.0-py3-none-any.whl", hash = "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d"}, {file = "charset_normalizer-3.2.0-py3-none-any.whl", hash = "sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6"},
] ]
[[package]] [[package]]
name = "cryptography" name = "cryptography"
version = "40.0.1" version = "40.0.1"
description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
category = "main"
optional = false optional = false
python-versions = ">=3.6" python-versions = ">=3.6"
files = [ files = [
@ -287,7 +279,6 @@ tox = ["tox"]
name = "hcloud" name = "hcloud"
version = "1.18.2" version = "1.18.2"
description = "Official Hetzner Cloud python library" description = "Official Hetzner Cloud python library"
category = "main"
optional = false optional = false
python-versions = ">3.5" python-versions = ">3.5"
files = [ files = [
@ -306,7 +297,6 @@ docs = ["Sphinx (==1.8.1)", "sphinx-rtd-theme (==0.4.2)"]
name = "hetzner" name = "hetzner"
version = "0.8.3" version = "0.8.3"
description = "High level access to the Hetzner robot" description = "High level access to the Hetzner robot"
category = "main"
optional = false optional = false
python-versions = "*" python-versions = "*"
files = [ files = [
@ -317,7 +307,6 @@ files = [
name = "idna" name = "idna"
version = "3.4" version = "3.4"
description = "Internationalized Domain Names in Applications (IDNA)" description = "Internationalized Domain Names in Applications (IDNA)"
category = "main"
optional = false optional = false
python-versions = ">=3.5" python-versions = ">=3.5"
files = [ files = [
@ -329,7 +318,6 @@ files = [
name = "jmespath" name = "jmespath"
version = "1.0.1" version = "1.0.1"
description = "JSON Matching Expressions" description = "JSON Matching Expressions"
category = "main"
optional = false optional = false
python-versions = ">=3.7" python-versions = ">=3.7"
files = [ files = [
@ -341,7 +329,6 @@ files = [
name = "jsonpickle" name = "jsonpickle"
version = "3.0.1" version = "3.0.1"
description = "Python library for serializing any arbitrary object graph into JSON" description = "Python library for serializing any arbitrary object graph into JSON"
category = "main"
optional = false optional = false
python-versions = ">=3.7" python-versions = ">=3.7"
files = [ files = [
@ -356,20 +343,18 @@ testing-libs = ["simplejson", "ujson"]
[[package]] [[package]]
name = "libvirt-python" name = "libvirt-python"
version = "9.3.0" version = "9.6.0"
description = "The libvirt virtualization API python binding" description = "The libvirt virtualization API python binding"
category = "main"
optional = false optional = false
python-versions = "*" python-versions = ">=3.6"
files = [ files = [
{file = "libvirt-python-9.3.0.tar.gz", hash = "sha256:9c761d88b4ddcf65b324043944da4f18f82471c74d9371d2372d3b4e0f19861b"}, {file = "libvirt-python-9.6.0.tar.gz", hash = "sha256:53422d8e3110139655c3d9c2ff2602b238f8a39b7bf61a92a620119b45550a99"},
] ]
[[package]] [[package]]
name = "nixops" name = "nixops"
version = "2.0.0" version = "2.0.0"
description = "NixOS cloud provisioning and deployment tool" description = "NixOS cloud provisioning and deployment tool"
category = "main"
optional = false optional = false
python-versions = "^3.10" python-versions = "^3.10"
files = [] files = []
@ -391,7 +376,6 @@ resolved_reference = "fc9b55c55da62f949028143b974f67fdc7f40c8b"
name = "nixops-aws" name = "nixops-aws"
version = "1.0" version = "1.0"
description = "NixOps AWS plugin" description = "NixOps AWS plugin"
category = "main"
optional = false optional = false
python-versions = "^3.7" python-versions = "^3.7"
files = [] files = []
@ -408,13 +392,12 @@ typing-extensions = "^3.7.4"
type = "git" type = "git"
url = "https://github.com/NixOS/nixops-aws.git" url = "https://github.com/NixOS/nixops-aws.git"
reference = "HEAD" reference = "HEAD"
resolved_reference = "012c94fc128b1cf2497aa5f2bc8fbffd0b52b464" resolved_reference = "8802d1cda9004ec1362815292c2a8ab95e6d64e8"
[[package]] [[package]]
name = "nixops-digitalocean" name = "nixops-digitalocean"
version = "2.0" version = "2.0"
description = "NixOps plugin for Digital Ocean" description = "NixOps plugin for Digital Ocean"
category = "main"
optional = false optional = false
python-versions = "^3.7" python-versions = "^3.7"
files = [] files = []
@ -434,7 +417,6 @@ resolved_reference = "e977b7f11e264a6a2bff2dcbc7b94c6a97b92fff"
name = "nixops-encrypted-links" name = "nixops-encrypted-links"
version = "1.0" version = "1.0"
description = "Encrypted links support for NixOps" description = "Encrypted links support for NixOps"
category = "main"
optional = false optional = false
python-versions = "^3.7" python-versions = "^3.7"
files = [] files = []
@ -453,7 +435,6 @@ resolved_reference = "e2f196fce15fcfb00d18c055e1ac53aec33b8fb1"
name = "nixops-gcp" name = "nixops-gcp"
version = "1.0" version = "1.0"
description = "NixOps backend for Google Cloud Platform" description = "NixOps backend for Google Cloud Platform"
category = "main"
optional = false optional = false
python-versions = "^3.10" python-versions = "^3.10"
files = [] files = []
@ -475,7 +456,6 @@ resolved_reference = "d13cb794aef763338f544010ceb1816fe31d7f42"
name = "nixops-hercules-ci" name = "nixops-hercules-ci"
version = "0.1.0" version = "0.1.0"
description = "" description = ""
category = "main"
optional = false optional = false
python-versions = "^3.8" python-versions = "^3.8"
files = [] files = []
@ -494,7 +474,6 @@ resolved_reference = "e601d5baffd003fd5f22deeaea0cb96444b054dc"
name = "nixops-hetzner" name = "nixops-hetzner"
version = "1.0" version = "1.0"
description = "NixOS deployment tool, but for hetzner" description = "NixOS deployment tool, but for hetzner"
category = "main"
optional = false optional = false
python-versions = "^3.7" python-versions = "^3.7"
files = [] files = []
@ -516,7 +495,6 @@ resolved_reference = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35"
name = "nixops-hetznercloud" name = "nixops-hetznercloud"
version = "0.1.3" version = "0.1.3"
description = "NixOps Hetzner Cloud plugin" description = "NixOps Hetzner Cloud plugin"
category = "main"
optional = false optional = false
python-versions = "^3.10" python-versions = "^3.10"
files = [] files = []
@ -537,7 +515,6 @@ resolved_reference = "e14f340f7ffe9e2aa7ffbaac0b8a2e3b4cc116b3"
name = "nixops-virtd" name = "nixops-virtd"
version = "1.0" version = "1.0"
description = "NixOps plugin for virtd" description = "NixOps plugin for virtd"
category = "main"
optional = false optional = false
python-versions = "^3.10" python-versions = "^3.10"
files = [] files = []
@ -557,7 +534,6 @@ resolved_reference = "be1ea32e02d8abb3dbe1b09b7c5a7419a7412991"
name = "nixopsvbox" name = "nixopsvbox"
version = "1.7" version = "1.7"
description = "NixOps backend for VirtualBox" description = "NixOps backend for VirtualBox"
category = "main"
optional = false optional = false
python-versions = "^3.7" python-versions = "^3.7"
files = [] files = []
@ -576,7 +552,6 @@ resolved_reference = "2729672865ebe2aa973c062a3fbddda8c1359da0"
name = "nixos-modules-contrib" name = "nixos-modules-contrib"
version = "0.1.0" version = "0.1.0"
description = "NixOS modules that don't quite belong in NixOS." description = "NixOS modules that don't quite belong in NixOS."
category = "main"
optional = false optional = false
python-versions = "^3.7" python-versions = "^3.7"
files = [] files = []
@ -593,14 +568,13 @@ resolved_reference = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8"
[[package]] [[package]]
name = "pluggy" name = "pluggy"
version = "1.0.0" version = "1.2.0"
description = "plugin and hook calling mechanisms for python" description = "plugin and hook calling mechanisms for python"
category = "main"
optional = false optional = false
python-versions = ">=3.6" python-versions = ">=3.7"
files = [ files = [
{file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"},
{file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"},
] ]
[package.extras] [package.extras]
@ -611,7 +585,6 @@ testing = ["pytest", "pytest-benchmark"]
name = "prettytable" name = "prettytable"
version = "0.7.2" version = "0.7.2"
description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format." description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format."
category = "main"
optional = false optional = false
python-versions = "*" python-versions = "*"
files = [ files = [
@ -624,7 +597,6 @@ files = [
name = "pycparser" name = "pycparser"
version = "2.21" version = "2.21"
description = "C parser in Python" description = "C parser in Python"
category = "main"
optional = false optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
files = [ files = [
@ -636,7 +608,6 @@ files = [
name = "python-dateutil" name = "python-dateutil"
version = "2.8.2" version = "2.8.2"
description = "Extensions to the standard Python datetime module" description = "Extensions to the standard Python datetime module"
category = "main"
optional = false optional = false
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
files = [ files = [
@ -651,7 +622,6 @@ six = ">=1.5"
name = "python-digitalocean" name = "python-digitalocean"
version = "1.17.0" version = "1.17.0"
description = "digitalocean.com API to manage Droplets and Images" description = "digitalocean.com API to manage Droplets and Images"
category = "main"
optional = false optional = false
python-versions = "*" python-versions = "*"
files = [ files = [
@ -667,7 +637,6 @@ requests = "*"
name = "requests" name = "requests"
version = "2.31.0" version = "2.31.0"
description = "Python HTTP for Humans." description = "Python HTTP for Humans."
category = "main"
optional = false optional = false
python-versions = ">=3.7" python-versions = ">=3.7"
files = [ files = [
@ -689,7 +658,6 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
name = "s3transfer" name = "s3transfer"
version = "0.6.1" version = "0.6.1"
description = "An Amazon S3 Transfer Manager" description = "An Amazon S3 Transfer Manager"
category = "main"
optional = false optional = false
python-versions = ">= 3.7" python-versions = ">= 3.7"
files = [ files = [
@ -707,7 +675,6 @@ crt = ["botocore[crt] (>=1.20.29,<2.0a.0)"]
name = "six" name = "six"
version = "1.16.0" version = "1.16.0"
description = "Python 2 and 3 compatibility utilities" description = "Python 2 and 3 compatibility utilities"
category = "main"
optional = false optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
files = [ files = [
@ -719,7 +686,6 @@ files = [
name = "typeguard" name = "typeguard"
version = "2.13.3" version = "2.13.3"
description = "Run-time type checker for Python" description = "Run-time type checker for Python"
category = "main"
optional = false optional = false
python-versions = ">=3.5.3" python-versions = ">=3.5.3"
files = [ files = [
@ -735,7 +701,6 @@ test = ["mypy", "pytest", "typing-extensions"]
name = "typing-extensions" name = "typing-extensions"
version = "3.10.0.2" version = "3.10.0.2"
description = "Backported and Experimental Type Hints for Python 3.5+" description = "Backported and Experimental Type Hints for Python 3.5+"
category = "main"
optional = false optional = false
python-versions = "*" python-versions = "*"
files = [ files = [
@ -748,7 +713,6 @@ files = [
name = "urllib3" name = "urllib3"
version = "1.26.16" version = "1.26.16"
description = "HTTP library with thread-safe connection pooling, file post, and more." description = "HTTP library with thread-safe connection pooling, file post, and more."
category = "main"
optional = false optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
files = [ files = [

View File

@ -25,14 +25,14 @@ let
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "16.1.13"; version = "16.1.33";
pname = "jmol"; pname = "jmol";
src = let src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl { in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
hash = "sha256-BiCv1meuefFgzuhm/u5XmQNzM94xBOQsGtJceEBnu6s="; hash = "sha256-vOFGmLsCQNYRBMuDRVrdjWE6/MxY7IucB1OpV4cdZrs=";
}; };
patchPhase = '' patchPhase = ''

View File

@ -1,18 +1,18 @@
{ lib, mkDerivation, fetchFromGitHub, pkg-config, cmake { stdenv, lib, fetchFromGitHub, pkg-config, cmake, wrapQtAppsHook
, libzip, boost, fftw, qtbase, libusb1 , libzip, boost, fftw, qtbase, qtwayland, qtsvg, libusb1
, python3, fetchpatch , python3, fetchpatch
}: }:
mkDerivation rec { stdenv.mkDerivation rec {
pname = "dsview"; pname = "dsview";
version = "1.2.2"; version = "1.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DreamSourceLab"; owner = "DreamSourceLab";
repo = "DSView"; repo = "DSView";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-QaCVu/n9PDbAiJgPDVN6SJMILeUO/KRkKcHYAstm86Q="; sha256 = "sha256-wnBVhZ3Ky9PXs48OVvSbD1aAUSEqAwaNLg7Ntim7yFM=";
}; };
patches = [ patches = [
@ -20,10 +20,10 @@ mkDerivation rec {
./install.patch ./install.patch
]; ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [ buildInputs = [
boost fftw qtbase libusb1 libzip boost fftw qtbase qtwayland qtsvg libusb1 libzip
python3 python3
]; ];

View File

@ -46,8 +46,8 @@ mkOpenModelicaDerivation ({
preFixup = '' preFixup = ''
for entry in $(find $out -name libipopt.so); do for entry in $(find $out -name libipopt.so); do
patchelf --shrink-rpath --allowed-rpath-prefixes /nix/store $entry patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$entry"
patchelf --set-rpath '$ORIGIN':"$(patchelf --print-rpath $entry)" $entry patchelf --set-rpath '$ORIGIN':"$(patchelf --print-rpath $entry)" "$entry"
done done
''; '';

View File

@ -20,7 +20,10 @@ let
installPhase = '' installPhase = ''
find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
install -m444 -Dt $out/share/doc/${pname}-${version} ${lib.concatStringsSep " " docsToInstall} for i in ${toString docsToInstall}; do
# not all docs exist in all versions
install -m444 -Dt $out/share/doc/${pname}-${version} $i || true
done
''; '';
meta = with lib; { meta = with lib; {

View File

@ -0,0 +1,38 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "cel-go";
version = "0.17.1";
src = fetchFromGitHub {
owner = "google";
repo = "cel-go";
rev = "v${version}";
hash = "sha256-qk7jopOr/woWCi5j509K4bdlIybuZZ+UFTmTHEEw9/Y=";
};
sourceRoot = "${src.name}/repl";
vendorHash = "sha256-OypSL91/2FVCF3ADNSJH33JxH0+3HxIziwmXHb/vZM4=";
subPackages = [
"main"
];
ldflags = [ "-s" "-w" ];
postInstall = ''
mv $out/bin/{main,cel-go}
'';
meta = with lib; {
description = "Fast, portable, non-Turing complete expression evaluation with gradual typing";
homepage = "https://github.com/google/cel-go";
changelog = "https://github.com/google/cel-go/releases/tag/${src.rev}";
license = licenses.asl20;
maintainers = with maintainers; [ figsoda ];
};
}

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "clojure"; pname = "clojure";
version = "1.11.1.1347"; version = "1.11.1.1356";
src = fetchurl { src = fetchurl {
# https://clojure.org/releases/tools # https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${finalAttrs.version}.tar.gz"; url = "https://download.clojure.org/install/clojure-tools-${finalAttrs.version}.tar.gz";
hash = "sha256-1ebAPk64tJt/Cpt3pKfMTN50YABKPflqG055f4Quv+M="; hash = "sha256-Gshzo0ill96R+15DuFEdHo2bx3ePuRIuYXJfNF9jkIM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
'' + lib.optionalString buildSamples '' '' + lib.optionalString buildSamples ''
mkdir -p $sample/bin mkdir -p $sample/bin
mv clients/staging/hipfft_* $sample/bin mv clients/staging/hipfft_* $sample/bin
patchelf $sample/bin/hipfft_* --shrink-rpath --allowed-rpath-prefixes /nix/store patchelf $sample/bin/hipfft_* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE"
'' + lib.optionalString (buildTests || buildBenchmarks) '' '' + lib.optionalString (buildTests || buildBenchmarks) ''
rmdir $out/bin rmdir $out/bin
''; '';

View File

@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
'' + lib.optionalString buildSamples '' '' + lib.optionalString buildSamples ''
mkdir -p $sample/bin mkdir -p $sample/bin
mv clients/staging/example-* $sample/bin mv clients/staging/example-* $sample/bin
patchelf $sample/bin/example-* --shrink-rpath --allowed-rpath-prefixes /nix/store patchelf $sample/bin/example-* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE"
'' + lib.optionalString (buildTests || buildBenchmarks) '' '' + lib.optionalString (buildTests || buildBenchmarks) ''
rmdir $out/bin rmdir $out/bin
''; '';

View File

@ -140,7 +140,7 @@ in stdenv.mkDerivation (finalAttrs: {
'' + lib.optionalString buildTests '' '' + lib.optionalString buildTests ''
mkdir -p $test/bin mkdir -p $test/bin
mv bin/test_* $test/bin mv bin/test_* $test/bin
patchelf $test/bin/test_* --shrink-rpath --allowed-rpath-prefixes /nix/store patchelf $test/bin/test_* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE"
''; '';
passthru.updateScript = rocmUpdateScript { passthru.updateScript = rocmUpdateScript {

View File

@ -47,12 +47,13 @@ qtModule {
doCheck = false; # fails 13 out of 13 tests (ctest) doCheck = false; # fails 13 out of 13 tests (ctest)
# Hack to avoid TMPDIR in RPATHs. # remove forbidden references to $TMPDIR
preFixup = '' preFixup = lib.optionalString stdenv.isLinux ''
rm -rf "$(pwd)" patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/libexec/*
mkdir "$(pwd)"
''; '';
enableParallelBuilding = true;
meta = { meta = {
maintainers = with lib.maintainers; [ abbradar periklis ]; maintainers = with lib.maintainers; [ abbradar periklis ];
knownVulnerabilities = [ knownVulnerabilities = [

View File

@ -77,7 +77,7 @@ stdenv.mkDerivation {
mkdir "$out/bin" mkdir "$out/bin"
cp build/vm/*.so* "$out/lib/" cp build/vm/*.so* "$out/lib/"
cp build/vm/pharo "$out/bin/pharo" cp build/vm/pharo "$out/bin/pharo"
patchelf --allowed-rpath-prefixes /nix/store --shrink-rpath "$out/bin/pharo" patchelf --allowed-rpath-prefixes "$NIX_STORE" --shrink-rpath "$out/bin/pharo"
wrapProgram "$out/bin/pharo" --set LD_LIBRARY_PATH "${library_path}" wrapProgram "$out/bin/pharo" --set LD_LIBRARY_PATH "${library_path}"
runHook postInstall runHook postInstall

View File

@ -10,12 +10,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dvc-azure"; pname = "dvc-azure";
version = "2.22.0"; version = "2.22.1";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-aGPh77HLeUcddGtmFcLd9bc+WaYAFUprtpFkw3h5iSc="; hash = "sha256-v3VRCN1OoST5RlfUOP9Dpfmf3o9C/ckusmh91Ya2Cik=";
}; };
# Prevent circular dependency # Prevent circular dependency

View File

@ -10,12 +10,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dvc-ssh"; pname = "dvc-ssh";
version = "2.22.1"; version = "2.22.2";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-WHFfq0Cw17AWgmUlkZUOO6t6XcPYjLHUz4s0wcVYklc="; hash = "sha256-eJwNCZvdBqYKEbX4On3pGm2bzCvH9G7rdsgeN7XPJB0=";
}; };
# Prevent circular dependency # Prevent circular dependency

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dvc-studio-client"; pname = "dvc-studio-client";
version = "0.12.0"; version = "0.13.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "iterative"; owner = "iterative";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-Y2SMcz7aaYH1k4ieLwEijBkf6AMbCltsXBocafIVMcM="; hash = "sha256-m4UJRRwY+aJdPIMHPIWe3En7FCADeT1qCZnu3BJeYXc=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -55,14 +55,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dvc"; pname = "dvc";
version = "3.14.0"; version = "3.15.2";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "iterative"; owner = "iterative";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-UVDzcbVRG94vM7s78uscsJ7Oq8HvHowAN2Hj+thbrvU="; hash = "sha256-dp4WovmiSHgjk48aq4BjEed80XFHgd61BkRQbYgxp0A=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "flux-led"; pname = "flux-led";
version = "1.0.1"; version = "1.0.2";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Danielhiversen"; owner = "Danielhiversen";
repo = "flux_led"; repo = "flux_led";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-+eklvdmlWrwvdI6IwNyAIEI0kDlzIYh7bzNY94dzA+E="; hash = "sha256-DfC92gqPP9Lky4gX2v8/AbZgM7uRCKjRQC2nS/sDHsY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -14,29 +14,43 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "oauthenticator"; pname = "oauthenticator";
version = "15.1.0"; version = "16.0.4";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-0dmHPJtm4a+XMpGWi5Vz0lN4vYxkfzDXO42PsnsaC4U="; hash = "sha256-6dZt+GIbmOgC+R5KlFc5W2jpPaxCn+GkNkVhR/4Tke8=";
}; };
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=oauthenticator" ""
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
jupyterhub jupyterhub
]; ];
passthru.optional-dependencies = {
azuread = [
pyjwt
];
googlegroups = [
google-api-python-client
google-auth-oauthlib
];
mediawiki = [
mwoauth
];
};
nativeCheckInputs = [ nativeCheckInputs = [
google-api-python-client
google-auth-oauthlib
mwoauth
pyjwt
pytest-asyncio pytest-asyncio
pytestCheckHook pytestCheckHook
requests-mock requests-mock
]; ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
disabledTests = [ disabledTests = [
# Tests are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 # Tests are outdated, https://github.com/jupyterhub/oauthenticator/issues/432
@ -49,8 +63,9 @@ buildPythonPackage rec {
]; ];
meta = with lib; { meta = with lib; {
description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more."; description = "Authenticate JupyterHub users with common OAuth providers";
homepage = "https://github.com/jupyterhub/oauthenticator"; homepage = "https://github.com/jupyterhub/oauthenticator";
changelog = "https://github.com/jupyterhub/oauthenticator/blob/${version}/docs/source/reference/changelog.md";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ ixxie ]; maintainers = with maintainers; [ ixxie ];
}; };

View File

@ -6,14 +6,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "policyuniverse"; pname = "policyuniverse";
version = "1.5.1.20230725"; version = "1.5.1.20230813";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-N0yQSVgSYx2D5wpixBMrxPq8ddKcGr/vfnsGn+Smrac="; hash = "sha256-XKb8mAS59H9IeNyWiltYf8QPDyzZni5JALWA4E58i2s=";
}; };
# Tests are not shipped and there are no GitHub tags # Tests are not shipped and there are no GitHub tags

View File

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "publicsuffixlist"; pname = "publicsuffixlist";
version = "0.10.0.20230811"; version = "0.10.0.20230814";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-C6IKX6e5/lxtx4fZeMa+IS5TyWKhpBeipZSMnSikxUk="; hash = "sha256-GG6ilUUauVT2u/BuS4agzJVQdydEuGwpxJVznWDb46Q=";
}; };
passthru.optional-dependencies = { passthru.optional-dependencies = {

View File

@ -2,33 +2,55 @@
, boto3 , boto3
, botocore , botocore
, buildPythonPackage , buildPythonPackage
, fastparquet
, fetchPypi , fetchPypi
, fsspec , fsspec
, pandas , pandas
, poetry-core
, pyarrow
, pythonOlder , pythonOlder
, sqlalchemy
, tenacity , tenacity
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyathena"; pname = "pyathena";
version = "2.23.0"; version = "3.0.6";
format = "setuptools"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-6T2qr0fcHzgDPZvc3StZwIH2ZRvTOJFXDLPc3iFmwCQ="; hash = "sha256-7m6hdRNIlCCa8sa+GFm3vkNx93QfqnpY+fl5Bf9qc6Q=";
}; };
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [ propagatedBuildInputs = [
boto3 boto3
botocore botocore
fsspec fsspec
pandas
tenacity tenacity
]; ];
passthru.optional-dependencies = {
pandas = [
pandas
];
sqlalchemy = [
sqlalchemy
];
arrow = [
pyarrow
];
fastparquet = [
fastparquet
];
};
# Nearly all tests depend on a working AWS Athena instance, # Nearly all tests depend on a working AWS Athena instance,
# therefore deactivating them. # therefore deactivating them.
# https://github.com/laughingman7743/PyAthena/#testing # https://github.com/laughingman7743/PyAthena/#testing
@ -41,6 +63,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Python DB API 2.0 (PEP 249) client for Amazon Athena"; description = "Python DB API 2.0 (PEP 249) client for Amazon Athena";
homepage = "https://github.com/laughingman7743/PyAthena/"; homepage = "https://github.com/laughingman7743/PyAthena/";
changelog = "https://github.com/laughingman7743/PyAthena/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ turion ]; maintainers = with maintainers; [ turion ];
}; };

View File

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyfritzhome"; pname = "pyfritzhome";
version = "0.6.8"; version = "0.6.9";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "hthiery"; owner = "hthiery";
repo = "python-fritzhome"; repo = "python-fritzhome";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-MIWRBwqVuS1iEuWxsE1yuGS2zHYVgnH2G4JJk7Yct6s="; hash = "sha256-BhJkUbTAzMkzWINVoBDG2Vnf4Fd+kX1oBkXWD7UNbTw=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pygithub"; pname = "pygithub";
version = "1.59.0"; version = "1.59.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "PyGithub"; owner = "PyGithub";
repo = "PyGithub"; repo = "PyGithub";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-bfXf1lwTpoyf6Pn4J0KR99xUh28VPszlbcYSbqKfyFQ="; hash = "sha256-tzM2+nLBHTbKlQ7HLmNRq4Kn62vmz1MaGyZsnaJSrgQ=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pylibftdi"; pname = "pylibftdi";
version = "0.20.0"; version = "0.21.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "f4a87fc4af2c9c7d42badd4192ca9b529f32c9d96fdc8daea7e29c509226df5f"; hash = "sha256-634vUFKFJUf0xsRgIqFmX510U0OWORcereVv3ICliDI=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -24,7 +24,7 @@ buildPythonPackage rec {
]; ];
postPatch = '' postPatch = ''
substituteInPlace pylibftdi/driver.py \ substituteInPlace src/pylibftdi/driver.py \
--replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb-1.0.so')" \ --replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb-1.0.so')" \
--replace "self._load_library('libftdi')" "cdll.LoadLibrary('${libftdi1.out}/lib/libftdi1.so')" --replace "self._load_library('libftdi')" "cdll.LoadLibrary('${libftdi1.out}/lib/libftdi1.so')"
''; '';
@ -34,8 +34,9 @@ buildPythonPackage rec {
]; ];
meta = with lib; { meta = with lib; {
homepage = "https://pylibftdi.readthedocs.io/";
description = "Wrapper to Intra2net's libftdi driver for FTDI's USB devices"; description = "Wrapper to Intra2net's libftdi driver for FTDI's USB devices";
homepage = "https://pylibftdi.readthedocs.io/";
changelog = "https://github.com/codedstructure/pylibftdi/blob/${version}0/CHANGES.txt";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ matthuszagh ]; maintainers = with maintainers; [ matthuszagh ];
}; };

View File

@ -16,7 +16,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-engineio"; pname = "python-engineio";
version = "4.4.1"; version = "4.5.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "miguelgrinberg"; owner = "miguelgrinberg";
repo = "python-engineio"; repo = "python-engineio";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-sE6AlT01Rou427i9w+xwUTMflKxUr0Heqt2l+Y2AMmU="; hash = "sha256-XTr5potc3t9TxHEqMydRsAzslmLnrzsGqDaM8qdKfp8=";
}; };
nativeCheckInputs = [ nativeCheckInputs = [

View File

@ -15,11 +15,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "skl2onnx"; pname = "skl2onnx";
version = "1.14.1"; version = "1.15.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-VLEKfGLOKu5PlHvTqW1+2t75HV2mjeezPkzu0/0H1dw="; hash = "sha256-BbLCZDrQNX7B6mhNE4Q4ot9lffgo5X0Hy3jC52viDjc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -1,33 +1,50 @@
{ lib { lib
, beartype
, buildPythonPackage , buildPythonPackage
, click , click
, fetchPypi , fetchFromGitHub
, pyyaml , license-expression
, rdflib
, ply , ply
, xmltodict
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, pyyaml
, rdflib
, semantic-version
, setuptools
, setuptools-scm
, uritools , uritools
, xmltodict
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "spdx-tools"; pname = "spdx-tools";
version = "0.7.1"; version = "0.8.0";
format = "setuptools"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "spdx";
hash = "sha256-l15tu6iPEFqKyyKr9T/pDw6dVjWiubH+SHeB6WliOxc="; repo = "tools-python";
rev = "refs/tags/v${version}";
hash = "sha256-TMiaxapJuiLqm+x9K49MIzeWOE/CRAI+M1+9OeU0YvM=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [ propagatedBuildInputs = [
beartype
click click
license-expression
ply ply
pyyaml pyyaml
rdflib rdflib
semantic-version
uritools uritools
xmltodict xmltodict
]; ];
@ -37,7 +54,18 @@ buildPythonPackage rec {
]; ];
pythonImportsCheck = [ pythonImportsCheck = [
"spdx" "spdx_tools.spdx"
];
disabledTestPaths = [
# Test depends on the currently not packaged pyshacl module
"tests/spdx3/validation/json_ld/test_shacl_validation.py"
];
disabledTests = [
# Missing files
"test_spdx2_convert_to_spdx3"
"test_json_writer"
]; ];
meta = with lib; { meta = with lib; {
@ -45,6 +73,6 @@ buildPythonPackage rec {
homepage = "https://github.com/spdx/tools-python"; homepage = "https://github.com/spdx/tools-python";
changelog = "https://github.com/spdx/tools-python/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/spdx/tools-python/blob/v${version}/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = [ ]; maintainers = with maintainers; [ fab ];
}; };
} }

View File

@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "todoist-python"; pname = "todoist-python";
version = "8.1.3"; version = "8.1.4";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-AFRKA5VRD6jyiguZYP7WOQOWqHq1GjUzbuez0f1070U="; hash = "sha256-Rkg6eSLiQe8DZaVu2DEnlKLe8RLkRwKmpw+TaYj+lp0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -16,7 +16,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "yfinance"; pname = "yfinance";
version = "0.2.27"; version = "0.2.28";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "ranaroussi"; owner = "ranaroussi";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-hsSu2EnkCb/IUoLsW0HZHI4wtOUSdjRU8MmHGRuiY+g="; hash = "sha256-kTbQnpha4OHu5Xguo6v90uFpcXY1e8JJsJUo4ZbaCfk=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -22,14 +22,14 @@ with py.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "checkov"; pname = "checkov";
version = "2.3.361"; version = "2.3.364";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bridgecrewio"; owner = "bridgecrewio";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-k357VjGB+mKsKsd+l0S2lMh1f5za5Htlm4AWEVisQss="; hash = "sha256-pec8JLFLqhe75G2Tk/3EwGYr9Dg2xgT8MlVS471QH60=";
}; };
patches = [ patches = [

View File

@ -1,5 +1,6 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, python3 , python3
}: }:
@ -8,7 +9,6 @@ python3.pkgs.buildPythonApplication rec {
version = "6.2.1"; version = "6.2.1";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lovesegfault"; owner = "lovesegfault";
repo = pname; repo = pname;
@ -16,6 +16,15 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-rPeGRcyNK45Y7OvtzaIH93IIzexBf/jM1SzYP0phQ1o="; hash = "sha256-rPeGRcyNK45Y7OvtzaIH93IIzexBf/jM1SzYP0phQ1o=";
}; };
patches = [
# https://github.com/lovesegfault/beautysh/pull/247
(fetchpatch {
name = "poetry-to-poetry-core.patch";
url = "https://github.com/lovesegfault/beautysh/commit/5f4fcac083fa68568a50f3c2bcee3ead0f3ca7c5.patch";
hash = "sha256-H/kIJKww5ouWu8rmRkaMOXcsq2daZWDdwxBqbc99x0s=";
})
];
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [
poetry-core poetry-core
]; ];

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "esbuild"; pname = "esbuild";
version = "0.19.1"; version = "0.19.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "evanw"; owner = "evanw";
repo = "esbuild"; repo = "esbuild";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-HoCCgPny6XHz1uUTto6xJ56I6D3HhzLH2rBh9iKI1a8="; hash = "sha256-U/CAuLl+I3wNPXYcXr9r6DdT9fywvOTt25Vyu3OKG84=";
}; };
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

View File

@ -102,7 +102,7 @@ in stdenv.mkDerivation (finalAttrs: {
postInstall = '' postInstall = ''
find $out/bin -executable -type f -exec \ find $out/bin -executable -type f -exec \
patchelf {} --shrink-rpath --allowed-rpath-prefixes /nix/store \; patchelf {} --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" \;
'' + lib.optionalString buildTests '' '' + lib.optionalString buildTests ''
mkdir -p $test mkdir -p $test
mv $out/bin/rdctst_tests $test/bin mv $out/bin/rdctst_tests $test/bin

View File

@ -35,8 +35,10 @@ in stdenv.mkDerivation rec {
buildInputs = [ libelf freeglut libGLU libGL ] buildInputs = [ libelf freeglut libGLU libGL ]
++ lib.optional stdenv.isDarwin GLUT; ++ lib.optional stdenv.isDarwin GLUT;
# Hack to avoid TMPDIR in RPATHs. # remove forbidden references to $TMPDIR
preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; preFixup = lib.optionalString stdenv.isLinux ''
patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/*
'';
doCheck = true; doCheck = true;
checkTarget = "-C tests run_tests"; checkTarget = "-C tests run_tests";

View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
# remove forbidden reference to $TMPDIR # remove forbidden reference to $TMPDIR
preFixup = '' preFixup = ''
patchelf --shrink-rpath --allowed-rpath-prefixes "/nix/store" "$out/sbin/smbios-sys-info-lite" patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out/sbin/smbios-sys-info-lite"
''; '';
meta = with lib; { meta = with lib; {

View File

@ -0,0 +1,43 @@
{ lib
, buildGoModule
, fetchFromGitHub
, makeBinaryWrapper
}:
buildGoModule {
pname = "icebreaker";
version = "unstable-2023-08-13";
src = fetchFromGitHub {
owner = "jonhoo";
repo = "icebreaker";
rev = "71fe0679fcf82ccf458b47585cda09f3ef213155";
hash = "sha256-d8x4Q4ZT0qrKWEIRbYVOUjhnkJWOgY0ct/+cjaSh7SU=";
};
proxyVendor = true;
vendorHash = "sha256-i648w+BOUX5IfEEZ11gJAjX1ZUdoYRzDPz6GDe7i2S8=";
nativeBuildInputs = [
makeBinaryWrapper
];
ldflags = [ "-s" "-w" ];
postInstall = ''
mkdir -p $out/share
cp -r static templates $out/share
wrapProgram $out/bin/icebreaker \
--chdir $out/share \
--set-default GIN_MODE release
'';
meta = with lib; {
description = "Web app that allows students to ask real-time, anonymous questions during class";
homepage = "https://github.com/jonhoo/icebreaker";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "icebreaker";
};
}

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cfdg"; pname = "cfdg";
version = "3.3"; version = "3.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MtnViewJohn"; owner = "MtnViewJohn";
repo = "context-free"; repo = "context-free";
rev = "Version${version}"; rev = "Version${version}";
sha256 = "13m8npccacmgxbs4il45zw53dskjh53ngv2nxahwqw8shjrws4mh"; sha256 = "sha256-f2VMb0TM50afKf/lGdZBP2z13UrCVgG4/IYi5gnD+ow=";
}; };
nativeBuildInputs = [ bison flex ]; nativeBuildInputs = [ bison flex ];

View File

@ -48,8 +48,6 @@ mkDerivation rec {
libXdmcp libXdmcp
]; ];
qtWrapperArgs = [ "--prefix" "FCITX_ADDON_DIRS" ":" "${placeholder "out"}/lib/fcitx5" ];
meta = with lib; { meta = with lib; {
description = "Fcitx5 Qt Library"; description = "Fcitx5 Qt Library";
homepage = "https://github.com/fcitx/fcitx5-qt"; homepage = "https://github.com/fcitx/fcitx5-qt";

View File

@ -1,18 +1,38 @@
{ lib, symlinkJoin, makeWrapper, fcitx5, fcitx5-configtool, fcitx5-qt, fcitx5-gtk, addons ? [ ] }: { lib
, symlinkJoin
, makeBinaryWrapper
, fcitx5
, withConfigtool ? true
, fcitx5-configtool
, fcitx5-qt
, fcitx5-gtk
, addons ? [ ]
}:
symlinkJoin { symlinkJoin {
name = "fcitx5-with-addons-${fcitx5.version}"; name = "fcitx5-with-addons-${fcitx5.version}";
paths = [ fcitx5 fcitx5-configtool fcitx5-qt fcitx5-gtk ] ++ addons; paths = [
fcitx5
fcitx5-qt
fcitx5-gtk
] ++ lib.optionals withConfigtool [
fcitx5-configtool
] ++ addons;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeBinaryWrapper ];
postBuild = '' postBuild = ''
wrapProgram $out/bin/fcitx5 \ wrapProgram $out/bin/fcitx5 \
--prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \ --prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \
--suffix XDG_DATA_DIRS : "$out/share" \ --suffix XDG_DATA_DIRS : "$out/share" \
--suffix PATH : "$out/bin" \ --suffix PATH : "$out/bin" \
--suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath (lib.flatten (map (x: x.extraLdLibraries or []) addons))} --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.flatten (map (x: x.extraLdLibraries or []) addons))}"
${lib.optionals withConfigtool ''
# Configtool call libexec/fcitx5-qt5-gui-wrapper for gui addons in FCITX_ADDON_DIRS
wrapProgram $out/bin/fcitx5-config-qt --prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5"
''}
desktop=share/applications/org.fcitx.Fcitx5.desktop desktop=share/applications/org.fcitx.Fcitx5.desktop
autostart=etc/xdg/autostart/org.fcitx.Fcitx5.desktop autostart=etc/xdg/autostart/org.fcitx.Fcitx5.desktop

View File

@ -1,33 +1,54 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
addressable (2.7.0) Ascii85 (1.1.0)
public_suffix (>= 2.0.2, < 5.0) addressable (2.8.5)
ethon (0.12.0) public_suffix (>= 2.0.2, < 6.0)
ffi (>= 1.3.0) afm (0.2.2)
ffi (1.14.2) async (2.6.3)
html-proofer (3.18.8) console (~> 1.10)
fiber-annotation
io-event (~> 1.1)
timers (~> 4.1)
console (1.23.1)
fiber-annotation
fiber-local
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.15.5)
fiber-annotation (0.2.0)
fiber-local (1.0.0)
hashery (2.1.2)
html-proofer (5.0.8)
addressable (~> 2.3) addressable (~> 2.3)
mercenary (~> 0.3) async (~> 2.1)
nokogumbo (~> 2.0) nokogiri (~> 1.13)
parallel (~> 1.3) pdf-reader (~> 2.11)
rainbow (~> 3.0) rainbow (~> 3.0)
typhoeus (~> 1.3) typhoeus (~> 1.3)
yell (~> 2.0) yell (~> 2.0)
mercenary (0.4.0) zeitwerk (~> 2.5)
mini_portile2 (2.5.0) io-event (1.2.3)
nokogiri (1.11.1) mini_portile2 (2.8.4)
mini_portile2 (~> 2.5.0) nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4) racc (~> 1.4)
nokogumbo (2.0.4) pdf-reader (2.11.0)
nokogiri (~> 1.8, >= 1.8.4) Ascii85 (~> 1.0)
parallel (1.20.1) afm (~> 0.2.1)
public_suffix (4.0.6) hashery (~> 2.0)
racc (1.5.2) ruby-rc4
rainbow (3.0.0) ttfunk
public_suffix (5.0.3)
racc (1.7.1)
rainbow (3.1.1)
ruby-rc4 (0.1.5)
timers (4.3.5)
ttfunk (1.7.0)
typhoeus (1.4.0) typhoeus (1.4.0)
ethon (>= 0.9.0) ethon (>= 0.9.0)
yell (2.2.2) yell (2.2.2)
zeitwerk (2.6.11)
PLATFORMS PLATFORMS
ruby ruby
@ -36,4 +57,4 @@ DEPENDENCIES
html-proofer html-proofer
BUNDLED WITH BUNDLED WITH
2.1.4 2.4.17

View File

@ -5,10 +5,52 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33";
type = "gem"; type = "gem";
}; };
version = "2.7.0"; version = "2.8.5";
};
afm = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06kj9hgd0z8pj27bxp2diwqh6fv7qhwwm17z64rhdc4sfn76jgn8";
type = "gem";
};
version = "0.2.2";
};
Ascii85 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ds4v9xgsyvijnlflak4dzf1qwmda9yd5bv8jwsb56nngd399rlw";
type = "gem";
};
version = "1.1.0";
};
async = {
dependencies = ["console" "fiber-annotation" "io-event" "timers"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0806cya8kq9glg6vifa9j4zjf81drwa84hdzx71ah98zz317hvhb";
type = "gem";
};
version = "2.6.3";
};
console = {
dependencies = ["fiber-annotation" "fiber-local"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04cpbx4bsw3k20xgvz6cs1gi41q9mmagc95x2zk6ar49a25z89sb";
type = "gem";
};
version = "1.23.1";
}; };
ethon = { ethon = {
dependencies = ["ffi"]; dependencies = ["ffi"];
@ -16,51 +58,81 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v";
type = "gem"; type = "gem";
}; };
version = "0.12.0"; version = "0.16.0";
}; };
ffi = { ffi = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx"; sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
type = "gem"; type = "gem";
}; };
version = "1.14.2"; version = "1.15.5";
};
fiber-annotation = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00vcmynyvhny8n4p799rrhcx0m033hivy0s1gn30ix8rs7qsvgvs";
type = "gem";
};
version = "0.2.0";
};
fiber-local = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vrxxb09fc7aicb9zb0pmn5akggjy21dmxkdl3w949y4q05rldr9";
type = "gem";
};
version = "1.0.0";
};
hashery = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qj8815bf7q6q7llm5rzdz279gzmpqmqqicxnzv066a020iwqffj";
type = "gem";
};
version = "2.1.2";
}; };
html-proofer = { html-proofer = {
dependencies = ["addressable" "mercenary" "nokogumbo" "parallel" "rainbow" "typhoeus" "yell"]; dependencies = ["addressable" "async" "nokogiri" "pdf-reader" "rainbow" "typhoeus" "yell" "zeitwerk"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0i5anzj9lp2m6bvghcbz16dlv5ww2mcwgkfj878mamgvb2pfk2m9"; sha256 = "0lzh3lb3l2qid3sh3da0fgjdwdly2g5jia6drzpn1dn1b92a7wwm";
type = "gem"; type = "gem";
}; };
version = "3.18.8"; version = "5.0.8";
}; };
mercenary = { io-event = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0f2i827w4lmsizrxixsrv2ssa3gk1b7lmqh8brk8ijmdb551wnmj"; sha256 = "0046p1q98xrys4bzcx74k658fv1fiigdgcd0az0pm12n2hjcms6r";
type = "gem"; type = "gem";
}; };
version = "0.4.0"; version = "1.2.3";
}; };
mini_portile2 = { mini_portile2 = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq";
type = "gem"; type = "gem";
}; };
version = "2.5.0"; version = "2.8.4";
}; };
nokogiri = { nokogiri = {
dependencies = ["mini_portile2" "racc"]; dependencies = ["mini_portile2" "racc"];
@ -68,61 +140,81 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; sha256 = "0k9w2z0953mnjrsji74cshqqp08q7m1r6zhadw1w0g34xzjh3a74";
type = "gem"; type = "gem";
}; };
version = "1.11.1"; version = "1.15.4";
}; };
nokogumbo = { pdf-reader = {
dependencies = ["nokogiri"]; dependencies = ["Ascii85" "afm" "hashery" "ruby-rc4" "ttfunk"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0pxm7hx2lhmanm8kljd39f1j1742kl0a31zx98jsjiwrkfb5hhc6"; sha256 = "09sx25jpnip2sp6wh5sn5ad7za78rfi95qp5iiczfh43z4jqa8q3";
type = "gem"; type = "gem";
}; };
version = "2.0.4"; version = "2.11.0";
};
parallel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
type = "gem";
};
version = "1.20.1";
}; };
public_suffix = { public_suffix = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k";
type = "gem"; type = "gem";
}; };
version = "4.0.6"; version = "5.0.3";
}; };
racc = { racc = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g";
type = "gem"; type = "gem";
}; };
version = "1.5.2"; version = "1.7.1";
}; };
rainbow = { rainbow = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
type = "gem"; type = "gem";
}; };
version = "3.0.0"; version = "3.1.1";
};
ruby-rc4 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00vci475258mmbvsdqkmqadlwn6gj9m01sp7b5a3zd90knil1k00";
type = "gem";
};
version = "0.1.5";
};
timers = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pjzipnmzfywvgsr3gxwj6nmg47lz4700g0q71jgcy1z6rb7dn7p";
type = "gem";
};
version = "4.3.5";
};
ttfunk = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15iaxz9iak5643bq2bc0jkbjv8w2zn649lxgvh5wg48q9d4blw13";
type = "gem";
};
version = "1.7.0";
}; };
typhoeus = { typhoeus = {
dependencies = ["ethon"]; dependencies = ["ethon"];
@ -145,4 +237,14 @@
}; };
version = "2.2.2"; version = "2.2.2";
}; };
zeitwerk = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd";
type = "gem";
};
version = "2.6.11";
};
} }

View File

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "pistol"; pname = "pistol";
version = "0.4.1"; version = "0.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "doronbehar"; owner = "doronbehar";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-umejrLdx8R//o9uQIT9JhAKJOIF5Ifpx7s3x3ejsJgo="; sha256 = "sha256-7nALrB+QubEnryVsGPpFMJ003SP2lheYTkWXF5w/V8I=";
}; };
vendorHash = "sha256-zs7qzXvOnIiDwwNldMPB4Jkm2GWxVZnLpDzpf+ivhCc="; vendorHash = "sha256-9Ydps8UA1f0fwG5SHRE4F61OyRJiITw/4SyoMEbsRgM=";
doCheck = false; doCheck = false;

View File

@ -5,11 +5,11 @@ in
{ {
openssh = common rec { openssh = common rec {
pname = "openssh"; pname = "openssh";
version = "9.3p2"; version = "9.4p1";
src = fetchurl { src = fetchurl {
url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
hash = "sha256-IA6+FH9ss/EB/QzfngJEKvfdyimN/9n0VoeOfMrGdug="; hash = "sha256-Ngj9kIjbIWPOs+YAyFq3nQ3j0iHlkZLqGSPiMmOGaoU=";
}; };
extraPatches = [ ./ssh-keysign-8.5.patch ]; extraPatches = [ ./ssh-keysign-8.5.patch ];
@ -18,12 +18,12 @@ in
openssh_hpn = common rec { openssh_hpn = common rec {
pname = "openssh-with-hpn"; pname = "openssh-with-hpn";
version = "9.3p2"; version = "9.4p1";
extraDesc = " with high performance networking patches"; extraDesc = " with high performance networking patches";
src = fetchurl { src = fetchurl {
url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
hash = "sha256-IA6+FH9ss/EB/QzfngJEKvfdyimN/9n0VoeOfMrGdug="; hash = "sha256-Ngj9kIjbIWPOs+YAyFq3nQ3j0iHlkZLqGSPiMmOGaoU=";
}; };
extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/700625bcd86b74cf3fb9536aeea250d7f8cd1fd5/security/openssh-portable/files/extra-patch-hpn"; in extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/700625bcd86b74cf3fb9536aeea250d7f8cd1fd5/security/openssh-portable/files/extra-patch-hpn"; in
@ -58,12 +58,12 @@ in
openssh_gssapi = common rec { openssh_gssapi = common rec {
pname = "openssh-with-gssapi"; pname = "openssh-with-gssapi";
version = "9.3p2"; version = "9.4p1";
extraDesc = " with GSSAPI support"; extraDesc = " with GSSAPI support";
src = fetchurl { src = fetchurl {
url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
sha256 = "sha256-IA6+FH9ss/EB/QzfngJEKvfdyimN/9n0VoeOfMrGdug="; sha256 = "sha256-Ngj9kIjbIWPOs+YAyFq3nQ3j0iHlkZLqGSPiMmOGaoU=";
}; };
extraPatches = [ extraPatches = [

View File

@ -13,13 +13,13 @@ in
assert stdenv.isLinux; # better than `called with unexpected argument 'enableJavaFX'` assert stdenv.isLinux; # better than `called with unexpected argument 'enableJavaFX'`
mavenJdk.buildMavenPackage rec { mavenJdk.buildMavenPackage rec {
pname = "cryptomator"; pname = "cryptomator";
version = "1.9.1"; version = "1.9.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cryptomator"; owner = "cryptomator";
repo = "cryptomator"; repo = "cryptomator";
rev = version; rev = version;
hash = "sha256-CiM18Rdt7B/TrU7AoNbxouFGC5Gfvm4oLxypYOCAFzA="; hash = "sha256-63UXn1ejL/wDx6S2lugwwthu+C+vJovPypgM0iak78I=";
}; };
mvnParameters = "-Dmaven.test.skip=true"; mvnParameters = "-Dmaven.test.skip=true";

View File

@ -4525,6 +4525,8 @@ with pkgs;
{ inherit (haskellPackages) alex happy Agda ghcWithPackages; { inherit (haskellPackages) alex happy Agda ghcWithPackages;
}; };
cel-go = callPackage ../development/interpreters/cel-go { };
cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { }; cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { };
cf-terraforming = callPackage ../tools/misc/cf-terraforming { }; cf-terraforming = callPackage ../tools/misc/cf-terraforming { };
@ -7440,7 +7442,7 @@ with pkgs;
dropbear = callPackage ../tools/networking/dropbear { }; dropbear = callPackage ../tools/networking/dropbear { };
dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; dsview = qt6Packages.callPackage ../applications/science/electronics/dsview { };
dtach = callPackage ../tools/misc/dtach { }; dtach = callPackage ../tools/misc/dtach { };
@ -9120,6 +9122,8 @@ with pkgs;
ibniz = callPackage ../tools/graphics/ibniz { }; ibniz = callPackage ../tools/graphics/ibniz { };
icebreaker = callPackage ../servers/icebreaker { };
icecast = callPackage ../servers/icecast { }; icecast = callPackage ../servers/icecast { };
icemon = libsForQt5.callPackage ../applications/networking/icemon { }; icemon = libsForQt5.callPackage ../applications/networking/icemon { };