diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md
index 1bb0617bab73..26052d7cc10a 100644
--- a/nixos/doc/manual/release-notes/rl-2405.section.md
+++ b/nixos/doc/manual/release-notes/rl-2405.section.md
@@ -173,6 +173,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- The `stalwart-mail` package has been updated to v0.5.3, which includes [breaking changes](https://github.com/stalwartlabs/mail-server/blob/v0.5.3/UPGRADING.md).
+- `services.zope2` has been removed as `zope2` is unmaintained and was relying on Python2.
+
- `services.avahi.nssmdns` got split into `services.avahi.nssmdns4` and `services.avahi.nssmdns6` which enable the mDNS NSS switch for IPv4 and IPv6 respectively.
Since most mDNS responders only register IPv4 addresses, most users want to keep the IPv6 support disabled to avoid long timeouts.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index af26e31b1cbf..ba5bfe0a4b11 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1402,7 +1402,6 @@
./services/web-servers/unit/default.nix
./services/web-servers/uwsgi.nix
./services/web-servers/varnish/default.nix
- ./services/web-servers/zope2.nix
./services/x11/clight.nix
./services/x11/colord.nix
./services/x11/desktop-managers/default.nix
diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix
deleted file mode 100644
index 29731b29eea4..000000000000
--- a/nixos/modules/services/web-servers/zope2.nix
+++ /dev/null
@@ -1,262 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- cfg = config.services.zope2;
-
- zope2Opts = { name, ... }: {
- options = {
-
- name = mkOption {
- default = "${name}";
- type = types.str;
- description = lib.mdDoc "The name of the zope2 instance. If undefined, the name of the attribute set will be used.";
- };
-
- threads = mkOption {
- default = 2;
- type = types.int;
- description = lib.mdDoc "Specify the number of threads that Zope's ZServer web server will use to service requests. ";
- };
-
- http_address = mkOption {
- default = "localhost:8080";
- type = types.str;
- description = lib.mdDoc "Give a port and address for the HTTP server.";
- };
-
- user = mkOption {
- default = "zope2";
- type = types.str;
- description = lib.mdDoc "The name of the effective user for the Zope process.";
- };
-
- clientHome = mkOption {
- default = "/var/lib/zope2/${name}";
- type = types.path;
- description = lib.mdDoc "Home directory of zope2 instance.";
- };
- extra = mkOption {
- default =
- ''
-
- mount-point /
- cache-size 30000
-
- blob-dir /var/lib/zope2/${name}/blobstorage
-
- path /var/lib/zope2/${name}/filestorage/Data.fs
-
-
-
- '';
- type = types.lines;
- description = lib.mdDoc "Extra zope.conf";
- };
-
- packages = mkOption {
- type = types.listOf types.package;
- description = lib.mdDoc "The list of packages you want to make available to the zope2 instance.";
- };
-
- };
- };
-
-in
-
-{
-
- ###### interface
-
- options = {
-
- services.zope2.instances = mkOption {
- default = {};
- type = with types; attrsOf (submodule zope2Opts);
- example = literalExpression ''
- {
- plone01 = {
- http_address = "127.0.0.1:8080";
- extra =
- '''
-
- mount-point /
- cache-size 30000
-
- blob-dir /var/lib/zope2/plone01/blobstorage
-
- path /var/lib/zope2/plone01/filestorage/Data.fs
-
-
-
- ''';
- };
- }
- '';
- description = lib.mdDoc "zope2 instances to be created automatically by the system.";
- };
- };
-
- ###### implementation
-
- config = mkIf (cfg.instances != {}) {
-
- users.users.zope2 = {
- isSystemUser = true;
- group = "zope2";
- };
- users.groups.zope2 = {};
-
- systemd.services =
- let
-
- createZope2Instance = opts: name:
- let
- interpreter = pkgs.writeScript "interpreter"
- ''
- import sys
-
- _interactive = True
- if len(sys.argv) > 1:
- _options, _args = __import__("getopt").getopt(sys.argv[1:], 'ic:m:')
- _interactive = False
- for (_opt, _val) in _options:
- if _opt == '-i':
- _interactive = True
- elif _opt == '-c':
- exec _val
- elif _opt == '-m':
- sys.argv[1:] = _args
- _args = []
- __import__("runpy").run_module(
- _val, {}, "__main__", alter_sys=True)
-
- if _args:
- sys.argv[:] = _args
- __file__ = _args[0]
- del _options, _args
- execfile(__file__)
-
- if _interactive:
- del _interactive
- __import__("code").interact(banner="", local=globals())
- '';
- env = pkgs.buildEnv {
- name = "zope2-${name}-env";
- paths = [
- pkgs.python27
- pkgs.python27Packages.recursive-pth-loader
- pkgs.python27Packages."plone.recipe.zope2instance"
- ] ++ attrValues pkgs.python27.modules
- ++ opts.packages;
- postBuild =
- ''
- echo "#!$out/bin/python" > $out/bin/interpreter
- cat ${interpreter} >> $out/bin/interpreter
- '';
- };
- conf = pkgs.writeText "zope2-${name}-conf"
- ''
- %define INSTANCEHOME ${env}
- instancehome $INSTANCEHOME
- %define CLIENTHOME ${opts.clientHome}/${opts.name}
- clienthome $CLIENTHOME
-
- debug-mode off
- security-policy-implementation C
- verbose-security off
- default-zpublisher-encoding utf-8
- zserver-threads ${toString opts.threads}
- effective-user ${opts.user}
-
- pid-filename ${opts.clientHome}/${opts.name}/pid
- lock-filename ${opts.clientHome}/${opts.name}/lock
- python-check-interval 1000
- enable-product-installation off
-
-
- zope_i18n_compile_mo_files false
-
-
-
- level INFO
-
- path /var/log/zope2/${name}.log
- level INFO
-
-
-
-
- level WARN
-
- path /var/log/zope2/${name}-Z2.log
- format %(message)s
-
-
-
-
- address ${opts.http_address}
-
-
-
-
- name temporary storage for sessioning
-
- mount-point /temp_folder
- container-class Products.TemporaryFolder.TemporaryContainer
-
-
- ${opts.extra}
- '';
- ctlScript = pkgs.writeScript "zope2-${name}-ctl-script"
- ''
- #!${env}/bin/python
-
- import sys
- import plone.recipe.zope2instance.ctl
-
- if __name__ == '__main__':
- sys.exit(plone.recipe.zope2instance.ctl.main(
- ["-C", "${conf}"]
- + sys.argv[1:]))
- '';
-
- ctl = pkgs.writeScript "zope2-${name}-ctl"
- ''
- #!${pkgs.bash}/bin/bash -e
- export PYTHONHOME=${env}
- exec ${ctlScript} "$@"
- '';
- in {
- #description = "${name} instance";
- after = [ "network.target" ]; # with RelStorage also add "postgresql.service"
- wantedBy = [ "multi-user.target" ];
- path = opts.packages;
- preStart =
- ''
- mkdir -p /var/log/zope2/
- touch /var/log/zope2/${name}.log
- touch /var/log/zope2/${name}-Z2.log
- chown ${opts.user} /var/log/zope2/${name}.log
- chown ${opts.user} /var/log/zope2/${name}-Z2.log
-
- mkdir -p ${opts.clientHome}/filestorage ${opts.clientHome}/blobstorage
- mkdir -p ${opts.clientHome}/${opts.name}
- chown ${opts.user} ${opts.clientHome} -R
-
- ${ctl} adduser admin admin
- '';
-
- serviceConfig.Type = "forking";
- serviceConfig.ExecStart = "${ctl} start";
- serviceConfig.ExecStop = "${ctl} stop";
- serviceConfig.ExecReload = "${ctl} restart";
- };
-
- in listToAttrs (map (name: { name = "zope2-${name}"; value = createZope2Instance (builtins.getAttr name cfg.instances) name; }) (builtins.attrNames cfg.instances));
-
- };
-
-}
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 0c0df699a4e1..796e8a1efc62 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2507,8 +2507,8 @@ let
mktplcRef = {
name = "typst-preview";
publisher = "mgt19937";
- version = "0.10.5";
- sha256 = "sha256-cR5Pyokzmf8dNlsUkcwwfPx3jtJCQHRwTpYk78ovgrM=";
+ version = "0.10.8";
+ sha256 = "sha256-Ad6eCAuueeAeh6z/kk/F2HhbV4tp/XmiGySA2fn5wqY=";
};
buildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix
index 9a10c2eddba8..ba1606582b88 100644
--- a/pkgs/applications/networking/instant-messengers/element/pin.nix
+++ b/pkgs/applications/networking/instant-messengers/element/pin.nix
@@ -1,9 +1,9 @@
{
- "version" = "1.11.57";
+ "version" = "1.11.58";
"hashes" = {
- "desktopSrcHash" = "sha256-U1Koq+YrTQnbJAQmMuBioU6lxtw3oH9U3W3iMIDbibY=";
- "desktopYarnHash" = "03kx7g1fhm4qn6iq450156fgw1x6bf0sngmqhd2hrhp699mjxs5s";
- "webSrcHash" = "sha256-ZoB6ALNUDYh8nYUYsPNeiCaXn3qvg3NRJzDRJaHT4oU=";
- "webYarnHash" = "0vznx306p3racnq5xv27ywvlrdxql9x8i3fl77i5vlc8g7crpc3m";
+ "desktopSrcHash" = "sha256-otZNhe6V/kGErx6J0+TcIwk5ASD/H4K/pYtm864VTIE=";
+ "desktopYarnHash" = "1pdja3rw4ykf9pgk937i4n0w8dj1r64fz7nzk9fsqlq8ciygabsq";
+ "webSrcHash" = "sha256-IAIsg9dvZMFfWst1xeVQLp+8URUauiaL3j2ui4lpKaY=";
+ "webYarnHash" = "0gv0vrgb62hgw58lgrmn6yywvrl9a5v5msd4l06n5wgnbbqi0i5j";
};
}
diff --git a/pkgs/by-name/ty/typst-preview/Cargo.lock b/pkgs/by-name/ty/typst-preview/Cargo.lock
index 257164ef986e..9cbb837c3305 100644
--- a/pkgs/by-name/ty/typst-preview/Cargo.lock
+++ b/pkgs/by-name/ty/typst-preview/Cargo.lock
@@ -54,9 +54,9 @@ dependencies = [
[[package]]
name = "anstream"
-version = "0.6.7"
+version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba"
+checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -139,6 +139,24 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+[[package]]
+name = "await-tree"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "626aa057fb6d254883c2750ef6bcbe6f6a5ce45daff839b538708411794f794d"
+dependencies = [
+ "coarsetime",
+ "derive_builder",
+ "flexstr",
+ "indextree",
+ "itertools",
+ "parking_lot",
+ "pin-project",
+ "tokio",
+ "tracing",
+ "weak-table",
+]
+
[[package]]
name = "az"
version = "1.2.1"
@@ -438,6 +456,17 @@ dependencies = [
"roff",
]
+[[package]]
+name = "coarsetime"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13b3839cf01bb7960114be3ccf2340f541b6d0c81f8690b007b2b39f750f7e5d"
+dependencies = [
+ "libc",
+ "wasix",
+ "wasm-bindgen",
+]
+
[[package]]
name = "cobs"
version = "0.2.3"
@@ -604,14 +633,38 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "darling"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
+dependencies = [
+ "darling_core 0.14.4",
+ "darling_macro 0.14.4",
+]
+
[[package]]
name = "darling"
version = "0.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.20.3",
+ "darling_macro 0.20.3",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 1.0.109",
]
[[package]]
@@ -628,17 +681,41 @@ dependencies = [
"syn 2.0.48",
]
+[[package]]
+name = "darling_macro"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
+dependencies = [
+ "darling_core 0.14.4",
+ "quote",
+ "syn 1.0.109",
+]
+
[[package]]
name = "darling_macro"
version = "0.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
dependencies = [
- "darling_core",
+ "darling_core 0.20.3",
"quote",
"syn 2.0.48",
]
+[[package]]
+name = "dashmap"
+version = "5.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.14.3",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
[[package]]
name = "data-encoding"
version = "2.5.0"
@@ -661,6 +738,37 @@ dependencies = [
"serde",
]
+[[package]]
+name = "derive_builder"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
+dependencies = [
+ "derive_builder_macro",
+]
+
+[[package]]
+name = "derive_builder_core"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
+dependencies = [
+ "darling 0.14.4",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_builder_macro"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
+dependencies = [
+ "derive_builder_core",
+ "syn 1.0.109",
+]
+
[[package]]
name = "digest"
version = "0.10.7"
@@ -775,16 +883,26 @@ dependencies = [
]
[[package]]
-name = "env_logger"
-version = "0.10.1"
+name = "env_filter"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
+checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
dependencies = [
- "humantime",
- "is-terminal",
"log",
"regex",
- "termcolor",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05e7cf40684ae96ade6232ed84582f40ce0a66efcd43a5117aef610534f8e0b8"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "humantime",
+ "log",
]
[[package]]
@@ -856,6 +974,15 @@ dependencies = [
"miniz_oxide",
]
+[[package]]
+name = "flexstr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d50aef14619d336a54fca5a592d952eb39037b1a1e7e6afd9f91c892ac7ef65"
+dependencies = [
+ "static_assertions",
+]
+
[[package]]
name = "float-cmp"
version = "0.9.0"
@@ -1095,7 +1222,7 @@ dependencies = [
"futures-core",
"futures-sink",
"futures-util",
- "http",
+ "http 0.2.11",
"indexmap 2.1.0",
"slab",
"tokio",
@@ -1174,6 +1301,17 @@ dependencies = [
"itoa",
]
+[[package]]
+name = "http"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
[[package]]
name = "http-body"
version = "0.4.6"
@@ -1181,7 +1319,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
dependencies = [
"bytes",
- "http",
+ "http 0.2.11",
"pin-project-lite",
]
@@ -1214,7 +1352,7 @@ dependencies = [
"futures-core",
"futures-util",
"h2",
- "http",
+ "http 0.2.11",
"http-body",
"httparse",
"httpdate",
@@ -1234,7 +1372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
dependencies = [
"futures-util",
- "http",
+ "http 0.2.11",
"hyper",
"rustls",
"tokio",
@@ -1497,6 +1635,12 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590"
+[[package]]
+name = "indextree"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c40411d0e5c63ef1323c3d09ce5ec6d84d71531e18daed0743fccea279d7deb6"
+
[[package]]
name = "inotify"
version = "0.9.6"
@@ -1544,17 +1688,6 @@ dependencies = [
"once_cell",
]
-[[package]]
-name = "is-terminal"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455"
-dependencies = [
- "hermit-abi",
- "rustix",
- "windows-sys 0.52.0",
-]
-
[[package]]
name = "is-wsl"
version = "0.4.0"
@@ -1565,6 +1698,15 @@ dependencies = [
"once_cell",
]
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
[[package]]
name = "itoa"
version = "1.0.10"
@@ -1724,7 +1866,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
dependencies = [
"autocfg",
- "owning_ref",
"scopeguard",
]
@@ -1742,18 +1883,18 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
[[package]]
name = "memmap2"
-version = "0.7.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
+checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
dependencies = [
"libc",
]
[[package]]
name = "memmap2"
-version = "0.8.0"
+version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
dependencies = [
"libc",
]
@@ -1981,15 +2122,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-[[package]]
-name = "owning_ref"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
-dependencies = [
- "stable_deref_trait",
-]
-
[[package]]
name = "palette"
version = "0.7.3"
@@ -2066,6 +2198,26 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+[[package]]
+name = "pin-project"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
[[package]]
name = "pin-project-lite"
version = "0.2.13"
@@ -2338,7 +2490,7 @@ dependencies = [
"futures-core",
"futures-util",
"h2",
- "http",
+ "http 0.2.11",
"http-body",
"hyper",
"hyper-rustls",
@@ -2627,6 +2779,17 @@ dependencies = [
"serde",
]
+[[package]]
+name = "serde_repr"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
[[package]]
name = "serde_spanned"
version = "0.6.5"
@@ -2671,7 +2834,7 @@ version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
dependencies = [
- "darling",
+ "darling 0.20.3",
"proc-macro2",
"quote",
"syn 2.0.48",
@@ -2813,6 +2976,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
[[package]]
name = "strict-num"
version = "0.1.1"
@@ -3130,9 +3299,9 @@ dependencies = [
[[package]]
name = "tokio-tungstenite"
-version = "0.20.1"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
+checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
dependencies = [
"futures-util",
"log",
@@ -3239,14 +3408,14 @@ checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1"
[[package]]
name = "tungstenite"
-version = "0.20.1"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
+checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
dependencies = [
"byteorder",
"bytes",
"data-encoding",
- "http",
+ "http 1.0.0",
"httparse",
"log",
"rand",
@@ -3334,9 +3503,10 @@ dependencies = [
[[package]]
name = "typst-preview"
-version = "0.10.5"
+version = "0.10.8"
dependencies = [
"anyhow",
+ "await-tree",
"chrono",
"clap",
"clap_complete",
@@ -3348,8 +3518,9 @@ dependencies = [
"env_logger",
"futures",
"hyper",
+ "indexmap 2.1.0",
"log",
- "memmap2 0.7.1",
+ "memmap2 0.9.4",
"notify",
"once_cell",
"open",
@@ -3387,8 +3558,8 @@ dependencies = [
[[package]]
name = "typst-ts-compiler"
-version = "0.4.2-rc5"
-source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=54471328e55df43479ff56dc44920f803ccf1fe4#54471328e55df43479ff56dc44920f803ccf1fe4"
+version = "0.4.2-rc6"
+source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=98e3d3a42877b195f87223060882d55fd5aaa04a#98e3d3a42877b195f87223060882d55fd5aaa04a"
dependencies = [
"append-only-vec",
"base64",
@@ -3425,8 +3596,8 @@ dependencies = [
[[package]]
name = "typst-ts-core"
-version = "0.4.2-rc5"
-source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=54471328e55df43479ff56dc44920f803ccf1fe4#54471328e55df43479ff56dc44920f803ccf1fe4"
+version = "0.4.2-rc6"
+source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=98e3d3a42877b195f87223060882d55fd5aaa04a#98e3d3a42877b195f87223060882d55fd5aaa04a"
dependencies = [
"base64",
"base64-serde",
@@ -3434,6 +3605,7 @@ dependencies = [
"byteorder",
"comemo",
"crossbeam-queue",
+ "dashmap",
"ecow",
"elsa",
"flate2",
@@ -3441,7 +3613,6 @@ dependencies = [
"hex",
"log",
"once_cell",
- "owning_ref",
"parking_lot",
"path-clean",
"rayon",
@@ -3449,10 +3620,10 @@ dependencies = [
"rustc-hash",
"serde",
"serde_json",
+ "serde_repr",
"serde_with",
"sha2",
"siphasher 1.0.0",
- "svgtypes",
"tiny-skia",
"tiny-skia-path",
"ttf-parser",
@@ -3462,8 +3633,8 @@ dependencies = [
[[package]]
name = "typst-ts-svg-exporter"
-version = "0.4.2-rc5"
-source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=54471328e55df43479ff56dc44920f803ccf1fe4#54471328e55df43479ff56dc44920f803ccf1fe4"
+version = "0.4.2-rc6"
+source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=98e3d3a42877b195f87223060882d55fd5aaa04a#98e3d3a42877b195f87223060882d55fd5aaa04a"
dependencies = [
"base64",
"comemo",
@@ -3744,6 +3915,15 @@ version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+[[package]]
+name = "wasix"
+version = "0.12.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d"
+dependencies = [
+ "wasi",
+]
+
[[package]]
name = "wasm-bindgen"
version = "0.2.90"
@@ -3850,6 +4030,12 @@ dependencies = [
"indexmap-nostd",
]
+[[package]]
+name = "weak-table"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549"
+
[[package]]
name = "web-sys"
version = "0.3.67"
diff --git a/pkgs/by-name/ty/typst-preview/dom.json b/pkgs/by-name/ty/typst-preview/dom.json
index c3172208d400..38dfe78a9640 100644
--- a/pkgs/by-name/ty/typst-preview/dom.json
+++ b/pkgs/by-name/ty/typst-preview/dom.json
@@ -12,12 +12,12 @@
"link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer"
},
"peerDependencies": {
- "@myriaddreamin/typst-ts-renderer": "0.4.2-rc5",
- "@myriaddreamin/typst.ts": "0.4.2-rc5"
+ "@myriaddreamin/typst-ts-renderer": "0.4.2-rc6",
+ "@myriaddreamin/typst.ts": "0.4.2-rc6"
},
"devDependencies": {
- "@myriaddreamin/typst-ts-renderer": "0.4.2-rc5",
- "@myriaddreamin/typst.ts": "0.4.2-rc5",
+ "@myriaddreamin/typst-ts-renderer": "0.4.2-rc6",
+ "@myriaddreamin/typst.ts": "0.4.2-rc6",
"typescript": "^5.0.2",
"vite": "^4.3.9",
"vite-plugin-singlefile": "^0.13.5",
@@ -25,7 +25,7 @@
"vitest": "^0.32.2"
},
"exports": {
- ".": "./dist/esm/index.mjs",
- "./*": "./dist/esm/*"
+ ".": "./src/index.mts",
+ "./*": "./src/*"
}
}
diff --git a/pkgs/by-name/ty/typst-preview/frontend.json b/pkgs/by-name/ty/typst-preview/frontend.json
index 365a04beeafd..4338a9c1b03c 100644
--- a/pkgs/by-name/ty/typst-preview/frontend.json
+++ b/pkgs/by-name/ty/typst-preview/frontend.json
@@ -12,13 +12,13 @@
"link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer"
},
"dependencies": {
- "@myriaddreamin/typst-ts-renderer": "0.4.2-rc5",
- "@myriaddreamin/typst.ts": "0.4.2-rc5",
+ "@myriaddreamin/typst-ts-renderer": "0.4.2-rc6",
+ "@myriaddreamin/typst.ts": "0.4.2-rc6",
"typst-dom": "file:../typst-dom",
"rxjs": "^7.8.1"
},
"devDependencies": {
- "typescript": "^5.0.2",
+ "typescript": "^5.3.3",
"vite": "^4.3.9",
"vite-plugin-singlefile": "^0.13.5",
"vite-plugin-wasm": "^3.2.2",
diff --git a/pkgs/by-name/ty/typst-preview/package.nix b/pkgs/by-name/ty/typst-preview/package.nix
index 0e5f12cdc4c3..68eae7b47f69 100644
--- a/pkgs/by-name/ty/typst-preview/package.nix
+++ b/pkgs/by-name/ty/typst-preview/package.nix
@@ -14,14 +14,20 @@
let
# Keep the vscode "mgt19937.typst-preview" extension in sync when updating
# this package at pkgs/applications/editors/vscode/extensions/default.nix
- version = "0.10.5";
+ version = "0.10.8";
src = fetchFromGitHub {
owner = "Enter-tainer";
repo = "typst-preview";
rev = "v${version}";
- hash = "sha256-BebOwlY2hm/SGYCtmsQICbo1V8sbUMYVWSM773Qmh04=";
+ hash = "sha256-n3lrJpCe/+THYepiiWIlTEMSMZPX7Qiucbg1ouU1ZEs=";
fetchSubmodules = true;
+
+ postFetch = ''
+ cd $out
+ substituteInPlace addons/frontend/yarn.lock \
+ --replace-fail '"typst-dom@link:../typst-dom"' '"typst-dom@file:../typst-dom"'
+ '';
};
frontendSrc = "${src}/addons/frontend";
@@ -35,7 +41,7 @@ let
offlineCache = fetchYarnDeps {
yarnLock = "${domSrc}/yarn.lock";
- hash = "sha256-SxOQ/RABUkiqE7dLaDS0kETGiir4SMWJ2w7i7zMEl7U=";
+ hash = "sha256-+xn2SmpYdAb1nZkTOURqR5teu3dx2AKaiGoa9AmPA7o=";
};
buildPhase = ''
@@ -61,7 +67,7 @@ let
offlineCache = fetchYarnDeps {
yarnLock = "${frontendSrc}/yarn.lock";
- hash = "sha256-6e3UNd8gIBnTtllpo/1AC1XzeZ88rdUiechoQfo5V1Y=";
+ hash = "sha256-o8zWMLt6WqYWhcC7rqSeue6TxN20lYIjGqMxLApy5l0=";
};
packageResolutions = { inherit typst-dom; };
@@ -90,8 +96,7 @@ rustPlatform.buildRustPackage {
lockFile = ./Cargo.lock;
outputHashes = {
"typst-0.10.0" = "sha256-/Oy4KigXu1E/S9myd+eigqlNvk5x+Ld9gTL9dtpoyqk=";
- "typst-ts-compiler-0.4.2-rc5" =
- "sha256-fhwTaAK19Nb7AKNJ9QBZgK1MO7g7s5AdSDqaBjLxT3w=";
+ "typst-ts-compiler-0.4.2-rc6" = "sha256-mDQDxqXp38+Omt7D7kO2cUAVzG+h3JOs4tBdrbHH/lA=";
};
};
diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock
index e6331640f250..014618e83f5a 100644
--- a/pkgs/by-name/uv/uv/Cargo.lock
+++ b/pkgs/by-name/uv/uv/Cargo.lock
@@ -549,6 +549,47 @@ dependencies = [
"strsim",
]
+[[package]]
+name = "clap_complete"
+version = "4.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c"
+dependencies = [
+ "clap",
+]
+
+[[package]]
+name = "clap_complete_command"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d"
+dependencies = [
+ "clap",
+ "clap_complete",
+ "clap_complete_fig",
+ "clap_complete_nushell",
+]
+
+[[package]]
+name = "clap_complete_fig"
+version = "4.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b3e65f91fabdd23cac3d57d39d5d938b4daabd070c335c006dccb866a61110"
+dependencies = [
+ "clap",
+ "clap_complete",
+]
+
+[[package]]
+name = "clap_complete_nushell"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e"
+dependencies = [
+ "clap",
+ "clap_complete",
+]
+
[[package]]
name = "clap_derive"
version = "4.5.0"
@@ -853,6 +894,7 @@ dependencies = [
"data-encoding",
"distribution-filename",
"fs-err",
+ "itertools 0.12.1",
"once_cell",
"pep440_rs 0.4.0",
"pep508_rs",
@@ -4116,7 +4158,7 @@ checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
[[package]]
name = "uv"
-version = "0.1.5"
+version = "0.1.6"
dependencies = [
"anstream",
"anyhow",
@@ -4124,6 +4166,7 @@ dependencies = [
"assert_fs",
"chrono",
"clap",
+ "clap_complete_command",
"console",
"ctrlc",
"distribution-filename",
@@ -4274,6 +4317,7 @@ dependencies = [
"uv-cache",
"uv-fs",
"uv-normalize",
+ "uv-warnings",
]
[[package]]
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 52d3bdb3465a..cf91d8bd7b88 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -15,14 +15,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "uv";
- version = "0.1.5";
+ version = "0.1.6";
pyproject = true;
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
rev = version;
- hash = "sha256-aiTec1uWcLcCA03qki5EE7Yy4Ne2+kXu9YtIVIAyd+o=";
+ hash = "sha256-cwnZBKJcMgdSkOV0rojxF8kLQH59iOxjaE5yZkkY2/4=";
};
cargoDeps = rustPlatform.importCargoLock {
diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix
index 24448d1b66ab..7a5c8fc0c3f4 100644
--- a/pkgs/data/misc/v2ray-domain-list-community/default.nix
+++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix
@@ -3,12 +3,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
- version = "20240208184303";
+ version = "20240217140518";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
- hash = "sha256-pKijinMAnDIjOtLYJ8jcsIc5W1tEw6RA/inDm7Lqa1Q=";
+ hash = "sha256-7Voepx8+tFWpugtUKoRJ55nSX3cWtXgPhYiNDhE3OGs=";
};
vendorHash = "sha256-azvMUi8eLNoNofRa2X4SKTTiMd6aOyO6H/rOiKjkpIY=";
meta = with lib; {
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 16193e5e5148..2a1c2f8b45a9 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
homepage = "https://www.freedesktop.org/wiki/Software/libinput/";
license = licenses.mit;
- platforms = platforms.unix;
+ platforms = platforms.linux;
maintainers = with maintainers; [ codyopel ] ++ teams.freedesktop.members;
changelog = "https://gitlab.freedesktop.org/libinput/libinput/-/releases/${version}";
};
diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 4149bfc5764c..983a19cfcaf6 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -365,14 +365,14 @@
buildPythonPackage rec {
pname = "boto3-stubs";
- version = "1.34.45";
+ version = "1.34.46";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-1V1TzKG/tLOIBo4rVtWJQOshnUcuvF0wrnfWdS6gLtc=";
+ hash = "sha256-jwcGwT4yY/I68PSRL03Dqc7yZtyDd46Tw5Xm8QvT6DI=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix
index c7c134dfac08..0c3b7b59f61a 100644
--- a/pkgs/development/python-modules/langchain-community/default.nix
+++ b/pkgs/development/python-modules/langchain-community/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "langchain-community";
- version = "0.0.19";
+ version = "0.0.21";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "langchain_community";
inherit version;
- hash = "sha256-XRitnhiLEKq6Y2H7KnR88ptksh/7gGGTP+wJAYfKOcI=";
+ hash = "sha256-HDEKfiZj1fZGSkM5gVBIlPl8Eng8vri99BWaV0+IwY0=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix
index 7d2599d105b9..27252c4b3938 100644
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "langchain-core";
- version = "0.1.22";
+ version = "0.1.24";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "langchain_core";
inherit version;
- hash = "sha256-3qwSs+QqCLu6oqz4PV+N0tVRMlbY2vDoU+nWj/TJnXk=";
+ hash = "sha256-znD0uXaV61VjfgDuM9SA//xtsflXJvmbB2tVyxpCkn0=";
};
pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index d519748994a7..50d86398ebcf 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -3,7 +3,6 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
-, pythonRelaxDepsHook
, poetry-core
, aiohttp
, async-timeout
@@ -52,7 +51,7 @@
buildPythonPackage rec {
pname = "langchain";
- version = "0.1.6";
+ version = "0.1.8";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -61,14 +60,13 @@ buildPythonPackage rec {
owner = "langchain-ai";
repo = "langchain";
rev = "refs/tags/v${version}";
- hash = "sha256-DMUf1dW1/Xl8OKRDb2o9NFgFE4rEgsCBZEPejGz1tQQ=";
+ hash = "sha256-zZkz7KlRikUySLlGyoc2a+DRhPahjytV5AowpU8yiRg=";
};
sourceRoot = "${src.name}/libs/langchain";
nativeBuildInputs = [
poetry-core
- pythonRelaxDepsHook
];
buildInputs = [
@@ -76,18 +74,18 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
- langchain-core
- langchain-community
- pydantic
- sqlalchemy
- requests
- pyyaml
- numpy
aiohttp
- tenacity
- jsonpatch
dataclasses-json
+ jsonpatch
+ langchain-community
+ langchain-core
langsmith
+ numpy
+ pydantic
+ pyyaml
+ requests
+ sqlalchemy
+ tenacity
] ++ lib.optionals (pythonOlder "3.11") [
async-timeout
];
diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix
index 72ad5e138ca9..5f3bb399f99a 100644
--- a/pkgs/development/python-modules/langsmith/default.nix
+++ b/pkgs/development/python-modules/langsmith/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "langsmith";
- version = "0.0.90";
+ version = "0.1.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "langchain-ai";
repo = "langsmith-sdk";
rev = "refs/tags/v${version}";
- hash = "sha256-YZykHDu++cEoLmV9PvzowA4j2UpteFJfzr6+3VlbPME=";
+ hash = "sha256-apczSNhj39Av5gsIM0QPF9eus3Z4eCv/ztxjHDgG8E0=";
};
sourceRoot = "${src.name}/python";
diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix
index c6d65db362ae..3384ad516b5f 100644
--- a/pkgs/development/python-modules/pycaption/default.nix
+++ b/pkgs/development/python-modules/pycaption/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pycaption";
- version = "2.2.4";
+ version = "2.2.5";
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "pbs";
repo = "pycaption";
rev = "refs/tags/${version}";
- hash = "sha256-aUhNvqeSNtbnRVp4yxsk4q3szNfR0m1zo0MpkBOCokY=";
+ hash = "sha256-zI5zRjvtsVgiIgWsQQgBQHhbYSGRBB6RLYgpbZWJQHs=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/signify/default.nix b/pkgs/development/python-modules/signify/default.nix
index 85e4d4668e5b..a1924902fe8e 100644
--- a/pkgs/development/python-modules/signify/default.nix
+++ b/pkgs/development/python-modules/signify/default.nix
@@ -3,28 +3,42 @@
, buildPythonPackage
, certvalidator
, fetchFromGitHub
+, fetchpatch2
, mscerts
, oscrypto
, pyasn1
, pyasn1-modules
, pytestCheckHook
, pythonOlder
+, setuptools
}:
buildPythonPackage rec {
pname = "signify";
version = "0.5.2";
- format = "setuptools";
+ pyproject = true;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "ralphje";
- repo = pname;
+ repo = "signify";
rev = "refs/tags/v${version}";
hash = "sha256-+UhZF+QYuv8pq/sTu7GDPUrlPNNixFgVZL+L0ulj/ko=";
};
+ patches = [
+ # https://github.com/ralphje/signify/pull/42
+ (fetchpatch2 {
+ url = "https://github.com/ralphje/signify/commit/38cad57bf86f7498259b47bfef1354aec27c0955.patch";
+ hash = "sha256-dLmHSlj2Cj6jbbrZStgK2Rh/H5vOaIbi5lut5RAbd+s=";
+ })
+ ];
+
+ nativeBuildInputs = [
+ setuptools
+ ];
+
propagatedBuildInputs = [
asn1crypto
certvalidator
@@ -42,19 +56,11 @@ buildPythonPackage rec {
pytestCheckHook
];
- disabledTests = [
- # chain doesn't validate because end-entitys certificate expired
- # https://github.com/ralphje/signify/issues/27
- "test_revoked_certificate"
- ];
-
meta = with lib; {
+ changelog = "https://github.com/ralphje/signify/blob/${src.rev}/docs/changelog.rst";
description = "library that verifies PE Authenticode-signed binaries";
homepage = "https://github.com/ralphje/signify";
license = licenses.mit;
maintainers = with maintainers; [ baloo ];
- # No support for pyasn1 > 0.5
- # https://github.com/ralphje/signify/issues/37
- broken = true;
};
}
diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index 888ce0b8ae46..1958517a95c9 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation {
pname = "heroku";
- version = "8.9.0";
+ version = "8.10.0";
src = fetchzip {
- url = "https://cli-assets.heroku.com/versions/8.9.0/8f6ff45/heroku-v8.9.0-8f6ff45-linux-x64.tar.xz";
- hash = "sha256-z9SRbQjjl+qthEOa9C/zb4lxTQLeipcl6JXMdirAFcg=";
+ url = "https://cli-assets.heroku.com/versions/8.10.0/25f0948/heroku-v8.10.0-25f0948-linux-x64.tar.xz";
+ hash = "sha256-t2EQeOc6gi5lb7xrAc3WSqwUaczXN5pZXl0QkZ0Gk74=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix
index 12fae7b15c38..b41bdbe32f68 100644
--- a/pkgs/development/tools/rust/cargo-fuzz/default.nix
+++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-fuzz";
- version = "0.11.4";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "rust-fuzz";
repo = "cargo-fuzz";
rev = version;
- hash = "sha256-+k1kHiHRQER/8JTOeQdxcbsfMvS6eC74Wkd9IlLldok=";
+ hash = "sha256-PC36O5+eB+yVLpz+EywBDGcMAtHl79FYwUo/l/JL8hM=";
};
- cargoHash = "sha256-N3niTnSSIfOVOGhcHHgTbLnpYNmM4bow7qX539P+kHQ=";
+ cargoHash = "sha256-sfvepPpYtgA0TuUlu0CD50HX933AVQbUGzJBNAzFR94=";
buildInputs = lib.optional stdenv.isDarwin libiconv;