Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-08-29 06:05:29 +00:00 committed by GitHub
commit 4a1df24885
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
70 changed files with 1200 additions and 1383 deletions

View File

@ -19202,6 +19202,12 @@
githubId = 74413170;
name = "Johannes Klein";
};
sith-lord-vader = {
email = "abhiayush23@gmail.com";
github = "sith-lord-vader";
githubId = 24388085;
name = "Abhishek Adhikari";
};
sivteck = {
email = "sivaram1992@gmail.com";
github = "sivteck";

View File

@ -1,7 +1,4 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.services.mailman;
@ -44,7 +41,7 @@ let
transport_file_type: hash
'';
mailmanCfg = lib.generators.toINI {} (recursiveUpdate cfg.settings {
mailmanCfg = lib.generators.toINI {} (lib.recursiveUpdate cfg.settings {
webservice.admin_pass = "#NIXOS_MAILMAN_REST_API_PASS_SECRET#";
});
@ -68,15 +65,15 @@ in {
###### interface
imports = [
(mkRenamedOptionModule [ "services" "mailman" "hyperkittyBaseUrl" ]
(lib.mkRenamedOptionModule [ "services" "mailman" "hyperkittyBaseUrl" ]
[ "services" "mailman" "hyperkitty" "baseUrl" ])
(mkRemovedOptionModule [ "services" "mailman" "hyperkittyApiKey" ] ''
(lib.mkRemovedOptionModule [ "services" "mailman" "hyperkittyApiKey" ] ''
The Hyperkitty API key is now generated on first run, and not
stored in the world-readable Nix store. To continue using
Hyperkitty, you must set services.mailman.hyperkitty.enable = true.
'')
(mkRemovedOptionModule [ "services" "mailman" "package" ] ''
(lib.mkRemovedOptionModule [ "services" "mailman" "package" ] ''
Didn't have an effect for several years.
'')
];
@ -85,38 +82,38 @@ in {
services.mailman = {
enable = mkOption {
type = types.bool;
enable = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Enable Mailman on this host. Requires an active MTA on the host (e.g. Postfix).";
};
ldap = {
enable = mkEnableOption "LDAP auth";
serverUri = mkOption {
type = types.str;
enable = lib.mkEnableOption "LDAP auth";
serverUri = lib.mkOption {
type = lib.types.str;
example = "ldaps://ldap.host";
description = ''
LDAP host to connect against.
'';
};
bindDn = mkOption {
type = types.str;
bindDn = lib.mkOption {
type = lib.types.str;
example = "cn=root,dc=nixos,dc=org";
description = ''
Service account to bind against.
'';
};
bindPasswordFile = mkOption {
type = types.str;
bindPasswordFile = lib.mkOption {
type = lib.types.str;
example = "/run/secrets/ldap-bind";
description = ''
Path to the file containing the bind password of the service account
defined by [](#opt-services.mailman.ldap.bindDn).
'';
};
superUserGroup = mkOption {
type = types.nullOr types.str;
superUserGroup = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
example = "cn=admin,ou=groups,dc=nixos,dc=org";
description = ''
@ -124,15 +121,15 @@ in {
'';
};
userSearch = {
query = mkOption {
type = types.str;
query = lib.mkOption {
type = lib.types.str;
example = "(&(objectClass=inetOrgPerson)(|(uid=%(user)s)(mail=%(user)s)))";
description = ''
Query to find a user in the LDAP database.
'';
};
ou = mkOption {
type = types.str;
ou = lib.mkOption {
type = lib.types.str;
example = "ou=users,dc=nixos,dc=org";
description = ''
Organizational unit to look up a user.
@ -140,27 +137,27 @@ in {
};
};
groupSearch = {
type = mkOption {
type = types.enum [
type = lib.mkOption {
type = lib.types.enum [
"posixGroup" "groupOfNames" "memberDNGroup" "nestedMemberDNGroup" "nestedGroupOfNames"
"groupOfUniqueNames" "nestedGroupOfUniqueNames" "activeDirectoryGroup" "nestedActiveDirectoryGroup"
"organizationalRoleGroup" "nestedOrganizationalRoleGroup"
];
default = "posixGroup";
apply = v: "${toUpper (substring 0 1 v)}${substring 1 (stringLength v) v}Type";
apply = v: "${lib.toUpper (lib.substring 0 1 v)}${lib.substring 1 (lib.stringLength v) v}Type";
description = ''
Type of group to perform a group search against.
'';
};
query = mkOption {
type = types.str;
query = lib.mkOption {
type = lib.types.str;
example = "(objectClass=groupOfNames)";
description = ''
Query to find a group associated to a user in the LDAP database.
'';
};
ou = mkOption {
type = types.str;
ou = lib.mkOption {
type = lib.types.str;
example = "ou=groups,dc=nixos,dc=org";
description = ''
Organizational unit to look up a group.
@ -168,30 +165,30 @@ in {
};
};
attrMap = {
username = mkOption {
username = lib.mkOption {
default = "uid";
type = types.str;
type = lib.types.str;
description = ''
LDAP-attribute that corresponds to the `username`-attribute in mailman.
'';
};
firstName = mkOption {
firstName = lib.mkOption {
default = "givenName";
type = types.str;
type = lib.types.str;
description = ''
LDAP-attribute that corresponds to the `firstName`-attribute in mailman.
'';
};
lastName = mkOption {
lastName = lib.mkOption {
default = "sn";
type = types.str;
type = lib.types.str;
description = ''
LDAP-attribute that corresponds to the `lastName`-attribute in mailman.
'';
};
email = mkOption {
email = lib.mkOption {
default = "mail";
type = types.str;
type = lib.types.str;
description = ''
LDAP-attribute that corresponds to the `email`-attribute in mailman.
'';
@ -199,8 +196,8 @@ in {
};
};
enablePostfix = mkOption {
type = types.bool;
enablePostfix = lib.mkOption {
type = lib.types.bool;
default = true;
example = false;
description = ''
@ -213,8 +210,8 @@ in {
'';
};
siteOwner = mkOption {
type = types.str;
siteOwner = lib.mkOption {
type = lib.types.str;
example = "postmaster@example.org";
description = ''
Certain messages that must be delivered to a human, but which can't
@ -223,8 +220,8 @@ in {
'';
};
webHosts = mkOption {
type = types.listOf types.str;
webHosts = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [];
description = ''
The list of hostnames and/or IP addresses from which the Mailman Web
@ -235,60 +232,60 @@ in {
'';
};
webUser = mkOption {
type = types.str;
webUser = lib.mkOption {
type = lib.types.str;
default = "mailman-web";
description = ''
User to run mailman-web as
'';
};
webSettings = mkOption {
type = types.attrs;
webSettings = lib.mkOption {
type = lib.types.attrs;
default = {};
description = ''
Overrides for the default mailman-web Django settings.
'';
};
restApiPassFile = mkOption {
restApiPassFile = lib.mkOption {
default = null;
type = types.nullOr types.str;
type = lib.types.nullOr lib.types.str;
description = ''
Path to the file containing the value for `MAILMAN_REST_API_PASS`.
'';
};
serve = {
enable = mkEnableOption "automatic nginx and uwsgi setup for mailman-web";
enable = lib.mkEnableOption "automatic nginx and uwsgi setup for mailman-web";
virtualRoot = mkOption {
virtualRoot = lib.mkOption {
default = "/";
example = lib.literalExpression "/lists";
type = types.str;
type = lib.types.str;
description = ''
Path to mount the mailman-web django application on.
'';
};
};
extraPythonPackages = mkOption {
extraPythonPackages = lib.mkOption {
description = "Packages to add to the python environment used by mailman and mailman-web";
type = types.listOf types.package;
type = lib.types.listOf lib.types.package;
default = [];
};
settings = mkOption {
settings = lib.mkOption {
description = "Settings for mailman.cfg";
type = types.attrsOf (types.attrsOf types.str);
type = lib.types.attrsOf (lib.types.attrsOf lib.types.str);
default = {};
};
hyperkitty = {
enable = mkEnableOption "the Hyperkitty archiver for Mailman";
enable = lib.mkEnableOption "the Hyperkitty archiver for Mailman";
baseUrl = mkOption {
type = types.str;
baseUrl = lib.mkOption {
type = lib.types.str;
default = "http://localhost:18507/archives/";
description = ''
Where can Mailman connect to Hyperkitty's internal API, preferably on
@ -302,7 +299,7 @@ in {
###### implementation
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
services.mailman.settings = {
mailman.site_owner = lib.mkDefault cfg.siteOwner;
@ -336,14 +333,13 @@ in {
inherit (config.services) postfix;
requirePostfixHash = optionPath: dataFile:
with lib;
let
expected = "hash:/var/lib/mailman/data/${dataFile}";
value = attrByPath optionPath [] postfix;
value = lib.attrByPath optionPath [] postfix;
in
{ assertion = postfix.enable -> isList value && elem expected value;
{ assertion = postfix.enable -> lib.isList value && lib.elem expected value;
message = ''
services.postfix.${concatStringsSep "." optionPath} must contain
services.postfix.${lib.concatStringsSep "." optionPath} must contain
"${expected}".
See <https://mailman.readthedocs.io/en/latest/src/mailman/docs/mta.html>.
'';
@ -408,7 +404,7 @@ in {
config.read_file(f)
MAILMAN_REST_API_PASS = config['webservice']['admin_pass']
${optionalString (cfg.ldap.enable) ''
${lib.optionalString (cfg.ldap.enable) ''
import ldap
from django_auth_ldap.config import LDAPSearch, ${cfg.ldap.groupSearch.type}
AUTH_LDAP_SERVER_URI = "${cfg.ldap.serverUri}"
@ -421,11 +417,11 @@ in {
AUTH_LDAP_GROUP_SEARCH = LDAPSearch("${cfg.ldap.groupSearch.ou}",
ldap.SCOPE_SUBTREE, "${cfg.ldap.groupSearch.query}")
AUTH_LDAP_USER_ATTR_MAP = {
${concatStrings (flip mapAttrsToList cfg.ldap.attrMap (key: value: ''
${lib.concatStrings (lib.flip lib.mapAttrsToList cfg.ldap.attrMap (key: value: ''
"${key}": "${value}",
''))}
}
${optionalString (cfg.ldap.superUserGroup != null) ''
${lib.optionalString (cfg.ldap.superUserGroup != null) ''
AUTH_LDAP_USER_FLAGS_BY_GROUP = {
"is_superuser": "${cfg.ldap.superUserGroup}"
}
@ -437,15 +433,15 @@ in {
''}
'';
services.nginx = mkIf (cfg.serve.enable && cfg.webHosts != []) {
enable = mkDefault true;
services.nginx = lib.mkIf (cfg.serve.enable && cfg.webHosts != []) {
enable = lib.mkDefault true;
virtualHosts = lib.genAttrs cfg.webHosts (webHost: {
locations = {
${cfg.serve.virtualRoot}.extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;";
"${removeSuffix "/" cfg.serve.virtualRoot}/static/".alias = webSettings.STATIC_ROOT + "/";
"${lib.removeSuffix "/" cfg.serve.virtualRoot}/static/".alias = webSettings.STATIC_ROOT + "/";
};
});
proxyTimeout = mkDefault "120s";
proxyTimeout = lib.mkDefault "120s";
};
environment.systemPackages = [ (pkgs.buildEnv {
@ -483,7 +479,7 @@ in {
++ lib.optional cfg.enablePostfix "postfix-setup.service"
++ lib.optional withPostgresql "postgresql.service";
restartTriggers = [ mailmanCfgFile ];
requires = optional withPostgresql "postgresql.service";
requires = lib.optional withPostgresql "postgresql.service";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${mailmanEnv}/bin/mailman start";
@ -505,8 +501,8 @@ in {
before = [ "mailman.service" "mailman-web-setup.service" "mailman-uwsgi.service" "hyperkitty.service" ];
requiredBy = [ "mailman.service" "mailman-web-setup.service" "mailman-uwsgi.service" "hyperkitty.service" ];
path = with pkgs; [ jq ];
after = optional withPostgresql "postgresql.service";
requires = optional withPostgresql "postgresql.service";
after = lib.optional withPostgresql "postgresql.service";
requires = lib.optional withPostgresql "postgresql.service";
serviceConfig.RemainAfterExit = true;
serviceConfig.Type = "oneshot";
script = ''
@ -569,7 +565,7 @@ in {
};
};
mailman-uwsgi = mkIf cfg.serve.enable (let
mailman-uwsgi = lib.mkIf cfg.serve.enable (let
uwsgiConfig.uwsgi = {
type = "normal";
plugins = ["python3"];
@ -585,9 +581,9 @@ in {
uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig);
in {
wantedBy = ["multi-user.target"];
after = optional withPostgresql "postgresql.service";
after = lib.optional withPostgresql "postgresql.service";
requires = ["mailman-uwsgi.socket" "mailman-web-setup.service"]
++ optional withPostgresql "postgresql.service";
++ lib.optional withPostgresql "postgresql.service";
restartTriggers = [ config.environment.etc."mailman3/settings.py".source ];
serviceConfig = {
# Since the mailman-web settings.py obstinately creates a logs
@ -625,7 +621,7 @@ in {
Restart = "on-failure";
};
};
} // flip lib.mapAttrs' {
} // lib.flip lib.mapAttrs' {
"minutely" = "minutely";
"quarter_hourly" = "*:00/15";
"hourly" = "hourly";

View File

@ -47,7 +47,7 @@ python311Packages.buildPythonApplication rec {
minimock
pytest
pytest-httpserver
pytest-cov
pytest-cov-stub
];
doCheck = true;

View File

@ -1,677 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "ansi_term"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
dependencies = [
"winapi",
]
[[package]]
name = "anyhow"
version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
[[package]]
name = "arrayvec"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "atty"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi",
"libc",
"winapi",
]
[[package]]
name = "bitflags"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
[[package]]
name = "bitvec"
version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c"
dependencies = [
"either",
"radium",
]
[[package]]
name = "block-buffer"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [
"block-padding",
"generic-array",
]
[[package]]
name = "block-padding"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
[[package]]
name = "byte-slice-cast"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3"
[[package]]
name = "byteorder"
version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
version = "2.33.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
dependencies = [
"ansi_term",
"atty",
"bitflags",
"strsim",
"textwrap",
"unicode-width",
"vec_map",
]
[[package]]
name = "crunchy"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "digest"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
dependencies = [
"generic-array",
]
[[package]]
name = "either"
version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]]
name = "ethabi"
version = "13.0.0"
dependencies = [
"anyhow",
"ethereum-types",
"hex",
"hex-literal",
"paste",
"serde",
"serde_json",
"sha3",
"thiserror",
"uint",
]
[[package]]
name = "ethabi-cli"
version = "13.0.0"
dependencies = [
"anyhow",
"ethabi",
"hex",
"itertools",
"sha3",
"structopt",
]
[[package]]
name = "ethabi-contract"
version = "11.0.0"
[[package]]
name = "ethabi-derive"
version = "13.0.0"
dependencies = [
"anyhow",
"ethabi",
"heck",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "ethabi-tests"
version = "0.1.1"
dependencies = [
"ethabi",
"ethabi-contract",
"ethabi-derive",
"hex",
"hex-literal",
]
[[package]]
name = "ethbloom"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22a621dcebea74f2a6f2002d0a885c81ccf6cbdf86760183316a7722b5707ca4"
dependencies = [
"crunchy",
"fixed-hash",
"impl-rlp",
"impl-serde",
"tiny-keccak",
]
[[package]]
name = "ethereum-types"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05dc5f0df4915fa6dff7f975a8366ecfaaa8959c74235469495153e7bb1b280e"
dependencies = [
"ethbloom",
"fixed-hash",
"impl-rlp",
"impl-serde",
"primitive-types",
"uint",
]
[[package]]
name = "fixed-hash"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
dependencies = [
"byteorder",
"rand",
"rustc-hex",
"static_assertions",
]
[[package]]
name = "generic-array"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
dependencies = [
"typenum",
"version_check",
]
[[package]]
name = "getrandom"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
dependencies = [
"cfg-if",
"libc",
"wasi",
]
[[package]]
name = "heck"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
dependencies = [
"unicode-segmentation",
]
[[package]]
name = "hermit-abi"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
dependencies = [
"libc",
]
[[package]]
name = "hex"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "hex-literal"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8"
[[package]]
name = "impl-codec"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53"
dependencies = [
"parity-scale-codec",
]
[[package]]
name = "impl-rlp"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"
dependencies = [
"rlp",
]
[[package]]
name = "impl-serde"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f"
dependencies = [
"serde",
]
[[package]]
name = "itertools"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
dependencies = [
"either",
]
[[package]]
name = "itoa"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
[[package]]
name = "keccak"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
[[package]]
name = "lazy_static"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
[[package]]
name = "opaque-debug"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "parity-scale-codec"
version = "1.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d"
dependencies = [
"arrayvec",
"bitvec",
"byte-slice-cast",
"serde",
]
[[package]]
name = "paste"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58"
[[package]]
name = "ppv-lite86"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
[[package]]
name = "primitive-types"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8"
dependencies = [
"fixed-hash",
"impl-codec",
"impl-rlp",
"impl-serde",
"uint",
]
[[package]]
name = "proc-macro-error"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
"syn",
"version_check",
]
[[package]]
name = "proc-macro-error-attr"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2",
"quote",
"version_check",
]
[[package]]
name = "proc-macro2"
version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
dependencies = [
"unicode-xid",
]
[[package]]
name = "quote"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
dependencies = [
"proc-macro2",
]
[[package]]
name = "radium"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
[[package]]
name = "rand"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
dependencies = [
"libc",
"rand_chacha",
"rand_core",
]
[[package]]
name = "rand_chacha"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
dependencies = [
"ppv-lite86",
"rand_core",
]
[[package]]
name = "rand_core"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
dependencies = [
"getrandom",
]
[[package]]
name = "rlp"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8"
dependencies = [
"bytes",
"rustc-hex",
]
[[package]]
name = "rustc-hex"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
[[package]]
name = "ryu"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]]
name = "serde"
version = "1.0.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "serde_json"
version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
dependencies = [
"itoa",
"ryu",
"serde",
]
[[package]]
name = "sha3"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
dependencies = [
"block-buffer",
"digest",
"keccak",
"opaque-debug",
]
[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "strsim"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "structopt"
version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c"
dependencies = [
"clap",
"lazy_static",
"structopt-derive",
]
[[package]]
name = "structopt-derive"
version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"
dependencies = [
"heck",
"proc-macro-error",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "syn"
version = "1.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
dependencies = [
"proc-macro2",
"quote",
"unicode-xid",
]
[[package]]
name = "textwrap"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
dependencies = [
"unicode-width",
]
[[package]]
name = "thiserror"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "tiny-keccak"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
dependencies = [
"crunchy",
]
[[package]]
name = "typenum"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
[[package]]
name = "uint"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e"
dependencies = [
"byteorder",
"crunchy",
"hex",
"static_assertions",
]
[[package]]
name = "unicode-segmentation"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
[[package]]
name = "unicode-width"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
[[package]]
name = "unicode-xid"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
[[package]]
name = "vec_map"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "version_check"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
[[package]]
name = "wasi"
version = "0.10.2+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

View File

@ -1,29 +0,0 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "ethabi";
version = "13.0.0";
src = fetchFromGitHub {
owner = "rust-ethereum";
repo = "ethabi";
rev = "v${version}";
sha256 = "sha256-bl46CSVP1MMYI3tkVAHFrjMFwTt8QoleZCV9pMIMZyc=";
};
cargoLock = {
lockFile = ./Cargo.lock;
};
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
meta = with lib; {
description = "Ethereum function call encoding (ABI) utility";
homepage = "https://github.com/rust-ethereum/ethabi";
maintainers = [ maintainers.dbrock ];
license = licenses.asl20;
mainProgram = "ethabi";
};
}

View File

@ -2,14 +2,14 @@
appimageTools.wrapType1 rec {
pname = "pureref";
version = "1.11.1";
version = "2.0.2";
src = runCommand "PureRef-${version}_x64.Appimage" {
nativeBuildInputs = [ curl gnugrep cacert ];
outputHash = "sha256-da/dH0ruI562JylpvE9f2zMUSJ56+T7Y0xlP/xr3yhY=";
outputHash = "sha256-dCiQlYtjIkh/3x3Rt3Yzbn1KN7ip37Rxv1u8D9y+EMA=";
} ''
key="$(curl "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)"
curl "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out
curl -L "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out
'';
meta = with lib; {

View File

@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop-beta";
dir = "Signal Beta";
version = "7.19.0-beta.1";
version = "7.23.0-beta.1";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
hash = "sha256-dIZvzJ45c5kL+2HEaKrtbck5Zz572pQAj3YTenzz6Zs=";
hash = "sha256-qVPvzz5dEzff9+qmy92X2VWOhcfYdeoOsV4hX/PcJ+k=";
}

View File

@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop";
dir = "Signal";
version = "7.21.0";
version = "7.22.0";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
hash = "sha256-c4INjHMqTH2B71aUJtzgLSFZSe/KFo1OW/wv7rApSxA=";
hash = "sha256-om3hhGYgrBrcNt3tV9QHZOKuhN/ljaR6SG/6S51xqOo=";
}

View File

@ -1,107 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, yarn
, nodejs
, fetchYarnDeps
, fixup-yarn-lock
, electron
, alsa-utils
, which
, testers
, teams-for-linux
}:
stdenv.mkDerivation (finalAttrs: {
pname = "teams-for-linux";
version = "1.4.27";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
rev = "v${finalAttrs.version}";
hash = "sha256-nUHiveS1XI+vC2Tj1DK/DS4CrKTLMg1IYgTPWXuLrAc=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-jBwyIyiWeqNmOnxmVOr7c4oMWwHElEjM25sShhTMi78=";
};
nativeBuildInputs = [ yarn fixup-yarn-lock nodejs copyDesktopItems makeWrapper ];
configurePhase = ''
runHook preConfigure
export HOME=$(mktemp -d)
yarn config --offline set yarn-offline-mirror $offlineCache
fixup-yarn-lock yarn.lock
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules/
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
yarn --offline electron-builder \
--dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \
-c.electronDist=${electron.dist} \
-c.electronVersion=${electron.version}
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/{applications,teams-for-linux}
cp dist/${if stdenv.isDarwin then "darwin-" else "linux-"}${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/teams-for-linux/
pushd build/icons
for image in *png; do
mkdir -p $out/share/icons/hicolor/''${image%.png}/apps
cp -r $image $out/share/icons/hicolor/''${image%.png}/apps/teams-for-linux.png
done
popd
# Linux needs 'aplay' for notification sounds
makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \
${lib.optionalString stdenv.isLinux ''
--prefix PATH : ${lib.makeBinPath [ alsa-utils which ]} \
''} \
--add-flags "$out/share/teams-for-linux/app.asar" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
runHook postInstall
'';
desktopItems = [(makeDesktopItem {
name = finalAttrs.pname;
exec = finalAttrs.pname;
icon = finalAttrs.pname;
desktopName = "Microsoft Teams for Linux";
comment = finalAttrs.meta.description;
categories = [ "Network" "InstantMessaging" "Chat" ];
})];
passthru.updateScript = ./update.sh;
passthru.tests.version = testers.testVersion rec {
package = teams-for-linux;
command = "HOME=$TMPDIR ${package.meta.mainProgram or package.pname} --version";
};
meta = {
description = "Unofficial Microsoft Teams client for Linux";
mainProgram = "teams-for-linux";
homepage = "https://github.com/IsmaelMartinez/teams-for-linux";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ muscaln qjoly chvp ];
platforms = lib.platforms.unix;
broken = stdenv.isDarwin;
};
})

View File

@ -1,50 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix jq common-updater-scripts
set -euo pipefail
nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))"
stripwhitespace() {
sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//'
}
nixeval() {
nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r .
}
vendorhash() {
(nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in with pkgs.lib; (getAttrFromPath (splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true
}
findpath() {
path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
if [ -n "$outpath" ]; then
path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"
fi
echo "$path"
}
attr="${UPDATE_NIX_ATTR_PATH:-teams-for-linux}"
version="$(cd "$nixpkgs" && list-git-tags --pname="$(nixeval "$attr".pname)" --attr-path="$attr" | grep '^v' | sed -e 's|^v||' | sort -V | tail -n1)"
pkgpath="$(findpath "$attr")"
updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)"
if [ "$updated" -eq 0 ]; then
echo 'update.sh: Package version not updated, nothing to do.'
exit 0
fi
curhash="$(nixeval "$attr.offlineCache.outputHash")"
newhash="$(vendorhash "$attr.offlineCache")"
if [ -n "$newhash" ] && [ "$curhash" != "$newhash" ]; then
sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath"
else
echo 'update.sh: New vendorHash same as old vendorHash, nothing to do.'
fi

View File

@ -19,6 +19,7 @@
, proton-vpn-session
, pycairo
, pygobject3
, pytest-cov-stub
, pytestCheckHook
, withIndicator ? true
, libappindicator-gtk3
@ -69,11 +70,6 @@ buildPythonApplication rec {
pygobject3
];
postPatch = ''
substituteInPlace setup.cfg \
--replace-fail "--cov=proton --cov-report=html --cov-report=term" ""
'';
postInstall = ''
mkdir -p $out/share/{applications,pixmaps}
install -Dm 644 ${src}/rpmbuild/SOURCES/protonvpn-app.desktop $out/share/applications
@ -81,6 +77,7 @@ buildPythonApplication rec {
'';
nativeCheckInputs = [
pytest-cov-stub
pytestCheckHook
];

View File

@ -219,6 +219,7 @@ python.pkgs.buildPythonApplication rec {
daphne
factory-boy
imagehash
pytest-cov-stub
pytest-django
pytest-env
pytest-httpx
@ -240,10 +241,6 @@ python.pkgs.buildPythonApplication rec {
export PATH="${path}:$PATH"
export HOME=$(mktemp -d)
export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS"
# Disable unneeded code coverage test
substituteInPlace src/setup.cfg \
--replace-fail "--cov --cov-report=html --cov-report=xml" ""
'';
disabledTests = [

View File

@ -3,6 +3,7 @@
, fetchFromGitHub
, git
, pytestCheckHook
, pytest-cov-stub
, pytest-mock
}:
@ -28,7 +29,6 @@ buildPythonApplication rec {
--replace pytest==5.2.2 pytest \
--replace pytest-cov==2.8.1 "" \
--replace pytest-mock==1.11.2 pytest-mock \
--replace "--cov=git_archive_all --cov-report=term --cov-branch" "" \
--replace "filterwarnings = error" ""
substituteInPlace test_git_archive_all.py \
--replace "import pycodestyle" ""
@ -40,6 +40,7 @@ buildPythonApplication rec {
checkInputs = [
pytestCheckHook
pytest-cov-stub
pytest-mock
];

View File

@ -1,5 +1,4 @@
yarnConfigHook(){
runHook preConfigure
echo "Executing yarnConfigHook"
# Use a constant HOME directory
@ -29,9 +28,8 @@ yarnConfigHook(){
patchShebangs node_modules
echo "finished yarnConfigHook"
runHook postConfigure
}
if [[ -z "${dontYarnInstallDeps-}" && -z "${configurePhase-}" ]]; then
configurePhase=yarnConfigHook
if [[ -z "${dontYarnInstallDeps-}" ]]; then
postConfigureHooks+=(yarnConfigHook)
fi

View File

@ -17,11 +17,6 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-AJ0ZWRxqhBJEics6XnIVWyf7pJI8MphQU4LRqSYYNSQ=";
};
postPatch = ''
substituteInPlace setup.cfg \
--replace-fail '--cov-config=setup.cfg' ""
'';
dependencies = with python3.pkgs; [
dbus-python
icalendar
@ -40,6 +35,7 @@ python3.pkgs.buildPythonApplication rec {
nativeCheckInputs = with python3.pkgs; [
dbus
freezegun
pytest-cov-stub
pytest-datadir
pytest-httpserver
pytest-mock

View File

@ -28,25 +28,30 @@ let
electron = electron_31;
in buildNpmPackage rec {
pname = "bitwarden-desktop";
version = "2024.8.0";
version = "2024.8.1";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "desktop-v${version}";
hash = "sha256-szIa7fASDmeWKZPc6HtHKeXKerCAXrYZQWTVFMugAxk=";
hash = "sha256-FBNqgPjWSY8SCIGyKpoOl7I3pWQxDbWiFtcPZScDE4A=";
};
patches = [
./electron-builder-package-lock.patch
];
postPatch = ''
# remove code under unfree license
rm -r bitwarden_license
'';
nodejs = nodejs_20;
makeCacheWritable = true;
npmFlags = [ "--engine-strict" "--legacy-peer-deps" ];
npmWorkspace = "apps/desktop";
npmDepsHash = "sha256-5neEpU7ZhVO5OR181owsvAnFfl7lr0MymvqbRFCPs3M=";
npmDepsHash = "sha256-8cxhor90GqgO34AD8Jhd3N7PCnBnbhg8h7agVq0i3jk=";
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
@ -62,7 +67,7 @@ in buildNpmPackage rec {
patches;
patchFlags = [ "-p4" ];
sourceRoot = "${src.name}/${cargoRoot}";
hash = "sha256-ya/5z5XpsyuWayziLxuETu/dY8LzZspaAMqL2p8jYN8=";
hash = "sha256-zc5AarCbrJixcin8t+Ws8fH0ULM9rp3sUFsDb0htPuM=";
};
cargoRoot = "apps/desktop/desktop_native";

View File

@ -18,18 +18,13 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-/OuWwerBlJynEibaYo+jkLpHt4x9GZrqMRJNxgrDBlM=";
};
postPatch = ''
# We don't need to test coverage, so remove these checks
substituteInPlace setup.cfg \
--replace-fail "addopts = --cov-fail-under=84 --cov=./cmakelint" ""
'';
build-system = [ python3Packages.setuptools ];
pythonImportsCheck = [ "cmakelint" ];
nativeCheckInputs = [
python3Packages.pytestCheckHook
python3Packages.pytest-cov-stub
];
passthru.tests = {

View File

@ -16,11 +16,6 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-5iMhl3Wcxwgq4Wr0TUcAuRnb2+y8DHBugnnkpcZfSAM=";
};
postPatch = ''
substituteInPlace pytest.ini \
--replace-fail " --cov-append --cov-report term --cov depscan" ""
'';
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
@ -40,6 +35,7 @@ python3.pkgs.buildPythonApplication rec {
nativeCheckInputs = with python3.pkgs; [
httpretty
pytest-cov-stub
pytestCheckHook
];

View File

@ -16,11 +16,6 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-vXQFgP0KDWo1VWe7tMGCB2yEYlr/1KMXsiNupBVLBqc=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov=gato" ""
'';
nativeBuildInputs = with python3.pkgs; [
setuptools
wheel
@ -36,6 +31,7 @@ python3.pkgs.buildPythonApplication rec {
nativeCheckInputs = with python3.pkgs; [
git
pytest-cov-stub
pytestCheckHook
];

View File

@ -20,11 +20,6 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-3IiFU6qGI2MDTBOLQ2qyT5keUMNTNG3sxhtGR3bkIBc=";
};
postPatch = ''
# We don't want to run the coverage.
substituteInPlace tox.ini --replace "--cov=git_pw --cov-report" ""
'';
nativeBuildInputs = with python3.pkgs; [
pbr
setuptools
@ -39,6 +34,7 @@ python3.pkgs.buildPythonApplication rec {
];
nativeCheckInputs = with python3.pkgs; [
pytest-cov-stub
pytest
git
];

View File

@ -0,0 +1,28 @@
{
lib,
rustPlatform,
fetchFromGitHub,
}:
rustPlatform.buildRustPackage rec {
pname = "harper";
version = "0.9.5";
src = fetchFromGitHub {
owner = "elijah-potter";
repo = "harper";
rev = "v${version}";
hash = "sha256-Tk2YOY9myAGHrNTpgwyqo+P6gGQ+2cpKAJbsA3ZfhUA=";
};
cargoHash = "sha256-9ITfjrtc8LPQ3u3G59xESzqky/PCiea5mJiTIiEAmSA=";
meta = {
description = "Grammar Checker for Developers";
homepage = "https://github.com/elijah-potter/harper";
changelog = "https://github.com/elijah-potter/harper/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ pbsds ];
mainProgram = "harper-cli";
};
}

View File

@ -31,12 +31,10 @@ python3Packages.buildPythonApplication rec {
++ typed-settings.optional-dependencies.cattrs
++ typed-settings.optional-dependencies.click;
preCheck = ''
substituteInPlace pyproject.toml \
--replace-fail "--cov makejinja --cov-report term-missing" ""
'';
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
nativeCheckInputs = with python3Packages; [
pytest-cov-stub
pytestCheckHook
];
meta = {
description = "Generate entire directory structures using Jinja templates with support for external data and custom plugins";

View File

@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
};
postPatch = ''
substituteInPlace setup.cfg --replace-fail "--flake8 --pylint --cov=marge" ""
substituteInPlace setup.cfg --replace-fail "--flake8 --pylint" ""
'';
nativeBuildInputs = [
@ -30,7 +30,12 @@ python3.pkgs.buildPythonApplication rec {
requests
];
nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pendulum ];
nativeCheckInputs = with python3.pkgs; [
pytest-cov-stub
pytestCheckHook
pendulum
];
disabledTests = [
# test broken when run under Nix:
# "unittest.mock.InvalidSpecError: Cannot spec a Mock object."
@ -39,6 +44,7 @@ python3.pkgs.buildPythonApplication rec {
# "AttributeError: 'has_calls' is not a valid assertion."
"test_reapprove"
];
disabledTestPaths = [
# test errors due to API mismatch in test setup:
# "ImportError: cannot import name 'set_test_now' from 'pendulum.helpers'"

View File

@ -27,13 +27,13 @@
let
self = buildGoModule {
pname = "micro";
version = "2.0.13";
version = "2.0.14";
src = fetchFromGitHub {
owner = "zyedidia";
repo = "micro";
rev = "v${self.version}";
hash = "sha256-fe+7RkUwCveBk14bYzg5uLGOqTVVJsrqixBQhCS79hY=";
hash = "sha256-avLVl6mn0xKgIy0BNnPZ8ypQhn8Ivj7gTgWbebDSjt0=";
};
vendorHash = "sha256-ePhObvm3m/nT+7IyT0W6K+y+9UNkfd2kYjle2ffAd9Y=";

View File

@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "pgraphs";
version = "0.6.13";
version = "0.6.17";
src = fetchFromGitHub {
owner = "pg-format";
repo = "pgraphs";
rev = "refs/tags/v${version}";
hash = "sha256-NLQMBEN/wO/xOMy+gX3sQZRqU8gYesXS7hwRGWyjvX0=";
hash = "sha256-0Zo8Vg2KHhEGvO+vrbcP0ZTnfLtNTE2fqxq5LwPsJGs=";
};
npmDepsHash = "sha256-Fj5huWKatJmdH2PUqNWWysE+qhiq7aR2ue723Pv5Y4M=";
npmDepsHash = "sha256-47zT3wlCnVIcv0Sst4lUWLUMiWftgvP60cOmHu65vB8=";
dontNpmBuild = true;
meta = {

View File

@ -74,9 +74,6 @@ python.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace src/pretalx/common/management/commands/rebuild.py \
--replace 'subprocess.check_call(["npm", "run", "build"], cwd=frontend_dir, env=env)' ""
substituteInPlace src/setup.cfg \
--replace "--cov=./ --cov-report=" ""
'';
nativeBuildInputs = [
@ -196,6 +193,7 @@ python.pkgs.buildPythonApplication rec {
faker
freezegun
jsonschema
pytest-cov-stub
pytest-django
pytest-mock
pytest-xdist

View File

@ -88,8 +88,7 @@ python.pkgs.buildPythonApplication rec {
'return str(Path("${glibc}/lib/ld-linux-x86-64.so.2"))'
substituteInPlace pyproject.toml \
--replace-fail '"pytest-cov>=4.0",' "" \
--replace-fail "--cov=snapcraft" ""
--replace-fail '"pytest-cov>=4.0",' ""
'';
nativeBuildInputs = [ makeWrapper ];
@ -155,6 +154,7 @@ python.pkgs.buildPythonApplication rec {
with python.pkgs;
[
pytest-check
pytest-cov-stub
pytest-mock
pytest-subprocess
pytestCheckHook

View File

@ -35,11 +35,6 @@ python3.pkgs.buildPythonApplication rec {
})
];
postPatch = ''
sed -i "/--cov/d" setup.cfg
sed -i "/--no-cov-on-fail/d" setup.cfg
'';
build-system = with python3.pkgs; [
flit-core
];
@ -76,6 +71,7 @@ python3.pkgs.buildPythonApplication rec {
;
nativeCheckInputs = with python3.pkgs; [
pytest-cov-stub
pytestCheckHook
];

View File

@ -0,0 +1,125 @@
{
lib,
stdenv,
buildNpmPackage,
fetchFromGitHub,
alsa-utils,
copyDesktopItems,
electron_30,
makeDesktopItem,
makeWrapper,
nix-update-script,
versionCheckHook,
which,
}:
buildNpmPackage rec {
pname = "teams-for-linux";
version = "1.9.5";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
rev = "refs/tags/v${version}";
hash = "sha256-+rEGDg+/qvjCMhGHccb4p+CKOo/65RpkFT/WnCDlCgU=";
};
npmDepsHash = "sha256-vDRFFxkIQo5qU9gmkSwUhPz4FG2XbUNkTw6SCuvMqCc=";
nativeBuildInputs = [
makeWrapper
versionCheckHook
] ++ lib.optionals (stdenv.isLinux) [ copyDesktopItems ];
doInstallCheck = stdenv.isLinux;
env = {
# disable code signing on Darwin
CSC_IDENTITY_AUTO_DISCOVERY = "false";
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
};
buildPhase = ''
runHook preBuild
cp -r ${electron_30.dist} electron-dist
chmod -R u+w electron-dist
npm exec electron-builder -- \
--dir \
-c.npmRebuild=true \
-c.asarUnpack="**/*.node" \
-c.electronDist=electron-dist \
-c.electronVersion=${electron_30.version}
runHook postBuild
'';
installPhase =
''
runHook preInstall
''
+ lib.optionalString stdenv.isLinux ''
mkdir -p $out/share/{applications,teams-for-linux}
cp dist/*-unpacked/resources/app.asar $out/share/teams-for-linux/
pushd build/icons
for image in *png; do
mkdir -p $out/share/icons/hicolor/''${image%.png}/apps
cp -r $image $out/share/icons/hicolor/''${image%.png}/apps/teams-for-linux.png
done
popd
# Linux needs 'aplay' for notification sounds
makeWrapper '${lib.getExe electron_30}' "$out/bin/teams-for-linux" \
--prefix PATH : ${
lib.makeBinPath [
alsa-utils
which
]
} \
--add-flags "$out/share/teams-for-linux/app.asar" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
''
+ lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
cp -r dist/mac*/teams-for-linux.app $out/Applications
makeWrapper $out/Applications/teams-for-linux.app/Contents/MacOS/teams-for-linux $out/bin/teams-for-linux
''
+ ''
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = "teams-for-linux";
exec = "teams-for-linux";
icon = "teams-for-linux";
desktopName = "Microsoft Teams for Linux";
comment = meta.description;
categories = [
"Network"
"InstantMessaging"
"Chat"
];
})
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Unofficial Microsoft Teams client for Linux";
mainProgram = "teams-for-linux";
homepage = "https://github.com/IsmaelMartinez/teams-for-linux";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
muscaln
qjoly
chvp
khaneliman
];
platforms = with lib.platforms; darwin ++ linux;
};
}

View File

@ -4,9 +4,9 @@ version = 3
[[package]]
name = "addr2line"
version = "0.21.0"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
dependencies = [
"gimli",
]
@ -28,9 +28,9 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.85"
version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27a4bd113ab6da4cd0f521068a6e2ee1065eab54107266a11835d02c8ec86a37"
checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
[[package]]
name = "arrayvec"
@ -45,16 +45,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
dependencies = [
"concurrent-queue",
"event-listener-strategy 0.5.2",
"event-listener-strategy",
"futures-core",
"pin-project-lite",
]
[[package]]
name = "async-executor"
version = "1.11.0"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a"
checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
dependencies = [
"async-task",
"concurrent-queue",
@ -76,9 +76,9 @@ dependencies = [
[[package]]
name = "async-io"
version = "2.3.2"
version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
dependencies = [
"async-lock",
"cfg-if 1.0.0",
@ -95,12 +95,12 @@ dependencies = [
[[package]]
name = "async-lock"
version = "3.3.0"
version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
dependencies = [
"event-listener 4.0.3",
"event-listener-strategy 0.4.0",
"event-listener",
"event-listener-strategy",
"pin-project-lite",
]
@ -117,9 +117,9 @@ dependencies = [
[[package]]
name = "async-process"
version = "2.2.2"
version = "2.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d"
checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a"
dependencies = [
"async-channel",
"async-io",
@ -128,7 +128,7 @@ dependencies = [
"async-task",
"blocking",
"cfg-if 1.0.0",
"event-listener 5.3.0",
"event-listener",
"futures-lite",
"rustix",
"tracing",
@ -137,9 +137,9 @@ dependencies = [
[[package]]
name = "async-signal"
version = "0.2.6"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda"
checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32"
dependencies = [
"async-io",
"async-lock",
@ -173,9 +173,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]]
name = "backtrace"
version = "0.3.71"
version = "0.3.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
dependencies = [
"addr2line",
"cc",
@ -225,9 +225,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.5.0"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "block"
@ -246,12 +246,11 @@ dependencies = [
[[package]]
name = "blocking"
version = "1.6.0"
version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88"
checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
dependencies = [
"async-channel",
"async-lock",
"async-task",
"futures-io",
"futures-lite",
@ -264,7 +263,7 @@ version = "0.19.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
"cairo-sys-rs",
"glib",
"libc",
@ -284,9 +283,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.0.97"
version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
[[package]]
name = "cfg-expr"
@ -330,24 +329,24 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
version = "0.5.12"
version = "0.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
dependencies = [
"crossbeam-utils",
]
[[package]]
name = "crossbeam-utils"
version = "0.8.19"
version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]]
name = "crossmist"
version = "1.0.5"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f69c418587209b3bbd1baa976310e92522482d7f11d45f08c2dce683e01275a"
checksum = "aac3d5666778cfce50c72bd87d5f2a21c7fc4f1fceb4022f565196cb7e70f6f9"
dependencies = [
"async-fs",
"async-io",
@ -435,7 +434,7 @@ dependencies = [
"deluxe-macros",
"once_cell",
"proc-macro2",
"syn 2.0.64",
"syn 2.0.72",
]
[[package]]
@ -448,7 +447,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
"syn 2.0.64",
"syn 2.0.72",
]
[[package]]
@ -463,7 +462,7 @@ dependencies = [
"proc-macro-crate 1.3.1",
"proc-macro2",
"quote",
"syn 2.0.64",
"syn 2.0.72",
]
[[package]]
@ -510,9 +509,9 @@ dependencies = [
[[package]]
name = "either"
version = "1.12.0"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "enum-iterator"
@ -531,7 +530,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.64",
"syn 2.0.72",
]
[[package]]
@ -552,43 +551,22 @@ dependencies = [
[[package]]
name = "event-listener"
version = "4.0.3"
version = "5.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
dependencies = [
"concurrent-queue",
"parking",
"pin-project-lite",
]
[[package]]
name = "event-listener"
version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24"
dependencies = [
"concurrent-queue",
"parking",
"pin-project-lite",
]
[[package]]
name = "event-listener-strategy"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
dependencies = [
"event-listener 4.0.3",
"pin-project-lite",
]
[[package]]
name = "event-listener-strategy"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
dependencies = [
"event-listener 5.3.0",
"event-listener",
"pin-project-lite",
]
@ -722,7 +700,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.64",
"syn 2.0.72",
]
[[package]]
@ -757,9 +735,9 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
version = "0.19.2"
version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92"
checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699"
dependencies = [
"gdk-pixbuf-sys",
"gio",
@ -769,9 +747,9 @@ dependencies = [
[[package]]
name = "gdk-pixbuf-sys"
version = "0.19.5"
version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f"
checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379"
dependencies = [
"gio-sys",
"glib-sys",
@ -866,15 +844,15 @@ dependencies = [
[[package]]
name = "gimli"
version = "0.28.1"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
[[package]]
name = "gio"
version = "0.19.5"
version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7"
checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe"
dependencies = [
"futures-channel",
"futures-core",
@ -890,9 +868,9 @@ dependencies = [
[[package]]
name = "gio-sys"
version = "0.19.5"
version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40"
checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef"
dependencies = [
"glib-sys",
"gobject-sys",
@ -903,11 +881,11 @@ dependencies = [
[[package]]
name = "glib"
version = "0.19.6"
version = "0.19.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0116c428e4841cab183a32a71b900fd6712194c20f9c424f01d2c016c96bd23"
checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
"futures-channel",
"futures-core",
"futures-executor",
@ -925,22 +903,22 @@ dependencies = [
[[package]]
name = "glib-macros"
version = "0.19.5"
version = "0.19.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ed782fa3e949c31146671da6e7a227a5e7d354660df1db6d0aac4974dc82a3c"
checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7"
dependencies = [
"heck 0.5.0",
"proc-macro-crate 3.1.0",
"proc-macro2",
"quote",
"syn 2.0.64",
"syn 2.0.72",
]
[[package]]
name = "glib-sys"
version = "0.19.5"
version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282"
checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5"
dependencies = [
"libc",
"system-deps",
@ -948,9 +926,9 @@ dependencies = [
[[package]]
name = "gobject-sys"
version = "0.19.5"
version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b"
checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e"
dependencies = [
"glib-sys",
"libc",
@ -959,9 +937,9 @@ dependencies = [
[[package]]
name = "graphene-rs"
version = "0.19.2"
version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91"
checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf"
dependencies = [
"glib",
"graphene-sys",
@ -970,9 +948,9 @@ dependencies = [
[[package]]
name = "graphene-sys"
version = "0.19.5"
version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d"
checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05"
dependencies = [
"glib-sys",
"libc",
@ -982,18 +960,18 @@ dependencies = [
[[package]]
name = "gsettings-macro"
version = "0.2.0"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f4ea0f496faeabbfdd1f5d9c39d9b9f7cff83f52d2cbbdec3c94b0e51b3f2f3"
checksum = "a5d601b9c413a6835a1e1d3efec21c75c1c2a4f399338f6db8be1ab3ab146865"
dependencies = [
"deluxe",
"heck 0.4.1",
"heck 0.5.0",
"proc-macro-error",
"proc-macro2",
"quick-xml",
"quote",
"serde",
"syn 2.0.64",
"syn 2.0.72",
]
[[package]]
@ -1057,7 +1035,7 @@ dependencies = [
"proc-macro-crate 3.1.0",
"proc-macro2",
"quote",
"syn 2.0.64",
"syn 2.0.72",
]
[[package]]
@ -1099,9 +1077,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "hermit-abi"
version = "0.3.9"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
[[package]]
name = "hex"
@ -1195,9 +1173,9 @@ dependencies = [
[[package]]
name = "lazy_static"
version = "1.4.0"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libadwaita"
@ -1243,7 +1221,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
"libc",
]
@ -1268,9 +1246,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.21"
version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "malloc_buf"
@ -1289,9 +1267,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
[[package]]
name = "memchr"
version = "2.7.2"
version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memoffset"
@ -1304,9 +1282,9 @@ dependencies = [
[[package]]
name = "miniz_oxide"
version = "0.7.3"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
dependencies = [
"adler",
]
@ -1359,7 +1337,7 @@ version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
"cfg-if 1.0.0",
"libc",
"memoffset",
@ -1406,9 +1384,9 @@ dependencies = [
[[package]]
name = "object"
version = "0.32.2"
version = "0.36.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
dependencies = [
"memchr",
]
@ -1433,9 +1411,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "pango"
version = "0.19.5"
version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d"
checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd"
dependencies = [
"gio",
"glib",
@ -1445,9 +1423,9 @@ dependencies = [
[[package]]
name = "pango-sys"
version = "0.19.5"
version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505"
checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0"
dependencies = [
"glib-sys",
"gobject-sys",
@ -1481,9 +1459,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "piper"
version = "0.2.2"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf"
checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
dependencies = [
"atomic-waker",
"fastrand",
@ -1498,9 +1476,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
[[package]]
name = "polling"
version = "3.7.0"
version = "3.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3"
checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
dependencies = [
"cfg-if 1.0.0",
"concurrent-queue",
@ -1568,9 +1546,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.82"
version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]
@ -1592,9 +1570,9 @@ dependencies = [
[[package]]
name = "quick-xml"
version = "0.31.0"
version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
dependencies = [
"memchr",
"serde",
@ -1663,9 +1641,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.10.4"
version = "1.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
dependencies = [
"aho-corasick",
"memchr",
@ -1675,9 +1653,9 @@ dependencies = [
[[package]]
name = "regex-automata"
version = "0.4.6"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
dependencies = [
"aho-corasick",
"memchr",
@ -1686,9 +1664,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.8.3"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
[[package]]
name = "rustc-demangle"
@ -1711,7 +1689,7 @@ version = "0.38.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
dependencies = [
"bitflags 2.5.0",
"bitflags 2.6.0",
"errno",
"libc",
"linux-raw-sys",
@ -1738,30 +1716,31 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]]
name = "serde"
version = "1.0.202"
version = "1.0.204"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.202"
version = "1.0.204"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.64",
"syn 2.0.72",
]
[[package]]
name = "serde_json"
version = "1.0.117"
version = "1.0.120"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
dependencies = [
"indexmap",
"itoa",
"ryu",
"serde",
@ -1769,9 +1748,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
version = "0.6.6"
version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
dependencies = [
"serde",
]
@ -1915,9 +1894,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.64"
version = "2.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f"
checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
dependencies = [
"proc-macro2",
"quote",
@ -1939,9 +1918,9 @@ dependencies = [
[[package]]
name = "target-lexicon"
version = "0.12.14"
version = "0.12.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2"
[[package]]
name = "temp-dir"
@ -1963,7 +1942,7 @@ dependencies = [
[[package]]
name = "textpieces"
version = "4.0.6"
version = "4.1.0"
dependencies = [
"anyhow",
"cairo-rs",
@ -1987,8 +1966,8 @@ dependencies = [
[[package]]
name = "textpieces-core"
version = "1.0.0"
source = "git+https://gitlab.com/liferooter/textpieces-core#668e783856073ece22b059f2b5cddaec0f38dd5c"
version = "1.1.2"
source = "git+https://gitlab.com/liferooter/textpieces-core#ef2902e17c259223d6d3ed77eccdf51ec45fc9b0"
dependencies = [
"base64",
"digest",
@ -2005,14 +1984,15 @@ dependencies = [
"textpieces-foundations",
"textpieces-function-actions",
"textpieces-script-actions",
"toml",
"urlencoding",
"xml-rs",
]
[[package]]
name = "textpieces-foundations"
version = "1.0.0"
source = "git+https://gitlab.com/liferooter/textpieces-core#668e783856073ece22b059f2b5cddaec0f38dd5c"
version = "1.1.2"
source = "git+https://gitlab.com/liferooter/textpieces-core#ef2902e17c259223d6d3ed77eccdf51ec45fc9b0"
dependencies = [
"crossmist",
"enum-iterator",
@ -2023,8 +2003,8 @@ dependencies = [
[[package]]
name = "textpieces-function-actions"
version = "1.0.0"
source = "git+https://gitlab.com/liferooter/textpieces-core#668e783856073ece22b059f2b5cddaec0f38dd5c"
version = "1.1.2"
source = "git+https://gitlab.com/liferooter/textpieces-core#ef2902e17c259223d6d3ed77eccdf51ec45fc9b0"
dependencies = [
"anyhow",
"crossmist",
@ -2037,8 +2017,8 @@ dependencies = [
[[package]]
name = "textpieces-script-actions"
version = "1.0.0"
source = "git+https://gitlab.com/liferooter/textpieces-core#668e783856073ece22b059f2b5cddaec0f38dd5c"
version = "1.1.2"
source = "git+https://gitlab.com/liferooter/textpieces-core#ef2902e17c259223d6d3ed77eccdf51ec45fc9b0"
dependencies = [
"anyhow",
"rustix",
@ -2051,22 +2031,22 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.61"
version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.61"
version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.64",
"syn 2.0.72",
]
[[package]]
@ -2081,21 +2061,22 @@ dependencies = [
[[package]]
name = "toml"
version = "0.8.13"
version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"
checksum = "81967dd0dd2c1ab0bc3468bd7caecc32b8a4aa47d0c8c695d8c2b2108168d62c"
dependencies = [
"indexmap",
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit 0.22.13",
"toml_edit 0.22.17",
]
[[package]]
name = "toml_datetime"
version = "0.6.6"
version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db"
dependencies = [
"serde",
]
@ -2124,15 +2105,15 @@ dependencies = [
[[package]]
name = "toml_edit"
version = "0.22.13"
version = "0.22.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
checksum = "8d9f8729f5aea9562aac1cc0441f5d6de3cff1ee0c5d67293eeca5eb36ee7c16"
dependencies = [
"indexmap",
"serde",
"serde_spanned",
"toml_datetime",
"winnow 0.6.8",
"winnow 0.6.16",
]
[[package]]
@ -2154,7 +2135,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.64",
"syn 2.0.72",
]
[[package]]
@ -2224,9 +2205,9 @@ checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
[[package]]
name = "uuid"
version = "1.8.0"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
dependencies = [
"getrandom 0.2.15",
]
@ -2245,9 +2226,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
[[package]]
name = "version_check"
version = "0.9.4"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "wasi"
@ -2323,7 +2304,7 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
"windows-targets 0.52.5",
"windows-targets 0.52.6",
]
[[package]]
@ -2343,18 +2324,18 @@ dependencies = [
[[package]]
name = "windows-targets"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
"windows_aarch64_gnullvm 0.52.5",
"windows_aarch64_msvc 0.52.5",
"windows_i686_gnu 0.52.5",
"windows_aarch64_gnullvm 0.52.6",
"windows_aarch64_msvc 0.52.6",
"windows_i686_gnu 0.52.6",
"windows_i686_gnullvm",
"windows_i686_msvc 0.52.5",
"windows_x86_64_gnu 0.52.5",
"windows_x86_64_gnullvm 0.52.5",
"windows_x86_64_msvc 0.52.5",
"windows_i686_msvc 0.52.6",
"windows_x86_64_gnu 0.52.6",
"windows_x86_64_gnullvm 0.52.6",
"windows_x86_64_msvc 0.52.6",
]
[[package]]
@ -2365,9 +2346,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
@ -2383,9 +2364,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
@ -2401,15 +2382,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
@ -2425,9 +2406,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
@ -2443,9 +2424,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
@ -2455,9 +2436,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
@ -2473,9 +2454,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.5"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
@ -2488,9 +2469,9 @@ dependencies = [
[[package]]
name = "winnow"
version = "0.6.8"
version = "0.6.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d"
checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c"
dependencies = [
"memchr",
]

View File

@ -1,36 +1,37 @@
{ lib
, stdenv
, fetchFromGitLab
, meson
, ninja
, pkg-config
, cargo
, rustc
, rustPlatform
, blueprint-compiler
, glib
, gtk4
, libadwaita
, gtksourceview5
, wrapGAppsHook4
, desktop-file-utils
{
lib,
stdenv,
fetchFromGitLab,
meson,
ninja,
pkg-config,
cargo,
rustc,
rustPlatform,
blueprint-compiler,
glib,
gtk4,
libadwaita,
gtksourceview5,
wrapGAppsHook4,
desktop-file-utils,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "textpieces";
version = "4.0.6";
version = "4.1.0";
src = fetchFromGitLab {
owner = "liferooter";
repo = "textpieces";
rev = "v${finalAttrs.version}";
hash = "sha256-6kbGvCiaoOY+pwSmaDn1N/rbTBzEehNi/j+RI05nn6o=";
hash = "sha256-0bc2Q3k08ZItRH7teQCv7uQyj4Rig6LtZmO5Vu48vxo=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"textpieces-core-1.0.0" = "sha256-HaLkL2HhH1khwsSdH64pZYtJ/WG+MLiEQPScDte/PAg=";
"textpieces-core-1.1.2" = "sha256-fAATzugZ4kpUqHx8H4yuNH9Weeubkp8eAHAe94rMBmA=";
};
};
@ -55,11 +56,21 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Swiss knife of text processing";
longDescription = "A small tool for quick text transformations such as checksums, encoding, decoding and so on.";
longDescription = ''
A small tool for quick text transformations such as
checksums, encoding, decoding and so on.
'';
homepage = "https://gitlab.com/liferooter/textpieces";
mainProgram = "textpieces";
license = lib.licenses.gpl3Plus;
license = with lib.licenses; [
gpl3Plus
# and
cc0
];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ zendo ];
maintainers = with lib.maintainers; [
zendo
aleksana
];
};
})

View File

@ -42,6 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ installShellFiles makeWrapper ];
# Usually --set-default is used to set default environment variables.
# But the value is wrapped in single-quotes so our variables would be used literally instead
# of the expanded version. Thus we use --run instead.
installPhase = ''
runHook preInstall
@ -50,12 +53,12 @@ stdenv.mkDerivation (finalAttrs: {
installShellCompletion --bash --name wp ${completion}
makeWrapper ${lib.getExe php} $out/bin/${finalAttrs.meta.mainProgram} \
--set-default XDG_CACHE_HOME \$HOME/.cache \
--set-default XDG_CONFIG_HOME \$HOME/.config \
--set-default XDG_DATA_HOME \$HOME/.local/share \
--set-default WP_CLI_CONFIG_PATH \$XDG_CONFIG_HOME}/wp-cli \
--set-default WP_CLI_PACKAGES_DIR \$XDG_DATA_HOME/wp-cli \
--set-default WP_CLI_CACHE_DIR \$XDG_CACHE_HOME/wp-cli \
--run 'export XDG_CACHE_HOME=''${XDG_CACHE_HOME-"$HOME/.cache"}' \
--run 'export XDG_CONFIG_HOME=''${XDG_CONFIG_HOME-"$HOME/.config"}' \
--run 'export XDG_DATA_HOME=''${XDG_DATA_HOME-"$HOME/.local/share"}' \
--run 'export WP_CLI_CONFIG_PATH=''${WP_CLI_CONFIG_PATH-"$XDG_CONFIG_HOME/wp-cli"}' \
--run 'export WP_CLI_PACKAGES_DIR=''${WP_CLI_PACKAGES_DIR-"$XDG_DATA_HOME/wp-cli"}' \
--run 'export WP_CLI_CACHE_DIR=''${WP_CLI_CACHE_DIR-"$XDG_CACHE_HOME/wp-cli"}' \
--add-flags "-c $out/etc/${ini.name}" \
--add-flags "-f $out/share/wp-cli/wp-cli.phar" \
--add-flags "--"

View File

@ -1,25 +1,34 @@
{ lib, stdenv, fetchFromGitHub, gcc, gmp, openssl, zlib }:
{ lib, stdenv, fetchFromGitHub, makeWrapper, gmp, gcc, openssl, zlib }:
stdenv.mkDerivation rec {
pname = "spasm-ng";
version = "unstable-2020-08-03";
version = "unstable-2022-07-05";
src = fetchFromGitHub {
owner = "alberthdev";
repo = "spasm-ng";
rev = "221898beff2442f459b80ab89c8e1035db97868e";
sha256 = "0xspxmp2fir604b4xsk4hi1gjv61rnq2ypppr7cj981jlhicmvjj";
rev = "5f0786d38f064835be674d4b7df42969967bb73c";
sha256 = "sha256-j7Z3oI+J0wZF4EG5OMMjuDe2o69KKGuJvfyHNPTLrXM=";
};
nativeBuildInputs = [ gcc ];
# GCC is needed for Darwin
nativeBuildInputs = [ makeWrapper gcc ];
buildInputs = [ gmp openssl zlib ];
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
install -Dm755 spasm -t $out/bin
install -Dm555 inc/*.inc -t $out/include
runHook postInstall
'';
postFixup = ''
wrapProgram $out/bin/spasm --add-flags "-I $out/include"
'';
meta = with lib; {

View File

@ -28,7 +28,7 @@ buildPythonPackage rec {
ninja
pybind11
scikit-build-core
] ++ scikit-build-core.optional-dependencies.pyproject;
];
dependencies = [ numpy ];

View File

@ -38,7 +38,7 @@ buildPythonPackage rec {
pathspec
ninja
pyproject-metadata
] ++ scikit-build-core.optional-dependencies.pyproject;
];
propagatedBuildInputs = [ numpy ];

View File

@ -44,7 +44,7 @@ buildPythonPackage rec {
ninja
pybind11
scikit-build-core
] ++ scikit-build-core.optional-dependencies.pyproject;
];
dontUseCmakeConfigure = true;

View File

@ -6,13 +6,13 @@
setuptools,
aiohttp,
xmltodict,
python-socketio,
python-socketio-v4,
websocket-client,
}:
buildPythonPackage rec {
pname = "pycontrol4";
version = "1.1.2";
version = "1.2.0";
disabled = pythonOlder "3.6";
@ -22,20 +22,15 @@ buildPythonPackage rec {
owner = "lawtancool";
repo = "pyControl4";
rev = "refs/tags/v${version}";
hash = "sha256-oKKc9s3/fO7cFMjOeKtpvEwmfglxI2lxlN3EIva7zR8=";
hash = "sha256-1gZebYseuEBI0dlXlD72f/uozNuoxHPqVsc8AWJV148=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "python-socketio>=4,<5" "python-socketio>=4"
'';
build-system = [ setuptools ];
nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
aiohttp
xmltodict
python-socketio
python-socketio-v4
websocket-client
];
@ -50,6 +45,7 @@ buildPythonPackage rec {
];
meta = with lib; {
changelog = "https://github.com/lawtancool/pyControl4/releases/tag/v${version}";
description = "Python 3 asyncio package for interacting with Control4 systems";
homepage = "https://github.com/lawtancool/pyControl4";
license = licenses.asl20;

View File

@ -0,0 +1,55 @@
{
lib,
buildPythonPackage,
fetchPypi,
freetds,
krb5-c,
openssl,
cython,
gevent,
psutil,
pytestCheckHook,
setuptools-scm,
sqlalchemy,
tomli,
}:
buildPythonPackage rec {
pname = "pymssql";
version = "2.3.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-8DTka1aAYdFxSPHe3qZI+dX2tzQOjP/g7bqhcTy0q6s=";
};
build-system = [
cython
setuptools-scm
tomli
];
buildInputs = [
freetds
krb5-c
openssl
];
nativeCheckInputs = [
gevent
psutil
pytestCheckHook
sqlalchemy
];
pythonImportsCheck = [ "pymssql" ];
meta = with lib; {
changelog = "https://github.com/pymssql/pymssql/blob/v${version}/ChangeLog.rst";
description = "Simple database interface for Python that builds on top of FreeTDS to provide a Python DB-API (PEP-249) interface to Microsoft SQL Server";
homepage = "https://github.com/pymssql/pymssql";
license = licenses.lgpl21Plus;
maintainers = [ maintainers.sith-lord-vader ];
};
}

View File

@ -7,7 +7,6 @@
# build-system
cmake,
scikit-build-core,
pathspec,
ninja,
nanobind,
@ -45,7 +44,6 @@ buildPythonPackage rec {
nanobind
ninja
numpy
pathspec
scikit-build-core
];

View File

@ -0,0 +1,46 @@
{
aiohttp,
buildPythonPackage,
fetchPypi,
lib,
requests,
setuptools,
six,
websocket-client,
}:
buildPythonPackage rec {
pname = "python-engineio-v3";
version = "3.14.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-tYri/+OKIJAWWzeijFwgY9PK66lH584dvZnoBWyzaFw=";
};
build-system = [ setuptools ];
dependencies = [ six ];
optional-dependencies = {
client = [
requests
websocket-client
];
asyncio_client = [ aiohttp ];
};
pythonImportsCheck = [ "engineio_v3" ];
# no tests on PyPI
doCheck = false;
meta = {
description = "Engine.IO server";
homepage = "https://github.com/bdraco/python-engineio-v3";
license = lib.licenses.mit;
longDescription = "This is a release of 3.14.2 under the engineio_v3 namespace for old systems.";
maintainers = with lib.maintainers; [ dotlambda ];
};
}

View File

@ -0,0 +1,54 @@
{
aiohttp,
buildPythonPackage,
fetchPypi,
lib,
python-engineio-v3,
requests,
setuptools,
six,
websocket-client,
websockets,
}:
buildPythonPackage rec {
pname = "python-socketio-v4";
version = "4.6.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-3VzLPYT4p4Uh2U4DMpxu6kq1NPZXlOqWOljLOe0bM40=";
};
build-system = [ setuptools ];
dependencies = [
python-engineio-v3
six
];
optional-dependencies = {
client = [
requests
websocket-client
];
asyncio_client = [
aiohttp
websockets
];
};
pythonImportsCheck = [ "socketio_v4" ];
# no tests on PyPI
doCheck = false;
meta = {
description = "Socket.IO server";
homepage = "https://github.com/bdraco/python-socketio-v4";
license = lib.licenses.mit;
longDescription = "This is a release of 4.6.1 under the socketio_v4 namespace for old systems.";
maintainers = with lib.maintainers; [ dotlambda ];
};
}

View File

@ -0,0 +1,62 @@
{
lib,
buildPythonPackage,
fetchPypi,
poetry-core,
charset-normalizer,
httpx,
pipdeptree,
platformdirs,
pydantic,
python-dateutil,
rich,
tabulate,
typer,
websockets,
}:
buildPythonPackage rec {
pname = "reflex-hosting-cli";
version = "0.1.13";
pyproject = true;
# source is not published https://github.com/reflex-dev/reflex/issues/3762
src = fetchPypi {
pname = "reflex_hosting_cli";
inherit version;
hash = "sha256-xdav3P63TO4EajdN29WRFquO15fa5oj8x0TauuJNxXE=";
};
pythonRelaxDeps = [ "pipdeptree" ];
build-system = [ poetry-core ];
dependencies = [
charset-normalizer
httpx
pipdeptree
platformdirs
pydantic
python-dateutil
rich
tabulate
typer
websockets
];
pythonImportsCheck = [
"reflex_cli"
"reflex_cli.cli"
"reflex_cli.deployments"
];
# no tests on pypi
doCheck = false;
meta = with lib; {
description = "Reflex Hosting CLI";
homepage = "https://pypi.org/project/reflex-hosting-cli/";
license = licenses.asl20;
maintainers = with maintainers; [ pbsds ];
};
}

View File

@ -0,0 +1,136 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
poetry-core,
alembic,
attrs,
build,
charset-normalizer,
dill,
distro,
fastapi,
gunicorn,
httpx,
jinja2,
lazy-loader,
numpy,
pandas,
pillow,
platformdirs,
plotly,
psutil,
pydantic,
pytest-asyncio,
pytest-mock,
pytestCheckHook,
python-engineio,
python-multipart,
python-socketio,
redis,
reflex-hosting-cli,
rich,
sqlmodel,
starlette-admin,
tomlkit,
twine,
typer,
unzip,
uvicorn,
watchdog,
watchfiles,
wrapt,
}:
buildPythonPackage rec {
pname = "reflex";
version = "0.5.9";
pyproject = true;
src = fetchFromGitHub {
owner = "reflex-dev";
repo = "reflex";
rev = "v${version}";
hash = "sha256-QeEggHPilCLjUQ76AYDkqdf1iWLwCyAYTnf17RdhDq0=";
};
pythonRelaxDeps = [ "fastapi" ];
pythonRemoveDeps = [
"setuptools"
"build"
];
build-system = [ poetry-core ];
dependencies = [
alembic
build # used in custom_components/custom_components.py
charset-normalizer
dill
distro
fastapi
gunicorn
httpx
jinja2
lazy-loader
platformdirs
psutil
pydantic
python-engineio
python-multipart
python-socketio
redis
reflex-hosting-cli
rich
sqlmodel
starlette-admin
tomlkit
twine # used in custom_components/custom_components.py
typer
uvicorn
watchdog
watchfiles
wrapt
];
nativeCheckInputs = [
pytestCheckHook
pytest-asyncio
pytest-mock
attrs
numpy
plotly
pandas
pillow
unzip
];
disabledTests = [
# touches network
"test_find_and_check_urls"
"test_event_actions"
"test_upload_file"
# /proc is too funky in nix sandbox
"test_get_cpu_info"
# broken
"test_potentially_dirty_substates" # AssertionError: Extra items in the left set
# flaky
"test_preprocess" # KeyError: 'reflex___state____state'
"test_send" # AssertionError: Expected 'post' to have been called once. Called 0 times.
];
disabledTestPaths = [
"benchmarks/"
"integration/"
];
pythonImportsCheck = [ "reflex" ];
meta = with lib; {
description = "Web apps in pure Python";
homepage = "https://github.com/reflex-dev/reflex";
changelog = "https://github.com/reflex-dev/reflex/releases/tag/${src.rev}";
license = licenses.asl20;
maintainers = with maintainers; [ pbsds ];
mainProgram = "reflex";
};
}

View File

@ -1,18 +1,25 @@
{
lib,
buildPythonPackage,
fetchPypi,
distlib,
fetchFromGitHub,
pythonOlder,
exceptiongroup,
# build-system
hatch-vcs,
hatchling,
cattrs,
cmake,
ninja,
# dependencies
packaging,
pathspec,
pyproject-metadata,
exceptiongroup,
# tests
build,
cattrs,
numpy,
pybind11,
pytest-subprocess,
pytestCheckHook,
setuptools,
@ -23,62 +30,56 @@
buildPythonPackage rec {
pname = "scikit-build-core";
version = "0.9.6";
version = "0.10.5";
pyproject = true;
src = fetchPypi {
pname = "scikit_build_core";
inherit version;
hash = "sha256-e+r5M89zSsvrttlsApNlQQIkcJvN5o87C08MsD4FSTk=";
src = fetchFromGitHub {
owner = "scikit-build";
repo = "scikit-build-core";
rev = "refs/tags/v${version}";
hash = "sha256-hpwXEWPofgMT4ua2tZI1mtGbaBkT2XPBd6QL8xTi1A0=";
};
postPatch = lib.optionalString (pythonOlder "3.11") ''
substituteInPlace pyproject.toml \
--replace '"error",' '"error", "ignore::UserWarning",'
--replace-fail '"error",' '"error", "ignore::UserWarning",'
'';
nativeBuildInputs = [
build-system = [
hatch-vcs
hatchling
];
propagatedBuildInputs =
[ packaging ]
dependencies =
[
packaging
pathspec
]
++ lib.optionals (pythonOlder "3.11") [
exceptiongroup
tomli
];
passthru.optional-dependencies = {
pyproject = [
distlib
pathspec
pyproject-metadata
];
};
dontUseCmakeConfigure = true;
nativeCheckInputs = [
build
cattrs
cmake
ninja
numpy
pybind11
pytest-subprocess
pytestCheckHook
setuptools
virtualenv
wheel
] ++ passthru.optional-dependencies.pyproject;
];
# cmake is only used for tests
dontUseCmakeConfigure = true;
pytestFlagsArray = [ "-m 'not isolated and not network'" ];
disabledTestPaths = [
# runs pip, requires network access
"tests/test_custom_modules.py"
"tests/test_hatchling.py"
"tests/test_pyproject_pep517.py"
"tests/test_pyproject_pep518.py"
"tests/test_pyproject_pep660.py"
"tests/test_setuptools_pep517.py"
"tests/test_setuptools_pep518.py"
# store permissions issue in Nix:
"tests/test_editable.py"
];

View File

@ -0,0 +1,78 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
hatchling,
fasteners,
libcloud,
pillow,
pytestCheckHook,
sqlalchemy,
sqlmodel,
}:
buildPythonPackage rec {
pname = "sqlalchemy-file";
version = "0.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "jowilf";
repo = "sqlalchemy-file";
rev = version;
hash = "sha256-gtW7YA/rQ48tnqPdypMnSqqtwb90nhAkiQNhgEr1M3I=";
};
build-system = [ hatchling ];
dependencies = [
libcloud
sqlalchemy
];
nativeCheckInputs = [
pytestCheckHook
fasteners
pillow
sqlmodel
];
preCheck = ''
# used in get_test_container in tests/utils.py
# fixes FileNotFoundError: [Errno 2] No such file or directory: '/tmp/storage/...'
mkdir .storage
export LOCAL_PATH="$PWD/.storage"
'';
disabledTestPaths = lib.optionals stdenv.isDarwin [
# very flaky, sandbox issues?
# libcloud.storage.types.ContainerDoesNotExistError
# sqlite3.OperationalError: attempt to write a readonly database
"tests/test_content_type_validator.py"
"tests/test_image_field.py"
"tests/test_image_validator.py"
"tests/test_metadata.py"
"tests/test_multiple_field.py"
"tests/test_multiple_storage.py"
"tests/test_processor.py"
"tests/test_single_field.py"
"tests/test_size_validator.py"
"tests/test_sqlmodel.py"
];
pythonImportsCheck = [
"sqlalchemy_file"
"sqlalchemy_file.file"
"sqlalchemy_file.types"
"sqlalchemy_file.helpers"
];
meta = with lib; {
description = "SQLAlchemy extension for attaching files to SQLAlchemy model and uploading them to various storage with Apache Libcloud";
homepage = "https://github.com/jowilf/sqlalchemy-file";
changelog = "https://github.com/jowilf/sqlalchemy-file/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ pbsds ];
};
}

View File

@ -0,0 +1,127 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
hatchling,
aiosqlite,
arrow,
babel,
cacert,
colour,
fasteners,
httpx,
jinja2,
mongoengine,
motor,
passlib,
phonenumbers,
pillow,
psycopg2,
pydantic,
pytest-asyncio,
pytestCheckHook,
python-multipart,
requests,
sqlalchemy,
sqlalchemy-file,
sqlalchemy-utils,
sqlmodel,
starlette,
}:
buildPythonPackage rec {
pname = "starlette-admin";
version = "0.14.1";
pyproject = true;
src = fetchFromGitHub {
owner = "jowilf";
repo = "starlette-admin";
rev = version;
hash = "sha256-DoYD8Hc5pd68+BhASw3mwwCdhu0vYHiELjVmVwU8FHs=";
};
build-system = [ hatchling ];
dependencies = [
jinja2
python-multipart
starlette
];
optional-dependencies = {
i18n = [ babel ];
};
nativeCheckInputs = [
aiosqlite
arrow
babel
cacert
colour
fasteners
httpx
mongoengine
motor
passlib
phonenumbers
pillow
psycopg2
pydantic
pytest-asyncio
pytestCheckHook
requests
sqlalchemy
sqlalchemy-file
sqlalchemy-utils
sqlmodel
];
preCheck = ''
# used in get_test_container in tests/sqla/utils.py
# fixes FileNotFoundError: [Errno 2] No such file or directory: '/tmp/storage/...'
mkdir .storage
export LOCAL_PATH="$PWD/.storage"
'';
disabledTests = lib.optionals stdenv.isDarwin [
# flaky, depends on test order
"test_ensuring_pk"
# flaky, of-by-one
"test_api"
];
disabledTestPaths =
[
# odmantic is not packaged
"tests/odmantic"
# needs mongodb running on port 27017
"tests/mongoengine"
]
++ lib.optionals stdenv.isDarwin [
# very flaky, sandbox issues?
# libcloud.storage.types.ContainerDoesNotExistError
# sqlite3.OperationalError: attempt to write a readonly database
"tests/sqla/test_sync_engine.py"
"tests/sqla/test_async_engine.py"
];
pythonImportsCheck = [
"starlette_admin"
"starlette_admin.actions"
"starlette_admin.base"
"starlette_admin.fields"
"starlette_admin.i18n"
"starlette_admin.tools"
"starlette_admin.views"
];
meta = with lib; {
description = "Fast, beautiful and extensible administrative interface framework for Starlette & FastApi applications";
homepage = "https://github.com/jowilf/starlette-admin";
changelog = "https://github.com/jowilf/starlette-admin/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ pbsds ];
};
}

View File

@ -7,6 +7,7 @@
click-option-group,
fetchPypi,
hatchling,
hypothesis,
jinja2,
pydantic,
pytestCheckHook,
@ -53,6 +54,7 @@ buildPythonPackage rec {
};
nativeCheckInputs = [
hypothesis
pytestCheckHook
typing-extensions
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);

View File

@ -16,12 +16,6 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "sha256-X3Pueu0E7Q57sbKSXqCZki4/PUb1WyWk/Zmj+lhVTM8=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov=codespell_lib" "" \
--replace "--cov-report=" ""
'';
nativeBuildInputs = with python3.pkgs; [
setuptools-scm
];
@ -30,6 +24,7 @@ python3.pkgs.buildPythonApplication rec {
aspell-python
chardet
pytestCheckHook
pytest-cov-stub
pytest-dependency
];

View File

@ -15,11 +15,6 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-6MchaqRKJPmvwiDyhCK4kFyIYl2B+2dGL8H8X2ES+VQ=";
};
postPatch = ''
# remove --cov* options provided to pytest
sed -i '/^addopts = "--cov/d' pyproject.toml
'';
nativeBuildInputs = with python3Packages; [
poetry-core
];
@ -43,6 +38,7 @@ python3Packages.buildPythonApplication rec {
pluggy
py
pyparsing
pytest-cov-stub
pytestCheckHook
];

View File

@ -270,6 +270,23 @@ let
checkFlags = [
# Do not create __pycache__ when running tests.
"PYTHONDONTWRITEBYTECODE=1"
] ++ lib.optionals (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64) [
# Python 3.12 introduced a warning for calling `os.fork()` in a
# multithreaded program. For some reason, the Node.js
# `tools/pseudo-tty.py` program used for PTYrelated tests
# triggers this warning on Hydra, on `x86_64-darwin` only,
# despite not creating any threads itself. This causes the
# Node.js test runner to misinterpret the warnings as part of the
# test output and fail. It does not reproduce reliably off Hydra
# on Intel Macs, or occur on the `aarch64-darwin` builds.
#
# This seems likely to be related to Rosetta 2, but it could also
# be some strange x8664only threading behaviour of the Darwin
# system libraries, or a bug in CPython, or something else
# haunted about the Nixpkgs/Hydra build environment. We silence
# the warnings in the hope that closing our eyes will make the
# ghosts go away.
"PYTHONWARNINGS=ignore::DeprecationWarning"
] ++ lib.optionals (!stdenv.buildPlatform.isDarwin || lib.versionAtLeast version "20") [
"FLAKY_TESTS=skip"
# Skip some tests that are not passing in this context

View File

@ -3,6 +3,7 @@
, fetchFromGitHub
, fetchpatch2
, govee-led-wez
, pytest-cov-stub
, pytest-homeassistant-custom-component
, pytestCheckHook
}:
@ -26,11 +27,6 @@ buildHomeAssistantComponent {
})
];
postPatch = ''
substituteInPlace setup.cfg \
--replace-fail "--cov=custom_components" ""
'';
dontBuild = true;
propagatedBuildInputs = [
@ -41,11 +37,11 @@ buildHomeAssistantComponent {
doCheck = false;
nativeCheckInputs = [
pytest-cov-stub
pytest-homeassistant-custom-component
pytestCheckHook
];
meta = with lib; {
description = "Control Govee lights via the LAN API from Home Assistant";
homepage = "https://github.com/wez/govee-lan-hass";

View File

@ -6,13 +6,13 @@
buildHomeAssistantComponent rec {
owner = "rospogrigio";
domain = "localtuya";
version = "5.2.1";
version = "5.2.2";
src = fetchFromGitHub {
owner = "rospogrigio";
repo = "localtuya";
rev = "v${version}";
hash = "sha256-hA/1FxH0wfM0jz9VqGCT95rXlrWjxV5oIkSiBf0G0ac=";
hash = "sha256-GexGUu4hevRDGF7gv7Jklr5YZJV+QH3kZN7p+eK9HlM=";
};
meta = with lib; {

View File

@ -6,6 +6,7 @@
, music-assistant
, pytestCheckHook
, pytest-asyncio
, pytest-cov-stub
, pytest-homeassistant-custom-component
}:
@ -21,10 +22,6 @@ buildHomeAssistantComponent rec {
hash = "sha256-lrJx2wsVY0aJ+iVBxbZryC6QRvaXdxjBsTma/4ptl4o=";
};
postPatch = ''
sed -i "s/--cov//" pyproject.toml
'';
dependencies = [
async-timeout
(toPythonModule music-assistant)
@ -35,6 +32,7 @@ buildHomeAssistantComponent rec {
nativeCheckInputs = [
pytestCheckHook
pytest-asyncio
pytest-cov-stub
pytest-homeassistant-custom-component
];

View File

@ -5,16 +5,16 @@
buildNpmPackage rec {
pname = "mushroom";
version = "4.0.3";
version = "4.0.5";
src = fetchFromGitHub {
owner = "piitaya";
repo = "lovelace-mushroom";
rev = "v${version}";
hash = "sha256-H5u0Q4yiSCyk+oeCiTeYqol0+mUKaxFul7gXgto+Nmg=";
hash = "sha256-a/3HUwHrAhAutdVIf0/1HVKZwCcfAKxKnAnjU+6YZsU=";
};
npmDepsHash = "sha256-Qx0qDxpb35uIU7R6gG/mEo0EZJjYx0hPb/cBPRn9KlQ=";
npmDepsHash = "sha256-8vVv8fJ403FyFigztVoT3nyTdka3bwLxjug99/PeSrE=";
installPhase = ''
runHook preInstall

View File

@ -6,12 +6,12 @@
, stdenv
}:
let
version = "24.2.2";
version = "24.2.3";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "redpanda";
rev = "v${version}";
sha256 = "sha256-hVgmAFut2jGgXGeMKLX12TlASLIpr6YozINKRbvfDSg=";
sha256 = "sha256-X9RvMjmI6IMFsBvutXH8Bb8TTLRgaFGGXLxrIlmMEaU=";
};
in
buildGoModule rec {

View File

@ -44,7 +44,10 @@ rec {
'';
};
bootGCC = pkgs.gcc.cc.override { enableLTO = false; };
bootGCC = pkgs.gcc.cc.override {
enableLTO = false;
isl = null;
};
bootBinutils = pkgs.binutils.bintools.override {
withAllTargets = false;

View File

@ -17,7 +17,6 @@
gnumake,
gnused,
gzip,
isl,
libc,
libmpc,
mpfr,
@ -156,7 +155,6 @@ stdenv.mkDerivation (finalAttrs: {
rm -rf $out/include/c++/*/ext/parallel
cp -d ${gmpxx.out}/lib/libgmp*.so* $out/lib
cp -d ${isl.out}/lib/libisl*.so* $out/lib
cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib
cp -d ${zlib.out}/lib/libz.so* $out/lib

View File

@ -25,11 +25,6 @@ python3.pkgs.buildPythonApplication rec {
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --no-cov-on-fail" ""
'';
pythonRelaxDeps = [
"anyconfig"
"flake8"
@ -65,6 +60,7 @@ python3.pkgs.buildPythonApplication rec {
];
nativeCheckInputs = with python3.pkgs; [
pytest-cov-stub
pytest-mock
pytestCheckHook
];

View File

@ -4,7 +4,7 @@
, hypothesis
, lib
, poetry-core
, pytest
, pytest-cov-stub
, pytestCheckHook
, stringcase
}:
@ -19,10 +19,6 @@ buildPythonApplication rec {
hash = "sha256-Xmg33bqs3gQJWqkCNiWYUem3o6XsxpfbHIVvLs/2D94=";
};
postPatch = ''
sed -i pyproject.toml -e '/--cov[^"]*/d'
'';
nativeBuildInputs = [
poetry-core
];
@ -30,7 +26,7 @@ buildPythonApplication rec {
nativeCheckInputs = [
pytestCheckHook
hypothesis
pytest
pytest-cov-stub
];
propagatedBuildInputs = [

View File

@ -21,14 +21,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2024.7.3";
version = "2024.8.0";
pyproject = true;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-D81VmT2E84Q4sOzZy/98mbx69vAskpwYlwqtXNjkBvs=";
hash = "sha256-OI4WjuHSnOIKDIM/8LC1E8TwJRgrhGMjmyzyTFgrIM0=";
};
nativeBuildInputs = with python.pkgs; [
@ -48,9 +48,6 @@ python.pkgs.buildPythonApplication rec {
substituteInPlace pyproject.toml \
--replace-fail "setuptools==" "setuptools>="
# drop coverage testing
sed -i '/--cov/d' pyproject.toml
# ensure component dependencies are available
cat requirements_optional.txt >> requirements.txt
# relax strict runtime version check
@ -112,6 +109,7 @@ python.pkgs.buildPythonApplication rec {
hypothesis
mock
pytest-asyncio
pytest-cov-stub
pytest-mock
pytestCheckHook
];

View File

@ -22,11 +22,6 @@ python3.pkgs.buildPythonApplication rec {
--replace \
"install_requires=[\"colored\",\"toml\",\"attr\",\"attrs\",\"gitpython\"]," \
"install_requires=[\"colored\",\"toml\",\"attrs\",\"gitpython\"],"
# pytest coverage reporting isn't necessary
substituteInPlace setup.cfg \
--replace \
"addopts = --cov=kb --cov-report term-missing" ""
'';
propagatedBuildInputs = with python3.pkgs; [
@ -37,6 +32,7 @@ python3.pkgs.buildPythonApplication rec {
];
nativeCheckInputs = with python3.pkgs; [
pytest-cov-stub
pytestCheckHook
];

View File

@ -17,13 +17,13 @@
rustPlatform.buildRustPackage rec {
pname = "mise";
version = "2024.5.9";
version = "2024.8.13";
src = fetchFromGitHub {
owner = "jdx";
repo = "mise";
rev = "v${version}";
hash = "sha256-vmY+uI/NqMCLJwJaQU+aDppmn5OSLPUIbeqCSlN8Xb0=";
hash = "sha256-XarSfCjEwL1ps2Kwla0lLybpfjNUcIuvTD0kb5YiKgU=";
# registry is not needed for compilation nor for tests.
# contains files with the same name but different case, which cause problems with hash on darwin
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoHash = "sha256-7kcs1vOM68uKjMrRn8jGI6mgXd90TeMUeYWnAGl8sgE=";
cargoHash = "sha256-F+CGCk1U+I0htfWw1ZTl02lBhzSxk19hM7VjTWM8T10=";
nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
@ -41,20 +41,27 @@ rustPlatform.buildRustPackage rec {
patchShebangs --build \
./test/data/plugins/**/bin/* \
./src/fake_asdf.rs \
./src/cli/generate/git_pre_commit.rs \
./src/cli/generate/snapshots/*.snap \
./src/cli/reshim.rs \
./test/cwd/.mise/tasks/filetask
substituteInPlace ./src/test.rs \
--replace-fail '/usr/bin/env bash' '${bash}/bin/bash'
substituteInPlace ./src/env_diff.rs \
--replace '"bash"' '"${bash}/bin/bash"'
--replace-fail '"bash"' '"${bash}/bin/bash"'
substituteInPlace ./src/cli/direnv/exec.rs \
--replace '"env"' '"${coreutils}/bin/env"' \
--replace 'cmd!("direnv"' 'cmd!("${direnv}/bin/direnv"'
--replace-fail '"env"' '"${coreutils}/bin/env"' \
--replace-fail 'cmd!("direnv"' 'cmd!("${direnv}/bin/direnv"'
'';
checkFlags = [
# Requires .git directory to be present
"--skip=cli::plugins::ls::tests::test_plugin_list_urls"
"--skip=cli::generate::git_pre_commit::tests::test_git_pre_commit"
"--skip=cli::generate::github_action::tests::test_github_action"
];
cargoTestFlags = [ "--all-features" ];
# some tests access the same folders, don't test in parallel to avoid race conditions

View File

@ -15,17 +15,13 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-SCyCANZfi7PqexM2Kc8WJwwEEiBQxPBg0ggWsK9WB4k=";
};
postPatch = ''
substituteInPlace pytest.ini \
--replace-fail " --cov" ""
'';
build-system = with python3.pkgs; [ setuptools ];
propagatedBuildInputs = with python3.pkgs; [ docopt];
nativeCheckInputs = with python3.pkgs; [
pyfakefs
pytest-cov-stub
pytestCheckHook
];

View File

@ -32,6 +32,7 @@ python3.pkgs.buildPythonApplication rec {
];
nativeCheckInputs = with python3.pkgs; [
pytest-cov-stub
pytestCheckHook
requests-mock
];
@ -39,8 +40,7 @@ python3.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace setup.cfg \
--replace "dataclasses" "" \
--replace "kubernetes==12.0.1" "kubernetes" \
--replace "--cov=kube_hunter" ""
--replace "kubernetes==12.0.1" "kubernetes"
'';
pythonImportsCheck = [

View File

@ -25,11 +25,6 @@ python3Packages.buildPythonApplication rec {
patches = [ ./sudo.patch ];
postPatch = ''
substituteInPlace setup.cfg \
--replace '--cov=sshuttle --cov-branch --cov-report=term-missing' ""
'';
nativeBuildInputs = [
installShellFiles
makeWrapper
@ -37,7 +32,7 @@ python3Packages.buildPythonApplication rec {
sphinx
];
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
nativeCheckInputs = with python3Packages; [ pytest-cov-stub pytestCheckHook ];
postBuild = ''
make man -C docs

View File

@ -16,11 +16,6 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-Zkw+NfeVtIArrBxR1qR9bAQe5yd7mAtNiT0x5Mqr3Ic=";
};
postPatch = ''
substituteInPlace pytest.ini \
--replace-fail " --cov" ""
'';
build-system = with python3.pkgs; [ setuptools ];
dependencies =
@ -35,7 +30,10 @@ python3.pkgs.buildPythonApplication rec {
]
++ publicsuffixlist.optional-dependencies.update;
nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
nativeCheckInputs = with python3.pkgs; [
pytest-cov-stub
pytestCheckHook
];
pythonImportsCheck = [ "trustymail" ];

View File

@ -16,12 +16,6 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-Ekh31MXqxY6iSyQRX0YZ0Tl7DFhYqGtOepYS/VObZc0=";
};
postPatch = ''
# Remove code coverage checking
substituteInPlace pyproject.toml \
--replace-fail "--cov --cov-report=xml" ""
'';
pythonRelaxDeps = true;
build-system = with python3.pkgs; [ setuptools ];
@ -61,6 +55,7 @@ python3.pkgs.buildPythonApplication rec {
nativeCheckInputs = with python3.pkgs; [
respx
pytest-asyncio
pytest-cov-stub
pytestCheckHook
];

View File

@ -434,6 +434,7 @@ mapAliases ({
etcd_3_3 = throw "etcd_3_3 has been removed because upstream no longer maintains it"; # Added 2023-09-29
etcher = throw "'etcher' has been removed because it depended on an insecure version of Electron"; # Added 2024-03-14
eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10
ethabi = throw "ethabi has been removed due to lack of maintainence upstream and no updates in Nixpkgs"; # Added 2024-07-16
exa = throw "'exa' has been removed because it is unmaintained upstream. Consider using 'eza', a maintained fork"; # Added 2023-09-07
exhibitor = throw "'exhibitor' has been removed because it is unmaintained upstream"; # Added 2023-06-20
eww-wayland = lib.warn "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww;

View File

@ -33640,10 +33640,6 @@ with pkgs;
teams = callPackage ../applications/networking/instant-messengers/teams { };
teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux {
electron = electron_29;
};
teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { };
teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
@ -35040,8 +35036,6 @@ with pkgs;
nbxplorer = callPackage ../applications/blockchains/nbxplorer { };
ethabi = callPackage ../applications/blockchains/ethabi { };
pycoin = with python3Packages; toPythonApplication pycoin;
stellar-core = callPackage ../applications/blockchains/stellar-core { };

View File

@ -11908,6 +11908,10 @@ self: super: with self; {
pymsgbox = callPackage ../development/python-modules/pymsgbox { };
pymssql = callPackage ../development/python-modules/pymssql {
krb5-c = pkgs.krb5;
};
pymsteams = callPackage ../development/python-modules/pymsteams { };
py-multiaddr = callPackage ../development/python-modules/py-multiaddr { };
@ -12892,6 +12896,8 @@ self: super: with self; {
python-engineio = callPackage ../development/python-modules/python-engineio { };
python-engineio-v3 = callPackage ../development/python-modules/python-engineio-v3 { };
python-etcd = callPackage ../development/python-modules/python-etcd { };
python-ev3dev2 = callPackage ../development/python-modules/python-ev3dev2 { };
@ -13088,6 +13094,8 @@ self: super: with self; {
python-socketio = callPackage ../development/python-modules/python-socketio { };
python-socketio-v4 = callPackage ../development/python-modules/python-socketio-v4 { };
python-socks = callPackage ../development/python-modules/python-socks { };
python-sql = callPackage ../development/python-modules/python-sql { };
@ -13650,6 +13658,10 @@ self: super: with self; {
refery = callPackage ../development/python-modules/refery { };
reflex = callPackage ../development/python-modules/reflex { };
reflex-hosting-cli = callPackage ../development/python-modules/reflex-hosting-cli { };
reflink = callPackage ../development/python-modules/reflink { };
refoss-ha = callPackage ../development/python-modules/refoss-ha { };
@ -15020,6 +15032,8 @@ self: super: with self; {
sqlalchemy-continuum = callPackage ../development/python-modules/sqlalchemy-continuum { };
sqlalchemy-file = callPackage ../development/python-modules/sqlalchemy-file { };
sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { };
sqlalchemy-jsonfield = callPackage ../development/python-modules/sqlalchemy-jsonfield { };
@ -15108,6 +15122,8 @@ self: super: with self; {
starlette = callPackage ../development/python-modules/starlette { };
starlette-admin = callPackage ../development/python-modules/starlette-admin { };
starlette-context = callPackage ../development/python-modules/starlette-context { };
starlette-wtf = callPackage ../development/python-modules/starlette-wtf { };