diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-30 13:37:39 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-30 13:37:39 +0100 |
commit | 7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769 (patch) | |
tree | 38e753812c0ceba947d65ec0555a5a66c1a5aa4e /nixpkgs | |
parent | 46cf147fc42b72f68ecd52b3b03a8bfd6077f42b (diff) | |
parent | 63678e9f3d3afecfeafa0acead6239cdb447574c (diff) | |
download | nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.gz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.bz2 nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.lz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.xz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.zst nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.zip |
Merge commit '63678e9f3d3afecfeafa0acead6239cdb447574c' into HEAD
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs')
725 files changed, 16234 insertions, 9959 deletions
diff --git a/nixpkgs/doc/default.nix b/nixpkgs/doc/default.nix index 18e12c1a8aca..61bbd2ba8dc8 100644 --- a/nixpkgs/doc/default.nix +++ b/nixpkgs/doc/default.nix @@ -23,6 +23,7 @@ let { name = "sources"; description = "source filtering functions"; } { name = "cli"; description = "command-line serialization functions"; } { name = "gvariant"; description = "GVariant formatted string serialization functions"; } + { name = "customisation"; description = "Functions to customise (derivation-related) functions, derivatons, or attribute sets"; } ]; }; diff --git a/nixpkgs/doc/languages-frameworks/go.section.md b/nixpkgs/doc/languages-frameworks/go.section.md index 7fd38a7d21c5..59856b92c9ed 100644 --- a/nixpkgs/doc/languages-frameworks/go.section.md +++ b/nixpkgs/doc/languages-frameworks/go.section.md @@ -18,7 +18,7 @@ In the following is an example expression using `buildGoModule`, the following a To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;` - To obtain the actual hash, set `vendorHash = lib.fakeSha256;` and run the build ([more details here](#sec-source-hashes)). + To obtain the actual hash, set `vendorHash = lib.fakeHash;` and run the build ([more details here](#sec-source-hashes)). - `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform-dependent `vendorHash` checksums. - `modPostBuild`: Shell commands to run after the build of the goModules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash` (or `vendorSha256`). Note that if you change this attribute, you need to update `vendorHash` (or `vendorSha256`) attribute. diff --git a/nixpkgs/doc/stdenv/stdenv.chapter.md b/nixpkgs/doc/stdenv/stdenv.chapter.md index 366c519751c0..1dfe25f02654 100644 --- a/nixpkgs/doc/stdenv/stdenv.chapter.md +++ b/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -101,25 +101,62 @@ genericBuild ### Building a `stdenv` package in `nix-shell` {#sec-building-stdenv-package-in-nix-shell} -To build a `stdenv` package in a [`nix-shell`](https://nixos.org/manual/nix/unstable/command-ref/nix-shell.html), use +To build a `stdenv` package in a [`nix-shell`](https://nixos.org/manual/nix/unstable/command-ref/nix-shell.html), enter a shell, find the [phases](#sec-stdenv-phases) you wish to build, then invoke `genericBuild` manually: + +Go to an empty directory, invoke `nix-shell` with the desired package, and from inside the shell, set the output variables to a writable directory: ```bash +cd "$(mktemp -d)" nix-shell '<nixpkgs>' -A some_package -eval "${unpackPhase:-unpackPhase}" -cd $sourceRoot -eval "${patchPhase:-patchPhase}" -eval "${configurePhase:-configurePhase}" -eval "${buildPhase:-buildPhase}" +export out=$(pwd)/out +``` + +Next, invoke the desired parts of the build. +First, run the phases that generate a working copy of the sources, which will change directory to the sources for you: + +```bash +phases="${prePhases[*]:-} unpackPhase patchPhase" genericBuild +``` + +Then, run more phases up until the failure is reached. +For example, if the failure is in the build phase, the following phases would be required: + +```bash +phases="${preConfigurePhases[*]:-} configurePhase ${preBuildPhases[*]:-} buildPhase" genericBuild +``` + +Re-run a single phase as many times as necessary to examine the failure like so: + +```bash +phases="buildPhase" genericBuild ``` To modify a [phase](#sec-stdenv-phases), first print it with ```bash +echo "$buildPhase" +``` + +Or, if that is empty, for instance, if it is using a function: + +```bash type buildPhase ``` then change it in a text editor, and paste it back to the terminal. +::: {.note} +This method may have some inconsistencies in environment variables and behaviour compared to a normal build within the [Nix build sandbox](https://nixos.org/manual/nix/unstable/language/derivations#builder-execution). +The following is a non-exhaustive list of such differences: + +- `TMP`, `TMPDIR`, and similar variables likely point to non-empty directories that the build might conflict with files in. +- Output store paths are not writable, so the variables for outputs need to be overridden to writable paths. +- Other environment variables may be inconsistent with a `nix-build` either due to `nix-shell`'s initialization script or due to the use of `nix-shell` without the `--pure` option. + +If the build fails differently inside the shell than in the sandbox, consider using [`breakpointHook`](#breakpointhook) and invoking `nix-build` instead. +The [`--keep-failed`](https://nixos.org/manual/nix/unstable/command-ref/conf-file#opt--keep-failed) option for `nix-build` may also be useful to examine the build directory of a failed build. +::: + ## Tools provided by `stdenv` {#sec-tools-of-stdenv} The standard environment provides the following packages: diff --git a/nixpkgs/lib/customisation.nix b/nixpkgs/lib/customisation.nix index 5ef4f29e6f6a..61bb531d2f62 100644 --- a/nixpkgs/lib/customisation.nix +++ b/nixpkgs/lib/customisation.nix @@ -13,16 +13,7 @@ rec { scenarios (e.g. in ~/.config/nixpkgs/config.nix). For instance, if you want to "patch" the derivation returned by a package function in Nixpkgs to build another version than what the - function itself provides, you can do something like this: - - mySed = overrideDerivation pkgs.gnused (oldAttrs: { - name = "sed-4.2.2-pre"; - src = fetchurl { - url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2; - hash = "sha256-MxBJRcM2rYzQYwJ5XKxhXTQByvSg5jZc5cSHEZoB2IY="; - }; - patches = []; - }); + function itself provides. For another application, see build-support/vm, where this function is used to build arbitrary derivations inside a QEMU @@ -35,6 +26,19 @@ rec { You should in general prefer `drv.overrideAttrs` over this function; see the nixpkgs manual for more information on overriding. + + Example: + mySed = overrideDerivation pkgs.gnused (oldAttrs: { + name = "sed-4.2.2-pre"; + src = fetchurl { + url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2; + hash = "sha256-MxBJRcM2rYzQYwJ5XKxhXTQByvSg5jZc5cSHEZoB2IY="; + }; + patches = []; + }); + + Type: + overrideDerivation :: Derivation -> ( Derivation -> AttrSet ) -> Derivation */ overrideDerivation = drv: f: let @@ -55,6 +59,10 @@ rec { injects `override` attribute which can be used to override arguments of the function. + Please refer to documentation on [`<pkg>.overrideDerivation`](#sec-pkg-overrideDerivation) to learn about `overrideDerivation` and caveats + related to its use. + + Example: nix-repl> x = {a, b}: { result = a + b; } nix-repl> y = lib.makeOverridable x { a = 1; b = 2; } @@ -65,9 +73,8 @@ rec { nix-repl> y.override { a = 10; } { override = «lambda»; overrideDerivation = «lambda»; result = 12; } - Please refer to "Nixpkgs Contributors Guide" section - "<pkg>.overrideDerivation" to learn about `overrideDerivation` and caveats - related to its use. + Type: + makeOverridable :: (AttrSet -> a) -> AttrSet -> a */ makeOverridable = f: lib.setFunctionArgs (origArgs: let @@ -105,20 +112,29 @@ rec { `autoArgs`. This function is intended to be partially parameterised, e.g., + ```nix callPackage = callPackageWith pkgs; pkgs = { libfoo = callPackage ./foo.nix { }; libbar = callPackage ./bar.nix { }; }; + ``` If the `libbar` function expects an argument named `libfoo`, it is automatically passed as an argument. Overrides or missing arguments can be supplied in `args`, e.g. + ```nix libbar = callPackage ./bar.nix { libfoo = null; enableX11 = true; }; + ``` + + <!-- TODO: Apply "Example:" tag to the examples above --> + + Type: + callPackageWith :: AttrSet -> ((AttrSet -> a) | Path) -> AttrSet -> a */ callPackageWith = autoArgs: fn: args: let @@ -129,7 +145,7 @@ rec { # This includes automatic ones and ones passed explicitly allArgs = builtins.intersectAttrs fargs autoArgs // args; - # A list of argument names that the function requires, but + # a list of argument names that the function requires, but # wouldn't be passed to it missingArgs = lib.attrNames # Filter out arguments that have a default value @@ -176,7 +192,11 @@ rec { /* Like callPackage, but for a function that returns an attribute set of derivations. The override function is added to the - individual attributes. */ + individual attributes. + + Type: + callPackagesWith :: AttrSet -> ((AttrSet -> AttrSet) | Path) -> AttrSet -> AttrSet + */ callPackagesWith = autoArgs: fn: args: let f = if lib.isFunction fn then fn else import fn; @@ -193,7 +213,11 @@ rec { /* Add attributes to each output of a derivation without changing - the derivation itself and check a given condition when evaluating. */ + the derivation itself and check a given condition when evaluating. + + Type: + extendDerivation :: Bool -> Any -> Derivation -> Derivation + */ extendDerivation = condition: passthru: drv: let outputs = drv.outputs or [ "out" ]; @@ -227,7 +251,11 @@ rec { /* Strip a derivation of all non-essential attributes, returning only those needed by hydra-eval-jobs. Also strictly evaluate the result to ensure that there are no thunks kept alive to prevent - garbage collection. */ + garbage collection. + + Type: + hydraJob :: (Derivation | Null) -> (Derivation | Null) + */ hydraJob = drv: let outputs = drv.outputs or ["out"]; @@ -265,7 +293,11 @@ rec { called with the overridden packages. The package sets may be hierarchical: the packages in the set are called with the scope provided by `newScope` and the set provides a `newScope` attribute - which can form the parent scope for later package sets. */ + which can form the parent scope for later package sets. + + Type: + makeScope :: (AttrSet -> ((AttrSet -> a) | Path) -> AttrSet -> a) -> (AttrSet -> AttrSet) -> AttrSet + */ makeScope = newScope: f: let self = f self // { newScope = scope: newScope (self // scope); @@ -287,7 +319,25 @@ rec { { inherit otherSplices keep extra f; }; /* Like makeScope, but aims to support cross compilation. It's still ugly, but - hopefully it helps a little bit. */ + hopefully it helps a little bit. + + Type: + makeScopeWithSplicing' :: + { splicePackages :: Splice -> AttrSet + , newScope :: AttrSet -> ((AttrSet -> a) | Path) -> AttrSet -> a + } + -> { otherSplices :: Splice, keep :: AttrSet -> AttrSet, extra :: AttrSet -> AttrSet } + -> AttrSet + + Splice :: + { pkgsBuildBuild :: AttrSet + , pkgsBuildHost :: AttrSet + , pkgsBuildTarget :: AttrSet + , pkgsHostHost :: AttrSet + , pkgsHostTarget :: AttrSet + , pkgsTargetTarget :: AttrSet + } + */ makeScopeWithSplicing' = { splicePackages , newScope diff --git a/nixpkgs/lib/fileset/default.nix b/nixpkgs/lib/fileset/default.nix index 7bd701670386..0342be3e0371 100644 --- a/nixpkgs/lib/fileset/default.nix +++ b/nixpkgs/lib/fileset/default.nix @@ -6,6 +6,7 @@ let _coerceMany _toSourceFilter _unionMany + _fileFilter _printFileset _intersection ; @@ -41,6 +42,7 @@ let ; inherit (lib.trivial) + isFunction pipe ; @@ -279,6 +281,55 @@ If a directory does not recursively contain any file, it is omitted from the sto ]; /* + Filter a file set to only contain files matching some predicate. + + Type: + fileFilter :: + ({ + name :: String, + type :: String, + ... + } -> Bool) + -> FileSet + -> FileSet + + Example: + # Include all regular `default.nix` files in the current directory + fileFilter (file: file.name == "default.nix") ./. + + # Include all non-Nix files from the current directory + fileFilter (file: ! hasSuffix ".nix" file.name) ./. + + # Include all files that start with a "." in the current directory + fileFilter (file: hasPrefix "." file.name) ./. + + # Include all regular files (not symlinks or others) in the current directory + fileFilter (file: file.type == "regular") + */ + fileFilter = + /* + The predicate function to call on all files contained in given file set. + A file is included in the resulting file set if this function returns true for it. + + This function is called with an attribute set containing these attributes: + + - `name` (String): The name of the file + + - `type` (String, one of `"regular"`, `"symlink"` or `"unknown"`): The type of the file. + This matches result of calling [`builtins.readFileType`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-readFileType) on the file's path. + + Other attributes may be added in the future. + */ + predicate: + # The file set to filter based on the predicate function + fileset: + if ! isFunction predicate then + throw "lib.fileset.fileFilter: Expected the first argument to be a function, but it's a ${typeOf predicate} instead." + else + _fileFilter predicate + (_coerce "lib.fileset.fileFilter: second argument" fileset); + + /* The file set containing all files that are in both of two given file sets. See also [Intersection (set theory)](https://en.wikipedia.org/wiki/Intersection_(set_theory)). diff --git a/nixpkgs/lib/fileset/internal.nix b/nixpkgs/lib/fileset/internal.nix index 9892172955c3..2d52a8cb410b 100644 --- a/nixpkgs/lib/fileset/internal.nix +++ b/nixpkgs/lib/fileset/internal.nix @@ -638,4 +638,30 @@ rec { else # In all other cases it's the rhs rhs; + + _fileFilter = predicate: fileset: + let + recurse = path: tree: + mapAttrs (name: subtree: + if isAttrs subtree || subtree == "directory" then + recurse (path + "/${name}") subtree + else if + predicate { + inherit name; + type = subtree; + # To ensure forwards compatibility with more arguments being added in the future, + # adding an attribute which can't be deconstructed :) + "lib.fileset.fileFilter: The predicate function passed as the first argument must be able to handle extra attributes for future compatibility. If you're using `{ name, file }:`, use `{ name, file, ... }:` instead." = null; + } + then + subtree + else + null + ) (_directoryEntries path tree); + in + if fileset._internalIsEmptyWithoutBase then + _emptyWithoutBase + else + _create fileset._internalBase + (recurse fileset._internalBase fileset._internalTree); } diff --git a/nixpkgs/lib/fileset/tests.sh b/nixpkgs/lib/fileset/tests.sh index 529f23ae8871..d8d8dd413189 100755 --- a/nixpkgs/lib/fileset/tests.sh +++ b/nixpkgs/lib/fileset/tests.sh @@ -678,6 +678,73 @@ tree=( checkFileset 'intersection (unions [ ./a/b ./c/d ./c/e ]) (unions [ ./a ./c/d/f ./c/e ])' +## File filter + +# The predicate is not called when there's no files +tree=() +checkFileset 'fileFilter (file: abort "this is not needed") ./.' +checkFileset 'fileFilter (file: abort "this is not needed") _emptyWithoutBase' + +# The predicate must be able to handle extra attributes +touch a +expectFailure 'toSource { root = ./.; fileset = fileFilter ({ name, type }: true) ./.; }' 'called with unexpected argument '\''"lib.fileset.fileFilter: The predicate function passed as the first argument must be able to handle extra attributes for future compatibility. If you'\''re using `\{ name, file \}:`, use `\{ name, file, ... \}:` instead."'\' +rm -rf -- * + +# .name is the name, and it works correctly, even recursively +tree=( + [a]=1 + [b]=0 + [c/a]=1 + [c/b]=0 + [d/c/a]=1 + [d/c/b]=0 +) +checkFileset 'fileFilter (file: file.name == "a") ./.' +tree=( + [a]=0 + [b]=1 + [c/a]=0 + [c/b]=1 + [d/c/a]=0 + [d/c/b]=1 +) +checkFileset 'fileFilter (file: file.name != "a") ./.' + +# `.type` is the file type +mkdir d +touch d/a +ln -s d/b d/b +mkfifo d/c +expectEqual \ + 'toSource { root = ./.; fileset = fileFilter (file: file.type == "regular") ./.; }' \ + 'toSource { root = ./.; fileset = ./d/a; }' +expectEqual \ + 'toSource { root = ./.; fileset = fileFilter (file: file.type == "symlink") ./.; }' \ + 'toSource { root = ./.; fileset = ./d/b; }' +expectEqual \ + 'toSource { root = ./.; fileset = fileFilter (file: file.type == "unknown") ./.; }' \ + 'toSource { root = ./.; fileset = ./d/c; }' +expectEqual \ + 'toSource { root = ./.; fileset = fileFilter (file: file.type != "regular") ./.; }' \ + 'toSource { root = ./.; fileset = union ./d/b ./d/c; }' +expectEqual \ + 'toSource { root = ./.; fileset = fileFilter (file: file.type != "symlink") ./.; }' \ + 'toSource { root = ./.; fileset = union ./d/a ./d/c; }' +expectEqual \ + 'toSource { root = ./.; fileset = fileFilter (file: file.type != "unknown") ./.; }' \ + 'toSource { root = ./.; fileset = union ./d/a ./d/b; }' +rm -rf -- * + +# It's lazy +tree=( + [b]=1 + [c/a]=1 +) +# Note that union evaluates the first argument first if necessary, that's why we can use ./c/a here +checkFileset 'union ./c/a (fileFilter (file: assert file.name != "a"; true) ./.)' +# but here we need to use ./c +checkFileset 'union (fileFilter (file: assert file.name != "a"; true) ./.) ./c' + ## Tracing # The second trace argument is returned diff --git a/nixpkgs/lib/systems/parse.nix b/nixpkgs/lib/systems/parse.nix index 34bfd94b3ce5..b69ad669e187 100644 --- a/nixpkgs/lib/systems/parse.nix +++ b/nixpkgs/lib/systems/parse.nix @@ -29,6 +29,15 @@ let assert type.check value; setType type.name ({ inherit name; } // value)); + # gnu-config will ignore the portion of a triple matching the + # regex `e?abi.*$` when determining the validity of a triple. In + # other words, `i386-linuxabichickenlips` is a valid triple. + removeAbiSuffix = x: + let match = builtins.match "(.*)e?abi.*" x; + in if match==null + then x + else lib.elemAt match 0; + in rec { @@ -466,7 +475,7 @@ rec { else vendors.unknown; kernel = if hasPrefix "darwin" args.kernel then getKernel "darwin" else if hasPrefix "netbsd" args.kernel then getKernel "netbsd" - else getKernel args.kernel; + else getKernel (removeAbiSuffix args.kernel); abi = /**/ if args ? abi then getAbi args.abi else if isLinux parsed || isWindows parsed then diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index de345f0e8bf2..bb0f7c67a917 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -16112,6 +16112,12 @@ fingerprint = "AB63 4CD9 3322 BD42 6231 F764 C404 1EA6 B326 33DE"; }]; }; + shivaraj-bh = { + email = "sbh69840@gmail.com"; + name = "Shivaraj B H"; + github = "shivaraj-bh"; + githubId = 23645788; + }; shlevy = { email = "shea@shealevy.com"; github = "shlevy"; @@ -17212,6 +17218,12 @@ githubId = 1901799; name = "Nathan van Doorn"; }; + taranarmo = { + email = "taranarmo@gmail.com"; + github = "taranarmo"; + githubId = 11619234; + name = "Sergey Volkov"; + }; tari = { email = "peter@taricorp.net"; github = "tari"; diff --git a/nixpkgs/maintainers/scripts/luarocks-packages.csv b/nixpkgs/maintainers/scripts/luarocks-packages.csv index f03ef4fa09c9..5ad2f9431592 100644 --- a/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -16,7 +16,6 @@ cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3, dkjson,,,,,, fennel,,,,,,misterio77 -ferris.nvim,,,,,,mrcjkb fifo,,,,,, fluent,,,,,,alerque gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1, @@ -101,6 +100,7 @@ plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, rest.nvim,,,,,5.1,teto readline,,,,,, +rustaceanvim,,,,,,mrcjkb say,https://github.com/Olivine-Labs/say.git,,,,, serpent,,,,,,lockejan sqlite,,,,,, diff --git a/nixpkgs/maintainers/team-list.nix b/nixpkgs/maintainers/team-list.nix index 85a6227634f1..f8dbd637d77f 100644 --- a/nixpkgs/maintainers/team-list.nix +++ b/nixpkgs/maintainers/team-list.nix @@ -407,7 +407,6 @@ with lib.maintainers; { home-assistant = { members = [ fab - globin hexa mic92 ]; @@ -742,7 +741,6 @@ with lib.maintainers; { aanderse drupol etu - globin ma27 talyz ]; diff --git a/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md b/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md index 9e2afe5fd201..bd0d74a8885b 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md @@ -107,6 +107,8 @@ - [NNCP](http://www.nncpgo.org/). Added nncp-daemon and nncp-caller services. Configuration is set with [programs.nncp.settings](#opt-programs.nncp.settings) and the daemons are enabled at [services.nncp](#opt-services.nncp.caller.enable). +- [FastNetMon Advanced](https://fastnetmon.com/product-overview/), a commercial high performance DDoS detector / sensor. Available as [services.fastnetmon-advanced](#opt-services.fastnetmon-advanced.enable). + - [tuxedo-rs](https://github.com/AaronErhardt/tuxedo-rs), Rust utilities for interacting with hardware from TUXEDO Computers. - [audiobookshelf](https://github.com/advplyr/audiobookshelf/), a self-hosted audiobook and podcast server. Available as [services.audiobookshelf](#opt-services.audiobookshelf.enable). @@ -121,6 +123,8 @@ - [Soft Serve](https://github.com/charmbracelet/soft-serve), a tasty, self-hostable Git server for the command line. Available as [services.soft-serve](#opt-services.soft-serve.enable). +- [Rosenpass](https://rosenpass.eu/), a service for post-quantum-secure VPNs with WireGuard. Available as [services.rosenpass](#opt-services.rosenpass.enable). + ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} - `network-online.target` has been fixed to no longer time out for systems with `networking.useDHCP = true` and `networking.useNetworkd = true`. @@ -313,6 +317,8 @@ - `rome` was removed because it is no longer maintained and is succeeded by `biome`. +- The `prometheus-knot-exporter` was migrated to a version maintained by CZ.NIC. Various metric names have changed, so checking existing rules is recommended. + - The `services.mtr-exporter.target` has been removed in favor of `services.mtr-exporter.jobs` which allows specifying multiple targets. - Setting `nixpkgs.config` options while providing an external `pkgs` instance will now raise an error instead of silently ignoring the options. NixOS modules no longer set `nixpkgs.config` to accomodate this. This specifically affects `services.locate`, `services.xserver.displayManager.lightdm.greeters.tiny` and `programs.firefox` NixOS modules. No manual intervention should be required in most cases, however, configurations relying on those modules affecting packages outside the system environment should switch to explicit overlays. @@ -325,6 +331,10 @@ - `ps3netsrv` has been replaced with the webman-mod fork, the executable has been renamed from `ps3netsrv++` to `ps3netsrv` and cli parameters have changed. +- `ssm-agent` package and module were renamed to `amazon-ssm-agent` to be consistent with the upstream package name. + +- `services.kea.{ctrl-agent,dhcp-ddns,dhcp,dhcp6}` now use separate runtime directories instead of `/run/kea` to work around the runtime directory being cleared on service start. + ## Other Notable Changes {#sec-release-23.11-notable-changes} - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration. @@ -359,6 +369,8 @@ - `services.outline` can now be configured to use local filesystem storage instead of S3 storage using [services.outline.storage.storageType](#opt-services.outline.storage.storageType). +- `paperwork` was updated to version 2.2. Documents scanned with this version will not be visible to previous versions if you downgrade. See the [upstream announcement](https://forum.openpaper.work/t/paperwork-2-2-testing-phase/316#important-switch-from-jpeg-to-png-for-new-pages-2) for details and workarounds. + - `buildGoModule` `go-modules` attrs have been renamed to `goModules`. - The `fonts.fonts` and `fonts.enableDefaultFonts` options have been renamed to `fonts.packages` and `fonts.enableDefaultPackages` respectively. diff --git a/nixpkgs/nixos/lib/make-squashfs.nix b/nixpkgs/nixos/lib/make-squashfs.nix index b7c7078b73b1..4b6b56739948 100644 --- a/nixpkgs/nixos/lib/make-squashfs.nix +++ b/nixpkgs/nixos/lib/make-squashfs.nix @@ -1,15 +1,22 @@ { lib, stdenv, squashfsTools, closureInfo +, fileName ? "squashfs" , # The root directory of the squashfs filesystem is filled with the # closures of the Nix store paths listed here. storeContents ? [] + # Pseudo files to be added to squashfs image +, pseudoFiles ? [] +, noStrip ? false , # Compression parameters. # For zstd compression you can use "zstd -Xcompression-level 6". comp ? "xz -Xdict-size 100%" }: +let + pseudoFilesArgs = lib.concatMapStrings (f: ''-p "${f}" '') pseudoFiles; +in stdenv.mkDerivation { - name = "squashfs.img"; + name = "${fileName}.img"; __structuredAttrs = true; nativeBuildInputs = [ squashfsTools ]; @@ -31,8 +38,8 @@ stdenv.mkDerivation { '' + '' # Generate the squashfs image. - mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \ - -no-hardlinks -keep-as-directory -all-root -b 1048576 -comp ${comp} \ + mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out ${pseudoFilesArgs} \ + -no-hardlinks ${lib.optionalString noStrip "-no-strip"} -keep-as-directory -all-root -b 1048576 -comp ${comp} \ -processors $NIX_BUILD_CORES ''; } diff --git a/nixpkgs/nixos/lib/qemu-common.nix b/nixpkgs/nixos/lib/qemu-common.nix index 4fff2e0a6f15..b946f62d93dc 100644 --- a/nixpkgs/nixos/lib/qemu-common.nix +++ b/nixpkgs/nixos/lib/qemu-common.nix @@ -40,6 +40,7 @@ rec { otherHostGuestMatrix = { aarch64-darwin = { aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=2,accel=hvf:tcg -cpu max"; + inherit (otherHostGuestMatrix.x86_64-darwin) x86_64-linux; }; x86_64-darwin = { x86_64-linux = "${qemuPkg}/bin/qemu-system-x86_64 -machine type=q35,accel=hvf:tcg -cpu max"; diff --git a/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/nixpkgs/nixos/modules/hardware/video/nvidia.nix index 4320edf60da5..c36775dd24bb 100644 --- a/nixpkgs/nixos/modules/hardware/video/nvidia.nix +++ b/nixpkgs/nixos/modules/hardware/video/nvidia.nix @@ -269,9 +269,9 @@ in { services.udev.extraRules = '' # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. - KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'" - KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do mknod -m 666 /dev/nvidia$${i} c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) $${i}; done'" - KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'" + KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c 195 255'" + KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do mknod -m 666 /dev/nvidia$${i} c 195 $${i}; done'" + KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c 195 254'" KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'" ''; diff --git a/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl b/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl index 7d0c5898e23d..85180bf2d1b4 100644 --- a/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl @@ -102,22 +102,6 @@ sub cpuManufacturer { return $cpuinfo =~ /^vendor_id\s*:.* $id$/m; } - -# Determine CPU governor to use -if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") { - my $governors = read_file("/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors"); - # ondemand governor is not available on sandy bridge or later Intel CPUs - my @desired_governors = ("ondemand", "powersave"); - my $e; - - foreach $e (@desired_governors) { - if (index($governors, $e) != -1) { - last if (push @attrs, "powerManagement.cpuFreqGovernor = lib.mkDefault \"$e\";"); - } - } -} - - # Virtualization support? push @kernelModules, "kvm-intel" if hasCPUFeature "vmx"; push @kernelModules, "kvm-amd" if hasCPUFeature "svm"; diff --git a/nixpkgs/nixos/modules/misc/nixpkgs.nix b/nixpkgs/nixos/modules/misc/nixpkgs.nix index bfcae9c7a935..da321a923449 100644 --- a/nixpkgs/nixos/modules/misc/nixpkgs.nix +++ b/nixpkgs/nixos/modules/misc/nixpkgs.nix @@ -187,7 +187,7 @@ in hostPlatform = mkOption { type = types.either types.str types.attrs; # TODO utilize lib.systems.parsedPlatform - example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + example = { system = "aarch64-linux"; }; # Make sure that the final value has all fields for sake of other modules # referring to this. TODO make `lib.systems` itself use the module system. apply = lib.systems.elaborate; @@ -205,7 +205,7 @@ in buildPlatform = mkOption { type = types.either types.str types.attrs; # TODO utilize lib.systems.parsedPlatform default = cfg.hostPlatform; - example = { system = "x86_64-linux"; config = "x86_64-unknown-linux-gnu"; }; + example = { system = "x86_64-linux"; }; # Make sure that the final value has all fields for sake of other modules # referring to this. apply = lib.systems.elaborate; @@ -228,7 +228,7 @@ in localSystem = mkOption { type = types.attrs; # TODO utilize lib.systems.parsedPlatform default = { inherit (cfg) system; }; - example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + example = { system = "aarch64-linux"; }; # Make sure that the final value has all fields for sake of other modules # referring to this. TODO make `lib.systems` itself use the module system. apply = lib.systems.elaborate; @@ -262,7 +262,7 @@ in crossSystem = mkOption { type = types.nullOr types.attrs; # TODO utilize lib.systems.parsedPlatform default = null; - example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + example = { system = "aarch64-linux"; }; description = lib.mdDoc '' Systems with a recently generated `hardware-configuration.nix` may instead specify *only* {option}`nixpkgs.buildPlatform`, diff --git a/nixpkgs/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix index 16541be4e120..c5c3c0d4719a 100644 --- a/nixpkgs/nixos/modules/module-list.nix +++ b/nixpkgs/nixos/modules/module-list.nix @@ -268,6 +268,7 @@ ./programs/usbtop.nix ./programs/vim.nix ./programs/wavemon.nix + ./programs/wayland/cardboard.nix ./programs/wayland/river.nix ./programs/wayland/sway.nix ./programs/wayland/waybar.nix @@ -626,6 +627,7 @@ ./services/matrix/matrix-sliding-sync.nix ./services/matrix/synapse.nix ./services/misc/airsonic.nix + ./services/misc/amazon-ssm-agent.nix ./services/misc/ananicy.nix ./services/misc/ankisyncd.nix ./services/misc/apache-kafka.nix @@ -742,7 +744,6 @@ ./services/misc/spice-autorandr.nix ./services/misc/spice-vdagentd.nix ./services/misc/spice-webdavd.nix - ./services/misc/ssm-agent.nix ./services/misc/sssd.nix ./services/misc/subsonic.nix ./services/misc/sundtek.nix @@ -908,6 +909,7 @@ ./services/networking/eternal-terminal.nix ./services/networking/expressvpn.nix ./services/networking/fakeroute.nix + ./services/networking/fastnetmon-advanced.nix ./services/networking/ferm.nix ./services/networking/firefox-syncserver.nix ./services/networking/fireqos.nix @@ -1048,6 +1050,7 @@ ./services/networking/redsocks.nix ./services/networking/resilio.nix ./services/networking/robustirc-bridge.nix + ./services/networking/rosenpass.nix ./services/networking/routedns.nix ./services/networking/rpcbind.nix ./services/networking/rxe.nix @@ -1269,6 +1272,7 @@ ./services/web-apps/kavita.nix ./services/web-apps/keycloak.nix ./services/web-apps/komga.nix + ./services/web-apps/lanraragi.nix ./services/web-apps/lemmy.nix ./services/web-apps/limesurvey.nix ./services/web-apps/mainsail.nix diff --git a/nixpkgs/nixos/modules/programs/browserpass.nix b/nixpkgs/nixos/modules/programs/browserpass.nix index abd99056ff3b..a9670a37e618 100644 --- a/nixpkgs/nixos/modules/programs/browserpass.nix +++ b/nixpkgs/nixos/modules/programs/browserpass.nix @@ -27,6 +27,6 @@ with lib; "opt/brave/native-messaging-hosts/${appId}".source = source "hosts/chromium"; "opt/brave/policies/managed/${appId}".source = source "policies/chromium"; }; - programs.firefox.wrapperConfig.enableBrowserpass = true; + programs.firefox.nativeMessagingHosts.packages = [ pkgs.browserpass ]; }; } diff --git a/nixpkgs/nixos/modules/programs/firefox.nix b/nixpkgs/nixos/modules/programs/firefox.nix index 813e0e0105f6..85f47530cf5a 100644 --- a/nixpkgs/nixos/modules/programs/firefox.nix +++ b/nixpkgs/nixos/modules/programs/firefox.nix @@ -5,8 +5,6 @@ with lib; let cfg = config.programs.firefox; - nmh = cfg.nativeMessagingHosts; - policyFormat = pkgs.formats.json { }; organisationInfo = '' @@ -17,6 +15,50 @@ let given control of your browser, unless of course they also control your NixOS configuration. ''; + + # deprecated per-native-messaging-host options + nmhOptions = { + browserpass = { + name = "Browserpass"; + package = pkgs.browserpass; + }; + bukubrow = { + name = "Bukubrow"; + package = pkgs.bukubrow; + }; + euwebid = { + name = "Web eID"; + package = pkgs.web-eid-app; + }; + ff2mpv = { + name = "ff2mpv"; + package = pkgs.ff2mpv; + }; + fxCast = { + name = "fx_cast"; + package = pkgs.fx-cast-bridge; + }; + gsconnect = { + name = "GSConnect"; + package = pkgs.gnomeExtensions.gsconnect; + }; + jabref = { + name = "JabRef"; + package = pkgs.jabref; + }; + passff = { + name = "PassFF"; + package = pkgs.passff-host; + }; + tridactyl = { + name = "Tridactyl"; + package = pkgs.tridactyl-native; + }; + ugetIntegrator = { + name = "Uget Integrator"; + package = pkgs.uget-integrator; + }; + }; in { options.programs.firefox = { @@ -204,46 +246,31 @@ in ''; }; - nativeMessagingHosts = mapAttrs (_: v: mkEnableOption (mdDoc v)) { - browserpass = "Browserpass support"; - bukubrow = "Bukubrow support"; - euwebid = "Web eID support"; - ff2mpv = "ff2mpv support"; - fxCast = "fx_cast support"; - gsconnect = "GSConnect support"; - jabref = "JabRef support"; - passff = "PassFF support"; - tridactyl = "Tridactyl support"; - ugetIntegrator = "Uget Integrator support"; - }; + nativeMessagingHosts = ({ + packages = mkOption { + type = types.listOf types.package; + default = []; + description = mdDoc '' + Additional packages containing native messaging hosts that should be made available to Firefox extensions. + ''; + }; + }) // (mapAttrs (k: v: mkEnableOption (mdDoc "${v.name} support")) nmhOptions); }; - config = mkIf cfg.enable { + config = let + forEachEnabledNmh = fn: flatten (mapAttrsToList (k: v: lib.optional cfg.nativeMessagingHosts.${k} (fn k v)) nmhOptions); + in mkIf cfg.enable { + warnings = forEachEnabledNmh (k: v: + "The `programs.firefox.nativeMessagingHosts.${k}` option is deprecated, " + + "please add `${v.package.pname}` to `programs.firefox.nativeMessagingHosts.packages` instead." + ); + programs.firefox.nativeMessagingHosts.packages = forEachEnabledNmh (_: v: v.package); + environment.systemPackages = [ (cfg.package.override (old: { - extraPrefs = cfg.autoConfig; - extraNativeMessagingHosts = - old.extraNativeMessagingHosts or [] - ++ optional nmh.ff2mpv pkgs.ff2mpv - ++ optional nmh.euwebid pkgs.web-eid-app - ++ optional nmh.gsconnect pkgs.gnomeExtensions.gsconnect - ++ optional nmh.jabref pkgs.jabref - ++ optional nmh.passff pkgs.passff-host; - cfg = let - # copy-pasted from the wrapper; TODO: figure out fix - applicationName = cfg.package.binaryName or (lib.getName cfg.package); - - oldCfg = old.cfg or {}; - nixpkgsConfig = pkgs.config.${applicationName} or {}; - optionConfig = cfg.wrapperConfig; - nmhConfig = { - enableBrowserpass = nmh.browserpass; - enableBukubrow = nmh.bukubrow; - enableTridactylNative = nmh.tridactyl; - enableUgetIntegrator = nmh.ugetIntegrator; - enableFXCastBridge = nmh.fxCast; - }; - in oldCfg // nixpkgsConfig // optionConfig // nmhConfig; + extraPrefsFiles = old.extraPrefsFiles or [] ++ [(pkgs.writeText "firefox-autoconfig.js" cfg.autoConfig)]; + nativeMessagingHosts = old.nativeMessagingHosts or [] ++ cfg.nativeMessagingHosts.packages; + cfg = (old.cfg or {}) // cfg.wrapperConfig; })) ]; diff --git a/nixpkgs/nixos/modules/programs/wayland/cardboard.nix b/nixpkgs/nixos/modules/programs/wayland/cardboard.nix new file mode 100644 index 000000000000..262c698c74ba --- /dev/null +++ b/nixpkgs/nixos/modules/programs/wayland/cardboard.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.programs.cardboard; +in +{ + meta.maintainers = with lib.maintainers; [ AndersonTorres ]; + + options.programs.cardboard = { + enable = lib.mkEnableOption (lib.mdDoc "cardboard"); + + package = lib.mkPackageOptionMD pkgs "cardboard" { }; + }; + + config = lib.mkIf cfg.enable (lib.mkMerge [ + { + environment.systemPackages = [ cfg.package ]; + + # To make a cardboard session available for certain DMs like SDDM + services.xserver.displayManager.sessionPackages = [ cfg.package ]; + } + (import ./wayland-session.nix { inherit lib pkgs; }) + ]); +} diff --git a/nixpkgs/nixos/modules/security/acme/default.nix b/nixpkgs/nixos/modules/security/acme/default.nix index f8e17bc71ee1..932bf3e79115 100644 --- a/nixpkgs/nixos/modules/security/acme/default.nix +++ b/nixpkgs/nixos/modules/security/acme/default.nix @@ -184,6 +184,7 @@ let certToConfig = cert: data: let acmeServer = data.server; useDns = data.dnsProvider != null; + useDnsOrS3 = useDns || data.s3Bucket != null; destPath = "/var/lib/acme/${cert}"; selfsignedDeps = optionals (cfg.preliminarySelfsigned) [ "acme-selfsigned-${cert}.service" ]; @@ -219,7 +220,8 @@ let [ "--dns" data.dnsProvider ] ++ optionals (!data.dnsPropagationCheck) [ "--dns.disable-cp" ] ++ optionals (data.dnsResolver != null) [ "--dns.resolvers" data.dnsResolver ] - ) else if data.listenHTTP != null then [ "--http" "--http.port" data.listenHTTP ] + ) else if data.s3Bucket != null then [ "--http" "--http.s3-bucket" data.s3Bucket ] + else if data.listenHTTP != null then [ "--http" "--http.port" data.listenHTTP ] else [ "--http" "--http.webroot" data.webroot ]; commonOpts = [ @@ -362,13 +364,12 @@ let "/var/lib/acme/.lego/${cert}/${certDir}:/tmp/certificates" ]; - # Only try loading the environmentFile if the dns challenge is enabled - EnvironmentFile = mkIf useDns data.environmentFile; + EnvironmentFile = mkIf useDnsOrS3 data.environmentFile; - Environment = mkIf useDns + Environment = mkIf useDnsOrS3 (mapAttrsToList (k: v: ''"${k}=%d/${k}"'') data.credentialFiles); - LoadCredential = mkIf useDns + LoadCredential = mkIf useDnsOrS3 (mapAttrsToList (k: v: "${k}:${v}") data.credentialFiles); # Run as root (Prefixed with +) @@ -755,6 +756,15 @@ let ''; }; + s3Bucket = mkOption { + type = types.nullOr types.str; + default = null; + example = "acme"; + description = lib.mdDoc '' + S3 bucket name to use for HTTP-01 based challenges. Challenges will be written to the S3 bucket. + ''; + }; + inheritDefaults = mkOption { default = true; example = true; @@ -928,35 +938,20 @@ in { and remove the wildcard from the path. ''; } - { - assertion = data.dnsProvider == null || data.webroot == null; - message = '' - Options `security.acme.certs.${cert}.dnsProvider` and - `security.acme.certs.${cert}.webroot` are mutually exclusive. - ''; - } - { - assertion = data.webroot == null || data.listenHTTP == null; - message = '' - Options `security.acme.certs.${cert}.webroot` and - `security.acme.certs.${cert}.listenHTTP` are mutually exclusive. - ''; - } - { - assertion = data.listenHTTP == null || data.dnsProvider == null; + (let exclusiveAttrs = { + inherit (data) dnsProvider webroot listenHTTP s3Bucket; + }; in { + assertion = lib.length (lib.filter (x: x != null) (builtins.attrValues exclusiveAttrs)) == 1; message = '' - Options `security.acme.certs.${cert}.listenHTTP` and - `security.acme.certs.${cert}.dnsProvider` are mutually exclusive. + Exactly one of the options + `security.acme.certs.${cert}.dnsProvider`, + `security.acme.certs.${cert}.webroot`, + `security.acme.certs.${cert}.listenHTTP` and + `security.acme.certs.${cert}.s3Bucket` + is required. + Current values: ${(lib.generators.toPretty {} exclusiveAttrs)}. ''; - } - { - assertion = data.dnsProvider != null || data.webroot != null || data.listenHTTP != null; - message = '' - One of `security.acme.certs.${cert}.dnsProvider`, - `security.acme.certs.${cert}.webroot`, or - `security.acme.certs.${cert}.listenHTTP` must be provided. - ''; - } + }) { assertion = all (hasSuffix "_FILE") (attrNames data.credentialFiles); message = '' diff --git a/nixpkgs/nixos/modules/services/backup/bacula.nix b/nixpkgs/nixos/modules/services/backup/bacula.nix index 0acbf1b3eabb..5a75a46e5259 100644 --- a/nixpkgs/nixos/modules/services/backup/bacula.nix +++ b/nixpkgs/nixos/modules/services/backup/bacula.nix @@ -15,16 +15,16 @@ let Client { Name = "${fd_cfg.name}"; FDPort = ${toString fd_cfg.port}; - WorkingDirectory = "${libDir}"; - Pid Directory = "/run"; + WorkingDirectory = ${libDir}; + Pid Directory = /run; ${fd_cfg.extraClientConfig} } ${concatStringsSep "\n" (mapAttrsToList (name: value: '' Director { Name = "${name}"; - Password = "${value.password}"; - Monitor = "${value.monitor}"; + Password = ${value.password}; + Monitor = ${value.monitor}; } '') fd_cfg.director)} @@ -41,8 +41,8 @@ let Storage { Name = "${sd_cfg.name}"; SDPort = ${toString sd_cfg.port}; - WorkingDirectory = "${libDir}"; - Pid Directory = "/run"; + WorkingDirectory = ${libDir}; + Pid Directory = /run; ${sd_cfg.extraStorageConfig} } @@ -50,8 +50,8 @@ let Autochanger { Name = "${name}"; Device = ${concatStringsSep ", " (map (a: "\"${a}\"") value.devices)}; - Changer Device = "${value.changerDevice}"; - Changer Command = "${value.changerCommand}"; + Changer Device = ${value.changerDevice}; + Changer Command = ${value.changerCommand}; ${value.extraAutochangerConfig} } '') sd_cfg.autochanger)} @@ -59,8 +59,8 @@ let ${concatStringsSep "\n" (mapAttrsToList (name: value: '' Device { Name = "${name}"; - Archive Device = "${value.archiveDevice}"; - Media Type = "${value.mediaType}"; + Archive Device = ${value.archiveDevice}; + Media Type = ${value.mediaType}; ${value.extraDeviceConfig} } '') sd_cfg.device)} @@ -68,8 +68,8 @@ let ${concatStringsSep "\n" (mapAttrsToList (name: value: '' Director { Name = "${name}"; - Password = "${value.password}"; - Monitor = "${value.monitor}"; + Password = ${value.password}; + Monitor = ${value.monitor}; } '') sd_cfg.director)} @@ -85,18 +85,18 @@ let '' Director { Name = "${dir_cfg.name}"; - Password = "${dir_cfg.password}"; + Password = ${dir_cfg.password}; DirPort = ${toString dir_cfg.port}; - Working Directory = "${libDir}"; - Pid Directory = "/run/"; - QueryFile = "${pkgs.bacula}/etc/query.sql"; + Working Directory = ${libDir}; + Pid Directory = /run/; + QueryFile = ${pkgs.bacula}/etc/query.sql; ${dir_cfg.extraDirectorConfig} } Catalog { - Name = "PostgreSQL"; - dbname = "bacula"; - user = "bacula"; + Name = PostgreSQL; + dbname = bacula; + user = bacula; } Messages { @@ -533,7 +533,7 @@ in { }; }; - services.postgresql.enable = dir_cfg.enable == true; + services.postgresql.enable = lib.mkIf dir_cfg.enable true; systemd.services.bacula-dir = mkIf dir_cfg.enable { after = [ "network.target" "postgresql.service" ]; diff --git a/nixpkgs/nixos/modules/services/databases/ferretdb.nix b/nixpkgs/nixos/modules/services/databases/ferretdb.nix index 45f822d64691..ab55e22bf214 100644 --- a/nixpkgs/nixos/modules/services/databases/ferretdb.nix +++ b/nixpkgs/nixos/modules/services/databases/ferretdb.nix @@ -30,7 +30,7 @@ in }; description = '' Additional configuration for FerretDB, see - <https://docs.ferretdb.io/flags/> + <https://docs.ferretdb.io/configuration/flags/> for supported values. ''; }; diff --git a/nixpkgs/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix b/nixpkgs/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix index d18e303891e4..4f680eabbe15 100644 --- a/nixpkgs/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix +++ b/nixpkgs/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix @@ -42,6 +42,6 @@ in services.dbus.packages = [ pkgs.gnome-browser-connector ]; - programs.firefox.wrapperConfig.enableGnomeExtensions = true; + programs.firefox.nativeMessagingHosts.packages = [ pkgs.gnome-browser-connector ]; }; } diff --git a/nixpkgs/nixos/modules/services/home-automation/esphome.nix b/nixpkgs/nixos/modules/services/home-automation/esphome.nix index d7dbb6f0b90e..080c8876382f 100644 --- a/nixpkgs/nixos/modules/services/home-automation/esphome.nix +++ b/nixpkgs/nixos/modules/services/home-automation/esphome.nix @@ -112,7 +112,7 @@ in ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; - ProcSubset = "pid"; + ProcSubset = "all"; # Using "pid" breaks bwrap ProtectSystem = "strict"; #RemoveIPC = true; # Implied by DynamicUser RestrictAddressFamilies = [ diff --git a/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix b/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix index 99bac86a8e9a..0e6fa65667af 100644 --- a/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix @@ -12,7 +12,7 @@ let # We post-process the result to add support for YAML functions, like secrets or includes, see e.g. # https://www.home-assistant.io/docs/configuration/secrets/ filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [ null ])) cfg.config or {}; - configFile = pkgs.runCommand "configuration.yaml" { preferLocalBuild = true; } '' + configFile = pkgs.runCommandLocal "configuration.yaml" { } '' cp ${format.generate "configuration.yaml" filteredConfig} $out sed -i -e "s/'\!\([a-z_]\+\) \(.*\)'/\!\1 \2/;s/^\!\!/\!/;" $out ''; diff --git a/nixpkgs/nixos/modules/services/matrix/synapse.nix b/nixpkgs/nixos/modules/services/matrix/synapse.nix index b38b35361cf0..12e27ef26ff3 100644 --- a/nixpkgs/nixos/modules/services/matrix/synapse.nix +++ b/nixpkgs/nixos/modules/services/matrix/synapse.nix @@ -60,7 +60,6 @@ let ++ lib.optional (cfg.settings ? oidc_providers) "oidc" ++ lib.optional (cfg.settings ? jwt_config) "jwt" ++ lib.optional (cfg.settings ? saml2_config) "saml2" - ++ lib.optional (cfg.settings ? opentracing) "opentracing" ++ lib.optional (cfg.settings ? redis) "redis" ++ lib.optional (cfg.settings ? sentry) "sentry" ++ lib.optional (cfg.settings ? user_directory) "user-search" @@ -334,7 +333,6 @@ in { [ "cache-memory" # Provide statistics about caching memory consumption "jwt" # JSON Web Token authentication - "opentracing" # End-to-end tracing support using Jaeger "oidc" # OpenID Connect authentication "postgres" # PostgreSQL database backend "redis" # Redis support for the replication stream between worker processes diff --git a/nixpkgs/nixos/modules/services/misc/ssm-agent.nix b/nixpkgs/nixos/modules/services/misc/amazon-ssm-agent.nix index d1f371c2bd61..0be79e759c31 100644 --- a/nixpkgs/nixos/modules/services/misc/ssm-agent.nix +++ b/nixpkgs/nixos/modules/services/misc/amazon-ssm-agent.nix @@ -2,7 +2,7 @@ with lib; let - cfg = config.services.ssm-agent; + cfg = config.services.amazon-ssm-agent; # The SSM agent doesn't pay attention to our /etc/os-release yet, and the lsb-release tool # in nixpkgs doesn't seem to work properly on NixOS, so let's just fake the two fields SSM @@ -16,19 +16,24 @@ let esac ''; in { - options.services.ssm-agent = { - enable = mkEnableOption (lib.mdDoc "AWS SSM agent"); + imports = [ + (mkRenamedOptionModule [ "services" "ssm-agent" "enable" ] [ "services" "amazon-ssm-agent" "enable" ]) + (mkRenamedOptionModule [ "services" "ssm-agent" "package" ] [ "services" "amazon-ssm-agent" "package" ]) + ]; + + options.services.amazon-ssm-agent = { + enable = mkEnableOption (lib.mdDoc "Amazon SSM agent"); package = mkOption { type = types.path; - description = lib.mdDoc "The SSM agent package to use"; - default = pkgs.ssm-agent.override { overrideEtc = false; }; - defaultText = literalExpression "pkgs.ssm-agent.override { overrideEtc = false; }"; + description = lib.mdDoc "The Amazon SSM agent package to use"; + default = pkgs.amazon-ssm-agent.override { overrideEtc = false; }; + defaultText = literalExpression "pkgs.amazon-ssm-agent.override { overrideEtc = false; }"; }; }; config = mkIf cfg.enable { - systemd.services.ssm-agent = { + systemd.services.amazon-ssm-agent = { inherit (cfg.package.meta) description; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; diff --git a/nixpkgs/nixos/modules/services/misc/forgejo.nix b/nixpkgs/nixos/modules/services/misc/forgejo.nix index b2920981efbd..90b5f16f4189 100644 --- a/nixpkgs/nixos/modules/services/misc/forgejo.nix +++ b/nixpkgs/nixos/modules/services/misc/forgejo.nix @@ -632,6 +632,8 @@ in }; }; + services.openssh.settings.AcceptEnv = mkIf (!cfg.settings.START_SSH_SERVER or false) "GIT_PROTOCOL"; + users.users = mkIf (cfg.user == "forgejo") { forgejo = { home = cfg.stateDir; diff --git a/nixpkgs/nixos/modules/services/monitoring/munin.nix b/nixpkgs/nixos/modules/services/monitoring/munin.nix index f37f2689927e..90a51181ac30 100644 --- a/nixpkgs/nixos/modules/services/monitoring/munin.nix +++ b/nixpkgs/nixos/modules/services/monitoring/munin.nix @@ -83,42 +83,47 @@ let # Copy one Munin plugin into the Nix store with a specific name. # This is suitable for use with plugins going directly into /etc/munin/plugins, # i.e. munin.extraPlugins. - internOnePlugin = name: path: + internOnePlugin = { name, path }: "cp -a '${path}' '${name}'"; # Copy an entire tree of Munin plugins into a single directory in the Nix - # store, with no renaming. - # This is suitable for use with munin-node-configure --suggest, i.e. - # munin.extraAutoPlugins. - internManyPlugins = name: path: + # store, with no renaming. The output is suitable for use with + # munin-node-configure --suggest, i.e. munin.extraAutoPlugins. + # Note that this flattens the input; this is intentional, as + # munin-node-configure won't recurse into subdirectories. + internManyPlugins = path: "find '${path}' -type f -perm /a+x -exec cp -a -t . '{}' '+'"; # Use the appropriate intern-fn to copy the plugins into the store and patch # them afterwards in an attempt to get them to run on NixOS. + # This is a bit hairy because we can't just fix shebangs; lots of munin plugins + # hardcode paths like /sbin/mount rather than trusting $PATH, so we have to + # look for and update those throughout the script. At the same time, if the + # plugin comes from a package that is already nixified, we don't want to + # rewrite paths like /nix/store/foo/sbin/mount. + # For now we make the simplifying assumption that no file will contain lines + # which mix store paths and FHS paths, and thus run our substitution only on + # lines which do not contain store paths. internAndFixPlugins = name: intern-fn: paths: pkgs.runCommand name {} '' mkdir -p "$out" cd "$out" - ${lib.concatStringsSep "\n" - (lib.attrsets.mapAttrsToList intern-fn paths)} + ${lib.concatStringsSep "\n" (map intern-fn paths)} chmod -R u+w . - find . -type f -exec sed -E -i ' - s,(/usr)?/s?bin/,/run/current-system/sw/bin/,g - ' '{}' '+' + ${pkgs.findutils}/bin/find . -type f -exec ${pkgs.gnused}/bin/sed -E -i " + \%''${NIX_STORE}/%! s,(/usr)?/s?bin/,/run/current-system/sw/bin/,g + " '{}' '+' ''; # TODO: write a derivation for munin-contrib, so that for contrib plugins # you can just refer to them by name rather than needing to include a copy # of munin-contrib in your nixos configuration. extraPluginDir = internAndFixPlugins "munin-extra-plugins.d" - internOnePlugin nodeCfg.extraPlugins; + internOnePlugin + (lib.attrsets.mapAttrsToList (k: v: { name = k; path = v; }) nodeCfg.extraPlugins); extraAutoPluginDir = internAndFixPlugins "munin-extra-auto-plugins.d" - internManyPlugins - (builtins.listToAttrs - (map - (path: { name = baseNameOf path; value = path; }) - nodeCfg.extraAutoPlugins)); + internManyPlugins nodeCfg.extraAutoPlugins; customStaticDir = pkgs.runCommand "munin-custom-static-data" {} '' cp -a "${pkgs.munin}/etc/opt/munin/static" "$out" diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix index ed33c72f644f..8b1cd47d0a40 100644 --- a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @@ -15,8 +15,8 @@ in { type = types.listOf types.str; example = literalExpression '' [ - "/run/kea/kea-dhcp4.socket" - "/run/kea/kea-dhcp6.socket" + "/run/kea-dhcp4/kea-dhcp4.socket" + "/run/kea-dhcp6/kea-dhcp6.socket" ] ''; description = lib.mdDoc '' diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix index a73425b37da7..775848750803 100644 --- a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix @@ -8,9 +8,9 @@ in { port = 9433; extraOpts = { knotLibraryPath = mkOption { - type = types.str; - default = "${pkgs.knot-dns.out}/lib/libknot.so"; - defaultText = literalExpression ''"''${pkgs.knot-dns.out}/lib/libknot.so"''; + type = types.nullOr types.str; + default = null; + example = literalExpression ''"''${pkgs.knot-dns.out}/lib/libknot.so"''; description = lib.mdDoc '' Path to the library of `knot-dns`. ''; @@ -25,7 +25,7 @@ in { }; knotSocketTimeout = mkOption { - type = types.int; + type = types.ints.positive; default = 2000; description = lib.mdDoc '' Timeout in seconds. @@ -33,17 +33,22 @@ in { }; }; serviceOpts = { + path = with pkgs; [ + procps + ]; serviceConfig = { ExecStart = '' - ${pkgs.prometheus-knot-exporter}/bin/knot_exporter \ + ${pkgs.prometheus-knot-exporter}/bin/knot-exporter \ --web-listen-addr ${cfg.listenAddress} \ --web-listen-port ${toString cfg.port} \ - --knot-library-path ${cfg.knotLibraryPath} \ --knot-socket-path ${cfg.knotSocketPath} \ --knot-socket-timeout ${toString cfg.knotSocketTimeout} \ + ${lib.optionalString (cfg.knotLibraryPath != null) "--knot-library-path ${cfg.knotLibraryPath}"} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; - SupplementaryGroups = [ "knot" ]; + SupplementaryGroups = [ + "knot" + ]; RestrictAddressFamilies = [ # Need AF_UNIX to collect data "AF_UNIX" diff --git a/nixpkgs/nixos/modules/services/networking/fastnetmon-advanced.nix b/nixpkgs/nixos/modules/services/networking/fastnetmon-advanced.nix new file mode 100644 index 000000000000..26e8ad8b76d9 --- /dev/null +++ b/nixpkgs/nixos/modules/services/networking/fastnetmon-advanced.nix @@ -0,0 +1,222 @@ +{ config, lib, pkgs, ... }: + +let + # Background information: FastNetMon requires a MongoDB to start. This is because + # it uses MongoDB to store its configuration. That is, in a normal setup there is + # one collection with one document. + # To provide declarative configuration in our NixOS module, this database is + # completely emptied and replaced on each boot by the fastnetmon-setup service + # using the configuration backup functionality. + + cfg = config.services.fastnetmon-advanced; + settingsFormat = pkgs.formats.yaml { }; + + # obtain the default configs by starting up ferretdb and fcli in a derivation + default_configs = pkgs.runCommand "default-configs" { + nativeBuildInputs = [ + pkgs.ferretdb + pkgs.fastnetmon-advanced # for fcli + pkgs.proot + ]; + } '' + mkdir ferretdb fastnetmon $out + FERRETDB_TELEMETRY="disable" FERRETDB_HANDLER="sqlite" FERRETDB_STATE_DIR="$PWD/ferretdb" FERRETDB_SQLITE_URL="file:$PWD/ferretdb/" ferretdb & + + cat << EOF > fastnetmon/fastnetmon.conf + ${builtins.toJSON { + mongodb_username = ""; + }} + EOF + proot -b fastnetmon:/etc/fastnetmon -0 fcli create_configuration + proot -b fastnetmon:/etc/fastnetmon -0 fcli set bgp default + proot -b fastnetmon:/etc/fastnetmon -0 fcli export_configuration backup.tar + tar -C $out --no-same-owner -xvf backup.tar + ''; + + # merge the user configs into the default configs + config_tar = pkgs.runCommand "fastnetmon-config.tar" { + nativeBuildInputs = with pkgs; [ jq ]; + } '' + jq -s add ${default_configs}/main.json ${pkgs.writeText "main-add.json" (builtins.toJSON cfg.settings)} > main.json + mkdir hostgroup + ${lib.concatImapStringsSep "\n" (pos: hostgroup: '' + jq -s add ${default_configs}/hostgroup/0.json ${pkgs.writeText "hostgroup-${toString (pos - 1)}-add.json" (builtins.toJSON hostgroup)} > hostgroup/${toString (pos - 1)}.json + '') hostgroups} + mkdir bgp + ${lib.concatImapStringsSep "\n" (pos: bgp: '' + jq -s add ${default_configs}/bgp/0.json ${pkgs.writeText "bgp-${toString (pos - 1)}-add.json" (builtins.toJSON bgp)} > bgp/${toString (pos - 1)}.json + '') bgpPeers} + tar -cf $out main.json ${lib.concatImapStringsSep " " (pos: _: "hostgroup/${toString (pos - 1)}.json") hostgroups} ${lib.concatImapStringsSep " " (pos: _: "bgp/${toString (pos - 1)}.json") bgpPeers} + ''; + + hostgroups = lib.mapAttrsToList (name: hostgroup: { inherit name; } // hostgroup) cfg.hostgroups; + bgpPeers = lib.mapAttrsToList (name: bgpPeer: { inherit name; } // bgpPeer) cfg.bgpPeers; + +in { + options.services.fastnetmon-advanced = with lib; { + enable = mkEnableOption "the fastnetmon-advanced DDoS Protection daemon"; + + settings = mkOption { + description = '' + Extra configuration options to declaratively load into FastNetMon Advanced. + + See the [FastNetMon Advanced Configuration options reference](https://fastnetmon.com/docs-fnm-advanced/fastnetmon-advanced-configuration-options/) for more details. + ''; + type = settingsFormat.type; + default = {}; + example = literalExpression '' + { + networks_list = [ "192.0.2.0/24" ]; + gobgp = true; + gobgp_flow_spec_announces = true; + } + ''; + }; + hostgroups = mkOption { + description = "Hostgroups to declaratively load into FastNetMon Advanced"; + type = types.attrsOf settingsFormat.type; + default = {}; + }; + bgpPeers = mkOption { + description = "BGP Peers to declaratively load into FastNetMon Advanced"; + type = types.attrsOf settingsFormat.type; + default = {}; + }; + + enableAdvancedTrafficPersistence = mkOption { + description = "Store historical flow data in clickhouse"; + type = types.bool; + default = false; + }; + + traffic_db.settings = mkOption { + type = settingsFormat.type; + description = "Additional settings for /etc/fastnetmon/traffic_db.conf"; + }; + }; + + config = lib.mkMerge [ (lib.mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + fastnetmon-advanced # for fcli + ]; + + environment.etc."fastnetmon/license.lic".source = "/var/lib/fastnetmon/license.lic"; + environment.etc."fastnetmon/gobgpd.conf".source = "/run/fastnetmon/gobgpd.conf"; + environment.etc."fastnetmon/fastnetmon.conf".source = pkgs.writeText "fastnetmon.conf" (builtins.toJSON { + mongodb_username = ""; + }); + + services.ferretdb.enable = true; + + systemd.services.fastnetmon-setup = { + wantedBy = [ "multi-user.target" ]; + after = [ "ferretdb.service" ]; + path = with pkgs; [ fastnetmon-advanced config.systemd.package ]; + script = '' + fcli create_configuration + fcli delete hostgroup global + fcli import_configuration ${config_tar} + systemctl --no-block try-restart fastnetmon + ''; + serviceConfig.Type = "oneshot"; + }; + + systemd.services.fastnetmon = { + wantedBy = [ "multi-user.target" ]; + after = [ "ferretdb.service" "fastnetmon-setup.service" "polkit.service" ]; + path = with pkgs; [ iproute2 ]; + unitConfig = { + # Disable logic which shuts service when we do too many restarts + # We do restarts from sudo fcli commit and it's expected that we may have many restarts + # Details: https://github.com/systemd/systemd/issues/2416 + StartLimitInterval = 0; + }; + serviceConfig = { + ExecStart = "${pkgs.fastnetmon-advanced}/bin/fastnetmon --log_to_console"; + + LimitNOFILE = 65535; + # Restart service when it fails due to any reasons, we need to keep processing traffic no matter what happened + Restart= "on-failure"; + RestartSec= "5s"; + + DynamicUser = true; + CacheDirectory = "fastnetmon"; + RuntimeDirectory = "fastnetmon"; # for gobgpd config + StateDirectory = "fastnetmon"; # for license file + }; + }; + + security.polkit.enable = true; + security.polkit.extraConfig = '' + polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.systemd1.manage-units" && + subject.isInGroup("fastnetmon")) { + if (action.lookup("unit") == "gobgp.service") { + var verb = action.lookup("verb"); + if (verb == "start" || verb == "stop" || verb == "restart") { + return polkit.Result.YES; + } + } + } + }); + ''; + + # We don't use the existing gobgp NixOS module and package, because the gobgp + # version might not be compatible with fastnetmon. Also, the service name + # _must_ be 'gobgp' and not 'gobgpd', so that fastnetmon can reload the config. + systemd.services.gobgp = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + description = "GoBGP Routing Daemon"; + unitConfig = { + ConditionPathExists = "/run/fastnetmon/gobgpd.conf"; + }; + serviceConfig = { + Type = "notify"; + ExecStartPre = "${pkgs.fastnetmon-advanced}/bin/fnm-gobgpd -f /run/fastnetmon/gobgpd.conf -d"; + SupplementaryGroups = [ "fastnetmon" ]; + ExecStart = "${pkgs.fastnetmon-advanced}/bin/fnm-gobgpd -f /run/fastnetmon/gobgpd.conf --sdnotify"; + ExecReload = "${pkgs.fastnetmon-advanced}/bin/fnm-gobgpd -r"; + DynamicUser = true; + AmbientCapabilities = "cap_net_bind_service"; + }; + }; + }) + + (lib.mkIf (cfg.enable && cfg.enableAdvancedTrafficPersistence) { + ## Advanced Traffic persistence + ## https://fastnetmon.com/docs-fnm-advanced/fastnetmon-advanced-traffic-persistency/ + + services.clickhouse.enable = true; + + services.fastnetmon-advanced.settings.traffic_db = true; + + services.fastnetmon-advanced.traffic_db.settings = { + clickhouse_batch_size = lib.mkDefault 1000; + clickhouse_batch_delay = lib.mkDefault 1; + traffic_db_host = lib.mkDefault "127.0.0.1"; + traffic_db_port = lib.mkDefault 8100; + clickhouse_host = lib.mkDefault "127.0.0.1"; + clickhouse_port = lib.mkDefault 9000; + clickhouse_user = lib.mkDefault "default"; + clickhouse_password = lib.mkDefault ""; + }; + environment.etc."fastnetmon/traffic_db.conf".text = builtins.toJSON cfg.traffic_db.settings; + + systemd.services.traffic_db = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${pkgs.fastnetmon-advanced}/bin/traffic_db"; + # Restart service when it fails due to any reasons, we need to keep processing traffic no matter what happened + Restart= "on-failure"; + RestartSec= "5s"; + + DynamicUser = true; + }; + }; + + }) ]; + + meta.maintainers = lib.teams.wdz.members; +} diff --git a/nixpkgs/nixos/modules/services/networking/kea.nix b/nixpkgs/nixos/modules/services/networking/kea.nix index 945f4113bd47..2f922a026a3a 100644 --- a/nixpkgs/nixos/modules/services/networking/kea.nix +++ b/nixpkgs/nixos/modules/services/networking/kea.nix @@ -254,7 +254,6 @@ in DynamicUser = true; User = "kea"; ConfigurationDirectory = "kea"; - RuntimeDirectory = "kea"; StateDirectory = "kea"; UMask = "0077"; }; @@ -289,8 +288,8 @@ in ]; environment = { - KEA_PIDFILE_DIR = "/run/kea"; - KEA_LOCKFILE_DIR = "/run/kea"; + KEA_PIDFILE_DIR = "/run/kea-ctrl-agent"; + KEA_LOCKFILE_DIR = "/run/kea-ctrl-agent"; }; restartTriggers = [ @@ -301,6 +300,7 @@ in ExecStart = "${package}/bin/kea-ctrl-agent -c /etc/kea/ctrl-agent.conf ${lib.escapeShellArgs cfg.ctrl-agent.extraArgs}"; KillMode = "process"; Restart = "on-failure"; + RuntimeDirectory = "kea-ctrl-agent"; } // commonServiceConfig; }; }) @@ -329,8 +329,8 @@ in ]; environment = { - KEA_PIDFILE_DIR = "/run/kea"; - KEA_LOCKFILE_DIR = "/run/kea"; + KEA_PIDFILE_DIR = "/run/kea-dhcp4"; + KEA_LOCKFILE_DIR = "/run/kea-dhcp4"; }; restartTriggers = [ @@ -348,6 +348,7 @@ in "CAP_NET_BIND_SERVICE" "CAP_NET_RAW" ]; + RuntimeDirectory = "kea-dhcp4"; } // commonServiceConfig; }; }) @@ -376,8 +377,8 @@ in ]; environment = { - KEA_PIDFILE_DIR = "/run/kea"; - KEA_LOCKFILE_DIR = "/run/kea"; + KEA_PIDFILE_DIR = "/run/kea-dhcp6"; + KEA_LOCKFILE_DIR = "/run/kea-dhcp6"; }; restartTriggers = [ @@ -393,6 +394,7 @@ in CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + RuntimeDirectory = "kea-dhcp6"; } // commonServiceConfig; }; }) @@ -421,8 +423,8 @@ in ]; environment = { - KEA_PIDFILE_DIR = "/run/kea"; - KEA_LOCKFILE_DIR = "/run/kea"; + KEA_PIDFILE_DIR = "/run/kea-dhcp-ddns"; + KEA_LOCKFILE_DIR = "/run/kea-dhcp-ddns"; }; restartTriggers = [ @@ -437,6 +439,7 @@ in CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + RuntimeDirectory = "kea-dhcp-ddns"; } // commonServiceConfig; }; }) diff --git a/nixpkgs/nixos/modules/services/networking/rosenpass.nix b/nixpkgs/nixos/modules/services/networking/rosenpass.nix new file mode 100644 index 000000000000..d2a264b83d67 --- /dev/null +++ b/nixpkgs/nixos/modules/services/networking/rosenpass.nix @@ -0,0 +1,233 @@ +{ config +, lib +, options +, pkgs +, ... +}: +let + inherit (lib) + attrValues + concatLines + concatMap + filter + filterAttrsRecursive + flatten + getExe + mdDoc + mkIf + optional + ; + + cfg = config.services.rosenpass; + opt = options.services.rosenpass; + settingsFormat = pkgs.formats.toml { }; +in +{ + options.services.rosenpass = + let + inherit (lib) + literalExpression + mdDoc + mkOption + ; + inherit (lib.types) + enum + listOf + nullOr + path + str + submodule + ; + in + { + enable = lib.mkEnableOption (mdDoc "Rosenpass"); + + package = lib.mkPackageOption pkgs "rosenpass" { }; + + defaultDevice = mkOption { + type = nullOr str; + description = mdDoc "Name of the network interface to use for all peers by default."; + example = "wg0"; + }; + + settings = mkOption { + type = submodule { + freeformType = settingsFormat.type; + + options = { + public_key = mkOption { + type = path; + description = mdDoc "Path to a file containing the public key of the local Rosenpass peer. Generate this by running {command}`rosenpass gen-keys`."; + }; + + secret_key = mkOption { + type = path; + description = mdDoc "Path to a file containing the secret key of the local Rosenpass peer. Generate this by running {command}`rosenpass gen-keys`."; + }; + + listen = mkOption { + type = listOf str; + description = mdDoc "List of local endpoints to listen for connections."; + default = [ ]; + example = literalExpression "[ \"0.0.0.0:10000\" ]"; + }; + + verbosity = mkOption { + type = enum [ "Verbose" "Quiet" ]; + default = "Quiet"; + description = mdDoc "Verbosity of output produced by the service."; + }; + + peers = + let + peer = submodule { + freeformType = settingsFormat.type; + + options = { + public_key = mkOption { + type = path; + description = mdDoc "Path to a file containing the public key of the remote Rosenpass peer."; + }; + + endpoint = mkOption { + type = nullOr str; + default = null; + description = mdDoc "Endpoint of the remote Rosenpass peer."; + }; + + device = mkOption { + type = str; + default = cfg.defaultDevice; + defaultText = literalExpression "config.${opt.defaultDevice}"; + description = mdDoc "Name of the local WireGuard interface to use for this peer."; + }; + + peer = mkOption { + type = str; + description = mdDoc "WireGuard public key corresponding to the remote Rosenpass peer."; + }; + }; + }; + in + mkOption { + type = listOf peer; + description = mdDoc "List of peers to exchange keys with."; + default = [ ]; + }; + }; + }; + default = { }; + description = mdDoc "Configuration for Rosenpass, see <https://rosenpass.eu/> for further information."; + }; + }; + + config = mkIf cfg.enable { + warnings = + let + # NOTE: In the descriptions below, we tried to refer to e.g. + # options.systemd.network.netdevs."<name>".wireguardPeers.*.PublicKey + # directly, but don't know how to traverse "<name>" and * in this path. + extractions = [ + { + relevant = config.systemd.network.enable; + root = config.systemd.network.netdevs; + peer = (x: x.wireguardPeers); + key = (x: if x.wireguardPeerConfig ? PublicKey then x.wireguardPeerConfig.PublicKey else null); + description = mdDoc "${options.systemd.network.netdevs}.\"<name>\".wireguardPeers.*.wireguardPeerConfig.PublicKey"; + } + { + relevant = config.networking.wireguard.enable; + root = config.networking.wireguard.interfaces; + peer = (x: x.peers); + key = (x: x.publicKey); + description = mdDoc "${options.networking.wireguard.interfaces}.\"<name>\".peers.*.publicKey"; + } + rec { + relevant = root != { }; + root = config.networking.wg-quick.interfaces; + peer = (x: x.peers); + key = (x: x.publicKey); + description = mdDoc "${options.networking.wg-quick.interfaces}.\"<name>\".peers.*.publicKey"; + } + ]; + relevantExtractions = filter (x: x.relevant) extractions; + extract = { root, peer, key, ... }: + filter (x: x != null) (flatten (concatMap (x: (map key (peer x))) (attrValues root))); + configuredKeys = flatten (map extract relevantExtractions); + itemize = xs: concatLines (map (x: " - ${x}") xs); + descriptions = map (x: "`${x.description}`"); + missingKeys = filter (key: !builtins.elem key configuredKeys) (map (x: x.peer) cfg.settings.peers); + unusual = '' + While this may work as expected, e.g. you want to manually configure WireGuard, + such a scenario is unusual. Please double-check your configuration. + ''; + in + (optional (relevantExtractions != [ ] && missingKeys != [ ]) '' + You have configured Rosenpass peers with the WireGuard public keys: + ${itemize missingKeys} + But there is no corresponding active Wireguard peer configuration in any of: + ${itemize (descriptions relevantExtractions)} + ${unusual} + '') + ++ + optional (relevantExtractions == [ ]) '' + You have configured Rosenpass, but you have not configured Wireguard via any of: + ${itemize (descriptions extractions)} + ${unusual} + ''; + + environment.systemPackages = [ cfg.package pkgs.wireguard-tools ]; + + systemd.services.rosenpass = + let + filterNonNull = filterAttrsRecursive (_: v: v != null); + config = settingsFormat.generate "config.toml" ( + filterNonNull (cfg.settings + // + ( + let + credentialPath = id: "$CREDENTIALS_DIRECTORY/${id}"; + # NOTE: We would like to remove all `null` values inside `cfg.settings` + # recursively, since `settingsFormat.generate` cannot handle `null`. + # This would require to traverse both attribute sets and lists recursively. + # `filterAttrsRecursive` only recurses into attribute sets, but not + # into values that might contain other attribute sets (such as lists, + # e.g. `cfg.settings.peers`). Here, we just specialize on `cfg.settings.peers`, + # and this may break unexpectedly whenever a `null` value is contained + # in a list in `cfg.settings`, other than `cfg.settings.peers`. + peersWithoutNulls = map filterNonNull cfg.settings.peers; + in + { + secret_key = credentialPath "pqsk"; + public_key = credentialPath "pqpk"; + peers = peersWithoutNulls; + } + ) + ) + ); + in + rec { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + path = [ cfg.package pkgs.wireguard-tools ]; + + serviceConfig = { + User = "rosenpass"; + Group = "rosenpass"; + RuntimeDirectory = "rosenpass"; + DynamicUser = true; + AmbientCapabilities = [ "CAP_NET_ADMIN" ]; + LoadCredential = [ + "pqsk:${cfg.settings.secret_key}" + "pqpk:${cfg.settings.public_key}" + ]; + }; + + # See <https://www.freedesktop.org/software/systemd/man/systemd.unit.html#Specifiers> + environment.CONFIG = "%t/${serviceConfig.RuntimeDirectory}/config.toml"; + + preStart = "${getExe pkgs.envsubst} -i ${config} -o \"$CONFIG\""; + script = "rosenpass exchange-config \"$CONFIG\""; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/networking/syncthing.nix b/nixpkgs/nixos/modules/services/networking/syncthing.nix index c4b2d0e80f9b..bdcdaf056d03 100644 --- a/nixpkgs/nixos/modules/services/networking/syncthing.nix +++ b/nixpkgs/nixos/modules/services/networking/syncthing.nix @@ -10,6 +10,21 @@ let settingsFormat = pkgs.formats.json { }; cleanedConfig = converge (filterAttrsRecursive (_: v: v != null && v != {})) cfg.settings; + isUnixGui = (builtins.substring 0 1 cfg.guiAddress) == "/"; + + # Syncthing supports serving the GUI over Unix sockets. If that happens, the + # API is served over the Unix socket as well. This function returns the correct + # curl arguments for the address portion of the curl command for both network + # and Unix socket addresses. + curlAddressArgs = path: if isUnixGui + # if cfg.guiAddress is a unix socket, tell curl explicitly about it + # note that the dot in front of `${path}` is the hostname, which is + # required. + then "--unix-socket ${cfg.guiAddress} http://.${path}" + # no adjustements are needed if cfg.guiAddress is a network address + else "${cfg.guiAddress}${path}" + ; + devices = mapAttrsToList (_: device: device // { deviceID = device.id; }) cfg.settings.devices; @@ -62,14 +77,14 @@ let GET_IdAttrName = "deviceID"; override = cfg.overrideDevices; conf = devices; - baseAddress = "${cfg.guiAddress}/rest/config/devices"; + baseAddress = curlAddressArgs "/rest/config/devices"; }; dirs = { new_conf_IDs = map (v: v.id) folders; GET_IdAttrName = "id"; override = cfg.overrideFolders; conf = folders; - baseAddress = "${cfg.guiAddress}/rest/config/folders"; + baseAddress = curlAddressArgs "/rest/config/folders"; }; } [ # Now for each of these attributes, write the curl commands that are @@ -117,15 +132,14 @@ let builtins.attrNames (lib.subtractLists ["folders" "devices"]) (map (subOption: '' - curl -X PUT -d ${lib.escapeShellArg (builtins.toJSON cleanedConfig.${subOption})} \ - ${cfg.guiAddress}/rest/config/${subOption} + curl -X PUT -d ${lib.escapeShellArg (builtins.toJSON cleanedConfig.${subOption})} ${curlAddressArgs "/rest/config/${subOption}"} '')) (lib.concatStringsSep "\n") ]) + '' # restart Syncthing if required - if curl ${cfg.guiAddress}/rest/config/restart-required | + if curl ${curlAddressArgs "/rest/config/restart-required"} | ${jq} -e .requiresRestart > /dev/null; then - curl -X POST ${cfg.guiAddress}/rest/system/restart + curl -X POST ${curlAddressArgs "/rest/system/restart"} fi ''); in { @@ -651,7 +665,7 @@ in { ExecStart = '' ${cfg.package}/bin/syncthing \ -no-browser \ - -gui-address=${cfg.guiAddress} \ + -gui-address=${if isUnixGui then "unix://" else ""}${cfg.guiAddress} \ -home=${cfg.configDir} ${escapeShellArgs cfg.extraFlags} ''; MemoryDenyWriteExecute = true; diff --git a/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix b/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix index 0595e9e6df23..90d9c68433cf 100644 --- a/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix @@ -530,5 +530,5 @@ in { ''; }; - meta.maintainers = with lib.maintainers; [ globin rnhmjoj ]; + meta.maintainers = with lib.maintainers; [ rnhmjoj ]; } diff --git a/nixpkgs/nixos/modules/services/web-apps/akkoma.nix b/nixpkgs/nixos/modules/services/web-apps/akkoma.nix index 8d1775258612..eaee70c712bb 100644 --- a/nixpkgs/nixos/modules/services/web-apps/akkoma.nix +++ b/nixpkgs/nixos/modules/services/web-apps/akkoma.nix @@ -282,11 +282,11 @@ let AKKOMA_CONFIG_PATH="$RUNTIME_DIRECTORY/config.exs" \ ERL_EPMD_ADDRESS="${cfg.dist.address}" \ ERL_EPMD_PORT="${toString cfg.dist.epmdPort}" \ - ERL_FLAGS="${concatStringsSep " " [ - "-kernel inet_dist_use_interface '${erlAddr cfg.dist.address}'" - "-kernel inet_dist_listen_min ${toString cfg.dist.portMin}" - "-kernel inet_dist_listen_max ${toString cfg.dist.portMax}" - ]}" \ + ERL_FLAGS=${lib.escapeShellArg (lib.escapeShellArgs ([ + "-kernel" "inet_dist_use_interface" (erlAddr cfg.dist.address) + "-kernel" "inet_dist_listen_min" (toString cfg.dist.portMin) + "-kernel" "inet_dist_listen_max" (toString cfg.dist.portMax) + ] ++ cfg.dist.extraFlags))} \ RELEASE_COOKIE="$(<"$RUNTIME_DIRECTORY/cookie")" \ RELEASE_NAME="akkoma" \ exec "${cfg.package}/bin/$(basename "$0")" "$@" @@ -553,6 +553,13 @@ in { description = mdDoc "TCP port to bind Erlang Port Mapper Daemon to."; }; + extraFlags = mkOption { + type = with types; listOf str; + default = [ ]; + description = mdDoc "Extra flags to pass to Erlang"; + example = [ "+sbwt" "none" "+sbwtdcpu" "none" "+sbwtdio" "none" ]; + }; + portMin = mkOption { type = types.port; default = 49152; diff --git a/nixpkgs/nixos/modules/services/web-apps/lanraragi.nix b/nixpkgs/nixos/modules/services/web-apps/lanraragi.nix new file mode 100644 index 000000000000..f1ab8b8b4eb4 --- /dev/null +++ b/nixpkgs/nixos/modules/services/web-apps/lanraragi.nix @@ -0,0 +1,100 @@ +{ pkgs, lib, config, ... }: + +let + cfg = config.services.lanraragi; +in +{ + meta.maintainers = with lib.maintainers; [ tomasajt ]; + + options.services = { + lanraragi = { + enable = lib.mkEnableOption (lib.mdDoc "LANraragi"); + package = lib.mkPackageOptionMD pkgs "lanraragi" { }; + + port = lib.mkOption { + type = lib.types.port; + default = 3000; + description = lib.mdDoc "Port for LANraragi's web interface."; + }; + + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/keys/lanraragi-password"; + description = lib.mdDoc '' + A file containing the password for LANraragi's admin interface. + ''; + }; + + redis = { + port = lib.mkOption { + type = lib.types.port; + default = 6379; + description = lib.mdDoc "Port for LANraragi's Redis server."; + }; + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/keys/redis-lanraragi-password"; + description = lib.mdDoc '' + A file containing the password for LANraragi's Redis server. + ''; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + services.redis.servers.lanraragi = { + enable = true; + port = cfg.redis.port; + requirePassFile = cfg.redis.passwordFile; + }; + + systemd.services.lanraragi = { + description = "LANraragi main service"; + after = [ "network.target" "redis-lanraragi.service" ]; + requires = [ "redis-lanraragi.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = lib.getExe cfg.package; + DynamicUser = true; + StateDirectory = "lanraragi"; + RuntimeDirectory = "lanraragi"; + LogsDirectory = "lanraragi"; + Restart = "on-failure"; + WorkingDirectory = "/var/lib/lanraragi"; + }; + environment = { + "LRR_TEMP_DIRECTORY" = "/run/lanraragi"; + "LRR_LOG_DIRECTORY" = "/var/log/lanraragi"; + "LRR_NETWORK" = "http://*:${toString cfg.port}"; + "HOME" = "/var/lib/lanraragi"; + }; + preStart = '' + REDIS_PASS=${lib.optionalString (cfg.redis.passwordFile != null) "$(head -n1 ${cfg.redis.passwordFile})"} + cat > lrr.conf <<EOF + { + redis_address => "127.0.0.1:${toString cfg.redis.port}", + redis_password => "$REDIS_PASS", + redis_database => "0", + redis_database_minion => "1", + redis_database_config => "2", + redis_database_search => "3", + } + EOF + '' + lib.optionalString (cfg.passwordFile != null) '' + PASS_HASH=$( + PASS=$(head -n1 ${cfg.passwordFile}) ${cfg.package.perlEnv}/bin/perl -I${cfg.package}/share/lanraragi/lib -e \ + 'use LANraragi::Controller::Config; print LANraragi::Controller::Config::make_password_hash($ENV{PASS})' \ + 2>/dev/null + ) + + ${lib.getExe pkgs.redis} -h 127.0.0.1 -p ${toString cfg.redis.port} -a "$REDIS_PASS" <<EOF + SELECT 2 + HSET LRR_CONFIG password $PASS_HASH + EOF + ''; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix index c82f02ecefec..9db4c8e23025 100644 --- a/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -35,7 +35,10 @@ with lib; }; port = mkOption { type = types.nullOr port; - description = lib.mdDoc "Port number."; + description = lib.mdDoc '' + Port number to listen on. + If unset and the listen address is not a socket then nginx defaults to 80. + ''; default = null; }; ssl = mkOption { diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index 285d0a181931..fc3287045710 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -379,7 +379,7 @@ in # Update the start menu for each user that is currently logged in system.userActivationScripts.plasmaSetup = activationScript; - programs.firefox.wrapperConfig.enablePlasmaBrowserIntegration = true; + programs.firefox.nativeMessagingHosts.packages = [ pkgs.plasma5Packages.plasma-browser-integration ]; }) (mkIf (cfg.kwinrc != {}) { diff --git a/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 64c8ab74bba6..6f0a62d0ea89 100644 --- a/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -49,7 +49,7 @@ let ''; }; - checkedSystemdBootBuilder = pkgs.runCommandLocal "systemd-boot" { + checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" { nativeBuildInputs = [ pkgs.mypy ]; } '' install -m755 ${systemdBootBuilder} $out diff --git a/nixpkgs/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixpkgs/nixos/modules/system/boot/systemd/tmpfiles.nix index 3065392b1d20..f7ef45aab3c9 100644 --- a/nixpkgs/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/nixpkgs/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -20,6 +20,102 @@ in ''; }; + systemd.tmpfiles.settings = mkOption { + description = lib.mdDoc '' + Declare systemd-tmpfiles rules to create, delete, and clean up volatile + and temporary files and directories. + + Even though the service is called `*tmp*files` you can also create + persistent files. + ''; + example = { + "10-mypackage" = { + "/var/lib/my-service/statefolder".d = { + mode = "0755"; + user = "root"; + group = "root"; + }; + }; + }; + default = {}; + type = types.attrsOf (types.attrsOf (types.attrsOf (types.submodule ({ name, config, ... }: { + options.type = mkOption { + type = types.str; + default = name; + example = "d"; + description = lib.mdDoc '' + The type of operation to perform on the file. + + The type consists of a single letter and optionally one or more + modifier characters. + + Please see the upstream documentation for the available types and + more details: + <https://www.freedesktop.org/software/systemd/man/tmpfiles.d> + ''; + }; + options.mode = mkOption { + type = types.str; + default = "-"; + example = "0755"; + description = lib.mdDoc '' + The file access mode to use when creating this file or directory. + ''; + }; + options.user = mkOption { + type = types.str; + default = "-"; + example = "root"; + description = lib.mdDoc '' + The user of the file. + + This may either be a numeric ID or a user/group name. + + If omitted or when set to `"-"`, the user and group of the user who + invokes systemd-tmpfiles is used. + ''; + }; + options.group = mkOption { + type = types.str; + default = "-"; + example = "root"; + description = lib.mdDoc '' + The group of the file. + + This may either be a numeric ID or a user/group name. + + If omitted or when set to `"-"`, the user and group of the user who + invokes systemd-tmpfiles is used. + ''; + }; + options.age = mkOption { + type = types.str; + default = "-"; + example = "10d"; + description = lib.mdDoc '' + Delete a file when it reaches a certain age. + + If a file or directory is older than the current time minus the age + field, it is deleted. + + If set to `"-"` no automatic clean-up is done. + ''; + }; + options.argument = mkOption { + type = types.str; + default = ""; + example = ""; + description = lib.mdDoc '' + An argument whose meaning depends on the type of operation. + + Please see the upstream documentation for the meaning of this + parameter in different situations: + <https://www.freedesktop.org/software/systemd/man/tmpfiles.d> + ''; + }; + })))); + }; + systemd.tmpfiles.packages = mkOption { type = types.listOf types.package; default = []; @@ -102,7 +198,13 @@ in ${concatStringsSep "\n" cfg.rules} ''; }) - ]; + ] ++ (mapAttrsToList (name: paths: + pkgs.writeTextDir "lib/tmpfiles.d/${name}.conf" (concatStrings (mapAttrsToList (path: types: + concatStrings (mapAttrsToList (_type: entry: '' + '${entry.type}' '${path}' '${entry.mode}' '${entry.user}' '${entry.group}' '${entry.age}' ${entry.argument} + '') types) + ) paths )) + ) cfg.settings); systemd.tmpfiles.rules = [ "d /nix/var 0755 root root - -" diff --git a/nixpkgs/nixos/modules/virtualisation/lxc-container.nix b/nixpkgs/nixos/modules/virtualisation/lxc-container.nix index 1034c699629d..61d7c4cb73fe 100644 --- a/nixpkgs/nixos/modules/virtualisation/lxc-container.nix +++ b/nixpkgs/nixos/modules/virtualisation/lxc-container.nix @@ -37,7 +37,6 @@ in { ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; - # TODO: build rootfs as squashfs for faster unpack system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix { extraArgs = "--owner=0"; @@ -64,6 +63,23 @@ in { extraCommands = "mkdir -p proc sys dev"; }; + system.build.squashfs = pkgs.callPackage ../../lib/make-squashfs.nix { + fileName = "nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}"; + + noStrip = true; # keep directory structure + comp = "zstd -Xcompression-level 6"; + + storeContents = [config.system.build.toplevel]; + + pseudoFiles = [ + "/sbin d 0755 0 0" + "/sbin/init s 0555 0 0 ${config.system.build.toplevel}/init" + "/dev d 0755 0 0" + "/proc d 0555 0 0" + "/sys d 0555 0 0" + ]; + }; + system.build.installBootLoader = pkgs.writeScript "install-lxd-sbin-init.sh" '' #!${pkgs.runtimeShell} ${pkgs.coreutils}/bin/ln -fs "$1/init" /sbin/init diff --git a/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index 737a935711ae..e625c6322d9c 100644 --- a/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -198,6 +198,39 @@ let fi ''} + ${lib.optionalString cfg.tpm.enable '' + NIX_SWTPM_DIR=$(readlink -f "''${NIX_SWTPM_DIR:-${config.system.name}-swtpm}") + mkdir -p "$NIX_SWTPM_DIR" + ${lib.getExe cfg.tpm.package} \ + socket \ + --tpmstate dir="$NIX_SWTPM_DIR" \ + --ctrl type=unixio,path="$NIX_SWTPM_DIR"/socket,terminate \ + --pid file="$NIX_SWTPM_DIR"/pid --daemon \ + --tpm2 \ + --log file="$NIX_SWTPM_DIR"/stdout,level=6 + + # Enable `fdflags` builtin in Bash + # We will need it to perform surgical modification of the file descriptor + # passed in the coprocess to remove `FD_CLOEXEC`, i.e. close the file descriptor + # on exec. + # If let alone, it will trigger the coprocess to read EOF when QEMU is `exec` + # at the end of this script. To work around that, we will just clear + # the `FD_CLOEXEC` bits as a first step. + enable -f ${hostPkgs.bash}/lib/bash/fdflags fdflags + # leave a dangling subprocess because the swtpm ctrl socket has + # "terminate" when the last connection disconnects, it stops swtpm. + # When qemu stops, or if the main shell process ends, the coproc will + # get signaled by virtue of the pipe between main and coproc ending. + # Which in turns triggers a socat connect-disconnect to swtpm which + # will stop it. + coproc waitingswtpm { + read || : + echo "" | ${lib.getExe hostPkgs.socat} STDIO UNIX-CONNECT:"$NIX_SWTPM_DIR"/socket + } + # Clear `FD_CLOEXEC` on the coprocess' file descriptor stdin. + fdflags -s-cloexec ''${waitingswtpm[1]} + ''} + cd "$TMPDIR" ${lib.optionalString (cfg.emptyDiskImages != []) "idx=0"} @@ -657,8 +690,8 @@ in package = mkOption { type = types.package; - default = hostPkgs.qemu_kvm; - defaultText = literalExpression "config.virtualisation.host.pkgs.qemu_kvm"; + default = if hostPkgs.stdenv.hostPlatform.qemuArch == pkgs.stdenv.hostPlatform.qemuArch then hostPkgs.qemu_kvm else hostPkgs.qemu; + defaultText = literalExpression "if hostPkgs.stdenv.hostPlatform.qemuArch == pkgs.stdenv.hostPlatform.qemuArch then config.virtualisation.host.pkgs.qemu_kvm else config.virtualisation.host.pkgs.qemu"; example = literalExpression "pkgs.qemu_test"; description = lib.mdDoc "QEMU package to use."; }; @@ -863,6 +896,32 @@ in }; }; + virtualisation.tpm = { + enable = mkEnableOption "a TPM device in the virtual machine with a driver, using swtpm."; + + package = mkPackageOptionMD cfg.host.pkgs "swtpm" { }; + + deviceModel = mkOption { + type = types.str; + default = ({ + "i686-linux" = "tpm-tis"; + "x86_64-linux" = "tpm-tis"; + "ppc64-linux" = "tpm-spapr"; + "armv7-linux" = "tpm-tis-device"; + "aarch64-linux" = "tpm-tis-device"; + }.${pkgs.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU")); + defaultText = '' + Based on the guest platform Linux system: + + - `tpm-tis` for (i686, x86_64) + - `tpm-spapr` for ppc64 + - `tpm-tis-device` for (armv7, aarch64) + ''; + example = "tpm-tis-device"; + description = lib.mdDoc "QEMU device model for the TPM, uses the appropriate default based on th guest platform system and the package passed."; + }; + }; + virtualisation.useDefaultFilesystems = mkOption { type = types.bool; @@ -1028,7 +1087,8 @@ in boot.initrd.availableKernelModules = optional cfg.writableStore "overlay" - ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx"; + ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx" + ++ optional (cfg.tpm.enable) "tpm_tis"; virtualisation.additionalPaths = [ config.system.build.toplevel ]; @@ -1099,6 +1159,11 @@ in (mkIf (!cfg.graphics) [ "-nographic" ]) + (mkIf (cfg.tpm.enable) [ + "-chardev socket,id=chrtpm,path=\"$NIX_SWTPM_DIR\"/socket" + "-tpmdev emulator,id=tpm_dev_0,chardev=chrtpm" + "-device ${cfg.tpm.deviceModel},tpmdev=tpm_dev_0" + ]) ]; virtualisation.qemu.drives = mkMerge [ diff --git a/nixpkgs/nixos/release-combined.nix b/nixpkgs/nixos/release-combined.nix index 20bcb6802881..149a924de4d0 100644 --- a/nixpkgs/nixos/release-combined.nix +++ b/nixpkgs/nixos/release-combined.nix @@ -97,6 +97,7 @@ in rec { (onSystems ["x86_64-linux"] "nixos.tests.installer.simpleUefiSystemdBoot") (onSystems ["x86_64-linux"] "nixos.tests.installer.simple") (onSystems ["x86_64-linux"] "nixos.tests.installer.swraid") + (onSystems ["x86_64-linux"] "nixos.tests.nixos-rebuild-specialisations") (onFullSupported "nixos.tests.ipv6") (onFullSupported "nixos.tests.keymap.azerty") (onFullSupported "nixos.tests.keymap.colemak") @@ -163,7 +164,6 @@ in rec { (onFullSupported "nixos.tests.switchTest") (onFullSupported "nixos.tests.udisks2") (onFullSupported "nixos.tests.xfce") - (onSystems ["i686-linux"] "nixos.tests.zfs.installer") (onFullSupported "nixpkgs.emacs") (onFullSupported "nixpkgs.jdk") ["nixpkgs.tarball"] diff --git a/nixpkgs/nixos/release.nix b/nixpkgs/nixos/release.nix index abaa7ef9a711..60f4cc94399c 100644 --- a/nixpkgs/nixos/release.nix +++ b/nixpkgs/nixos/release.nix @@ -328,6 +328,21 @@ in rec { ); + lxdContainerImageSquashfs = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = + [ configuration + versionModule + ./maintainers/scripts/lxd/lxd-container-image.nix + ]; + }).config.system.build.squashfs) + + ); + # Metadata for the lxd image lxdContainerMeta = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: diff --git a/nixpkgs/nixos/tests/all-tests.nix b/nixpkgs/nixos/tests/all-tests.nix index 1c8ee32428ea..3531930d863a 100644 --- a/nixpkgs/nixos/tests/all-tests.nix +++ b/nixpkgs/nixos/tests/all-tests.nix @@ -248,6 +248,7 @@ in { ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {}; ecryptfs = handleTest ./ecryptfs.nix {}; fscrypt = handleTest ./fscrypt.nix {}; + fastnetmon-advanced = runTest ./fastnetmon-advanced.nix; ejabberd = handleTest ./xmpp/ejabberd.nix {}; elk = handleTestOn ["x86_64-linux"] ./elk.nix {}; emacs-daemon = handleTest ./emacs-daemon.nix {}; @@ -431,6 +432,7 @@ in { kubo = import ./kubo { inherit recurseIntoAttrs runTest; }; ladybird = handleTest ./ladybird.nix {}; languagetool = handleTest ./languagetool.nix {}; + lanraragi = handleTest ./lanraragi.nix {}; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; leaps = handleTest ./leaps.nix {}; lemmy = handleTest ./lemmy.nix {}; @@ -569,7 +571,8 @@ in { nix-serve-ssh = handleTest ./nix-serve-ssh.nix {}; nixops = handleTest ./nixops/default.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; - nixos-rebuild-specialisations = handleTest ./nixos-rebuild-specialisations.nix {}; + nixos-rebuild-install-bootloader = handleTestOn ["x86_64-linux"] ./nixos-rebuild-install-bootloader.nix {}; + nixos-rebuild-specialisations = handleTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix {}; nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; }; node-red = handleTest ./node-red.nix {}; nomad = handleTest ./nomad.nix {}; @@ -702,6 +705,7 @@ in { rkvm = handleTest ./rkvm {}; robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; + rosenpass = handleTest ./rosenpass.nix {}; rshim = handleTest ./rshim.nix {}; rspamd = handleTest ./rspamd.nix {}; rss2email = handleTest ./rss2email.nix {}; diff --git a/nixpkgs/nixos/tests/cockpit.nix b/nixpkgs/nixos/tests/cockpit.nix index 6f86d1e2c464..e7165b979014 100644 --- a/nixpkgs/nixos/tests/cockpit.nix +++ b/nixpkgs/nixos/tests/cockpit.nix @@ -50,7 +50,8 @@ import ./make-test-python.nix ( options = Options() options.add_argument("--headless") - driver = webdriver.Firefox(options=options) + service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501 + driver = webdriver.Firefox(options=options, service=service) driver.implicitly_wait(10) diff --git a/nixpkgs/nixos/tests/fastnetmon-advanced.nix b/nixpkgs/nixos/tests/fastnetmon-advanced.nix new file mode 100644 index 000000000000..b2d2713a9211 --- /dev/null +++ b/nixpkgs/nixos/tests/fastnetmon-advanced.nix @@ -0,0 +1,65 @@ +{ pkgs, lib, ... }: + +{ + name = "fastnetmon-advanced"; + meta.maintainers = lib.teams.wdz.members; + + nodes = { + bird = { ... }: { + networking.firewall.allowedTCPPorts = [ 179 ]; + services.bird2 = { + enable = true; + config = '' + router id 192.168.1.1; + + protocol bgp fnm { + local 192.168.1.1 as 64513; + neighbor 192.168.1.2 as 64514; + multihop; + ipv4 { + import all; + export none; + }; + } + ''; + }; + }; + fnm = { ... }: { + networking.firewall.allowedTCPPorts = [ 179 ]; + services.fastnetmon-advanced = { + enable = true; + settings = { + networks_list = [ "172.23.42.0/24" ]; + gobgp = true; + gobgp_flow_spec_announces = true; + }; + bgpPeers = { + bird = { + local_asn = 64514; + remote_asn = 64513; + local_address = "192.168.1.2"; + remote_address = "192.168.1.1"; + + description = "Bird"; + ipv4_unicast = true; + multihop = true; + active = true; + }; + }; + }; + }; + }; + + testScript = { nodes, ... }: '' + start_all() + fnm.wait_for_unit("fastnetmon.service") + bird.wait_for_unit("bird2.service") + + fnm.wait_until_succeeds('journalctl -eu fastnetmon.service | grep "BGP daemon restarted correctly"') + fnm.wait_until_succeeds("journalctl -eu gobgp.service | grep BGP_FSM_OPENCONFIRM") + bird.wait_until_succeeds("birdc show protocol fnm | grep Estab") + fnm.wait_until_succeeds('journalctl -eu fastnetmon.service | grep "API server listening"') + fnm.succeed("fcli set blackhole 172.23.42.123") + bird.succeed("birdc show route | grep 172.23.42.123") + ''; +} diff --git a/nixpkgs/nixos/tests/firefox.nix b/nixpkgs/nixos/tests/firefox.nix index 3f9cea6662fb..fbea95dc7523 100644 --- a/nixpkgs/nixos/tests/firefox.nix +++ b/nixpkgs/nixos/tests/firefox.nix @@ -1,14 +1,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: -let firefoxPackage' = firefoxPackage.override (args: { - extraPrefsFiles = (args.extraPrefsFiles or []) ++ [ - # make sure that autoplay is enabled by default for the audio test - (builtins.toString (builtins.toFile "autoplay-pref.js" ''defaultPref("media.autoplay.default",0);'')) - ]; - }); - -in { - name = firefoxPackage'.unwrapped.pname; + name = firefoxPackage.pname; + meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; }; @@ -17,10 +10,13 @@ in { pkgs, ... }: { imports = [ ./common/x11.nix ]; - environment.systemPackages = [ - firefoxPackage' - pkgs.xdotool - ]; + environment.systemPackages = [ pkgs.xdotool ]; + + programs.firefox = { + enable = true; + preferences."media.autoplay.default" = 0; + package = firefoxPackage; + }; # Create a virtual sound device, with mixing # and all, for recording audio. @@ -58,7 +54,9 @@ in }; - testScript = '' + testScript = let + exe = firefoxPackage.unwrapped.binaryName; + in '' from contextlib import contextmanager @@ -97,7 +95,7 @@ in with subtest("Wait until Firefox has finished loading the Valgrind docs page"): machine.execute( - "xterm -e '${firefoxPackage'.unwrapped.binaryName} file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &" + "xterm -e '${exe} file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &" ) machine.wait_for_window("Valgrind") machine.sleep(40) @@ -105,7 +103,7 @@ in with subtest("Check whether Firefox can play sound"): with record_audio(machine): machine.succeed( - "${firefoxPackage'.unwrapped.binaryName} file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga >&2 &" + "${exe} file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga >&2 &" ) wait_for_sound(machine) machine.copy_from_vm("/tmp/record.wav") diff --git a/nixpkgs/nixos/tests/forgejo.nix b/nixpkgs/nixos/tests/forgejo.nix index b326819e3190..6acd6acb50fa 100644 --- a/nixpkgs/nixos/tests/forgejo.nix +++ b/nixpkgs/nixos/tests/forgejo.nix @@ -37,7 +37,7 @@ let settings."repository.signing".SIGNING_KEY = signingPrivateKeyId; settings.actions.ENABLED = true; }; - environment.systemPackages = [ config.services.forgejo.package pkgs.gnupg pkgs.jq ]; + environment.systemPackages = [ config.services.forgejo.package pkgs.gnupg pkgs.jq pkgs.file ]; services.openssh.enable = true; specialisation.runner = { @@ -53,6 +53,14 @@ let tokenFile = "/var/lib/forgejo/runner_token"; }; }; + specialisation.dump = { + inheritParentConfig = true; + configuration.services.forgejo.dump = { + enable = true; + type = "tar.zst"; + file = "dump.tar.zst"; + }; + }; }; client1 = { config, pkgs, ... }: { environment.systemPackages = [ pkgs.git ]; @@ -66,8 +74,10 @@ let let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; serverSystem = nodes.server.system.build.toplevel; + dumpFile = with nodes.server.specialisation.dump.configuration.services.forgejo.dump; "${backupDir}/${file}"; in '' + import json GIT_SSH_COMMAND = "ssh -i $HOME/.ssh/privk -o StrictHostKeyChecking=no" REPO = "forgejo@server:test/repo" PRIVK = "${snakeOilPrivateKey}" @@ -137,6 +147,11 @@ let client2.succeed(f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' git clone {REPO}") client2.succeed('test "$(cat repo/testfile | xargs echo -n)" = "hello world"') + with subtest("Testing git protocol version=2 over ssh"): + git_protocol = client2.succeed(f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' GIT_TRACE2_EVENT=true git -C repo fetch |& grep negotiated-version") + version = json.loads(git_protocol).get("value") + assert version == "2", f"git did not negotiate protocol version 2, but version {version} instead." + server.wait_until_succeeds( 'test "$(curl http://localhost:3000/api/v1/repos/test/repo/commits ' + '-H "Accept: application/json" | jq length)" = "1"', @@ -150,6 +165,12 @@ let server.succeed("${serverSystem}/specialisation/runner/bin/switch-to-configuration test") server.wait_for_unit("gitea-runner-test.service") server.succeed("journalctl -o cat -u gitea-runner-test.service | grep -q 'Runner registered successfully'") + + with subtest("Testing backup service"): + server.succeed("${serverSystem}/specialisation/dump/bin/switch-to-configuration test") + server.systemctl("start forgejo-dump") + assert "Zstandard compressed data" in server.succeed("file ${dumpFile}") + server.copy_from_vm("${dumpFile}") ''; }); in diff --git a/nixpkgs/nixos/tests/installer.nix b/nixpkgs/nixos/tests/installer.nix index 5111cedf9256..9ff1d8f5d039 100644 --- a/nixpkgs/nixos/tests/installer.nix +++ b/nixpkgs/nixos/tests/installer.nix @@ -69,8 +69,8 @@ let # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create # partitions and filesystems. - testScriptFun = { bootLoader, createPartitions, grubDevice, grubUseEfi - , grubIdentifier, preBootCommands, postBootCommands, extraConfig + testScriptFun = { bootLoader, createPartitions, grubDevice, grubUseEfi, grubIdentifier + , postInstallCommands, preBootCommands, postBootCommands, extraConfig , testSpecialisationConfig, testFlakeSwitch }: let iface = "virtio"; @@ -153,6 +153,8 @@ let """ ) + ${postInstallCommands} + with subtest("Shutdown system after installation"): machine.succeed("umount -R /mnt") machine.succeed("sync") @@ -368,7 +370,9 @@ let makeInstallerTest = name: - { createPartitions, preBootCommands ? "", postBootCommands ? "", extraConfig ? "" + { createPartitions + , postInstallCommands ? "", preBootCommands ? "", postBootCommands ? "" + , extraConfig ? "" , extraInstallerConfig ? {} , bootLoader ? "grub" # either "grub" or "systemd-boot" , grubDevice ? "/dev/vda", grubIdentifier ? "uuid", grubUseEfi ? false @@ -479,7 +483,7 @@ let }; testScript = testScriptFun { - inherit bootLoader createPartitions preBootCommands postBootCommands + inherit bootLoader createPartitions postInstallCommands preBootCommands postBootCommands grubDevice grubIdentifier grubUseEfi extraConfig testSpecialisationConfig testFlakeSwitch; }; @@ -682,20 +686,32 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary linux-swap 1M 1024M" - + " mkpart primary 1024M -1s", + + " mkpart primary 1M 100MB" # bpool + + " mkpart primary linux-swap 100M 1024M" + + " mkpart primary 1024M -1s", # rpool "udevadm settle", - "mkswap /dev/vda1 -L swap", + "mkswap /dev/vda2 -L swap", "swapon -L swap", - "zpool create rpool /dev/vda2", + "zpool create rpool /dev/vda3", "zfs create -o mountpoint=legacy rpool/root", "mount -t zfs rpool/root /mnt", "zfs create -o mountpoint=legacy rpool/root/usr", "mkdir /mnt/usr", "mount -t zfs rpool/root/usr /mnt/usr", + "zpool create -o compatibility=grub2 bpool /dev/vda1", + "zfs create -o mountpoint=legacy bpool/boot", + "mkdir /mnt/boot", + "mount -t zfs bpool/boot /mnt/boot", "udevadm settle", ) ''; + + # umount & export bpool before shutdown + # this is a fix for "cannot import 'bpool': pool was previously in use from another system." + postInstallCommands = '' + machine.succeed("umount /mnt/boot") + machine.succeed("zpool export bpool") + ''; }; # Create two physical LVM partitions combined into one volume group diff --git a/nixpkgs/nixos/tests/lanraragi.nix b/nixpkgs/nixos/tests/lanraragi.nix new file mode 100644 index 000000000000..f513ac9d252b --- /dev/null +++ b/nixpkgs/nixos/tests/lanraragi.nix @@ -0,0 +1,40 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "lanraragi"; + meta.maintainers = with lib.maintainers; [ tomasajt ]; + + nodes = { + machine1 = { pkgs, ... }: { + services.lanraragi.enable = true; + }; + machine2 = { pkgs, ... }: { + services.lanraragi = { + enable = true; + passwordFile = pkgs.writeText "lrr-test-pass" '' + ultra-secure-password + ''; + port = 4000; + redis = { + port = 4001; + passwordFile = pkgs.writeText "redis-lrr-test-pass" '' + still-a-very-secure-password + ''; + }; + }; + }; + + + }; + + testScript = '' + start_all() + + machine1.wait_for_unit("lanraragi.service") + machine1.wait_until_succeeds("curl -f localhost:3000") + machine1.succeed("[ $(curl -o /dev/null -X post 'http://localhost:3000/login' --data-raw 'password=kamimamita' -w '%{http_code}') -eq 302 ]") + + machine2.wait_for_unit("lanraragi.service") + machine2.wait_until_succeeds("curl -f localhost:4000") + machine2.succeed("[ $(curl -o /dev/null -X post 'http://localhost:4000/login' --data-raw 'password=ultra-secure-password' -w '%{http_code}') -eq 302 ]") + ''; +}) + diff --git a/nixpkgs/nixos/tests/lxd/container.nix b/nixpkgs/nixos/tests/lxd/container.nix index bdaaebfc0028..0ebe73d872f2 100644 --- a/nixpkgs/nixos/tests/lxd/container.nix +++ b/nixpkgs/nixos/tests/lxd/container.nix @@ -13,6 +13,7 @@ let lxd-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; lxd-image-rootfs = releases.lxdContainerImage.${pkgs.stdenv.hostPlatform.system}; + lxd-image-rootfs-squashfs = releases.lxdContainerImageSquashfs.${pkgs.stdenv.hostPlatform.system}; in { name = "lxd-container"; @@ -23,7 +24,7 @@ in { nodes.machine = { lib, ... }: { virtualisation = { - diskSize = 4096; + diskSize = 6144; # Since we're testing `limits.cpu`, we've gotta have a known number of # cores to lean on @@ -65,6 +66,16 @@ in { machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -") machine.succeed("lxc delete -f container") + with subtest("Squashfs image is functional"): + machine.succeed( + "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs-squashfs} --alias nixos-squashfs" + ) + machine.succeed("lxc launch nixos-squashfs container") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) + machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -") + machine.succeed("lxc delete -f container") + with subtest("Container is mounted with lxcfs inside"): machine.succeed("lxc launch nixos container") with machine.nested("Waiting for instance to start and be usable"): diff --git a/nixpkgs/nixos/tests/misc.nix b/nixpkgs/nixos/tests/misc.nix index 442b45948c60..e7842debba7a 100644 --- a/nixpkgs/nixos/tests/misc.nix +++ b/nixpkgs/nixos/tests/misc.nix @@ -13,6 +13,7 @@ in { environment.variables.EDITOR = lib.mkOverride 0 "emacs"; documentation.nixos.enable = lib.mkOverride 0 true; systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ]; + systemd.tmpfiles.settings."10-test"."/tmp/somefile".d = {}; virtualisation.fileSystems = { "/tmp2" = { fsType = "tmpfs"; options = [ "mode=1777" "noauto" ]; @@ -117,6 +118,9 @@ in { ) machine.fail("[ -e /tmp/foo ]") + with subtest("whether systemd-tmpfiles settings works"): + machine.succeed("[ -e /tmp/somefile ]") + with subtest("whether automounting works"): machine.fail("grep '/tmp2 tmpfs' /proc/mounts") machine.succeed("touch /tmp2/x") diff --git a/nixpkgs/nixos/tests/nixos-rebuild-install-bootloader.nix b/nixpkgs/nixos/tests/nixos-rebuild-install-bootloader.nix new file mode 100644 index 000000000000..3ade90ea24a7 --- /dev/null +++ b/nixpkgs/nixos/tests/nixos-rebuild-install-bootloader.nix @@ -0,0 +1,73 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "nixos-rebuild-install-bootloader"; + + nodes = { + machine = { lib, pkgs, ... }: { + imports = [ + ../modules/profiles/installation-device.nix + ../modules/profiles/base.nix + ]; + + nix.settings = { + substituters = lib.mkForce [ ]; + hashed-mirrors = null; + connect-timeout = 1; + }; + + system.includeBuildDependencies = true; + + virtualisation = { + cores = 2; + memorySize = 2048; + }; + + virtualisation.useBootLoader = true; + }; + }; + + testScript = + let + configFile = pkgs.writeText "configuration.nix" '' + { lib, pkgs, ... }: { + imports = [ + ./hardware-configuration.nix + <nixpkgs/nixos/modules/testing/test-instrumentation.nix> + ]; + + boot.loader.grub = { + enable = true; + device = "/dev/vda"; + forceInstall = true; + }; + + documentation.enable = false; + } + ''; + + in + '' + machine.start() + machine.succeed("udevadm settle") + machine.wait_for_unit("multi-user.target") + + machine.succeed("nixos-generate-config") + machine.copy_from_host( + "${configFile}", + "/etc/nixos/configuration.nix", + ) + machine.succeed("nixos-rebuild switch") + + # Need to run `nixos-rebuild` twice because the first run will install + # GRUB anyway + with subtest("Switch system again and install bootloader"): + result = machine.succeed("nixos-rebuild switch --install-bootloader") + # install-grub2.pl messages + assert "updating GRUB 2 menu..." in result + assert "installing the GRUB 2 boot loader on /dev/vda..." in result + # GRUB message + assert "Installation finished. No error reported." in result + # at this point we've tested regression #262724, but haven't tested the bootloader itself + # TODO: figure out how to how to tell the test driver to start the bootloader instead of + # booting into the kernel directly. + ''; +}) diff --git a/nixpkgs/nixos/tests/openssh.nix b/nixpkgs/nixos/tests/openssh.nix index e88625678fec..88d3e54ee76c 100644 --- a/nixpkgs/nixos/tests/openssh.nix +++ b/nixpkgs/nixos/tests/openssh.nix @@ -22,7 +22,7 @@ in { ]; }; - server_lazy = + server-lazy = { ... }: { @@ -34,7 +34,7 @@ in { ]; }; - server_localhost_only = + server-localhost-only = { ... }: { @@ -43,7 +43,7 @@ in { }; }; - server_localhost_only_lazy = + server-localhost-only-lazy = { ... }: { @@ -52,7 +52,7 @@ in { }; }; - server_match_rule = + server-match-rule = { ... }: { @@ -119,11 +119,11 @@ in { ) client.succeed( - "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2", + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server-lazy 'echo hello world' >&2", timeout=30 ) client.succeed( - "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024", + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server-lazy 'ulimit -l' | grep 1024", timeout=30 ) @@ -137,7 +137,7 @@ in { timeout=30 ) client.succeed( - "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true", + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-lazy true", timeout=30 ) diff --git a/nixpkgs/nixos/tests/prometheus-exporters.nix b/nixpkgs/nixos/tests/prometheus-exporters.nix index 8369d6a497ac..7fd824967206 100644 --- a/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -416,8 +416,8 @@ let }; kea = let - controlSocketPathV4 = "/run/kea/dhcp4.sock"; - controlSocketPathV6 = "/run/kea/dhcp6.sock"; + controlSocketPathV4 = "/run/kea-dhcp4/dhcp4.sock"; + controlSocketPathV6 = "/run/kea-dhcp6/dhcp6.sock"; in { exporterConfig = { @@ -512,7 +512,7 @@ let wait_for_unit("knot.service") wait_for_unit("prometheus-knot-exporter.service") wait_for_open_port(9433) - succeed("curl -sSf 'localhost:9433' | grep 'knot_server_zone_count 1.0'") + succeed("curl -sSf 'localhost:9433' | grep '2\.019031301'") ''; }; diff --git a/nixpkgs/nixos/tests/rosenpass.nix b/nixpkgs/nixos/tests/rosenpass.nix new file mode 100644 index 000000000000..ec4046c8c035 --- /dev/null +++ b/nixpkgs/nixos/tests/rosenpass.nix @@ -0,0 +1,217 @@ +import ./make-test-python.nix ({ pkgs, ... }: +let + deviceName = "rp0"; + + server = { + ip = "fe80::1"; + wg = { + public = "mQufmDFeQQuU/fIaB2hHgluhjjm1ypK4hJr1cW3WqAw="; + secret = "4N5Y1dldqrpsbaEiY8O0XBUGUFf8vkvtBtm8AoOX7Eo="; + listen = 10000; + }; + }; + client = { + ip = "fe80::2"; + wg = { + public = "Mb3GOlT7oS+F3JntVKiaD7SpHxLxNdtEmWz/9FMnRFU="; + secret = "uC5dfGMv7Oxf5UDfdPkj6rZiRZT2dRWp5x8IQxrNcUE="; + }; + }; +in +{ + name = "rosenpass"; + + nodes = + let + shared = peer: { config, modulesPath, ... }: { + imports = [ "${modulesPath}/services/networking/rosenpass.nix" ]; + + boot.kernelModules = [ "wireguard" ]; + + services.rosenpass = { + enable = true; + defaultDevice = deviceName; + settings = { + verbosity = "Verbose"; + public_key = "/etc/rosenpass/pqpk"; + secret_key = "/etc/rosenpass/pqsk"; + }; + }; + + networking.firewall.allowedUDPPorts = [ 9999 ]; + + systemd.network = { + enable = true; + networks."rosenpass" = { + matchConfig.Name = deviceName; + networkConfig.IPForward = true; + address = [ "${peer.ip}/64" ]; + }; + + netdevs."10-rp0" = { + netdevConfig = { + Kind = "wireguard"; + Name = deviceName; + }; + wireguardConfig.PrivateKeyFile = "/etc/wireguard/wgsk"; + }; + }; + + environment.etc."wireguard/wgsk" = { + text = peer.wg.secret; + user = "systemd-network"; + group = "systemd-network"; + }; + }; + in + { + server = { + imports = [ (shared server) ]; + + networking.firewall.allowedUDPPorts = [ server.wg.listen ]; + + systemd.network.netdevs."10-${deviceName}" = { + wireguardConfig.ListenPort = server.wg.listen; + wireguardPeers = [ + { + wireguardPeerConfig = { + AllowedIPs = [ "::/0" ]; + PublicKey = client.wg.public; + }; + } + ]; + }; + + services.rosenpass.settings = { + listen = [ "0.0.0.0:9999" ]; + peers = [ + { + public_key = "/etc/rosenpass/peers/client/pqpk"; + peer = client.wg.public; + } + ]; + }; + }; + client = { + imports = [ (shared client) ]; + + systemd.network.netdevs."10-${deviceName}".wireguardPeers = [ + { + wireguardPeerConfig = { + AllowedIPs = [ "::/0" ]; + PublicKey = server.wg.public; + Endpoint = "server:${builtins.toString server.wg.listen}"; + }; + } + ]; + + services.rosenpass.settings.peers = [ + { + public_key = "/etc/rosenpass/peers/server/pqpk"; + endpoint = "server:9999"; + peer = server.wg.public; + } + ]; + }; + }; + + testScript = { ... }: '' + from os import system + + # Full path to rosenpass in the store, to avoid fiddling with `$PATH`. + rosenpass = "${pkgs.rosenpass}/bin/rosenpass" + + # Path in `/etc` where keys will be placed. + etc = "/etc/rosenpass" + + start_all() + + for machine in [server, client]: + machine.wait_for_unit("multi-user.target") + + # Gently stop Rosenpass to avoid crashes during key generation/distribution. + for machine in [server, client]: + machine.execute("systemctl stop rosenpass.service") + + for (name, machine, remote) in [("server", server, client), ("client", client, server)]: + pk, sk = f"{name}.pqpk", f"{name}.pqsk" + system(f"{rosenpass} gen-keys --force --secret-key {sk} --public-key {pk}") + machine.copy_from_host(sk, f"{etc}/pqsk") + machine.copy_from_host(pk, f"{etc}/pqpk") + remote.copy_from_host(pk, f"{etc}/peers/{name}/pqpk") + + for machine in [server, client]: + machine.execute("systemctl start rosenpass.service") + + for machine in [server, client]: + machine.wait_for_unit("rosenpass.service") + + with subtest("ping"): + client.succeed("ping -c 2 -i 0.5 ${server.ip}%${deviceName}") + + with subtest("preshared-keys"): + # Rosenpass works by setting the WireGuard preshared key at regular intervals. + # Thus, if it is not active, then no key will be set, and the output of `wg show` will contain "none". + # Otherwise, if it is active, then the key will be set and "none" will not be found in the output of `wg show`. + for machine in [server, client]: + machine.wait_until_succeeds("wg show all preshared-keys | grep --invert-match none", timeout=5) + ''; + + # NOTE: Below configuration is for "interactive" (=developing/debugging) only. + interactive.nodes = + let + inherit (import ./ssh-keys.nix pkgs) snakeOilPublicKey snakeOilPrivateKey; + + sshAndKeyGeneration = { + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; + environment.systemPackages = [ + (pkgs.writeShellApplication { + name = "gen-keys"; + runtimeInputs = [ pkgs.rosenpass ]; + text = '' + HOST="$(hostname)" + if [ "$HOST" == "server" ] + then + PEER="client" + else + PEER="server" + fi + + # Generate keypair. + mkdir -vp /etc/rosenpass/peers/$PEER + rosenpass gen-keys --force --secret-key /etc/rosenpass/pqsk --public-key /etc/rosenpass/pqpk + + # Set up SSH key. + mkdir -p /root/.ssh + cp ${snakeOilPrivateKey} /root/.ssh/id_ecdsa + chmod 0400 /root/.ssh/id_ecdsa + + # Copy public key to other peer. + # shellcheck disable=SC2029 + ssh -o StrictHostKeyChecking=no $PEER "mkdir -pv /etc/rosenpass/peers/$HOST" + scp /etc/rosenpass/pqpk "$PEER:/etc/rosenpass/peers/$HOST/pqpk" + ''; + }) + ]; + }; + + # Use kmscon <https://www.freedesktop.org/wiki/Software/kmscon/> + # to provide a slightly nicer console, and while we're at it, + # also use a nice font. + # With kmscon, we can for example zoom in/out using [Ctrl] + [+] + # and [Ctrl] + [-] + niceConsoleAndAutologin.services.kmscon = { + enable = true; + autologinUser = "root"; + fonts = [{ + name = "Fira Code"; + package = pkgs.fira-code; + }]; + }; + in + { + server = sshAndKeyGeneration // niceConsoleAndAutologin; + client = sshAndKeyGeneration // niceConsoleAndAutologin; + }; +}) diff --git a/nixpkgs/nixos/tests/stratis/encryption.nix b/nixpkgs/nixos/tests/stratis/encryption.nix index a555ff8a8e85..81b5f92b4ac4 100644 --- a/nixpkgs/nixos/tests/stratis/encryption.nix +++ b/nixpkgs/nixos/tests/stratis/encryption.nix @@ -26,7 +26,7 @@ import ../make-test-python.nix ({ pkgs, ... }: # test rebinding encrypted pool machine.succeed("stratis pool rebind keyring testpool testkey2") # test restarting encrypted pool - machine.succeed("stratis pool stop testpool") - machine.succeed("stratis pool start --name testpool --unlock-method keyring") + machine.succeed("stratis pool stop --name testpool") + machine.succeed("stratis pool start --name testpool --unlock-method keyring") ''; }) diff --git a/nixpkgs/nixos/tests/systemd-credentials-tpm2.nix b/nixpkgs/nixos/tests/systemd-credentials-tpm2.nix index d2dc1fd7b615..bf7418312236 100644 --- a/nixpkgs/nixos/tests/systemd-credentials-tpm2.nix +++ b/nixpkgs/nixos/tests/systemd-credentials-tpm2.nix @@ -1,13 +1,4 @@ -import ./make-test-python.nix ({ lib, pkgs, system, ... }: - -let - tpmSocketPath = "/tmp/swtpm-sock"; - tpmDeviceModels = { - x86_64-linux = "tpm-tis"; - aarch64-linux = "tpm-tis-device"; - }; -in - +import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "systemd-credentials-tpm2"; @@ -16,51 +7,11 @@ in }; nodes.machine = { pkgs, ... }: { - virtualisation = { - qemu.options = [ - "-chardev socket,id=chrtpm,path=${tpmSocketPath}" - "-tpmdev emulator,id=tpm_dev_0,chardev=chrtpm" - "-device ${tpmDeviceModels.${system}},tpmdev=tpm_dev_0" - ]; - }; - - boot.initrd.availableKernelModules = [ "tpm_tis" ]; - + virtualisation.tpm.enable = true; environment.systemPackages = with pkgs; [ diffutils ]; }; testScript = '' - import subprocess - from tempfile import TemporaryDirectory - - # From systemd-initrd-luks-tpm2.nix - class Tpm: - def __init__(self): - self.state_dir = TemporaryDirectory() - self.start() - - def start(self): - self.proc = subprocess.Popen(["${pkgs.swtpm}/bin/swtpm", - "socket", - "--tpmstate", f"dir={self.state_dir.name}", - "--ctrl", "type=unixio,path=${tpmSocketPath}", - "--tpm2", - ]) - - # Check whether starting swtpm failed - try: - exit_code = self.proc.wait(timeout=0.2) - if exit_code is not None and exit_code != 0: - raise Exception("failed to start swtpm") - except subprocess.TimeoutExpired: - pass - - """Check whether the swtpm process exited due to an error""" - def check(self): - exit_code = self.proc.poll() - if exit_code is not None and exit_code != 0: - raise Exception("swtpm process died") - CRED_NAME = "testkey" CRED_RAW_FILE = f"/root/{CRED_NAME}" CRED_FILE = f"/root/{CRED_NAME}.cred" @@ -85,12 +36,6 @@ in machine.log("systemd-run finished successfully") - tpm = Tpm() - - @polling_condition - def swtpm_running(): - tpm.check() - machine.wait_for_unit("multi-user.target") with subtest("Check whether TPM device exists"): diff --git a/nixpkgs/nixos/tests/systemd-cryptenroll.nix b/nixpkgs/nixos/tests/systemd-cryptenroll.nix index 055ae7d1681f..034aae1d5e95 100644 --- a/nixpkgs/nixos/tests/systemd-cryptenroll.nix +++ b/nixpkgs/nixos/tests/systemd-cryptenroll.nix @@ -8,47 +8,34 @@ import ./make-test-python.nix ({ pkgs, ... }: { environment.systemPackages = [ pkgs.cryptsetup ]; virtualisation = { emptyDiskImages = [ 512 ]; - qemu.options = [ - "-chardev socket,id=chrtpm,path=/tmp/swtpm-sock" - "-tpmdev emulator,id=tpm0,chardev=chrtpm" - "-device tpm-tis,tpmdev=tpm0" - ]; + tpm.enable = true; }; }; testScript = '' - import subprocess - import tempfile - - def start_swtpm(tpmstate): - subprocess.Popen(["${pkgs.swtpm}/bin/swtpm", "socket", "--tpmstate", "dir="+tpmstate, "--ctrl", "type=unixio,path=/tmp/swtpm-sock", "--log", "level=0", "--tpm2"]) - - with tempfile.TemporaryDirectory() as tpmstate: - start_swtpm(tpmstate) - machine.start() - - # Verify the TPM device is available and accessible by systemd-cryptenroll - machine.succeed("test -e /dev/tpm0") - machine.succeed("test -e /dev/tpmrm0") - machine.succeed("systemd-cryptenroll --tpm2-device=list") - - # Create LUKS partition - machine.succeed("echo -n lukspass | cryptsetup luksFormat -q /dev/vdb -") - # Enroll new LUKS key and bind it to Secure Boot state - # For more details on PASSWORD variable, check the following issue: - # https://github.com/systemd/systemd/issues/20955 - machine.succeed("PASSWORD=lukspass systemd-cryptenroll --tpm2-device=auto --tpm2-pcrs=7 /dev/vdb") - # Add LUKS partition to /etc/crypttab to test auto unlock - machine.succeed("echo 'luks /dev/vdb - tpm2-device=auto' >> /etc/crypttab") - machine.shutdown() - - start_swtpm(tpmstate) - machine.start() - - # Test LUKS partition automatic unlock on boot - machine.wait_for_unit("systemd-cryptsetup@luks.service") - # Wipe TPM2 slot - machine.succeed("systemd-cryptenroll --wipe-slot=tpm2 /dev/vdb") + machine.start() + + # Verify the TPM device is available and accessible by systemd-cryptenroll + machine.succeed("test -e /dev/tpm0") + machine.succeed("test -e /dev/tpmrm0") + machine.succeed("systemd-cryptenroll --tpm2-device=list") + + # Create LUKS partition + machine.succeed("echo -n lukspass | cryptsetup luksFormat -q /dev/vdb -") + # Enroll new LUKS key and bind it to Secure Boot state + # For more details on PASSWORD variable, check the following issue: + # https://github.com/systemd/systemd/issues/20955 + machine.succeed("PASSWORD=lukspass systemd-cryptenroll --tpm2-device=auto --tpm2-pcrs=7 /dev/vdb") + # Add LUKS partition to /etc/crypttab to test auto unlock + machine.succeed("echo 'luks /dev/vdb - tpm2-device=auto' >> /etc/crypttab") + + machine.shutdown() + machine.start() + + # Test LUKS partition automatic unlock on boot + machine.wait_for_unit("systemd-cryptsetup@luks.service") + # Wipe TPM2 slot + machine.succeed("systemd-cryptenroll --wipe-slot=tpm2 /dev/vdb") ''; }) diff --git a/nixpkgs/nixos/tests/systemd-initrd-luks-tpm2.nix b/nixpkgs/nixos/tests/systemd-initrd-luks-tpm2.nix index d9dd9118a3a2..e292acfd1c5f 100644 --- a/nixpkgs/nixos/tests/systemd-initrd-luks-tpm2.nix +++ b/nixpkgs/nixos/tests/systemd-initrd-luks-tpm2.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { # Booting off the TPM2-encrypted device requires an available init script mountHostNixStore = true; useEFIBoot = true; - qemu.options = ["-chardev socket,id=chrtpm,path=/tmp/mytpm1/swtpm-sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0"]; + tpm.enable = true; }; boot.loader.systemd-boot.enable = true; @@ -33,29 +33,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { }; testScript = '' - import subprocess - import os - import time - - - class Tpm: - def __init__(self): - os.mkdir("/tmp/mytpm1") - self.start() - - def start(self): - self.proc = subprocess.Popen(["${pkgs.swtpm}/bin/swtpm", "socket", "--tpmstate", "dir=/tmp/mytpm1", "--ctrl", "type=unixio,path=/tmp/mytpm1/swtpm-sock", "--log", "level=20", "--tpm2"]) - - def wait_for_death_then_restart(self): - while self.proc.poll() is None: - print("waiting for tpm to die") - time.sleep(1) - assert self.proc.returncode == 0 - self.start() - - tpm = Tpm() - - # Create encrypted volume machine.wait_for_unit("multi-user.target") machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -") @@ -66,8 +43,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { machine.succeed("sync") machine.crash() - tpm.wait_for_death_then_restart() - # Boot and decrypt the disk machine.wait_for_unit("multi-user.target") assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") diff --git a/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix b/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix index 5cec295d0a75..00aed303666e 100644 --- a/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix +++ b/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; - maintainers = with maintainers; [ abbradar globin ]; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; mainProgram = "pavucontrol"; }; diff --git a/nixpkgs/pkgs/applications/audio/spotify/linux.nix b/nixpkgs/pkgs/applications/audio/spotify/linux.nix index 239d03268245..16b3e7bdd5de 100644 --- a/nixpkgs/pkgs/applications/audio/spotify/linux.nix +++ b/nixpkgs/pkgs/applications/audio/spotify/linux.nix @@ -2,7 +2,7 @@ , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon -, pname, meta, harfbuzz +, pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu # High-DPI support: Spotify's --force-device-scale-factor argument # not added if `null`, otherwise, should be a number. , deviceScaleFactor ? null @@ -14,14 +14,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.13.661.ga588f749"; + version = "1.2.22.982.g794acc0a"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "68"; + rev = "70"; deps = [ alsa-lib @@ -40,6 +40,8 @@ let glib gtk3 harfbuzz + libayatana-appindicator + libdbusmenu libdrm libgcrypt libnotify @@ -84,7 +86,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - hash = "sha512-THGSRx0sGOVEB6bOHWHiy1G0Acq0hUa94tG/v+i5DA+CluI58pqj8gYQ61k/ACLJXTUyM8SA92C8DK1Go18X8w=="; + hash = "sha512-oxDUZqyMLxCbUBb1A+BBznByQ1rZAJcEIkaSUQ93/k1DX3rTaBHzEXmBtJhmN6L8L3fw1pa9GvE7eDaD8+jeGg=="; }; nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ]; diff --git a/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/nixpkgs/pkgs/applications/audio/strawberry/default.nix index 7933c7457173..b9821895d37b 100644 --- a/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.0.20"; + version = "1.0.21"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-/utd2uYoxPHQ4kQwA0tZW5HwmN90vXL23EiNFh3wXoE="; + hash = "sha256-McwnYHaw0LYDeHLDQzfqRIYMV2FoiMdHyOL/EE8/esU="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead diff --git a/nixpkgs/pkgs/applications/audio/touchosc/default.nix b/nixpkgs/pkgs/applications/audio/touchosc/default.nix index 82a5220d7dda..3d6917b58dfe 100644 --- a/nixpkgs/pkgs/applications/audio/touchosc/default.nix +++ b/nixpkgs/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.2.1.171"; + version = "1.2.4.180"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-lIm+X+znIp80cbVb8KEkeZwiMkTsqdRLAfI+3a9BgfY="; - armv7l-linux = "sha256-kghoaLQ3aEIytdmxlmVXPuZWBwg/A3Y3NL2WSmHKxMM="; - x86_64-linux = "sha256-iRab2H+TYpGcUBB/x2/M4NuupWLjvt4EvyMc5cfWyeo="; + aarch64-linux = "sha256-Z3vHcfimchshFTRbSsVhAw4DJPetZF59zyAnnbQ3YAM="; + armv7l-linux = "sha256-KUA6UFenEVme0AMuE69dR13RfYSGAd9GEdikh3DS0ko="; + x86_64-linux = "sha256-3RA+piRJ4UE4tPYALaifENJg7+0BZDmSwS36VJiEn8Q="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix index abeea41cfd4a..33c370708d11 100644 --- a/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.11.6"; + version = "1.11.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-PORzTbvB9HriilaBCsC6R323RFvsI55WgSojJJ6uoIs="; + sha256 = "sha256-6DhVsN8VZmQ1lU7imXInL1y4Fu+JFr4R1nFthMHrQQ8="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix b/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix index 6cc22d122fbc..e4b5d3963d12 100644 --- a/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -2,8 +2,8 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; }) - (fetchNuGet { pname = "AngleSharp.Css"; version = "0.14.2"; sha256 = "1d34a8ab5dri4wlw07jvk7b1z0d0zizwihwpdfva3sxhb4279ahd"; }) + (fetchNuGet { pname = "AngleSharp"; version = "0.17.1"; sha256 = "038idg33ydy72362qplsd7y8ldifi9zg02dhjli6wy4p47hyqcph"; }) + (fetchNuGet { pname = "AngleSharp.Css"; version = "0.17.0"; sha256 = "0q5vfj4l24kz1djigl0fva0dv64j2f90x3g1db59vbiz8vvfjz5i"; }) (fetchNuGet { pname = "AWSSDK.Core"; version = "3.3.104.14"; sha256 = "157694kb63z1szbsv861515fvjv7amrjrfmgbm3idpyw31afk650"; }) (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) @@ -20,7 +20,7 @@ (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; }) (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) (fetchNuGet { pname = "Dapper"; version = "2.0.123"; sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91"; }) - (fetchNuGet { pname = "DigitalRuby.ExchangeSharp"; version = "1.0.2"; sha256 = "1l6g61l18jqnc0h8rpsilfjjnyapm4ld8wcsr8bp0hp34p6wpidm"; }) + (fetchNuGet { pname = "DigitalRuby.ExchangeSharp"; version = "1.0.4"; sha256 = "1hkdls4wjrxq6df1zq9saa6hn5hynalq3gxb486w59j7i9f3g7d8"; }) (fetchNuGet { pname = "Fido2"; version = "2.0.2"; sha256 = "1wqlk48apm7h637da7sav0r1a8yz2yy2gxhifpvydjqk1n3qybz4"; }) (fetchNuGet { pname = "Fido2.AspNet"; version = "2.0.2"; sha256 = "0x2k1wyd0p7cy4ir15m2bxiggckl98znc65b4vq75ckjyd6dm1a1"; }) (fetchNuGet { pname = "Fido2.Models"; version = "2.0.2"; sha256 = "1vk4h9sv2dhdr0jvh2a7yk6v9rhxk9y8hxz4mkal8vd9psajz5cg"; }) @@ -34,7 +34,7 @@ (fetchNuGet { pname = "Google.Apis.Core"; version = "1.38.0"; sha256 = "012gslhnx65vqfyzjnqx4bqk9kb8bwbx966q2f9fdgrfcn26gj9j"; }) (fetchNuGet { pname = "Google.Apis.Storage.v1"; version = "1.38.0.1470"; sha256 = "0mfrz7fmpfbjvp4zfpjasmnfbgxgxrrjkf8xgp9p6h9g8qh2f2h2"; }) (fetchNuGet { pname = "Google.Cloud.Storage.V1"; version = "2.3.0"; sha256 = "01jhrd6m6md8m28chzg2dkdfd4yris79j1xi7r1ydm1cfjhmlj64"; }) - (fetchNuGet { pname = "HtmlSanitizer"; version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; }) + (fetchNuGet { pname = "HtmlSanitizer"; version = "8.0.723"; sha256 = "1x621v4ypgd1zrmq7zd7j9wcrc30f6rm9qh0i1sm4yfqd983yf4g"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) (fetchNuGet { pname = "LNURL"; version = "0.0.34"; sha256 = "1sbkqsln7wq5fsbw63wdha8kqwxgd95j0iblv4kxa1shyg3c5d9x"; }) @@ -145,12 +145,11 @@ (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.6.0"; sha256 = "0h5vbsd5x9cf7nqyrwn7d7y1axhf1zz0jr9prvi4xpxawa3kajyj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) (fetchNuGet { pname = "MimeKit"; version = "3.3.0"; sha256 = "0rslxmwlv6w2fssv0mz2v6qi6zg1v0lmly6hvh258xqdfxrhn0y8"; }) (fetchNuGet { pname = "MySqlConnector"; version = "2.1.2"; sha256 = "12wgwns172vjldp1cvcq212zizpw18za7z3438rdh40zkq55s5yz"; }) (fetchNuGet { pname = "NBitcoin"; version = "5.0.40"; sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh"; }) @@ -170,7 +169,7 @@ (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; version = "2.0.0"; sha256 = "1cng096r3kb85lf5wjill4yhxx8nv9v0d6ksbn1i1vvdawwl6fkw"; }) (fetchNuGet { pname = "NicolasDorier.RateLimits"; version = "1.2.3"; sha256 = "197cqb0yxd2hfxyikxw53m4lmxh87l9sqrr8xihg1j0knvwzgyyp"; }) (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; version = "2.0.1"; sha256 = "1jiinqj1y8vv78p766asml4bd0k5gwrpl9ksi176h0z7wsj6ilrx"; }) - (fetchNuGet { pname = "NLog"; version = "4.7.14"; sha256 = "1pjkxlf20vrh9b8r6wzay1563fdhhxslxb7acdkn5ss8gvd2m23n"; }) + (fetchNuGet { pname = "NLog"; version = "5.1.3"; sha256 = "0r09pd9cax95gn5bxskfhmalfd5qi3xx5j14znvryd1vn2vy6fln"; }) (fetchNuGet { pname = "Npgsql"; version = "6.0.7"; sha256 = "0c5zyd9n3597ryzqh9qfisp3wvr7q0krbnl26w2sy33xm4hvls2c"; }) (fetchNuGet { pname = "Npgsql.EntityFrameworkCore.PostgreSQL"; version = "6.0.7"; sha256 = "0gsvjf0vk7anmc889my8x68wpd47bsdgsk1rwbg77rrb9zsf4nxp"; }) (fetchNuGet { pname = "NSec.Cryptography"; version = "20.2.0"; sha256 = "19slji51v8s8i4836nqqg7qb3i3p4ahqahz0fbb3gwpp67pn6izx"; }) @@ -248,7 +247,7 @@ (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "3.1.1"; sha256 = "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"; }) (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "1.0.1"; sha256 = "0969mb254kr59bgkq01ybyzca89z3f4n9ng5mdj8m53d5653zf22"; }) (fetchNuGet { pname = "Serilog.Sinks.File"; version = "4.1.0"; sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; }) - (fetchNuGet { pname = "SocketIOClient"; version = "3.0.6"; sha256 = "0yvvwyg05sjlam8841kxy1qv6bc7a1kykdk5jdy2jvw89d40k31d"; }) + (fetchNuGet { pname = "SocketIOClient"; version = "3.0.8"; sha256 = "1k3csni1zyy55rdzcyivppqmyxvrmm31bqm6gffc25v959jp73wv"; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.0.6"; sha256 = "1ip0a653dx5cqybxg27zyz5ps31f2yz50g3jvz3vx39isx79gax3"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.0.6"; sha256 = "1w4iyg0v1v1z2m7akq7rv8lsgixp2m08732vr14vgpqs918bsy1i"; }) (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.0.6"; sha256 = "16378rh1lcqxynf5qj0kh8mrsb0jp37qqwg4285kqc5pknvh1bx3"; }) @@ -265,7 +264,8 @@ (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "7.0.0"; sha256 = "149d9kmakzkbw69cip1ny0wjlgcvnhrr7vz5pavpsip36k2mw02a"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) @@ -274,7 +274,7 @@ (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) @@ -312,7 +312,6 @@ (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.0.1"; sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) @@ -347,7 +346,6 @@ (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) @@ -357,22 +355,22 @@ (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.0"; sha256 = "1q80znpwkv5wrzgx0qnzxqaa5k1s72fnk3g1yng62l7y14d8ki64"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; sha256 = "15s9s6hsj9bz0nzw41mxbqdjgjd71w2djqbv0aj413gfi9amybk9"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; sha256 = "0wkm6bj4abknzj41ygkziifx8mzhj4bix92wjvj6lihaw1gniq8c"; }) (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.0"; sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.4.0"; sha256 = "05qp3yivh6gz0vva0v3wjlj3g1b45d5jmz362f2y8ah6yb3rx088"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.2"; sha256 = "1lz6gx1r4if8sbx6yp9h0mi0g9ffr40x0cg518l0z2aiqgil3fk0"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "7.0.2"; sha256 = "1i6yinxvbwdk5g5z9y8l4a5hj2gw3h9ijlz2f1c1ngyprnwz2ivf"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) @@ -385,7 +383,7 @@ (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; sha256 = "11r9f0v7qp365bdpq5ax023yra4qvygljz18dlqs650d44iay669"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) (fetchNuGet { pname = "TwentyTwenty.Storage"; version = "2.12.1"; sha256 = "0m41dxzc3hh0f4j1k4q915pvcq6zr0hv1pj6b3sayrn8vjhk64qb"; }) diff --git a/nixpkgs/pkgs/applications/blockchains/exodus/default.nix b/nixpkgs/pkgs/applications/blockchains/exodus/default.nix index 2d778a059f28..9311ba4c544c 100644 --- a/nixpkgs/pkgs/applications/blockchains/exodus/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/exodus/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, requireFile +, fetchurl , unzip , glib , systemd @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { pname = "exodus"; version = "23.9.25"; - src = requireFile { + src = fetchurl { name = "exodus-linux-x64-${version}.zip"; url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; + curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; sha256 = "a3e314de257e1ec01baa1023886f327ade4b233d833f7fe79f6c3e0f26d07ced"; }; diff --git a/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock b/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock index 2ebbe1296fb1..b5f10b26d694 100644 --- a/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -121,9 +121,9 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead 0.5.2", "aes 0.8.3", @@ -494,7 +494,7 @@ dependencies = [ "ark-ff", "ark-std", "tracing", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] @@ -513,7 +513,7 @@ dependencies = [ [[package]] name = "ark-secret-scalar" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" dependencies = [ "ark-ec", "ark-ff", @@ -561,7 +561,7 @@ dependencies = [ [[package]] name = "ark-transcript" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" dependencies = [ "ark-ff", "ark-serialize", @@ -617,7 +617,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.27", + "time", ] [[package]] @@ -633,7 +633,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.27", + "time", ] [[package]] @@ -737,7 +737,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "kusama-runtime-constants", "log", "pallet-asset-conversion", @@ -774,6 +774,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-offchain", "sp-runtime", @@ -833,7 +834,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-asset-tx-payment", "pallet-assets", @@ -866,6 +867,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-offchain", "sp-runtime", @@ -926,7 +928,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-asset-conversion", "pallet-asset-conversion-tx-payment", @@ -961,6 +963,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-offchain", @@ -990,7 +993,7 @@ dependencies = [ "cumulus-test-relay-sproof-builder", "frame-support", "frame-system", - "hex-literal 0.4.1", + "hex-literal", "pallet-assets", "pallet-balances", "pallet-collator-selection", @@ -1138,7 +1141,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -1160,7 +1163,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -1177,7 +1180,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -1240,13 +1243,12 @@ dependencies = [ [[package]] name = "bandersnatch_vrfs" version = "0.0.1" -source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" dependencies = [ "ark-bls12-381", "ark-ec", "ark-ed-on-bls12-381-bandersnatch", "ark-ff", - "ark-scale", "ark-serialize", "ark-std", "dleq_vrf", @@ -1352,7 +1354,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -1636,7 +1638,7 @@ dependencies = [ "finality-grandpa", "frame-support", "hex", - "hex-literal 0.4.1", + "hex-literal", "parity-scale-codec", "scale-info", "serde", @@ -1666,7 +1668,7 @@ dependencies = [ "bp-runtime", "frame-support", "hex", - "hex-literal 0.4.1", + "hex-literal", "parity-scale-codec", "scale-info", "serde", @@ -1728,7 +1730,7 @@ dependencies = [ "bp-runtime", "frame-support", "hex", - "hex-literal 0.4.1", + "hex-literal", "parity-scale-codec", "scale-info", "sp-runtime", @@ -1754,7 +1756,7 @@ dependencies = [ "frame-support", "frame-system", "hash-db", - "hex-literal 0.4.1", + "hex-literal", "impl-trait-for-tuples", "log", "num-traits", @@ -1778,7 +1780,7 @@ dependencies = [ "bp-parachains", "bp-polkadot-core", "bp-runtime", - "ed25519-dalek 1.0.1", + "ed25519-dalek", "finality-grandpa", "parity-scale-codec", "sp-application-crypto", @@ -1832,7 +1834,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "kusama-runtime-constants", "log", "pallet-aura", @@ -1860,6 +1862,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-offchain", @@ -1895,7 +1898,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-aura", "pallet-authorship", @@ -1923,6 +1926,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-offchain", @@ -1990,7 +1994,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-aura", "pallet-authorship", @@ -2022,6 +2026,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keyring", @@ -2274,9 +2279,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", ] @@ -2334,7 +2339,7 @@ name = "chain-spec-builder" version = "2.0.0" dependencies = [ "ansi_term", - "clap 4.4.2", + "clap 4.4.4", "node-cli", "rand 0.8.5", "sc-chain-spec", @@ -2345,15 +2350,14 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.27" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56b4c72906975ca04becb8a30e102dfecddd0c06181e3e95ddc444be28881f8" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time 0.1.45", "wasm-bindgen", "windows-targets 0.48.5", ] @@ -2465,9 +2469,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.2" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" +checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" dependencies = [ "clap_builder", "clap_derive 4.4.2", @@ -2475,9 +2479,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" dependencies = [ "anstream", "anstyle", @@ -2491,7 +2495,7 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", ] [[package]] @@ -2516,7 +2520,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -2566,6 +2570,7 @@ dependencies = [ "frame-support", "integration-tests-common", "pallet-assets", + "pallet-balances", "pallet-core-fellowship", "pallet-salary", "pallet-xcm", @@ -2600,7 +2605,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-alliance", "pallet-aura", @@ -2608,6 +2613,7 @@ dependencies = [ "pallet-balances", "pallet-collator-selection", "pallet-collective", + "pallet-collective-content", "pallet-core-fellowship", "pallet-multisig", "pallet-preimage", @@ -2636,6 +2642,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-offchain", @@ -2705,7 +2712,7 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +source = "git+https://github.com/w3f/ring-proof?rev=8657210#86572101f4210647984ab4efedba6b3fcc890895" dependencies = [ "ark-ec", "ark-ff", @@ -2714,6 +2721,7 @@ dependencies = [ "ark-std", "fflonk", "merlin 3.0.0", + "rand_chacha 0.3.1", ] [[package]] @@ -2815,7 +2823,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "kusama-runtime-constants", "log", "pallet-aura", @@ -2845,6 +2853,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-offchain", "sp-runtime", @@ -3086,7 +3095,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.4.2", + "clap 4.4.4", "criterion-plot", "futures", "is-terminal", @@ -3251,7 +3260,7 @@ dependencies = [ name = "cumulus-client-cli" version = "0.1.0" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "parity-scale-codec", "sc-chain-spec", "sc-cli", @@ -3545,7 +3554,7 @@ dependencies = [ "environmental", "frame-support", "frame-system", - "hex-literal 0.4.1", + "hex-literal", "impl-trait-for-tuples", "lazy_static", "log", @@ -3575,7 +3584,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -3901,14 +3910,6 @@ dependencies = [ ] [[package]] -name = "cumulus-test-relay-validation-worker-provider" -version = "0.1.0" -dependencies = [ - "polkadot-node-core-pvf", - "toml 0.7.6", -] - -[[package]] name = "cumulus-test-runtime" version = "0.1.0" dependencies = [ @@ -3944,7 +3945,7 @@ name = "cumulus-test-service" version = "0.1.0" dependencies = [ "async-trait", - "clap 4.4.2", + "clap 4.4.4", "criterion 0.5.1", "cumulus-client-cli", "cumulus-client-consensus-common", @@ -3959,7 +3960,6 @@ dependencies = [ "cumulus-relay-chain-minimal-node", "cumulus-test-client", "cumulus-test-relay-sproof-builder", - "cumulus-test-relay-validation-worker-provider", "cumulus-test-runtime", "frame-system", "frame-system-rpc-runtime-api", @@ -4067,7 +4067,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -4107,7 +4107,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -4124,7 +4124,7 @@ checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -4375,9 +4375,9 @@ dependencies = [ [[package]] name = "directories" -version = "4.0.1" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ "dirs-sys", ] @@ -4394,13 +4394,14 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -4422,7 +4423,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -4434,7 +4435,7 @@ checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" [[package]] name = "dleq_vrf" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" dependencies = [ "ark-ec", "ark-ff", @@ -4465,18 +4466,18 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "docify" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029de870d175d11969524d91a3fb2cbf6d488b853bff99d41cf65e533ac7d9d2" +checksum = "76ee528c501ddd15d5181997e9518e59024844eac44fd1e40cb20ddb2a8562fa" dependencies = [ "docify_macros", ] [[package]] name = "docify_macros" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac43324656a1b05eb0186deb51f27d2d891c704c37f34de281ef6297ba193e5" +checksum = "0ca01728ab2679c464242eca99f94e2ce0514b52ac9ad950e2ed03fca991231c" dependencies = [ "common-path", "derive-syn-parse", @@ -4484,7 +4485,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.31", + "syn 2.0.37", "termcolor", "toml 0.7.6", "walkdir", @@ -4563,15 +4564,6 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature 1.6.4", -] - -[[package]] -name = "ed25519" version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" @@ -4582,26 +4574,12 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek 3.2.0", - "ed25519 1.5.3", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "zeroize", -] - -[[package]] -name = "ed25519-dalek" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ "curve25519-dalek 4.0.0", - "ed25519 2.2.2", + "ed25519", "rand_core 0.6.4", "serde", "sha2 0.10.7", @@ -4629,7 +4607,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e83e509bcd060ca4b54b72bde5bb306cb2088cb01e14797ebae90a24f70f5f7" dependencies = [ "curve25519-dalek 4.0.0", - "ed25519 2.2.2", + "ed25519", "hashbrown 0.14.0", "hex", "rand_core 0.6.4", @@ -4728,7 +4706,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -4739,7 +4717,7 @@ checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -4863,12 +4841,6 @@ dependencies = [ ] [[package]] -name = "exitcode" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193" - -[[package]] name = "expander" version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4882,18 +4854,6 @@ dependencies = [ [[package]] name = "expander" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3774182a5df13c3d1690311ad32fbe913feef26baba609fa2dd5f72042bd2ab6" -dependencies = [ - "blake2", - "fs-err", - "proc-macro2", - "quote", -] - -[[package]] -name = "expander" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7" @@ -4902,7 +4862,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -5192,7 +5152,7 @@ dependencies = [ "Inflector", "array-bytes", "chrono", - "clap 4.4.2", + "clap 4.4.4", "comfy-table", "frame-benchmarking", "frame-support", @@ -5258,7 +5218,7 @@ dependencies = [ "quote", "scale-info", "sp-arithmetic", - "syn 2.0.31", + "syn 2.0.37", "trybuild", ] @@ -5284,7 +5244,7 @@ dependencies = [ name = "frame-election-solution-type-fuzzer" version = "2.0.0-alpha.5" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "frame-election-provider-solution-type", "frame-election-provider-support", "frame-support", @@ -5410,7 +5370,7 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -5421,7 +5381,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -5430,7 +5390,7 @@ version = "3.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -5653,7 +5613,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -5839,9 +5799,11 @@ dependencies = [ name = "glutton-runtime" version = "1.0.0" dependencies = [ + "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", "cumulus-pallet-xcm", "cumulus-primitives-core", + "cumulus-primitives-timestamp", "frame-benchmarking", "frame-executive", "frame-support", @@ -5849,15 +5811,19 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", + "pallet-aura", "pallet-glutton", "pallet-sudo", + "pallet-timestamp", "parachain-info", "parachains-common", "parity-scale-codec", "scale-info", "sp-api", "sp-block-builder", + "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-offchain", "sp-runtime", @@ -6006,12 +5972,6 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hex-literal" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" - -[[package]] -name = "hex-literal" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" @@ -6860,6 +6820,7 @@ dependencies = [ "sp-consensus-babe", "sp-consensus-grandpa", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-offchain", @@ -6942,6 +6903,15 @@ dependencies = [ ] [[package]] +name = "layout-rs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1164ef87cb9607c2d887216eca79f0fc92895affe1789bba805dd38d829584e0" +dependencies = [ + "log", +] + +[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7130,7 +7100,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ "bs58 0.4.0", - "ed25519-dalek 2.0.0", + "ed25519-dalek", "log", "multiaddr", "multihash", @@ -7660,7 +7630,7 @@ dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -7674,7 +7644,7 @@ dependencies = [ "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -7685,7 +7655,7 @@ checksum = "c12469fc165526520dff2807c2975310ab47cf7190a45b99b49a7dc8befab17b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -7696,7 +7666,7 @@ checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -7721,15 +7691,6 @@ dependencies = [ ] [[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] name = "matches" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8192,7 +8153,7 @@ name = "node-bench" version = "0.9.0-dev" dependencies = [ "array-bytes", - "clap 4.4.2", + "clap 4.4.4", "derive_more", "fs_extra", "futures", @@ -8229,7 +8190,7 @@ version = "3.0.0-dev" dependencies = [ "array-bytes", "assert_cmd", - "clap 4.4.2", + "clap 4.4.4", "clap_complete", "criterion 0.4.0", "frame-benchmarking-cli", @@ -8355,7 +8316,7 @@ dependencies = [ name = "node-inspect" version = "0.9.0-dev" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "parity-scale-codec", "sc-cli", "sc-client-api", @@ -8409,7 +8370,7 @@ dependencies = [ name = "node-runtime-generate-bags" version = "3.0.0" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "generate-bags", "kitchensink-runtime", ] @@ -8418,7 +8379,7 @@ dependencies = [ name = "node-template" version = "4.0.0-dev" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "frame-benchmarking", "frame-benchmarking-cli", "frame-system", @@ -8461,7 +8422,7 @@ dependencies = [ name = "node-template-release" version = "3.0.0" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "flate2", "fs_extra", "glob", @@ -8497,6 +8458,7 @@ dependencies = [ "sp-consensus-aura", "sp-consensus-grandpa", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-offchain", "sp-runtime", @@ -8573,16 +8535,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] name = "num" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8755,10 +8707,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] name = "orchestra" -version = "0.0.5" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "227585216d05ba65c7ab0a0450a3cf2cbd81a98862a54c4df8e14d5ac6adb015" +checksum = "46d78e1deb2a8d54fc1f063a544130db4da31dfe4d5d3b493186424910222a76" dependencies = [ "async-trait", "dyn-clonable", @@ -8773,12 +8731,16 @@ dependencies = [ [[package]] name = "orchestra-proc-macro" -version = "0.0.5" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2871aadd82a2c216ee68a69837a526dfe788ecbe74c4c5038a6acdbff6653066" +checksum = "d035b1f968d91a826f2e34a9d6d02cb2af5aa7ca39ebd27922d850ab4b2dd2c6" dependencies = [ - "expander 0.0.6", - "itertools 0.10.5", + "anyhow", + "expander 2.0.0", + "fs-err", + "indexmap 2.0.0", + "itertools 0.11.0", + "layout-rs", "petgraph", "proc-macro-crate", "proc-macro2", @@ -8802,12 +8764,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" [[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] name = "owo-colors" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9347,6 +9303,21 @@ dependencies = [ ] [[package]] +name = "pallet-collective-content" +version = "0.1.0" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] name = "pallet-contracts" version = "4.0.0-dev" dependencies = [ @@ -9403,7 +9374,7 @@ version = "4.0.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -10474,7 +10445,7 @@ dependencies = [ "proc-macro2", "quote", "sp-runtime", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -10540,6 +10511,7 @@ dependencies = [ name = "pallet-sudo" version = "4.0.0-dev" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -10570,6 +10542,7 @@ dependencies = [ name = "pallet-timestamp" version = "4.0.0-dev" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -10862,7 +10835,7 @@ dependencies = [ name = "parachain-template-node" version = "0.1.0" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "color-print", "cumulus-client-cli", "cumulus-client-collator", @@ -10934,7 +10907,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-aura", "pallet-authorship", @@ -10957,6 +10930,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-offchain", "sp-runtime", @@ -11018,7 +10992,7 @@ dependencies = [ "cumulus-test-relay-sproof-builder", "frame-support", "frame-system", - "hex-literal 0.4.1", + "hex-literal", "pallet-assets", "pallet-balances", "pallet-collator-selection", @@ -11263,7 +11237,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-asset-tx-payment", "pallet-assets", @@ -11289,6 +11263,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-offchain", "sp-runtime", @@ -11339,7 +11314,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -11380,7 +11355,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -11463,7 +11438,7 @@ dependencies = [ [[package]] name = "polkadot" -version = "1.1.0" +version = "1.2.0" dependencies = [ "assert_cmd", "color-eyre", @@ -11570,6 +11545,7 @@ name = "polkadot-availability-recovery" version = "1.0.0" dependencies = [ "assert_matches", + "async-trait", "env_logger 0.9.3", "fatality", "futures", @@ -11598,7 +11574,7 @@ dependencies = [ name = "polkadot-cli" version = "1.1.0" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "frame-benchmarking-cli", "futures", "log", @@ -12061,7 +12037,7 @@ dependencies = [ "assert_matches", "futures", "futures-timer", - "hex-literal 0.3.4", + "hex-literal", "libc", "parity-scale-codec", "pin-project", @@ -12078,7 +12054,6 @@ dependencies = [ "slotmap", "sp-core", "sp-maybe-compressed-blob", - "sp-tracing", "sp-wasm-interface", "substrate-build-script-utils", "tempfile", @@ -12303,9 +12278,10 @@ dependencies = [ "parking_lot 0.12.1", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-overseer", "polkadot-primitives", + "sc-client-api", "sc-keystore", + "sc-utils", "sp-application-crypto", "sp-core", "sp-keyring", @@ -12325,6 +12301,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-primitives", "polkadot-statement-table", + "sc-client-api", "sc-network", "sc-transaction-pool-api", "smallvec", @@ -12362,11 +12339,13 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", + "polkadot-node-subsystem-types", "polkadot-overseer", "polkadot-primitives", "polkadot-primitives-test-helpers", "prioritized-metered-channel", "rand 0.8.5", + "sc-client-api", "schnellru", "sp-application-crypto", "sp-core", @@ -12390,6 +12369,7 @@ dependencies = [ "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", + "polkadot-node-subsystem-test-helpers", "polkadot-node-subsystem-types", "polkadot-primitives", "polkadot-primitives-test-helpers", @@ -12404,7 +12384,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "1.0.0" +version = "1.1.0" dependencies = [ "assert_cmd", "asset-hub-kusama-runtime", @@ -12414,7 +12394,7 @@ dependencies = [ "bridge-hub-kusama-runtime", "bridge-hub-polkadot-runtime", "bridge-hub-rococo-runtime", - "clap 4.4.2", + "clap 4.4.4", "collectives-polkadot-runtime", "color-print", "contracts-rococo-runtime", @@ -12432,7 +12412,7 @@ dependencies = [ "frame-benchmarking-cli", "futures", "glutton-runtime", - "hex-literal 0.4.1", + "hex-literal", "jsonrpsee", "log", "nix 0.26.2", @@ -12523,7 +12503,7 @@ name = "polkadot-primitives" version = "1.0.0" dependencies = [ "bitvec", - "hex-literal 0.4.1", + "hex-literal", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain-primitives", @@ -12600,7 +12580,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-authority-discovery", "pallet-authorship", @@ -12666,6 +12646,7 @@ dependencies = [ "sp-consensus-babe", "sp-consensus-beefy", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keyring", @@ -12700,7 +12681,7 @@ dependencies = [ "frame-support", "frame-support-test", "frame-system", - "hex-literal 0.4.1", + "hex-literal", "impl-trait-for-tuples", "libsecp256k1", "log", @@ -12779,7 +12760,7 @@ dependencies = [ "frame-support-test", "frame-system", "futures", - "hex-literal 0.4.1", + "hex-literal", "impl-trait-for-tuples", "log", "pallet-authority-discovery", @@ -12792,6 +12773,7 @@ dependencies = [ "pallet-timestamp", "pallet-vesting", "parity-scale-codec", + "polkadot-core-primitives", "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-primitives-test-helpers", @@ -12834,9 +12816,8 @@ dependencies = [ "frame-system", "frame-system-rpc-runtime-api", "futures", - "hex-literal 0.4.1", + "hex-literal", "is_executable", - "kusama-runtime-constants", "kvdb", "kvdb-rocksdb", "log", @@ -12882,9 +12863,6 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-rpc", - "polkadot-runtime", - "polkadot-runtime-common", - "polkadot-runtime-constants", "polkadot-runtime-parachains", "polkadot-statement-distribution", "polkadot-test-client", @@ -12940,7 +12918,6 @@ dependencies = [ "sp-transaction-pool", "sp-version", "sp-weights", - "staging-kusama-runtime", "substrate-prometheus-endpoint", "tempfile", "thiserror", @@ -13028,7 +13005,7 @@ version = "1.0.0" dependencies = [ "assert_matches", "async-trait", - "clap 4.4.2", + "clap 4.4.4", "color-eyre", "futures", "futures-timer", @@ -13063,7 +13040,7 @@ dependencies = [ "frame-support", "frame-system", "frame-system-rpc-runtime-api", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-authority-discovery", "pallet-authorship", @@ -13098,6 +13075,7 @@ dependencies = [ "sp-consensus-babe", "sp-consensus-beefy", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keyring", @@ -13174,7 +13152,7 @@ dependencies = [ name = "polkadot-voter-bags" version = "1.0.0" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "generate-bags", "polkadot-runtime", "sp-io", @@ -13354,7 +13332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -13374,9 +13352,9 @@ dependencies = [ [[package]] name = "prioritized-metered-channel" -version = "0.2.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382698e48a268c832d0b181ed438374a6bb708a82a8ca273bb0f61c74cf209c4" +checksum = "e99f0c89bd88f393aab44a4ab949351f7bc7e7e1179d11ecbfe50cbe4c47e342" dependencies = [ "coarsetime", "crossbeam-queue", @@ -13436,14 +13414,14 @@ checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -13482,7 +13460,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -13640,9 +13618,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" +checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989" dependencies = [ "bytes", "rand 0.8.5", @@ -13797,7 +13775,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", "ring 0.16.20", - "time 0.3.27", + "time", "x509-parser 0.13.2", "yasna", ] @@ -13810,7 +13788,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring 0.16.20", - "time 0.3.27", + "time", "yasna", ] @@ -13873,7 +13851,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -13936,7 +13914,7 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" name = "remote-ext-tests-bags-list" version = "1.0.0" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "frame-system", "kusama-runtime-constants", "log", @@ -14024,13 +14002,14 @@ dependencies = [ [[package]] name = "ring" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +source = "git+https://github.com/w3f/ring-proof?rev=8657210#86572101f4210647984ab4efedba6b3fcc890895" dependencies = [ "ark-ec", "ark-ff", "ark-poly", "ark-serialize", "ark-std", + "blake2", "common", "fflonk", "merlin 3.0.0", @@ -14111,6 +14090,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-offchain", "sp-runtime", @@ -14137,7 +14117,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-authority-discovery", "pallet-authorship", @@ -14196,6 +14176,7 @@ dependencies = [ "sp-consensus-babe", "sp-consensus-beefy", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keyring", @@ -14635,7 +14616,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -14644,7 +14625,7 @@ version = "0.10.0-dev" dependencies = [ "array-bytes", "chrono", - "clap 4.4.2", + "clap 4.4.4", "fdlimit", "futures", "futures-timer", @@ -14702,6 +14683,7 @@ dependencies = [ "sp-statement-store", "sp-storage", "sp-test-primitives", + "sp-trie", "substrate-prometheus-endpoint", "substrate-test-runtime", "thiserror", @@ -14816,17 +14798,14 @@ dependencies = [ "num-traits", "parity-scale-codec", "parking_lot 0.12.1", - "rand_chacha 0.2.2", "sc-block-builder", "sc-client-api", "sc-consensus", "sc-consensus-epochs", "sc-consensus-slots", - "sc-network", "sc-network-test", "sc-telemetry", "sc-transaction-pool-api", - "scale-info", "sp-api", "sp-application-crypto", "sp-block-builder", @@ -15140,7 +15119,7 @@ dependencies = [ "substrate-test-runtime", "tempfile", "tracing", - "tracing-subscriber 0.2.25", + "tracing-subscriber", "wat", ] @@ -15748,7 +15727,7 @@ dependencies = [ name = "sc-storage-monitor" version = "0.1.0" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "fs4", "log", "sc-client-db", @@ -15838,7 +15817,7 @@ dependencies = [ "thiserror", "tracing", "tracing-log", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] @@ -15848,7 +15827,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -16121,21 +16100,27 @@ dependencies = [ name = "seedling-runtime" version = "0.1.0" dependencies = [ + "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", "cumulus-pallet-solo-to-para", "cumulus-primitives-core", + "cumulus-primitives-timestamp", "frame-executive", "frame-support", "frame-system", + "pallet-aura", "pallet-balances", "pallet-sudo", + "pallet-timestamp", "parachain-info", "parachains-common", "parity-scale-codec", "scale-info", "sp-api", "sp-block-builder", + "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-offchain", "sp-runtime", @@ -16202,7 +16187,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -16216,9 +16201,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -16268,7 +16253,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -16365,6 +16350,7 @@ dependencies = [ name = "shell-runtime" version = "0.1.0" dependencies = [ + "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", "cumulus-pallet-xcm", "cumulus-primitives-core", @@ -16372,13 +16358,17 @@ dependencies = [ "frame-support", "frame-system", "frame-try-runtime", + "pallet-aura", + "pallet-timestamp", "parachain-info", "parachains-common", "parity-scale-codec", "scale-info", "sp-api", "sp-block-builder", + "sp-consensus-aura", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-offchain", "sp-runtime", @@ -16418,18 +16408,6 @@ dependencies = [ ] [[package]] -name = "signal-hook-tokio" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213241f76fb1e37e27de3b6aa1b068a2c333233b59cca6634f634b80a27ecf1e" -dependencies = [ - "futures-core", - "libc", - "signal-hook", - "tokio", -] - -[[package]] name = "signature" version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -16708,7 +16686,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -17046,7 +17024,6 @@ name = "sp-core" version = "21.0.0" dependencies = [ "array-bytes", - "arrayvec 0.7.4", "bandersnatch_vrfs", "bitflags 1.3.2", "blake2", @@ -17109,7 +17086,7 @@ version = "9.0.0" dependencies = [ "quote", "sp-core-hashing", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -17153,7 +17130,7 @@ version = "8.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -17195,7 +17172,7 @@ name = "sp-io" version = "23.0.0" dependencies = [ "bytes", - "ed25519-dalek 2.0.0", + "ed25519-dalek", "libsecp256k1", "log", "parity-scale-codec", @@ -17291,7 +17268,7 @@ dependencies = [ name = "sp-npos-elections-fuzzer" version = "2.0.0-alpha.5" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "honggfuzz", "rand 0.8.5", "sp-npos-elections", @@ -17384,7 +17361,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -17480,9 +17457,9 @@ dependencies = [ name = "sp-statement-store" version = "4.0.0-dev" dependencies = [ - "aes-gcm 0.10.2", + "aes-gcm 0.10.3", "curve25519-dalek 4.0.0", - "ed25519-dalek 2.0.0", + "ed25519-dalek", "hkdf", "parity-scale-codec", "rand 0.8.5", @@ -17548,7 +17525,7 @@ dependencies = [ "sp-std", "tracing", "tracing-core", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] @@ -17624,7 +17601,7 @@ dependencies = [ "proc-macro2", "quote", "sp-version", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -17732,7 +17709,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "kusama-runtime-constants", "log", "pallet-authority-discovery", @@ -17806,6 +17783,7 @@ dependencies = [ "sp-consensus-babe", "sp-consensus-beefy", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keyring", @@ -17831,47 +17809,6 @@ dependencies = [ ] [[package]] -name = "staging-staking-miner" -version = "1.0.0" -dependencies = [ - "assert_cmd", - "clap 4.4.2", - "exitcode", - "frame-election-provider-support", - "frame-remote-externalities", - "frame-support", - "frame-system", - "futures-util", - "jsonrpsee", - "log", - "pallet-balances", - "pallet-election-provider-multi-phase", - "pallet-staking", - "pallet-transaction-payment", - "parity-scale-codec", - "paste", - "polkadot-core-primitives", - "polkadot-runtime", - "polkadot-runtime-common", - "sc-transaction-pool-api", - "serde", - "serde_json", - "signal-hook", - "signal-hook-tokio", - "sp-core", - "sp-npos-elections", - "sp-runtime", - "sp-state-machine", - "sp-version", - "staging-kusama-runtime", - "sub-tokens", - "thiserror", - "tokio", - "tracing-subscriber 0.3.17", - "westend-runtime", -] - -[[package]] name = "staging-xcm" version = "1.0.0" dependencies = [ @@ -17879,7 +17816,7 @@ dependencies = [ "derivative", "environmental", "hex", - "hex-literal 0.4.1", + "hex-literal", "impl-trait-for-tuples", "log", "parity-scale-codec", @@ -18046,18 +17983,10 @@ dependencies = [ ] [[package]] -name = "sub-tokens" -version = "0.1.0" -source = "git+https://github.com/paritytech/substrate-debug-kit?branch=master#e12503ab781e913735dc389865a3b8b4a6c6399d" -dependencies = [ - "separator", -] - -[[package]] name = "subkey" version = "3.0.0" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "sc-cli", ] @@ -18099,7 +18028,7 @@ dependencies = [ name = "substrate-frame-cli" version = "4.0.0-dev" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "frame-support", "frame-system", "sc-cli", @@ -18448,9 +18377,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ "proc-macro2", "quote", @@ -18558,7 +18487,7 @@ dependencies = [ name = "test-parachain-adder-collator" version = "1.0.0" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "futures", "futures-timer", "log", @@ -18577,7 +18506,6 @@ dependencies = [ "sp-keyring", "substrate-test-utils", "test-parachain-adder", - "test-parachain-adder-collator", "tokio", ] @@ -18607,7 +18535,7 @@ dependencies = [ name = "test-parachain-undying-collator" version = "1.0.0" dependencies = [ - "clap 4.4.2", + "clap 4.4.4", "futures", "futures-timer", "log", @@ -18626,7 +18554,6 @@ dependencies = [ "sp-keyring", "substrate-test-utils", "test-parachain-undying", - "test-parachain-undying-collator", "tokio", ] @@ -18697,7 +18624,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -18771,17 +18698,6 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" @@ -18888,7 +18804,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -19069,7 +18985,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -19112,7 +19028,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -19145,7 +19061,7 @@ dependencies = [ "ansi_term", "chrono", "lazy_static", - "matchers 0.0.1", + "matchers", "parking_lot 0.11.2", "regex", "serde", @@ -19160,28 +19076,10 @@ dependencies = [ ] [[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers 0.1.0", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] name = "trie-bench" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f54b4f9d51d368e62cf7e0730c7c1e18fc658cc84333656bab5b328f44aa964" +checksum = "a4680cb226e31d2a096592d0edecdda91cc371743002f80c0f8cf80219819b3b" dependencies = [ "criterion 0.4.0", "hash-db", @@ -19195,9 +19093,9 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85" +checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" dependencies = [ "hash-db", "hashbrown 0.13.2", @@ -19283,7 +19181,7 @@ version = "0.10.0-dev" dependencies = [ "assert_cmd", "async-trait", - "clap 4.4.2", + "clap 4.4.4", "frame-remote-externalities", "frame-try-runtime", "hex", @@ -19652,12 +19550,6 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" @@ -19685,7 +19577,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", "wasm-bindgen-shared", ] @@ -19719,7 +19611,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -20158,7 +20050,7 @@ dependencies = [ "sha2 0.10.7", "stun", "thiserror", - "time 0.3.27", + "time", "tokio", "turn", "url", @@ -20195,7 +20087,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a00f4242f2db33307347bd5be53263c52a0331c96c14292118c9a6bb48d267" dependencies = [ "aes 0.6.0", - "aes-gcm 0.10.2", + "aes-gcm 0.10.3", "async-trait", "bincode", "block-modes", @@ -20355,7 +20247,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-authority-discovery", "pallet-authorship", @@ -20421,6 +20313,7 @@ dependencies = [ "sp-consensus-babe", "sp-consensus-beefy", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keyring", @@ -20766,7 +20659,7 @@ dependencies = [ "ring 0.16.20", "rusticata-macros", "thiserror", - "time 0.3.27", + "time", ] [[package]] @@ -20784,7 +20677,7 @@ dependencies = [ "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time 0.3.27", + "time", ] [[package]] @@ -20855,7 +20748,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] @@ -20954,7 +20847,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.27", + "time", ] [[package]] @@ -20974,7 +20867,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.37", ] [[package]] diff --git a/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index 4be874ef5ce1..5947a3112e9b 100644 --- a/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; rev = "polkadot-v${version}"; - hash = "sha256-B9egLeXZ6xGJ5g5+A9KXYGdesN5Gkrr2qQJe/7hwB5I="; + hash = "sha256-Xgu1BlSGDAj79TKSM9vCbzBT4quOMBd6evImkkKycH4="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -41,13 +41,14 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ark-secret-scalar-0.0.2" = "sha256-Nbf77KSsAjDKiFIP5kgzl23fRB+68x1EirNuZlS7jeM="; - "common-0.1.0" = "sha256-3OKBPpk0exdlV0N9rJRVIncSrkwdI8bkYL2QNsJl+sY="; + "ark-secret-scalar-0.0.2" = "sha256-Tcrz2tT561ICAJzMgarSTOnaUEPeTFKZzE7rkdL3eUQ="; + "common-0.1.0" = "sha256-dnZKDx3Rw5cd4ejcilo3Opsn/1XK9yWGxhceuwvBE0o="; "fflonk-0.1.0" = "sha256-MNvlePHQdY8DiOq6w7Hc1pgn7G58GDTeghCKHJdUy7E="; - "sub-tokens-0.1.0" = "sha256-GvhgZhOIX39zF+TbQWtTCgahDec4lQjH+NqamLFLUxM="; }; }; + buildType = "production"; + cargoBuildFlags = [ "-p" "polkadot" ]; # NOTE: tests currently fail to compile due to an issue with cargo-auditable @@ -61,9 +62,9 @@ rustPlatform.buildRustPackage rec { rustc-wasm32.llvmPackages.lld ]; - buildInputs = [ - rust-jemalloc-sys-unprefixed - ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + # NOTE: jemalloc is used by default on Linux with unprefixed enabled + buildInputs = lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ] ++ + lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; # NOTE: we need to force lld otherwise rust-lld is not found for wasm32 target CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld"; diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index c9fc93be049e..467d51df9d42 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -225,14 +225,17 @@ license = lib.licenses.free; }; }) {}; - altcaps = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + altcaps = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "altcaps"; ename = "altcaps"; - version = "1.1.0.0.20230801.43558"; + version = "1.2.0.0.20230922.155347"; src = fetchurl { - url = "https://elpa.gnu.org/devel/altcaps-1.1.0.0.20230801.43558.tar"; - sha256 = "12z37dc7add0lq1fqzjx9ipmzgnpymn4pipk3q1x9sngrg06q8q0"; + url = "https://elpa.gnu.org/devel/altcaps-1.2.0.0.20230922.155347.tar"; + sha256 = "1m6sihzjxv2cq3bz3j5a17fhbh8q1swvkpl99w53arhsfrmhphff"; }; packageRequires = [ emacs ]; meta = { @@ -309,10 +312,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.2.1.0.20230720.82135"; + version = "13.2.2.0.20231011.93504"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-13.2.1.0.20230720.82135.tar"; - sha256 = "0m973vyb37d57309f51rbds3lvf908484p71a4l216q63qzmidnj"; + url = "https://elpa.gnu.org/devel/auctex-13.2.2.0.20231011.93504.tar"; + sha256 = "0f13nfkzysp9l1ah74a00m2pr5fv5xx8jp82wqki5g9h60cwq5nk"; }; packageRequires = [ emacs ]; meta = { @@ -450,14 +453,17 @@ license = lib.licenses.free; }; }) {}; - beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + beframe = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "beframe"; ename = "beframe"; - version = "0.3.0.0.20230707.42330"; + version = "0.3.0.0.20231017.145435"; src = fetchurl { - url = "https://elpa.gnu.org/devel/beframe-0.3.0.0.20230707.42330.tar"; - sha256 = "12a7hhdjw9fy5mh3sj7jyb249vlmrl45r4wq4faap23mdnbygw49"; + url = "https://elpa.gnu.org/devel/beframe-0.3.0.0.20231017.145435.tar"; + sha256 = "1fnflpbnnjzfyccq6jcpwsq9byn7jda8mjhjynjk3l27jmzqd2g2"; }; packageRequires = [ emacs ]; meta = { @@ -472,10 +478,10 @@ elpaBuild { pname = "bind-key"; ename = "bind-key"; - version = "2.4.1.0.20230804.31751"; + version = "2.4.1.0.20230930.220905"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20230804.31751.tar"; - sha256 = "1h02g1lcl27fsz1jvisdy4fjp4ddknr9d1qj633bkmg3nrr06mr2"; + url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20230930.220905.tar"; + sha256 = "0mv8lmjsgklvh6g5m89qpzm3ncndf49di0fdjqg33y5vzdzfmiv2"; }; packageRequires = [ emacs ]; meta = { @@ -617,10 +623,10 @@ elpaBuild { pname = "buffer-env"; ename = "buffer-env"; - version = "0.4.0.20230909.111820"; + version = "0.5.0.20231008.102838"; src = fetchurl { - url = "https://elpa.gnu.org/devel/buffer-env-0.4.0.20230909.111820.tar"; - sha256 = "00rsklrirshsm8dimjkmjsj9yjrcff8ck42vnmlgwkrsvcdwilcc"; + url = "https://elpa.gnu.org/devel/buffer-env-0.5.0.20231008.102838.tar"; + sha256 = "0isxis03qgiq73zrizsv4xmmbdzqpcwh4kiva4kfiggz43xsk2g7"; }; packageRequires = [ compat emacs ]; meta = { @@ -707,10 +713,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "0.17.0.20230914.93805"; + version = "0.17.0.20230930.53703"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-0.17.0.20230914.93805.tar"; - sha256 = "1pfz85vnbp29sq8s2njl42v9s25w1q2px0n9vdichb7aik3dyfih"; + url = "https://elpa.gnu.org/devel/cape-0.17.0.20230930.53703.tar"; + sha256 = "1jfba9fm075bj9si4mn5c63yzc15a6qm5c4swm6bvz1rlcmyq7cz"; }; packageRequires = [ compat emacs ]; meta = { @@ -856,10 +862,10 @@ elpaBuild { pname = "code-cells"; ename = "code-cells"; - version = "0.3.0.20220917.143159"; + version = "0.3.0.20231015.132845"; src = fetchurl { - url = "https://elpa.gnu.org/devel/code-cells-0.3.0.20220917.143159.tar"; - sha256 = "1amsw75dm7d1iz9cj6nl36acg0im4yjx7x8xrf9a5252jnzz5xsw"; + url = "https://elpa.gnu.org/devel/code-cells-0.3.0.20231015.132845.tar"; + sha256 = "07d0y8xv5fzwmfma0xfmsm98ypvkwchscq0893d131y0q7cfx1gi"; }; packageRequires = [ emacs ]; meta = { @@ -874,10 +880,10 @@ elpaBuild { pname = "comint-mime"; ename = "comint-mime"; - version = "0.3.0.20230528.142235"; + version = "0.3.0.20231008.111300"; src = fetchurl { - url = "https://elpa.gnu.org/devel/comint-mime-0.3.0.20230528.142235.tar"; - sha256 = "0b4mwcfrnydjlqvljw61q2lnc2967lxlfmfz1ypyimcv7ijc2h7d"; + url = "https://elpa.gnu.org/devel/comint-mime-0.3.0.20231008.111300.tar"; + sha256 = "184811v36aa080fx2xkpx1p7fmd1s739apxryywpmisjq9alkkl9"; }; packageRequires = [ emacs ]; meta = { @@ -909,10 +915,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.9.13.0.20230805.204526"; + version = "0.10.2.0.20231016.232437"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-0.9.13.0.20230805.204526.tar"; - sha256 = "1z9kmx7r8wpy2vvzp6a12q48xcf43i0bqw56j2h0112h19m9zj8k"; + url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231016.232437.tar"; + sha256 = "16q3wlc1df8rlg67yihn33sshhg0c7lyvsajawf9xq92wqf2f5ik"; }; packageRequires = [ emacs ]; meta = { @@ -985,10 +991,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.2.0.20230909.101935"; + version = "29.1.4.2.0.20230927.210420"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-29.1.4.2.0.20230909.101935.tar"; - sha256 = "03lyxc9ikmvkh9vy9992azj502ljd0rqfhzjdw0ylm1a4cx7ksq7"; + url = "https://elpa.gnu.org/devel/compat-29.1.4.2.0.20230927.210420.tar"; + sha256 = "16apiq2aj82gmlg1xaqrrv6riikdb2m4iyg3b4abp472q8hwwfk5"; }; packageRequires = [ emacs seq ]; meta = { @@ -1000,10 +1006,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.35.0.20230914.154523"; + version = "0.35.0.20231020.193229"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-0.35.0.20230914.154523.tar"; - sha256 = "0gw61p4gsg1wwn5wf0qhh7lsbbh2aj3pbjj98aj5qpykdzfjj4wc"; + url = "https://elpa.gnu.org/devel/consult-0.35.0.20231020.193229.tar"; + sha256 = "1k96wpiyyylcmyd7hyi8yv0s5qrzipnkz9jpdwh0j53vy6yd7a7i"; }; packageRequires = [ compat emacs ]; meta = { @@ -1052,10 +1058,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.38.0.20230903.192458"; + version = "0.38.0.20231013.185720"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-0.38.0.20230903.192458.tar"; - sha256 = "1v3br4a9m0ywbm9z8w7kycmisbkyk691syrzwlz31snpm3xvg4aa"; + url = "https://elpa.gnu.org/devel/corfu-0.38.0.20231013.185720.tar"; + sha256 = "0573w5zgkchk5kkj2wb7sl1qrp88k99v44jv0cddrrn35r77hrpx"; }; packageRequires = [ compat emacs ]; meta = { @@ -1200,14 +1206,17 @@ license = lib.licenses.free; }; }) {}; - cursory = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + cursory = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "cursory"; ename = "cursory"; - version = "1.0.1.0.20230802.44321"; + version = "1.0.1.0.20230929.155749"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cursory-1.0.1.0.20230802.44321.tar"; - sha256 = "0ih37zhvr5p4q7ijix3fyi5vv26w0gc7vk53ns3n9yv4dnbprxdk"; + url = "https://elpa.gnu.org/devel/cursory-1.0.1.0.20230929.155749.tar"; + sha256 = "04kabcxz6rjiq43jz16af6aax93jl3pbsnaanmgqn16b3n89jsal"; }; packageRequires = [ emacs ]; meta = { @@ -1284,10 +1293,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.36.0.20230905.202240"; + version = "0.37.0.20231020.114541"; src = fetchurl { - url = "https://elpa.gnu.org/devel/debbugs-0.36.0.20230905.202240.tar"; - sha256 = "058ci84wj1p0j4iijkmq2ij62hqxaajxjbanl8yy9hix8ilz19y5"; + url = "https://elpa.gnu.org/devel/debbugs-0.37.0.20231020.114541.tar"; + sha256 = "1bzphx74h67jyfdz66p6d78knqddfgvzwk8w848r1lfw2jh2h6dc"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1314,10 +1323,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.0.0.0.20230915.85516"; + version = "2.0.0.0.20231020.121249"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20230915.85516.tar"; - sha256 = "0k5i4rr62a2rx7070xmpjfrmkq4906lrbbwpk0h0abn3dkaliagl"; + url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20231020.121249.tar"; + sha256 = "130k9ixw0n20zvhyj1b0k1363p8wa7q2klw9g8m9p4b6sslh7w5f"; }; packageRequires = [ emacs ]; meta = { @@ -1333,10 +1342,10 @@ elpaBuild { pname = "denote-menu"; ename = "denote-menu"; - version = "1.1.1.0.20230831.164141"; + version = "1.2.0.0.20230927.131718"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-menu-1.1.1.0.20230831.164141.tar"; - sha256 = "1799ni1l8v3h5mfqdrm7z6fi5bwnkmxw9mxcslq22wyhak1da0rp"; + url = "https://elpa.gnu.org/devel/denote-menu-1.2.0.0.20230927.131718.tar"; + sha256 = "1hm13sg6sif4620c78vma9qdgkpak0v1k3hfc35c946vzv8399x8"; }; packageRequires = [ denote emacs ]; meta = { @@ -1378,6 +1387,7 @@ }; }) {}; dict-tree = callPackage ({ elpaBuild + , emacs , fetchurl , heap , lib @@ -1386,12 +1396,12 @@ elpaBuild { pname = "dict-tree"; ename = "dict-tree"; - version = "0.16.0.20201214.122037"; + version = "0.17.0.20231015.24654"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dict-tree-0.16.0.20201214.122037.tar"; - sha256 = "0ax5xzmaf4zsbg95hf3d4khq1yf1zafc48vrpgfwgm2735mxsins"; + url = "https://elpa.gnu.org/devel/dict-tree-0.17.0.20231015.24654.tar"; + sha256 = "0snnya38i4pl583578rqykr7rj63qlfj6hygxivfpjaw187nqw27"; }; - packageRequires = [ heap tNFA trie ]; + packageRequires = [ emacs heap tNFA trie ]; meta = { homepage = "https://elpa.gnu.org/packages/dict-tree.html"; license = lib.licenses.free; @@ -1490,10 +1500,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.1.1.0.20230713.184118"; + version = "0.1.1.0.20231005.130135"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-preview-0.1.1.0.20230713.184118.tar"; - sha256 = "1vrm6k9sdbgsjbx6s0yz250n08sp6pg5rwgly2y0zwxdxmhkx7br"; + url = "https://elpa.gnu.org/devel/dired-preview-0.1.1.0.20231005.130135.tar"; + sha256 = "1rlcd0sbvgblgkaf0mp5xyci1cwbnd3ch6vwldk0jgb303j7ny9p"; }; packageRequires = [ emacs ]; meta = { @@ -1508,10 +1518,10 @@ elpaBuild { pname = "disk-usage"; ename = "disk-usage"; - version = "1.3.3.0.20220920.80620"; + version = "1.3.3.0.20230920.164444"; src = fetchurl { - url = "https://elpa.gnu.org/devel/disk-usage-1.3.3.0.20220920.80620.tar"; - sha256 = "0sf43dx83pa6zk0xv9v7g41xi3jqx5kw7xbdmlabg7xckkzlwk16"; + url = "https://elpa.gnu.org/devel/disk-usage-1.3.3.0.20230920.164444.tar"; + sha256 = "0x0rlvls7csj81cgmmdminq806f4l9rlcz3g45z6rnr1x6d236sh"; }; packageRequires = [ emacs ]; meta = { @@ -1556,10 +1566,10 @@ elpaBuild { pname = "do-at-point"; ename = "do-at-point"; - version = "0.1.0.0.20230828.165722"; + version = "0.1.1.0.20231002.131946"; src = fetchurl { - url = "https://elpa.gnu.org/devel/do-at-point-0.1.0.0.20230828.165722.tar"; - sha256 = "04s1bnjifmgz6hvxaf9vkzak0i96wnyaj9g7h7m3799q8azqz22p"; + url = "https://elpa.gnu.org/devel/do-at-point-0.1.1.0.20231002.131946.tar"; + sha256 = "1bqbfb2cj4qb46lximqz3nymdyq6lc5df74cvwksng09226nk9nj"; }; packageRequires = [ emacs ]; meta = { @@ -1652,10 +1662,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.18.0.20230913.153353"; + version = "0.8.18.0.20231021.161113"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ebdb-0.8.18.0.20230913.153353.tar"; - sha256 = "1fk23p4hgj91mkykn4bi4ps2836fqyn1yww79nsvc2yx2w0q8i7x"; + url = "https://elpa.gnu.org/devel/ebdb-0.8.18.0.20231021.161113.tar"; + sha256 = "0p6n69qzl3cpnhpyvfzn0pqmh0wjw2mrd4q4dnj4w4p9103g1z62"; }; packageRequires = [ emacs seq ]; meta = { @@ -1738,10 +1748,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.3.0.0.20230913.101951"; + version = "1.3.0.0.20231014.41130"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.3.0.0.20230913.101951.tar"; - sha256 = "0y81ry7dchz2swj01bgvw0gi00pnrk8gd7ysfayv6cswdk4a54yb"; + url = "https://elpa.gnu.org/devel/ef-themes-1.3.0.0.20231014.41130.tar"; + sha256 = "0sgyjwwna91mfj1knirx34hc27101lhpsnfw9ncb63790yw4sidd"; }; packageRequires = [ emacs ]; meta = { @@ -1763,10 +1773,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.15.0.20230911.130250"; + version = "1.15.0.20231021.100531"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.15.0.20230911.130250.tar"; - sha256 = "1c2hrbq3g6f2dkcw68hvx5nc73d8pkpvg66hw6rjlzg20a5bgr7d"; + url = "https://elpa.gnu.org/devel/eglot-1.15.0.20231021.100531.tar"; + sha256 = "0rgf0s76sbmabmv1wvghs2qapl3g23j58ka4ks9dd95nc004b8i6"; }; packageRequires = [ eldoc @@ -1807,10 +1817,10 @@ elpaBuild { pname = "eldoc"; ename = "eldoc"; - version = "1.14.0.0.20230602.82442"; + version = "1.14.0.0.20231016.70239"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eldoc-1.14.0.0.20230602.82442.tar"; - sha256 = "1wz7m96i4kdhijfcgim58w23znq1r5g9q0l0ivyjik550lmr69c7"; + url = "https://elpa.gnu.org/devel/eldoc-1.14.0.0.20231016.70239.tar"; + sha256 = "0rh009rw5682a7mdzli7s8r434mwacpxi7lz2aacsm1wmnz2g0g2"; }; packageRequires = [ emacs ]; meta = { @@ -1818,23 +1828,6 @@ license = lib.licenses.free; }; }) {}; - eldoc-eval = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "eldoc-eval"; - ename = "eldoc-eval"; - version = "0.2.0.20220106.195151"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/eldoc-eval-0.2.0.20220106.195151.tar"; - sha256 = "0lidijrg9ylwl80dljhkhsqdmrspfz5n3wdvrnibzvhlqyan7vd1"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/eldoc-eval.html"; - license = lib.licenses.free; - }; - }) {}; electric-spacing = callPackage ({ elpaBuild , fetchurl , lib }: @@ -1858,10 +1851,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.14.0.20221221.75401"; + version = "1.14.0.20230928.180802"; src = fetchurl { - url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.14.0.20221221.75401.tar"; - sha256 = "14gvzrcp32yg594g7pzxp7kic2zyrfqwn6a8ansil9adqsz8yarx"; + url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.14.0.20230928.180802.tar"; + sha256 = "0izajmxmbanlwkflp4fr2b8inka8i9p68bh93fvnp062cpk44pfj"; }; packageRequires = []; meta = { @@ -1891,10 +1884,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.22.1.0.20230915.70406"; + version = "0.23.0.20231007.130222"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-0.22.1.0.20230915.70406.tar"; - sha256 = "0sf2yl7wdifr9aa3xavb0v42vhbdly0g6halix3031acmlaib6q5"; + url = "https://elpa.gnu.org/devel/embark-0.23.0.20231007.130222.tar"; + sha256 = "0q15m0zccz3h9w88y3pbdy7g09yn317pyhf880gqpiwpbprd831b"; }; packageRequires = [ compat emacs ]; meta = { @@ -1911,10 +1904,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.7.0.20230915.70406"; + version = "0.8.0.20231007.130222"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-0.7.0.20230915.70406.tar"; - sha256 = "1m8qpca12a4g4pq7n5zz19lqpvyfx7ymznhz36q9q547b2af7769"; + url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231007.130222.tar"; + sha256 = "11c5r7j7hi5f91pn4dcx8z3i7p3lhrhqpj8jd6g36mwn3scb9m1b"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -1936,10 +1929,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.13pre0.20230914.231642"; + version = "0.14pre0.20231007.60132"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.13pre0.20230914.231642.tar"; - sha256 = "1531bxwz3ilwdkrkwcrlrp4v2ifz2s9l06fcwa895g7xa3wp3xi3"; + url = "https://elpa.gnu.org/devel/ement-0.14pre0.20231007.60132.tar"; + sha256 = "0ndvlrmmwlpn08pf45vg8qa9z8xjg41i03bw9x7lknlj27lk77c7"; }; packageRequires = [ emacs @@ -1965,10 +1958,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "16.0.20230818.103820"; + version = "16.0.20231017.153742"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-16.0.20230818.103820.tar"; - sha256 = "0p6dhvh5790q5qfyb3wm0jbbxhr3zkycnk64p6lx7r9jz03h5qxb"; + url = "https://elpa.gnu.org/devel/emms-16.0.20231017.153742.tar"; + sha256 = "02lvppyraqc66hb4q4smlcpccq3ggvhg6qj3ld66vmjl7gfasw1a"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2034,10 +2027,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6snapshot0.20230910.204449"; + version = "5.6snapshot0.20231020.152406"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20230910.204449.tar"; - sha256 = "0xxv3fy1cwbqvb4jk4nszmw6qh1i9aa0jii7cmwn42k3ciq62rbf"; + url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231020.152406.tar"; + sha256 = "18h6jkp051mmixrnfgqnkh0c21qfnpaxzhjnsxxaknp3v17rvm5d"; }; packageRequires = [ compat emacs ]; meta = { @@ -2116,17 +2109,18 @@ }; }) {}; expand-region = callPackage ({ elpaBuild + , emacs , fetchurl , lib }: elpaBuild { pname = "expand-region"; ename = "expand-region"; - version = "0.11.0.0.20200225.132539"; + version = "1.0.0.0.20231020.62055"; src = fetchurl { - url = "https://elpa.gnu.org/devel/expand-region-0.11.0.0.20200225.132539.tar"; - sha256 = "1fvjm2741q51zrd6i6smsg8l5vz1z2xiwwq2bhaq9dc1b8avpd2z"; + url = "https://elpa.gnu.org/devel/expand-region-1.0.0.0.20231020.62055.tar"; + sha256 = "15z23yil8jnpf8xgg9ham1r2sggvbshcxz9d380dd0ainp32n3ll"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/expand-region.html"; license = lib.licenses.free; @@ -2136,10 +2130,10 @@ elpaBuild { pname = "expreg"; ename = "expreg"; - version = "1.2.1.0.20230830.131742"; + version = "1.3.1.0.20230915.150818"; src = fetchurl { - url = "https://elpa.gnu.org/devel/expreg-1.2.1.0.20230830.131742.tar"; - sha256 = "10nb1k9ig61n11w7a5p59mq4n5nv7ma671vbclrm8ljv98259vfg"; + url = "https://elpa.gnu.org/devel/expreg-1.3.1.0.20230915.150818.tar"; + sha256 = "1wxayvfqc41c2qfqjmf8drzb0q7r5kyfygdl5l4c3idcm8agsim4"; }; packageRequires = [ emacs ]; meta = { @@ -2153,10 +2147,10 @@ elpaBuild { pname = "external-completion"; ename = "external-completion"; - version = "0.1.0.20230101.53112"; + version = "0.1.0.20230930.220905"; src = fetchurl { - url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20230101.53112.tar"; - sha256 = "042mjdaia5c267qlpc1s3cy3qhxdsa4hygqjbfir5z1mrks28z1v"; + url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20230930.220905.tar"; + sha256 = "1pipmg4j36cb7qp1jrw5hivwmsiic4pgvx9ahb9hyjwb110m3h52"; }; packageRequires = []; meta = { @@ -2168,10 +2162,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.27.0.20230910.0"; + version = "0.28.0.20231006.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/exwm-0.27.0.20230910.0.tar"; - sha256 = "1dc5k33i1yz6fms588fhi2820l4y88yhg9rxzz36ws7g58v72fbg"; + url = "https://elpa.gnu.org/devel/exwm-0.28.0.20231006.0.tar"; + sha256 = "1b7dpf6ahc76k22mdwvwdx72pm8z47l3bi050r12nd8vmbgmy0rh"; }; packageRequires = [ xelb ]; meta = { @@ -2266,19 +2260,14 @@ license = lib.licenses.free; }; }) {}; - flymake = callPackage ({ eldoc - , elpaBuild - , emacs - , fetchurl - , lib - , project }: + flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib, project }: elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.3.4.0.20230905.172742"; + version = "1.3.6.0.20230924.80727"; src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-1.3.4.0.20230905.172742.tar"; - sha256 = "13j7fxrb17rxg5lqiq6ladr8xvjskfccwsy4zwxln9h7sv8al0hz"; + url = "https://elpa.gnu.org/devel/flymake-1.3.6.0.20230924.80727.tar"; + sha256 = "0ldy6idm6kvrpx3d08wgalrv17s5vpwxqh339mq8ijv9qz7i39w4"; }; packageRequires = [ eldoc emacs project ]; meta = { @@ -2311,10 +2300,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "1.0.0.0.20230523.95022"; + version = "1.0.0.0.20230929.155942"; src = fetchurl { - url = "https://elpa.gnu.org/devel/fontaine-1.0.0.0.20230523.95022.tar"; - sha256 = "0s8fbjvkcz0627fdpf28myjhzw6bwlclwf4v9shld9vhsg7brhxk"; + url = "https://elpa.gnu.org/devel/fontaine-1.0.0.0.20230929.155942.tar"; + sha256 = "1xznn6w38p6riccwbnlqnqysaapssz18kwx0f9j4h07aam8d7kkg"; }; packageRequires = [ emacs ]; meta = { @@ -2474,10 +2463,10 @@ elpaBuild { pname = "gnome-c-style"; ename = "gnome-c-style"; - version = "0.1.0.20160130.1526"; + version = "0.1.0.20230924.235858"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gnome-c-style-0.1.0.20160130.1526.tar"; - sha256 = "0jj6xxn35iijzxipqna3kpks6ffg7gpp566riy7icifcq1pxkws1"; + url = "https://elpa.gnu.org/devel/gnome-c-style-0.1.0.20230924.235858.tar"; + sha256 = "0zp4dyqm04vk0168s7s972bzxajl0h4d3ywxqw7a6lj3ykjg1ir5"; }; packageRequires = []; meta = { @@ -2642,14 +2631,17 @@ license = lib.licenses.free; }; }) {}; - greader = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + greader = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "greader"; ename = "greader"; - version = "0.3.0.0.20230914.90609"; + version = "0.5.0.0.20230927.204955"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.3.0.0.20230914.90609.tar"; - sha256 = "1pqk8w20178njzaa9d6m7xpqj1ipxp4jw05x9zd9ifq5xpkr443k"; + url = "https://elpa.gnu.org/devel/greader-0.5.0.0.20230927.204955.tar"; + sha256 = "02kq8r2grdg8y2bjcw01d5wm5mkv4wir4yggs41cmgcwnk3gm1d1"; }; packageRequires = [ emacs ]; meta = { @@ -2832,10 +2824,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "8.0.1pre0.20230829.21756"; + version = "8.0.1pre0.20231009.215811"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20230829.21756.tar"; - sha256 = "19mx6nc1pr75s6p9i2vhyrbxrx56bmnlnpdwspyks98gr2jc20js"; + url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20231009.215811.tar"; + sha256 = "0dhrjdk3llxv5s5xfd849vqwr6f1fk411klgjn44szkgi9anbqdv"; }; packageRequires = [ emacs ]; meta = { @@ -2865,10 +2857,10 @@ elpaBuild { pname = "inspector"; ename = "inspector"; - version = "0.34.0.20230914.190620"; + version = "0.36.0.20230925.194622"; src = fetchurl { - url = "https://elpa.gnu.org/devel/inspector-0.34.0.20230914.190620.tar"; - sha256 = "0lx8vwgnh3y6fxdxb0mn0fz7a7xrqkca612fjwfm46nwwbb5j7lf"; + url = "https://elpa.gnu.org/devel/inspector-0.36.0.20230925.194622.tar"; + sha256 = "1pn6p9hiar9fsjxxs7wmz2kcfaf31pyhar2wmb3bkm1md98zhirx"; }; packageRequires = [ emacs ]; meta = { @@ -2898,10 +2890,10 @@ elpaBuild { pname = "isearch-mb"; ename = "isearch-mb"; - version = "0.7.0.20230218.111405"; + version = "0.7.0.20231020.185704"; src = fetchurl { - url = "https://elpa.gnu.org/devel/isearch-mb-0.7.0.20230218.111405.tar"; - sha256 = "1bvizhy320yln1h34dn31v9cwh0k83iwyqcqspj6qly89wnhn3zm"; + url = "https://elpa.gnu.org/devel/isearch-mb-0.7.0.20231020.185704.tar"; + sha256 = "080qsg5ykjkzmir2pi4dij0ayjjiwlq8129rmv6777dld2a1pdrm"; }; packageRequires = [ emacs ]; meta = { @@ -3028,10 +3020,10 @@ elpaBuild { pname = "jarchive"; ename = "jarchive"; - version = "0.10.0.0.20230118.130252"; + version = "0.11.0.0.20231010.221311"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jarchive-0.10.0.0.20230118.130252.tar"; - sha256 = "19mfqk255bj6f56r9flgx07s4ylf144l08w5id89qn4l6rbmjvrg"; + url = "https://elpa.gnu.org/devel/jarchive-0.11.0.0.20231010.221311.tar"; + sha256 = "0px6ki34v029i9wif1pzs500gqj1ppaj0zdn96535zk22b137dfn"; }; packageRequires = [ emacs ]; meta = { @@ -3076,10 +3068,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "0.9.0.20230914.104309"; + version = "0.9.0.20231019.170830"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-0.9.0.20230914.104309.tar"; - sha256 = "1z4xl9ij3dbfmjys5w9ihj6x1p8y2gbin64sa0p4jc3zx7nfh751"; + url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231019.170830.tar"; + sha256 = "13wd7xaa3grslycvykx4yglh669fqrrfpqz6715zifkd3mnl0ik3"; }; packageRequires = [ compat emacs ]; meta = { @@ -3162,10 +3154,10 @@ elpaBuild { pname = "jumpc"; ename = "jumpc"; - version = "3.0.0.20221221.80412"; + version = "3.1.0.20231015.14814"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jumpc-3.0.0.20221221.80412.tar"; - sha256 = "17phcxzqf2drxjmg19iyn9r8mlrzbj26c834p76p9887k05xcjyg"; + url = "https://elpa.gnu.org/devel/jumpc-3.1.0.20231015.14814.tar"; + sha256 = "04qd2n7lsfcxw0j3h27dfp6gkjzlgp6562gwydmqbwfrd87a7qdd"; }; packageRequires = []; meta = { @@ -3181,10 +3173,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.2.0.0.20230824.91306"; + version = "0.2.0.0.20230926.75840"; src = fetchurl { - url = "https://elpa.gnu.org/devel/kind-icon-0.2.0.0.20230824.91306.tar"; - sha256 = "0v1ic3q6cc5l09b6yx3dm9xd1wc0n5n6xc5f9vakak0xnjw8c88i"; + url = "https://elpa.gnu.org/devel/kind-icon-0.2.0.0.20230926.75840.tar"; + sha256 = "1z6c0bgkyn9qrbz0piq8wwxrcynxhzrwmlbz01d685r9bk09rvh4"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -3279,10 +3271,10 @@ elpaBuild { pname = "let-alist"; ename = "let-alist"; - version = "1.0.6.0.20230101.53112"; + version = "1.0.6.0.20230930.233523"; src = fetchurl { - url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20230101.53112.tar"; - sha256 = "068hdnbqr2jwfscwspf6zch0gwkcdpwj80zmrvi6dmixrnz65a9w"; + url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20230930.233523.tar"; + sha256 = "1j802kkxf4rhwjnnldv4brgjj4mmwlfyqmz065gv6a72y38i5lab"; }; packageRequires = [ emacs ]; meta = { @@ -3320,6 +3312,21 @@ license = lib.licenses.free; }; }) {}; + llm = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "llm"; + ename = "llm"; + version = "0.4.0.0.20231018.234129"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/llm-0.4.0.0.20231018.234129.tar"; + sha256 = "1zfqyqga38j319hy85pq7fqmma1x2p716z6zvydrnn0npnfnggry"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/llm.html"; + license = lib.licenses.free; + }; + }) {}; lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "lmc"; @@ -3451,10 +3458,10 @@ elpaBuild { pname = "map"; ename = "map"; - version = "3.3.1.0.20230730.132027"; + version = "3.3.1.0.20230930.220905"; src = fetchurl { - url = "https://elpa.gnu.org/devel/map-3.3.1.0.20230730.132027.tar"; - sha256 = "07mwm2y6h9q2c8058s1wg752rsi4hqpg2wr9apigvldli5fdwn72"; + url = "https://elpa.gnu.org/devel/map-3.3.1.0.20230930.220905.tar"; + sha256 = "0f9yyxb874qj66vwg63s8mah63pgg24ymz0japywbs9bhws892rj"; }; packageRequires = [ emacs ]; meta = { @@ -3470,10 +3477,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.3.0.20230910.73921"; + version = "1.3.0.20230925.162757"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.3.0.20230910.73921.tar"; - sha256 = "1zpjlh4vbgd6fkx78xgcgb6xz936y66dc9bxg43pxv732da8xs1j"; + url = "https://elpa.gnu.org/devel/marginalia-1.3.0.20230925.162757.tar"; + sha256 = "0g0ccxd2ks2av5lxbz5c3hi86jf10dizvm8ziday1v34lbp4f6hw"; }; packageRequires = [ compat emacs ]; meta = { @@ -3519,10 +3526,10 @@ elpaBuild { pname = "mct"; ename = "mct"; - version = "0.5.0.0.20230329.161705"; + version = "1.0.0.0.20230925.50052"; src = fetchurl { - url = "https://elpa.gnu.org/devel/mct-0.5.0.0.20230329.161705.tar"; - sha256 = "0wrxhlcwgbpkfp1p0djhqj09s6q484vyr3sxlvg9vvqk75v73brv"; + url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20230925.50052.tar"; + sha256 = "1splcr5aq3dc80i4rkqyxnadjrx7xg44hgiwi1sj353gf6q90q8h"; }; packageRequires = [ emacs ]; meta = { @@ -3650,10 +3657,10 @@ elpaBuild { pname = "mmm-mode"; ename = "mmm-mode"; - version = "0.5.9.0.20221228.193134"; + version = "0.5.10.0.20230917.2837"; src = fetchurl { - url = "https://elpa.gnu.org/devel/mmm-mode-0.5.9.0.20221228.193134.tar"; - sha256 = "0hmj27q8b10dsf3scjq9nslybpdip8bivd0h5dd5bc29mhazld8g"; + url = "https://elpa.gnu.org/devel/mmm-mode-0.5.10.0.20230917.2837.tar"; + sha256 = "1md34a8bgkf54n6qwylknknzzhql4779jh0pjl3xgnl09wvvdb74"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3668,10 +3675,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.2.0.0.20230913.154012"; + version = "4.3.0.0.20230926.152405"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.2.0.0.20230913.154012.tar"; - sha256 = "0lww916s07260fbqm9yfxkxijrb8z9pcgkcdkq07h89x6bb2dyjh"; + url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20230926.152405.tar"; + sha256 = "04fncghgdsz0fb1f49dr64nvy4as9wrvlxnc7jlx1im1dgjv9lcq"; }; packageRequires = [ emacs ]; meta = { @@ -3926,10 +3933,10 @@ elpaBuild { pname = "notmuch-indicator"; ename = "notmuch-indicator"; - version = "1.0.1.0.20230801.130142"; + version = "1.1.0.0.20231014.82644"; src = fetchurl { - url = "https://elpa.gnu.org/devel/notmuch-indicator-1.0.1.0.20230801.130142.tar"; - sha256 = "0c3iwgfaw4qy8a7s86nn82lqv1bw3cypmnr1bmyz4iyjdwfzb8xd"; + url = "https://elpa.gnu.org/devel/notmuch-indicator-1.1.0.0.20231014.82644.tar"; + sha256 = "0ami3zpjjq7q191cylw44q72yspxd6i8gximgm4kqb0mplk4dd1w"; }; packageRequires = [ emacs ]; meta = { @@ -3941,10 +3948,10 @@ elpaBuild { pname = "ntlm"; ename = "ntlm"; - version = "2.1.0.0.20230506.82958"; + version = "2.1.0.0.20230930.220905"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ntlm-2.1.0.0.20230506.82958.tar"; - sha256 = "0y4jd98bwv8bzypai2ahspknxgq0a90bn6pqfn9d65ddf611rswl"; + url = "https://elpa.gnu.org/devel/ntlm-2.1.0.0.20230930.220905.tar"; + sha256 = "02599spadf9ddbs1krgygfyi0xzjrqxrk5kmyq5ghx3vi24ngkda"; }; packageRequires = []; meta = { @@ -3982,6 +3989,23 @@ license = lib.licenses.free; }; }) {}; + ob-asymptote = callPackage ({ elpaBuild + , fetchurl + , lib }: + elpaBuild { + pname = "ob-asymptote"; + ename = "ob-asymptote"; + version = "1.0.0.20230908.121002"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ob-asymptote-1.0.0.20230908.121002.tar"; + sha256 = "0gldqmldbwa1rsfyzv9h1sl8za6i0k9j3lkar5capl5qs1c0lib1"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/ob-asymptote.html"; + license = lib.licenses.free; + }; + }) {}; ob-haxe = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ob-haxe"; @@ -4070,10 +4094,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.0.0.20230801.201828"; + version = "1.0.0.20230919.235319"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.0.0.20230801.201828.tar"; - sha256 = "1yn7rs9i2x75pv0nvwhm4dwrp7zj6lxgw8k516pari864ksk06zh"; + url = "https://elpa.gnu.org/devel/orderless-1.0.0.20230919.235319.tar"; + sha256 = "0j26253q0f6h016xpgxx6jy36mdi9sm5bvyki7i2374hmcp5lxd8"; }; packageRequires = [ emacs ]; meta = { @@ -4085,10 +4109,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20230915.103027"; + version = "9.7pre0.20231021.130825"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20230915.103027.tar"; - sha256 = "1c767dvr21xajsnwq9k3f3c6majyjw15i98kvh3n2wjxw07sldcb"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20231021.130825.tar"; + sha256 = "1vfgzgd7zwcnv55n7v542zn90irwjwsgn7z8kmxqg5cpyw0r2x06"; }; packageRequires = [ emacs ]; meta = { @@ -4143,10 +4167,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "0.10.0.20230905.80609"; + version = "0.10.0.20231019.184309"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-modern-0.10.0.20230905.80609.tar"; - sha256 = "09azhd2kp0b1am6c661gls7jn8aq3lq3bsy6lvkmaxasynidmgbm"; + url = "https://elpa.gnu.org/devel/org-modern-0.10.0.20231019.184309.tar"; + sha256 = "08mxrmhpqwdb5a9mpff5ld3m28j390k68pam2aalv07asppj9mz0"; }; packageRequires = [ compat emacs ]; meta = { @@ -4161,10 +4185,10 @@ elpaBuild { pname = "org-notify"; ename = "org-notify"; - version = "0.1.0.0.20221102.174044"; + version = "0.1.1.0.20231016.93952"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-notify-0.1.0.0.20221102.174044.tar"; - sha256 = "1jp3d7f63jkqhamihc7x1pmcj0k2bg1y8hp4akjdv5sfwxm2gr9q"; + url = "https://elpa.gnu.org/devel/org-notify-0.1.1.0.20231016.93952.tar"; + sha256 = "1bf7q55c63rxwsbbiyqb1z33jbhx04qi6qxx6jnfva6fz0v63ag2"; }; packageRequires = [ emacs ]; meta = { @@ -4200,10 +4224,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.2.1.0.20230821.73531"; + version = "1.2.1.0.20231007.205129"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-remark-1.2.1.0.20230821.73531.tar"; - sha256 = "1cfhfxm0rg3nnzdnkb85m5020fw4kg0kffzbh9s3lknlfvwvgs28"; + url = "https://elpa.gnu.org/devel/org-remark-1.2.1.0.20231007.205129.tar"; + sha256 = "0k9pinnm26psr40pa1rib91kj6lrk0dnnsgbywlx0nmrfhs35yd2"; }; packageRequires = [ emacs org ]; meta = { @@ -4283,10 +4307,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "0.13.0.20230825.91944"; + version = "0.14.0.20231014.133720"; src = fetchurl { - url = "https://elpa.gnu.org/devel/osm-0.13.0.20230825.91944.tar"; - sha256 = "13z4pz9q181jr9z66w2cn9ixh240x5dsyqjbjh455bqv2wf4kizl"; + url = "https://elpa.gnu.org/devel/osm-0.14.0.20231014.133720.tar"; + sha256 = "1zfjn4p30f5d6j3mwgc7asvb2p4jfl16svq98mx0q1n270bgs098"; }; packageRequires = [ compat emacs ]; meta = { @@ -4344,23 +4368,6 @@ license = lib.licenses.free; }; }) {}; - package-fixes = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "package-fixes"; - ename = "package-fixes"; - version = "0.0.20221221.81359"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/package-fixes-0.0.20221221.81359.tar"; - sha256 = "0n86dq8l2hwknilrx0871w8w4i9hnkndjj6q0yas5gm8jm4w0wfq"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/package-fixes.html"; - license = lib.licenses.free; - }; - }) {}; parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "parsec"; @@ -4544,10 +4551,10 @@ elpaBuild { pname = "poke-mode"; ename = "poke-mode"; - version = "3.0.0.20230312.110305"; + version = "3.1.0.20231014.222558"; src = fetchurl { - url = "https://elpa.gnu.org/devel/poke-mode-3.0.0.20230312.110305.tar"; - sha256 = "0zm1kgvf8qypzjg2c256s0lhp3idybl0dzwszaa1yjpv7hs792ky"; + url = "https://elpa.gnu.org/devel/poke-mode-3.1.0.20231014.222558.tar"; + sha256 = "0n73viyn9wia6qpbjilipf69lrmv11avznpbl6cmry3rryzdyn38"; }; packageRequires = []; meta = { @@ -4661,10 +4668,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.10.0.0.20230906.205430"; + version = "0.10.0.0.20231020.190403"; src = fetchurl { - url = "https://elpa.gnu.org/devel/project-0.10.0.0.20230906.205430.tar"; - sha256 = "1232sn36dvz8i34a1ywfvisnj88fyin26lkrm0gr0a18fvwcmaaw"; + url = "https://elpa.gnu.org/devel/project-0.10.0.0.20231020.190403.tar"; + sha256 = "07ywa9rf3gy4jjh4xpyp9v6sk39jiqc1nifklrvckm1mp84hl0qq"; }; packageRequires = [ emacs xref ]; meta = { @@ -4706,10 +4713,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "1.0.1.0.20230914.41539"; + version = "1.0.1.0.20230929.115806"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20230914.41539.tar"; - sha256 = "0k7gg130pv2xaa6zkar3nff907wfmzmpv56h2lbxwmmmf2ag6f0r"; + url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20230929.115806.tar"; + sha256 = "1rs8jnvj4g5m675srf3civhk52csm4nf7df81xscgvh6pafgyfvj"; }; packageRequires = [ emacs ]; meta = { @@ -4753,10 +4760,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.28.0.20230808.170856"; + version = "0.28.0.20230930.220905"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.28.0.20230808.170856.tar"; - sha256 = "1q72n1m1bkxgxs93ma4084wn3b53cssjqg3li89g8fpicd137i7b"; + url = "https://elpa.gnu.org/devel/python-0.28.0.20230930.220905.tar"; + sha256 = "1wx5r444rzbqhxj9gqhcxaliv7w8iqiscnbdnz2h8px1wdsfqxw9"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -4802,10 +4809,10 @@ elpaBuild { pname = "rainbow-mode"; ename = "rainbow-mode"; - version = "1.0.6.0.20221221.81735"; + version = "1.0.6.0.20230809.10050"; src = fetchurl { - url = "https://elpa.gnu.org/devel/rainbow-mode-1.0.6.0.20221221.81735.tar"; - sha256 = "1rwng66c7439m6dngl3b99162ranx6bwliy214vvv7i1qb92j3g7"; + url = "https://elpa.gnu.org/devel/rainbow-mode-1.0.6.0.20230809.10050.tar"; + sha256 = "1621pnk71r33b858rjmkab97sn26iwj010g9fl1fzv456w3bca1c"; }; packageRequires = []; meta = { @@ -4873,10 +4880,10 @@ elpaBuild { pname = "realgud"; ename = "realgud"; - version = "1.5.1.0.20230704.91526"; + version = "1.5.1.0.20231020.222710"; src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20230704.91526.tar"; - sha256 = "1cjpil5zdxwskw1r1in3w2zwqy9gyidz0wppzpxnfpfvk79vyf16"; + url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20231020.222710.tar"; + sha256 = "0lmq7x7x8cm6y8vp2gin1h6h7chkflj5fyzls4b61rh15yg8m1h0"; }; packageRequires = [ emacs load-relative loc-changes test-simple ]; meta = { @@ -5065,10 +5072,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.23.0.20230909.133412"; + version = "1.24.0.20231005.122642"; src = fetchurl { - url = "https://elpa.gnu.org/devel/relint-1.23.0.20230909.133412.tar"; - sha256 = "09qw51bmdvw2gdy8zikqk2982i8g3qjyrd4crm613kk1hcm44v52"; + url = "https://elpa.gnu.org/devel/relint-1.24.0.20231005.122642.tar"; + sha256 = "0xlb4i0zj225q8l4a9riagc7qv795bigygmqrlm81ypxqvbm3r5n"; }; packageRequires = [ emacs xr ]; meta = { @@ -5365,10 +5372,10 @@ elpaBuild { pname = "site-lisp"; ename = "site-lisp"; - version = "0.1.1.0.20230423.152517"; + version = "0.1.2.0.20231003.74326"; src = fetchurl { - url = "https://elpa.gnu.org/devel/site-lisp-0.1.1.0.20230423.152517.tar"; - sha256 = "1kx5zcd38m806piz3k1zqjykw5m5rwgs7lmz43rr46d3q920kniw"; + url = "https://elpa.gnu.org/devel/site-lisp-0.1.2.0.20231003.74326.tar"; + sha256 = "0a1l7cvibsrrhalr85vbg4g82y1z856krzia0h8pkv85mdjh1628"; }; packageRequires = [ emacs ]; meta = { @@ -5476,14 +5483,17 @@ license = lib.licenses.free; }; }) {}; - so-long = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + so-long = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "so-long"; ename = "so-long"; - version = "1.1.2.0.20230101.53112"; + version = "1.1.2.0.20231021.130558"; src = fetchurl { - url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20230101.53112.tar"; - sha256 = "03difjd7hd72a01b97sr30y2wk49nrh4imrlf0vfzgfii96n8k6i"; + url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20231021.130558.tar"; + sha256 = "0mvmb3b7z66qziifqhiny00iih5l9znb6fyn33ga0rvvnsra32n0"; }; packageRequires = [ emacs ]; meta = { @@ -5499,10 +5509,10 @@ elpaBuild { pname = "soap-client"; ename = "soap-client"; - version = "3.2.3.0.20230512.51050"; + version = "3.2.3.0.20230930.220905"; src = fetchurl { - url = "https://elpa.gnu.org/devel/soap-client-3.2.3.0.20230512.51050.tar"; - sha256 = "0cghw13gh8ck7p1kb5bxffqj98i4dnsvw6qbzl3fnh61libfpx7a"; + url = "https://elpa.gnu.org/devel/soap-client-3.2.3.0.20230930.220905.tar"; + sha256 = "1zj2935wfbr174pjvy5xb2h9szi9aaagr2967ri97qldbkgvjhq0"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -5619,10 +5629,10 @@ elpaBuild { pname = "sql-indent"; ename = "sql-indent"; - version = "1.6.0.20220728.130257"; + version = "1.7.0.20230922.224618"; src = fetchurl { - url = "https://elpa.gnu.org/devel/sql-indent-1.6.0.20220728.130257.tar"; - sha256 = "0l9dl2h7c034frdk59yh443zxblj2ry43v8dwp3mf6d3zgllvnwk"; + url = "https://elpa.gnu.org/devel/sql-indent-1.7.0.20230922.224618.tar"; + sha256 = "1clffdk29mq5cbgjw5if2sfmx1dvvhn10lapnrpfz560r2lfykvg"; }; packageRequires = [ cl-lib ]; meta = { @@ -5685,10 +5695,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "1.2.0.0.20230913.102100"; + version = "1.2.0.0.20230916.90636"; src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-1.2.0.0.20230913.102100.tar"; - sha256 = "092cbxk5yqdb07k6p0wp9pr70l7gksaq2crzis2iwp8mqsjd3vrq"; + url = "https://elpa.gnu.org/devel/standard-themes-1.2.0.0.20230916.90636.tar"; + sha256 = "0i1xqg65sbwm7xy26b116ips2769wa8yiqmyvcgsbsmig4vrydw8"; }; packageRequires = [ emacs ]; meta = { @@ -5733,10 +5743,10 @@ elpaBuild { pname = "svg"; ename = "svg"; - version = "1.1.0.20230101.53112"; + version = "1.1.0.20230930.220905"; src = fetchurl { - url = "https://elpa.gnu.org/devel/svg-1.1.0.20230101.53112.tar"; - sha256 = "0hd4xha8fhxx7ahirp3s03ylz13xdsdgy4bix6d0vhmz0hpiiwk8"; + url = "https://elpa.gnu.org/devel/svg-1.1.0.20230930.220905.tar"; + sha256 = "017piiqyi0kwrllmywyalfdddmm4h06ipx6srq97l4rj8hm8zikd"; }; packageRequires = [ emacs ]; meta = { @@ -5900,6 +5910,21 @@ license = lib.licenses.free; }; }) {}; + tam = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "tam"; + ename = "tam"; + version = "0.1.0.20230920.103516"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tam-0.1.0.20230920.103516.tar"; + sha256 = "1asfy9kflslpmci639pjcb8pr9ndb4as1075lvy9xfk74lif4zx6"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tam.html"; + license = lib.licenses.free; + }; + }) {}; taxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "taxy"; @@ -5957,10 +5982,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.8.0.20230810.233751"; + version = "0.8.0.20230915.222920"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tempel-0.8.0.20230810.233751.tar"; - sha256 = "0m982zs65vpk1sp9sasy4jpy3l4npqw6hzxn7687d0gplnjs1agw"; + url = "https://elpa.gnu.org/devel/tempel-0.8.0.20230915.222920.tar"; + sha256 = "1lsc3d8sqydbhyrd9ja43y06i0qxwc0dns2n4rnnb8039y2dvfnn"; }; packageRequires = [ compat emacs ]; meta = { @@ -5975,10 +6000,10 @@ elpaBuild { pname = "test-simple"; ename = "test-simple"; - version = "1.3.0.0.20200722.214339"; + version = "1.3.0.0.20230916.123447"; src = fetchurl { - url = "https://elpa.gnu.org/devel/test-simple-1.3.0.0.20200722.214339.tar"; - sha256 = "0q7b6y7qw8arhcx0cmhx0y1bmj84zk0nqjlgvra9bav07wb9xxm9"; + url = "https://elpa.gnu.org/devel/test-simple-1.3.0.0.20230916.123447.tar"; + sha256 = "0wd0br7bc2lis9iy3ilnwjiav971rp0n8iad60b2n2jdhcdwbk6s"; }; packageRequires = [ cl-lib ]; meta = { @@ -6072,10 +6097,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.1.2.0.20230830.72111"; + version = "2.6.1.3.0.20230929.72305"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-2.6.1.2.0.20230830.72111.tar"; - sha256 = "01ff3i8cji5hs4vjkf87bv866184n1c9v59sjmnywzmqgpgn1z5n"; + url = "https://elpa.gnu.org/devel/tramp-2.6.1.3.0.20230929.72305.tar"; + sha256 = "1k0hmnr7wnkmahmqxcg2km2cr44h3fiv4x4kv9h0297jqqi2jiq4"; }; packageRequires = [ emacs ]; meta = { @@ -6144,10 +6169,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.4.3.0.20230915.191143"; + version = "0.4.3.0.20230919.214625"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20230915.191143.tar"; - sha256 = "0538szrz1xmj2sf0p7j5b5y00v4a9dl98rjqyz35qwgkqmzmh0n9"; + url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20230919.214625.tar"; + sha256 = "1b4dlgk6x22mpacd4wiinlh5sjgprhabha7wq7dfcsgv7mqhk5z2"; }; packageRequires = [ compat emacs ]; meta = { @@ -6181,10 +6206,10 @@ elpaBuild { pname = "tree-inspector"; ename = "tree-inspector"; - version = "0.3.0.20230505.172252"; + version = "0.4.0.20230925.193758"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tree-inspector-0.3.0.20230505.172252.tar"; - sha256 = "0hk961pkpnyyk9jxsd52hqhhx7gvgp8680ypc2d96ylxs6mfvkjx"; + url = "https://elpa.gnu.org/devel/tree-inspector-0.4.0.20230925.193758.tar"; + sha256 = "0ncg9yhngzn7cspqna62i21v8rra4hczpz74xckgzs34s98mv4y7"; }; packageRequires = [ emacs treeview ]; meta = { @@ -6196,10 +6221,10 @@ elpaBuild { pname = "trie"; ename = "trie"; - version = "0.5.0.20201214.113408"; + version = "0.6.0.20231015.13107"; src = fetchurl { - url = "https://elpa.gnu.org/devel/trie-0.5.0.20201214.113408.tar"; - sha256 = "0z7nagf0fyd0qi4fnc04b2dp03xiwaw97c8lrqd6ii2vvnbxiw84"; + url = "https://elpa.gnu.org/devel/trie-0.6.0.20231015.13107.tar"; + sha256 = "00qghzzm9584vigfijkgghbnn9yqnlqddqv8khbn5k13zbrslbcv"; }; packageRequires = [ heap tNFA ]; meta = { @@ -6230,10 +6255,10 @@ elpaBuild { pname = "typo"; ename = "typo"; - version = "1.0.1.0.20230725.200324"; + version = "1.0.1.0.20230730.150555"; src = fetchurl { - url = "https://elpa.gnu.org/devel/typo-1.0.1.0.20230725.200324.tar"; - sha256 = "01280xwdm1n0x1n4avhy0zh6xl8dhxvzskhdarknszqz6yhxrc9x"; + url = "https://elpa.gnu.org/devel/typo-1.0.1.0.20230730.150555.tar"; + sha256 = "1fsv4jka06bgp6b39g9y28npbrb1i1rxvyamy95qw10nlsnw1130"; }; packageRequires = [ emacs ]; meta = { @@ -6337,16 +6362,17 @@ , elpaBuild , fetchurl , lib + , nadvice , ntlm ? null }: elpaBuild { pname = "url-http-ntlm"; ename = "url-http-ntlm"; - version = "2.0.4.0.20221221.82537"; + version = "2.0.4.0.20231015.130736"; src = fetchurl { - url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.4.0.20221221.82537.tar"; - sha256 = "0j67dwalw22ykdkvp5qf03b54gimx855c0aasfdi271hq9hi8jm2"; + url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.4.0.20231015.130736.tar"; + sha256 = "0gpkr7m2kwnz7pmj6y4xn41175jy9vaxsj5f7glzd3w1xklr4hg0"; }; - packageRequires = [ cl-lib ntlm ]; + packageRequires = [ cl-lib nadvice ntlm ]; meta = { homepage = "https://elpa.gnu.org/packages/url-http-ntlm.html"; license = lib.licenses.free; @@ -6373,10 +6399,10 @@ elpaBuild { pname = "url-scgi"; ename = "url-scgi"; - version = "0.9.0.20230905.134155"; + version = "0.9.0.20231009.93301"; src = fetchurl { - url = "https://elpa.gnu.org/devel/url-scgi-0.9.0.20230905.134155.tar"; - sha256 = "1cm3brj9jqh18da8bm6qfg893wcrffnqab6jb3qh92k4cxq4b7wb"; + url = "https://elpa.gnu.org/devel/url-scgi-0.9.0.20231009.93301.tar"; + sha256 = "056ycnpx1s8ndsls0vl5gfv5z6fi8inp692jcn9dxw49dja7fn63"; }; packageRequires = [ emacs ]; meta = { @@ -6392,10 +6418,10 @@ elpaBuild { pname = "use-package"; ename = "use-package"; - version = "2.4.5.0.20230115.133305"; + version = "2.4.5.0.20231022.75512"; src = fetchurl { - url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20230115.133305.tar"; - sha256 = "1xjyhd6wkf1z4jx7ffh1y6kk8yi44h4qrckwybwfj6zhiil42cjq"; + url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20231022.75512.tar"; + sha256 = "0cvsqrbamg9nxcjxqiq6avjyk027dxxzskgnvv0drrlsgcvb3yai"; }; packageRequires = [ bind-key emacs ]; meta = { @@ -6541,10 +6567,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2023.6.6.141322628.0.20230606.214619"; + version = "2023.6.6.141322628.0.20231013.132356"; src = fetchurl { - url = "https://elpa.gnu.org/devel/verilog-mode-2023.6.6.141322628.0.20230606.214619.tar"; - sha256 = "1gm5p32kcg9nisbic5pfnbyy5hmj598s6wma285x8hpd0fhypgn5"; + url = "https://elpa.gnu.org/devel/verilog-mode-2023.6.6.141322628.0.20231013.132356.tar"; + sha256 = "024gy1wjf1m6ip9pzs0373vrvci8dqxp6hyqv5j1s9imb1j5ps63"; }; packageRequires = []; meta = { @@ -6556,10 +6582,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.4.0.20230912.93924"; + version = "1.4.0.20231015.92801"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.4.0.20230912.93924.tar"; - sha256 = "1fi1y67rpzahpl9p6kzhz341ghalkn6r7pqlr0q13an7im6jcps1"; + url = "https://elpa.gnu.org/devel/vertico-1.4.0.20231015.92801.tar"; + sha256 = "0h73z4jbwd3pmn3rfgbklnrslcd0d60h1fg3j5ykbgqd770gklhc"; }; packageRequires = [ compat emacs ]; meta = { @@ -6637,16 +6663,16 @@ license = lib.licenses.free; }; }) {}; - vlf = callPackage ({ elpaBuild, fetchurl, lib }: + vlf = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "vlf"; ename = "vlf"; - version = "1.7.2.0.20201128.5141"; + version = "1.7.2.0.20231016.224412"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vlf-1.7.2.0.20201128.5141.tar"; - sha256 = "12m43ykq92hfnq91z27sabzj7gbjpl624k7acpg641909hm5nq1b"; + url = "https://elpa.gnu.org/devel/vlf-1.7.2.0.20231016.224412.tar"; + sha256 = "01r9li0pqypm37j0qh0aj29xvljvbcngsws0cc8bi1f8s9zlrnmw"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/vlf.html"; license = lib.licenses.free; @@ -6656,10 +6682,10 @@ elpaBuild { pname = "vundo"; ename = "vundo"; - version = "2.1.0.0.20230619.221715"; + version = "2.1.0.0.20230928.182756"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vundo-2.1.0.0.20230619.221715.tar"; - sha256 = "1vl1wfk68fy9jcr8dm673g8qbf5ax557fpb5wwpijffrsyss9qzk"; + url = "https://elpa.gnu.org/devel/vundo-2.1.0.0.20230928.182756.tar"; + sha256 = "148c6c4bndj09lns44a85ja3r3q6frspvcqzx2iidb1ryyj79gx5"; }; packageRequires = [ emacs ]; meta = { @@ -6875,6 +6901,23 @@ license = lib.licenses.free; }; }) {}; + wrap-search = callPackage ({ elpaBuild + , fetchurl + , lib }: + elpaBuild { + pname = "wrap-search"; + ename = "wrap-search"; + version = "4.12.10.0.20231002.184917"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/wrap-search-4.12.10.0.20231002.184917.tar"; + sha256 = "0svxaqjalqny3q3xbkn60zni30m2r9wyfqhjlxx9zxyf05d1dypg"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/wrap-search.html"; + license = lib.licenses.free; + }; + }) {}; xclip = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "xclip"; @@ -6939,10 +6982,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.24.0.20230901.120103"; + version = "1.25.0.20231005.122612"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xr-1.24.0.20230901.120103.tar"; - sha256 = "1v0qhsnw0szzss44n3yn7gdy4y21pxy9dln16xs3zdh2ggybivs4"; + url = "https://elpa.gnu.org/devel/xr-1.25.0.20231005.122612.tar"; + sha256 = "0sj2cyxdfykk3gfw3v9d93mzssxiassj5vhzl76sm8dy59z93z4y"; }; packageRequires = [ emacs ]; meta = { @@ -6954,10 +6997,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.6.3.0.20230902.15920"; + version = "1.6.3.0.20231009.180303"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20230902.15920.tar"; - sha256 = "13pqfn8psnm45l91k9n8770ym4hpq4hdp9233i6368y8i4pq2wa0"; + url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20231009.180303.tar"; + sha256 = "146bvnaxzfqjbpib8cm7mlq4j2695wh9czwi9lfbx5k8npakjrih"; }; packageRequires = [ emacs ]; meta = { @@ -7025,10 +7068,10 @@ elpaBuild { pname = "zones"; ename = "zones"; - version = "2019.7.13.0.20221212.231608"; + version = "2023.6.11.0.20231018.110342"; src = fetchurl { - url = "https://elpa.gnu.org/devel/zones-2019.7.13.0.20221212.231608.tar"; - sha256 = "1z7r295c2l1hxpz587szzbyxhig3b9siicwf3j1b31s8csdjzkvl"; + url = "https://elpa.gnu.org/devel/zones-2023.6.11.0.20231018.110342.tar"; + sha256 = "1hd4jlmy50050d1pr1r7civwv908ildpywr2525znhhh9nd29b9p"; }; packageRequires = []; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 8a0b0558e111..2e3016f1a73f 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -190,10 +190,10 @@ elpaBuild { pname = "altcaps"; ename = "altcaps"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/altcaps-1.1.0.tar"; - sha256 = "15jfhn9v74zi779a0m0v5dx8h135pbsxx0rh472sl13q2ark97bk"; + url = "https://elpa.gnu.org/packages/altcaps-1.2.0.tar"; + sha256 = "0pfd3j8x2ayqnvg418qcm4rkxjvm5qm2ks9xsw4irv04452zhahc"; }; packageRequires = [ emacs ]; meta = { @@ -265,10 +265,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.2.1"; + version = "13.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.2.1.tar"; - sha256 = "0q914q1qm5w0yx9cqfmyxzbzxmrdkz321cazy7g7l4mc5qndb9nm"; + url = "https://elpa.gnu.org/packages/auctex-13.2.2.tar"; + sha256 = "1k8ypxp2iwg7a0m5lyk1sy5chcnmas0gs6frk6xw6k0r974f193s"; }; packageRequires = [ emacs ]; meta = { @@ -535,10 +535,10 @@ elpaBuild { pname = "buffer-env"; ename = "buffer-env"; - version = "0.4"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/buffer-env-0.4.tar"; - sha256 = "0y8ik87dqldhn6q631zp2ln9z5byqgm9icrvr4xrdx6g8mr9c56z"; + url = "https://elpa.gnu.org/packages/buffer-env-0.5.tar"; + sha256 = "17q0flxp0rp52ksyh5ijcamvvm003icbyzv28r6vknrw3qsphb3p"; }; packageRequires = [ compat emacs ]; meta = { @@ -794,10 +794,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.9.13"; + version = "0.10.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.13.tar"; - sha256 = "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw"; + url = "https://elpa.gnu.org/packages/company-0.10.2.tar"; + sha256 = "0j2qrnx2w2al4f2n37b89q0pkabh5ccv00gsknvgaylhy0za5gq9"; }; packageRequires = [ emacs ]; meta = { @@ -1132,10 +1132,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.36"; + version = "0.37"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.36.tar"; - sha256 = "1rzv13shadbvy583vjj4zg13v920zpiqrsnn10r3cqqyli89ivn2"; + url = "https://elpa.gnu.org/packages/debbugs-0.37.tar"; + sha256 = "0xj0sv5d3y88fsbm7yhm0v59mzj1srxayng1hr418v89ky43rxpr"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1177,10 +1177,10 @@ elpaBuild { pname = "denote-menu"; ename = "denote-menu"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-menu-1.1.1.tar"; - sha256 = "12ry0rv45hv1vrwx9wih72s9h0f3r18xssnkzfa9ilp77kgbas5q"; + url = "https://elpa.gnu.org/packages/denote-menu-1.2.0.tar"; + sha256 = "1zm68bz6hya360g5zvs4r5naznykamgzqxhvfhpfyxb70hsnmx5w"; }; packageRequires = [ denote emacs ]; meta = { @@ -1218,16 +1218,22 @@ license = lib.licenses.free; }; }) {}; - dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }: + dict-tree = callPackage ({ elpaBuild + , emacs + , fetchurl + , heap + , lib + , tNFA + , trie }: elpaBuild { pname = "dict-tree"; ename = "dict-tree"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dict-tree-0.16.tar"; - sha256 = "1myf26g3jjk2v8yp3k2n8m45vi20452wd7w2bja8csfkk0qx3300"; + url = "https://elpa.gnu.org/packages/dict-tree-0.17.tar"; + sha256 = "0f9vj6kr8q9mfd522svwy3wmzsl5lc4y2p8ggwmckn88dpz79w02"; }; - packageRequires = [ heap tNFA trie ]; + packageRequires = [ emacs heap tNFA trie ]; meta = { homepage = "https://elpa.gnu.org/packages/dict-tree.html"; license = lib.licenses.free; @@ -1372,10 +1378,10 @@ elpaBuild { pname = "do-at-point"; ename = "do-at-point"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/do-at-point-0.1.0.tar"; - sha256 = "01xr3fn10z3986ibhglkx7gbcly0wklagk5yhx7cln1sc5dihkv1"; + url = "https://elpa.gnu.org/packages/do-at-point-0.1.1.tar"; + sha256 = "0y58a0x0pfk52h1cz930sbwr9y6nzy9g8f3935pk34dj2jf92rsj"; }; packageRequires = [ emacs ]; meta = { @@ -1617,21 +1623,6 @@ license = lib.licenses.free; }; }) {}; - eldoc-eval = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "eldoc-eval"; - ename = "eldoc-eval"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/eldoc-eval-0.2.tar"; - sha256 = "09g9y1w1dlq3s8sqzczgaj02y53x616ak9w3kynq53pwgaxq14j4"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/eldoc-eval.html"; - license = lib.licenses.free; - }; - }) {}; electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "electric-spacing"; @@ -1681,10 +1672,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.22.1"; + version = "0.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-0.22.1.tar"; - sha256 = "0dxbvrp057a0kyydnf8vfwnf4m3q3jy4180agcmizlr64lm2pmh1"; + url = "https://elpa.gnu.org/packages/embark-0.23.tar"; + sha256 = "03qmhi5wlx4wpj8fnqx352cwnx0czrj6majr18hyavx5cih8i8v6"; }; packageRequires = [ compat emacs ]; meta = { @@ -1701,10 +1692,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.7"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-consult-0.7.tar"; - sha256 = "12b8p2f1bpy43jzjz3ask9h38z23hq4nxkid5dljnpmvf31d8x9c"; + url = "https://elpa.gnu.org/packages/embark-consult-0.8.tar"; + sha256 = "1l6fcrf9hx7ll6zrm3igh80nkcig6i7fqwicm3dy9rwsjyjlmy2f"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -1726,10 +1717,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ement-0.12.tar"; - sha256 = "0v63xfvkdijf8wfy7kafqrqxclq2jvk4amp69kzxx9i0gnp90hzi"; + url = "https://elpa.gnu.org/packages/ement-0.13.tar"; + sha256 = "15pi9d5nxg3d7xnh36xpd0fa94fv3yra5imqpwbzz98d4wyacrv8"; }; packageRequires = [ emacs @@ -1878,16 +1869,16 @@ license = lib.licenses.free; }; }) {}; - expand-region = callPackage ({ elpaBuild, fetchurl, lib }: + expand-region = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "expand-region"; ename = "expand-region"; - version = "0.11.0"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/expand-region-0.11.0.tar"; - sha256 = "1q6xaqkv40z4c6rgdkxqqkvxgsaj8yjqjrxi40kz5y0ck3bjrk0i"; + url = "https://elpa.gnu.org/packages/expand-region-1.0.0.tar"; + sha256 = "04xwdcxahymppcyvkfh2bn2f4fs4f8z27kycva67i6qldhashq7y"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/expand-region.html"; license = lib.licenses.free; @@ -1897,10 +1888,10 @@ elpaBuild { pname = "expreg"; ename = "expreg"; - version = "1.2.1"; + version = "1.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/expreg-1.2.1.tar"; - sha256 = "13m08my5pl8k5gj78lpkh0lh05mrbkphg0k0bb40aw4rbnv7yr7v"; + url = "https://elpa.gnu.org/packages/expreg-1.3.1.tar"; + sha256 = "13s3hq6nfnv4md2z704ad1axqnir0drz9vvhvisrlp2lis16xzik"; }; packageRequires = [ emacs ]; meta = { @@ -1927,10 +1918,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.27"; + version = "0.28"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.27.tar"; - sha256 = "094k33clmxhnab0wniyrs48sdz28kna2g6fmkhsd7n20nmhhc4sn"; + url = "https://elpa.gnu.org/packages/exwm-0.28.tar"; + sha256 = "00h5awqazk807zxvb02a9dp8gd5ifi3y1kcwmr1czk6kdmkjx32l"; }; packageRequires = [ xelb ]; meta = { @@ -2020,10 +2011,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.3.4"; + version = "1.3.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.3.4.tar"; - sha256 = "0gm08rj83if9cs0jz7zig363zfqp809j6lgaqdb0apzh48fbznkd"; + url = "https://elpa.gnu.org/packages/flymake-1.3.6.tar"; + sha256 = "1ihv8gh77849rrdc6qpbpjdw7ikr4biaibw6aggv3hzjf508dzi8"; }; packageRequires = [ eldoc emacs project ]; meta = { @@ -2367,10 +2358,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.3.0"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/greader-0.3.0.tar"; - sha256 = "1g0djxa8zplw9dmlpg5263wbhp80nkj4wispyikh09cc2lppidw8"; + url = "https://elpa.gnu.org/packages/greader-0.5.0.tar"; + sha256 = "11rcppg3850dbrvwsp3y814bibkv0h35rc5sf4w9qlmd5rc5ilxj"; }; packageRequires = [ emacs ]; meta = { @@ -2569,10 +2560,10 @@ elpaBuild { pname = "inspector"; ename = "inspector"; - version = "0.34"; + version = "0.36"; src = fetchurl { - url = "https://elpa.gnu.org/packages/inspector-0.34.tar"; - sha256 = "1r1gcrhcxixm15ygi4i8brxdpic5a1i2248m7fgwvzij4bvhcg5h"; + url = "https://elpa.gnu.org/packages/inspector-0.36.tar"; + sha256 = "139w0qc99grd6yzxkpfblgddnbza02mh4hhcpbjgsm4bwdxq8az0"; }; packageRequires = [ emacs ]; meta = { @@ -2709,10 +2700,10 @@ elpaBuild { pname = "jarchive"; ename = "jarchive"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jarchive-0.10.0.tar"; - sha256 = "0hgxfz6kqammgbr6cx7l8bg9hmakamrkbzbsjycb4k0gbi4r567b"; + url = "https://elpa.gnu.org/packages/jarchive-0.11.0.tar"; + sha256 = "1hn0lyszm667a54j95v2ppddz4g89cp8byj9pd3k1gha2rplm9d8"; }; packageRequires = [ emacs ]; meta = { @@ -2829,10 +2820,10 @@ elpaBuild { pname = "jumpc"; ename = "jumpc"; - version = "3.0"; + version = "3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jumpc-3.0.el"; - sha256 = "1vhggw3mzaq33al8f16jbg5qq5f95s8365is9qqyb8yq77gqym6a"; + url = "https://elpa.gnu.org/packages/jumpc-3.1.tar"; + sha256 = "04wqajw4i7sslsw8cwqbw30kbwwf9qlqxjm17v0bsxh5sp27y1jc"; }; packageRequires = []; meta = { @@ -2980,6 +2971,21 @@ license = lib.licenses.free; }; }) {}; + llm = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "llm"; + ename = "llm"; + version = "0.4.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/llm-0.4.0.tar"; + sha256 = "0jq1q9gmm3nbdsycca2qkjpf04qpp9j615z6l41plmfv7bc0p0x6"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/llm.html"; + license = lib.licenses.free; + }; + }) {}; lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "lmc"; @@ -3164,10 +3170,10 @@ elpaBuild { pname = "mct"; ename = "mct"; - version = "0.5.0"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mct-0.5.0.tar"; - sha256 = "0yv0hqkyh5vpmf5i50fdc2rw3ssvrd9pn3n65v3gmb195gzmn6r9"; + url = "https://elpa.gnu.org/packages/mct-1.0.0.tar"; + sha256 = "1gzk0bjvry8wzi35yvghz003rbkz7ky4zd9vafg328b809n9ggff"; }; packageRequires = [ emacs ]; meta = { @@ -3284,10 +3290,10 @@ elpaBuild { pname = "mmm-mode"; ename = "mmm-mode"; - version = "0.5.9"; + version = "0.5.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mmm-mode-0.5.9.tar"; - sha256 = "12fss1ccb66xc87m5wpr3vg7bfrzz5m0q6s7pa0avvhsm2f8r2yh"; + url = "https://elpa.gnu.org/packages/mmm-mode-0.5.10.tar"; + sha256 = "1ny9gm87qah4qy0iphw2nlhz2pfc87hzzsv58lrxl18gr69qhndi"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3299,10 +3305,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-4.2.0.tar"; - sha256 = "0bki4h3rs1ch47sygb4nib8960lyvvgs7yxgsy009il3hfxzdgsq"; + url = "https://elpa.gnu.org/packages/modus-themes-4.3.0.tar"; + sha256 = "0zsglzqc36bw9r7fgvxjdcrdjar6xwad29kwyqd2k36bq3pivzq3"; }; packageRequires = [ emacs ]; meta = { @@ -3533,10 +3539,10 @@ elpaBuild { pname = "notmuch-indicator"; ename = "notmuch-indicator"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/notmuch-indicator-1.0.1.tar"; - sha256 = "1n5k2ikk93mdwqqysf6l7gd8i6iazk8yvbqpf8xnz5zny248cc2x"; + url = "https://elpa.gnu.org/packages/notmuch-indicator-1.1.0.tar"; + sha256 = "0k5csfrs8y1r6g7hs2y0961jpx0ih090kb6rkijljny2qhfj0573"; }; packageRequires = [ emacs ]; meta = { @@ -3589,6 +3595,21 @@ license = lib.licenses.free; }; }) {}; + ob-asymptote = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "ob-asymptote"; + ename = "ob-asymptote"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ob-asymptote-1.0.tar"; + sha256 = "0m9i21zailg7drglm19v9ysyigzvz3p2r3q069a3n04di56d4629"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/ob-asymptote.html"; + license = lib.licenses.free; + }; + }) {}; ob-haxe = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ob-haxe"; @@ -3683,10 +3704,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.6.9"; + version = "9.6.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.6.9.tar"; - sha256 = "1ixn20gb2mv3bg9h4p0kyqjqr74dsbv9c7n7s2646ff2b9i6l9bv"; + url = "https://elpa.gnu.org/packages/org-9.6.10.tar"; + sha256 = "1lv503jf556hrv9s85q8sk6lg0rwxkchp2sn0sgdki208l0im8wj"; }; packageRequires = [ emacs ]; meta = { @@ -3743,10 +3764,10 @@ elpaBuild { pname = "org-notify"; ename = "org-notify"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-notify-0.1.0.tar"; - sha256 = "1ijwlv8493g19cascv7fl23sjljvdcak6pg4y1wbs595mmsmh409"; + url = "https://elpa.gnu.org/packages/org-notify-0.1.1.tar"; + sha256 = "0y0zj7sri7m0q3nibwv0m1snkwhma403hbxpcd346xk3s3ljiz2k"; }; packageRequires = [ emacs ]; meta = { @@ -3848,10 +3869,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "0.13"; + version = "0.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/osm-0.13.tar"; - sha256 = "13bdp8cz1w396vdfxvv8ygla7cbln178rjliknhfl3kqggg32kqx"; + url = "https://elpa.gnu.org/packages/osm-0.14.tar"; + sha256 = "03zzdz7l76006x5540121ckbyd5gm10x30k9r43dlj7myd359i90"; }; packageRequires = [ compat emacs ]; meta = { @@ -4058,10 +4079,10 @@ elpaBuild { pname = "poke-mode"; ename = "poke-mode"; - version = "3.0"; + version = "3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/poke-mode-3.0.tar"; - sha256 = "0xw50x3fx3ai3rsykh371hwlgkmyx4h37ps2583l69f7id7h2103"; + url = "https://elpa.gnu.org/packages/poke-mode-3.1.tar"; + sha256 = "1lirhws5d8l16qs5ddrvvz0f9xfl004q9yp333pdgsmcpk3ww7sr"; }; packageRequires = []; meta = { @@ -4508,10 +4529,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.23"; + version = "1.24"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.23.tar"; - sha256 = "0cyv9hjlyxy1c2394544ljq5d4prhi296y9j2zy6p1lq6irncmv9"; + url = "https://elpa.gnu.org/packages/relint-1.24.tar"; + sha256 = "0wc7jzapzc4s7v7yqwp315ymbs6xighy2clx1ylvf60zs49y2bwm"; }; packageRequires = [ emacs xr ]; meta = { @@ -4769,10 +4790,10 @@ elpaBuild { pname = "site-lisp"; ename = "site-lisp"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/site-lisp-0.1.1.tar"; - sha256 = "05fdh7hv3dwm8li4qsyrm9j6zdj43k82al1p5z9ir6xmy1r5b571"; + url = "https://elpa.gnu.org/packages/site-lisp-0.1.2.tar"; + sha256 = "07704nz5rrzixmvw65h79rf4fpnf58jrrgbp1brvknidp6j95r0n"; }; packageRequires = [ emacs ]; meta = { @@ -4998,10 +5019,10 @@ elpaBuild { pname = "sql-indent"; ename = "sql-indent"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sql-indent-1.6.tar"; - sha256 = "000pimlg0k4mrv2wpqq8w8l51wpr1lzlaq6ai8iaximm2a92ap5b"; + url = "https://elpa.gnu.org/packages/sql-indent-1.7.tar"; + sha256 = "043qcy97a5hx68w0ac7xsk380l2i7bphgrdz6aby2zfpp90vrjpn"; }; packageRequires = [ cl-lib ]; meta = { @@ -5219,6 +5240,21 @@ license = lib.licenses.free; }; }) {}; + tam = callPackage ({ elpaBuild, emacs, fetchurl, lib, queue }: + elpaBuild { + pname = "tam"; + ename = "tam"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tam-0.1.tar"; + sha256 = "1f66la9mmw1frpy2k9vr9k1q2x3b1y9018z43rdhrp50zx1b2vsg"; + }; + packageRequires = [ emacs queue ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tam.html"; + license = lib.licenses.free; + }; + }) {}; taxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "taxy"; @@ -5382,10 +5418,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.1.2"; + version = "2.6.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.6.1.2.tar"; - sha256 = "0nazcrpkwy59dxbyzarj75zvz7vh4pgq4yzqgf6zfbvqp7q73wbn"; + url = "https://elpa.gnu.org/packages/tramp-2.6.1.3.tar"; + sha256 = "0z7q55yilwicgzl2m69r275pq6bzpyksxcjaf8fb3bcr3zvzil0y"; }; packageRequires = [ emacs ]; meta = { @@ -5472,10 +5508,10 @@ elpaBuild { pname = "tree-inspector"; ename = "tree-inspector"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tree-inspector-0.3.tar"; - sha256 = "1hns99rfga8p85ylbr4ri14wyfcxf0bcni0fyr09awipxrpn6ikq"; + url = "https://elpa.gnu.org/packages/tree-inspector-0.4.tar"; + sha256 = "0jsd32qk9rap8mhmm6qkyafvb6c2gyaa0adzdsh3bh03byi3sj6c"; }; packageRequires = [ emacs treeview ]; meta = { @@ -5487,10 +5523,10 @@ elpaBuild { pname = "trie"; ename = "trie"; - version = "0.5"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/trie-0.5.tar"; - sha256 = "1qbzxw7h3p3k3r3fzq66pj223vjiw20dvaljkb8w3r5q16fnav3p"; + url = "https://elpa.gnu.org/packages/trie-0.6.tar"; + sha256 = "0vh0cizpbdiaq0y018rkrzjyv6lq0jwv9pwlvggbjfsz34kd10a4"; }; packageRequires = [ heap tNFA ]; meta = { @@ -6107,6 +6143,21 @@ license = lib.licenses.free; }; }) {}; + wrap-search = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "wrap-search"; + ename = "wrap-search"; + version = "4.12.10"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/wrap-search-4.12.10.tar"; + sha256 = "0r1ggggpm7x201r5yp0nhnc9146nrqzb5df1bjg7z2am2150r1i9"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/wrap-search.html"; + license = lib.licenses.free; + }; + }) {}; xclip = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "xclip"; @@ -6171,10 +6222,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.24"; + version = "1.25"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-1.24.tar"; - sha256 = "04g7qx6qmhp98pw5iwdhspln9sg9jzjq2zp3nmq3q1yl82pzd214"; + url = "https://elpa.gnu.org/packages/xr-1.25.tar"; + sha256 = "0w4gaxypl76d1jw9vcq0zhj7ksj44wyfb148l1fb0vl7h6wpv0pg"; }; packageRequires = [ emacs ]; meta = { @@ -6249,10 +6300,10 @@ elpaBuild { pname = "zones"; ename = "zones"; - version = "2019.7.13"; + version = "2023.6.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/zones-2019.7.13.el"; - sha256 = "0qp1ba2pkqx9d35g7z8hf8qs2k455krf2a92l4rka3ipsbnmq5k1"; + url = "https://elpa.gnu.org/packages/zones-2023.6.11.tar"; + sha256 = "1znz720s9pchc7r9g1mpz9jcnz122bppimmh09g1rn94fh3m6vm3"; }; packageRequires = []; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index c9f36d4e49dc..063e4cac1f56 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -64,10 +64,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-2.0.2.tar"; - sha256 = "03iigyh9s378jif2vaaii8d31nag6mzairmgl9ffhmryz08jkig1"; + url = "https://elpa.nongnu.org/nongnu/annotate-2.0.3.tar"; + sha256 = "1kq195nmspysb1kiqcfh0kwxzp40ij9ccw1c204ayr40a0wp7ilc"; }; packageRequires = []; meta = { @@ -257,6 +257,21 @@ license = lib.licenses.free; }; }) {}; + blueprint-ts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "blueprint-ts-mode"; + ename = "blueprint-ts-mode"; + version = "0.0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode-0.0.2.tar"; + sha256 = "0fyvff2zh6iiswhxcvqgnxdhq3yk5f0w4a2w0jp126fvd3ryspym"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/blueprint-ts-mode.html"; + license = lib.licenses.free; + }; + }) {}; boxquote = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "boxquote"; @@ -276,10 +291,10 @@ elpaBuild { pname = "buttercup"; ename = "buttercup"; - version = "1.31"; + version = "1.32"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/buttercup-1.31.tar"; - sha256 = "1aw9k3dfscqpq2jkk1yqh6i3682yjs85fnm7rzc5i9qawrl9db6h"; + url = "https://elpa.nongnu.org/nongnu/buttercup-1.32.tar"; + sha256 = "07vxs1iq38m7ng9wia8h6q2sy4cdykv03jksqjqyqaab4cl7yl27"; }; packageRequires = [ emacs ]; meta = { @@ -321,10 +336,10 @@ elpaBuild { pname = "cdlatex"; ename = "cdlatex"; - version = "4.18.2"; + version = "4.18.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.2.tar"; - sha256 = "1sqmb7qcvdphkrak9bxw3xs0fdlv5vn36ckcqiannpm870s7ajnk"; + url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.3.tar"; + sha256 = "0zz73csyjagq4vfv1fdnzwg4jhscggg3vk75kjdl78dg1ly191iz"; }; packageRequires = []; meta = { @@ -341,14 +356,15 @@ , queue , seq , sesman - , spinner }: + , spinner + , transient }: elpaBuild { pname = "cider"; ename = "cider"; - version = "1.7.0"; + version = "1.8.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.7.0.tar"; - sha256 = "0x0acszamylmmly6h8s56lskd5l7lm8hdnf8rbvjd89v0j2anb0l"; + url = "https://elpa.nongnu.org/nongnu/cider-1.8.3.tar"; + sha256 = "0c77rlpyda4x05fj3d10cpww0pkbsjcbrvwcwy4gh74c9m9xmq1d"; }; packageRequires = [ clojure-mode @@ -358,6 +374,7 @@ seq sesman spinner + transient ]; meta = { homepage = "https://elpa.gnu.org/packages/cider.html"; @@ -368,10 +385,10 @@ elpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "5.17.0"; + version = "5.18.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.17.0.tar"; - sha256 = "189kyj57q4v8m9r9cd9q2x9db42vl5vb1qvww401lxlappc58fmw"; + url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.18.0.tar"; + sha256 = "1wh1r3kdjya7aqnnm6ask9q93pxm7h6ff4b7p6lrhwg4iyn2njss"; }; packageRequires = [ emacs ]; meta = { @@ -383,10 +400,10 @@ elpaBuild { pname = "clojure-ts-mode"; ename = "clojure-ts-mode"; - version = "0.1.5"; + version = "0.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.1.5.tar"; - sha256 = "1py4kxw2w9ggkl8ljchbcry14v9anxn9zinbdfls9x120y1cljsa"; + url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.2.0.tar"; + sha256 = "1jb6n84pk2ybrihh1s472q77pmnn288p4bzvhga0sxxqg88ial2p"; }; packageRequires = [ emacs ]; meta = { @@ -620,10 +637,10 @@ elpaBuild { pname = "dracula-theme"; ename = "dracula-theme"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/dracula-theme-1.8.1.tar"; - sha256 = "0j7m9z4y6jh0wlbi8xrg5syjaybhxs4karwshh1919ajzjs0f8ql"; + url = "https://elpa.nongnu.org/nongnu/dracula-theme-1.8.2.tar"; + sha256 = "17szqyl63nn66sxdz403kcd2diif5afvgv6abgqkw6x01bsr11i0"; }; packageRequires = [ emacs ]; meta = { @@ -646,16 +663,16 @@ license = lib.licenses.free; }; }) {}; - eat = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + eat = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "eat"; ename = "eat"; - version = "0.8"; + version = "0.9.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/eat-0.8.tar"; - sha256 = "1nvwd8iryjdcbm3v2xjgnf4ifcbs4d8hxn7xydxw6i7c5l8vya9f"; + url = "https://elpa.nongnu.org/nongnu/eat-0.9.3.tar"; + sha256 = "1dck6vvyn1y94z18p1b0kh3x4i587x8x5pk5bin56vwpkw05s40d"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/eat.html"; license = lib.licenses.free; @@ -725,10 +742,10 @@ elpaBuild { pname = "engine-mode"; ename = "engine-mode"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/engine-mode-2.2.3.tar"; - sha256 = "07r5g2xrss175m622npna7c51ra4im7l69mkqp6689m2954g23wk"; + url = "https://elpa.nongnu.org/nongnu/engine-mode-2.2.4.tar"; + sha256 = "0azc1l9dbalbsd5mcfg1adbkyyy1n4195grzr96w9d7cs7ds23ya"; }; packageRequires = [ cl-lib ]; meta = { @@ -914,6 +931,40 @@ license = lib.licenses.free; }; }) {}; + evil-surround = callPackage ({ elpaBuild, evil, fetchurl, lib }: + elpaBuild { + pname = "evil-surround"; + ename = "evil-surround"; + version = "1.0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-surround-1.0.4.tar"; + sha256 = "1cc6n05j7a3q3n8hzxrhgjwk2a79h0llidh0sqhq5bc9d8ygrl2s"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.gnu.org/packages/evil-surround.html"; + license = lib.licenses.free; + }; + }) {}; + evil-visual-mark-mode = callPackage ({ dash + , elpaBuild + , evil + , fetchurl + , lib }: + elpaBuild { + pname = "evil-visual-mark-mode"; + ename = "evil-visual-mark-mode"; + version = "0.0.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-visual-mark-mode-0.0.5.tar"; + sha256 = "1k7slwf6m1brwy40j7j4j6qw4jna4sh0llbywsimdj63zral3fki"; + }; + packageRequires = [ dash evil ]; + meta = { + homepage = "https://elpa.gnu.org/packages/evil-visual-mark-mode.html"; + license = lib.licenses.free; + }; + }) {}; evil-visualstar = callPackage ({ elpaBuild, evil, fetchurl, lib }: elpaBuild { pname = "evil-visualstar"; @@ -1609,16 +1660,17 @@ , lib , map , persist - , plz }: + , plz + , transient }: elpaBuild { pname = "hyperdrive"; ename = "hyperdrive"; - version = "0.1.0"; + version = "0.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.1.0.tar"; - sha256 = "1dawm6wxwik7jks0xc2ina2nikdg9x4cnnws4srcf15vwh40van4"; + url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.2.tar"; + sha256 = "1cvsl7caprdms83mvhlv3crk4ylka1g0swg0klqld04hayzikq0z"; }; - packageRequires = [ compat emacs map persist plz ]; + packageRequires = [ compat emacs map persist plz transient ]; meta = { homepage = "https://elpa.gnu.org/packages/hyperdrive.html"; license = lib.licenses.free; @@ -1697,10 +1749,10 @@ elpaBuild { pname = "inf-ruby"; ename = "inf-ruby"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.7.0.tar"; - sha256 = "0wzzhr10q8mnai024g5nprsnl0bcdlqfrh4nxf8qq43paah28i6f"; + url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.8.0.tar"; + sha256 = "1ax2sab4rm5alg12n2k6bz1xwv0mi0jvxx5xmjzavjxl4x6qckxy"; }; packageRequires = [ emacs ]; meta = { @@ -1727,10 +1779,10 @@ elpaBuild { pname = "iwindow"; ename = "iwindow"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/iwindow-1.0.tar"; - sha256 = "076i0p9kq48hxkkwzzapnni6cpdr25hdrw9bs2cly8w4v5rmd6rj"; + url = "https://elpa.nongnu.org/nongnu/iwindow-1.1.tar"; + sha256 = "1sx0dqm7wwq05qaxqyrsg8v57i5ghzaq2hcdrywjq5x3cl5rmw17"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -1942,10 +1994,10 @@ elpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "1.0.1"; + version = "1.0.12"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.1.tar"; - sha256 = "0xj5zsmacj68amcq9kshin5ddjhpyjyfhkc7nafzbjk63fnscjnb"; + url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.12.tar"; + sha256 = "1raq11350y5cpfzq7c8xmrsnl728fw0796bn1prbrrlly20rqxc2"; }; packageRequires = [ emacs persist request ]; meta = { @@ -2397,10 +2449,10 @@ elpaBuild { pname = "parseedn"; ename = "parseedn"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/parseedn-1.1.0.tar"; - sha256 = "1by9cy7pn12124vbg59c9qmn2k8v5dbqq4c8if81fclrccjqhrz4"; + url = "https://elpa.nongnu.org/nongnu/parseedn-1.2.0.tar"; + sha256 = "10y6mpjzxpmg029j0kysyxqqxdc82wwhkxh79sf8hz1ffks2ysmm"; }; packageRequires = [ emacs map parseclj ]; meta = { @@ -2507,10 +2559,10 @@ elpaBuild { pname = "projectile"; ename = "projectile"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/projectile-2.7.0.tar"; - sha256 = "1ibxsa1lv9aiplkfplamyn2wc2c6vfwfszyaicfx79aq2w9427bg"; + url = "https://elpa.nongnu.org/nongnu/projectile-2.8.0.tar"; + sha256 = "0j3zd1i6c0vinizg6ini0wqgkczqm48g7m5ihp1njq34c6pgpx7y"; }; packageRequires = [ emacs ]; meta = { @@ -2555,10 +2607,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20230905.102118"; + version = "1.0.20230919.113921"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230905.102118.tar"; - sha256 = "1109aq0q81r6r79vpazrn2r1dwpzpxgashrz1p4lbjh4mk8a16ka"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230919.113921.tar"; + sha256 = "00b4bw4cqm9yc8fxz14da5ahrjrmshf3497l8p65ss0s6qby5ag3"; }; packageRequires = [ emacs ]; meta = { @@ -2645,10 +2697,10 @@ elpaBuild { pname = "rfc-mode"; ename = "rfc-mode"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.4.0.tar"; - sha256 = "0036ypsjm35x8vwrlm346wcqmh85kbjmw0813q65z6k0gvmnwldj"; + url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.4.2.tar"; + sha256 = "1b2n52qn7s0zc2xxi45xp9zvlws963l3b45v9q0r1yr8mpbvcb9l"; }; packageRequires = [ emacs ]; meta = { @@ -2934,10 +2986,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.2.4.tar"; - sha256 = "05pnjdrf9gq32bayvbd0yvp1lxpwj2xsarcy3s2jjb6zcgm6djyb"; + url = "https://elpa.nongnu.org/nongnu/subed-1.2.5.tar"; + sha256 = "0qaliyn79zkpy3ppqb0s61i5hfbbcj8climj7x9c6vpq86s57mv1"; }; packageRequires = [ emacs ]; meta = { @@ -2949,10 +3001,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.24.1"; + version = "0.25.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.24.1.tar"; - sha256 = "0aw8xzh72zwam0f91d9w1x43hi477xgh0qk4rv732j3hs3fbxb4z"; + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.25.5.tar"; + sha256 = "1gxy68a26h65rzf8815iifcnr67rpw69ll14d4cbq9qsxvrmy50h"; }; packageRequires = [ compat emacs ]; meta = { @@ -2964,10 +3016,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "9.0.0"; + version = "9.1.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swift-mode-9.0.0.tar"; - sha256 = "1s69mm7yhz1dhxz118ik7nxqw6gliivbwv1qvylk8nz2lhr8sf9n"; + url = "https://elpa.nongnu.org/nongnu/swift-mode-9.1.0.tar"; + sha256 = "1zx25g2jdkc78pjhl36gwrc3kj5wxayfl8vgkl3k5gqsa7bjjbjm"; }; packageRequires = [ emacs seq ]; meta = { @@ -3120,10 +3172,10 @@ elpaBuild { pname = "treeview"; ename = "treeview"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/treeview-1.1.1.tar"; - sha256 = "0ryycz2n1kam3ji0ibpy99ll5l6xnx1mx9i9bgfvma61f0ppcppd"; + url = "https://elpa.nongnu.org/nongnu/treeview-1.2.0.tar"; + sha256 = "1vwkqnjj380w13xxj670da4kyqsxmjcsivaqd8k6w7bs59yrljkr"; }; packageRequires = [ emacs ]; meta = { @@ -3370,10 +3422,10 @@ elpaBuild { pname = "workroom"; ename = "workroom"; - version = "2.3"; + version = "2.3.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/workroom-2.3.tar"; - sha256 = "0c05pbxkrcgsjk7zcyxiacxrpxyvf85rf38nhaqhxbywh4j071fg"; + url = "https://elpa.nongnu.org/nongnu/workroom-2.3.1.tar"; + sha256 = "1rwixacz8dwws54dvm9dbrwnjh8xpqp1j594hwd4xfq9z1kfzz4f"; }; packageRequires = [ compat emacs project ]; meta = { @@ -3418,10 +3470,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "24.10.20230911080522"; + version = "24.13.20231009115302"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.10.20230911080522.tar"; - sha256 = "07k3v9gf7hbnicrggspd8xx2qwmd5x0vrfmy0x8fx21d61fylqvh"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.13.20231009115302.tar"; + sha256 = "0k530ihjjwcvl24f815nk9jqfnbhzb95xlfm8721dlsbrsmsaiwc"; }; packageRequires = [ emacs ]; meta = { @@ -3444,16 +3496,16 @@ license = lib.licenses.free; }; }) {}; - xml-rpc = callPackage ({ elpaBuild, fetchurl, lib }: + xml-rpc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xml-rpc"; ename = "xml-rpc"; - version = "1.6.16"; + version = "1.6.17"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.16.tar"; - sha256 = "0gglrrnicbsf1lrk4pwmif5658yrhx80ixgi5hm85p8yxarn3ynm"; + url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.17.tar"; + sha256 = "0k029lsyz1gpx88pprx5nj2qzkgk6dfc9kvna6a94r6m14brrgyc"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/xml-rpc.html"; license = lib.licenses.free; @@ -3463,10 +3515,10 @@ elpaBuild { pname = "yaml-mode"; ename = "yaml-mode"; - version = "0.0.15"; + version = "0.0.16"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/yaml-mode-0.0.15.tar"; - sha256 = "19r2kc894dd59f0r3q4gx52iw5cwj5gi1jjkmi8r9y0dya50rzfx"; + url = "https://elpa.nongnu.org/nongnu/yaml-mode-0.0.16.tar"; + sha256 = "19j90sss45gvs76nl1fxi0xahbygy2v639ziwcj93d9vs2p9axs0"; }; packageRequires = [ emacs ]; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 7da2af7a8387..955c3a07519c 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -197,6 +197,24 @@ } }, { + "ename": "aangit", + "commit": "33f6e08b349198de9c26c7c1b6dcc9a18bc78008", + "sha256": "1ym8jvll030c2zvmdlbdmmwi87bsrydwj4apbl6dzpsgk9cx6h4z", + "fetcher": "github", + "repo": "stephenwithav/aangit", + "unstable": { + "version": [ + 20231017, + 2022 + ], + "deps": [ + "transient" + ], + "commit": "68aeb3761b732daedd468c9f7593947cf4cb1d9a", + "sha256": "1rrh5ki6c7haykpm5ijlgzq771p40b8gc1af0j2nlrhhxwz5f4jv" + } + }, + { "ename": "aas", "commit": "30cedefefdab6d423bfc8851463a7892c266be70", "sha256": "0nn740r5w62a783ky9nsm3bzagcvamj0psd120vkdx28ml3g9xyr", @@ -1063,8 +1081,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20230529, - 1404 + 20230925, + 801 ], "deps": [ "dash", @@ -1074,8 +1092,8 @@ "s", "xcscope" ], - "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", - "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" + "commit": "586f4e8a46aac9236cb5af57c3f70a9878375702", + "sha256": "0jwhg52z448f4f18k32arq80hbdj3j9vshp42b4sr9v1mixv6vfc" }, "stable": { "version": [ @@ -1711,11 +1729,11 @@ "repo": "brownts/ada-ts-mode", "unstable": { "version": [ - 20230814, - 1220 + 20231015, + 1449 ], - "commit": "4fbfc5bac2aebe6c10ba27165a1d85b85ebe5f93", - "sha256": "11f2yxpq8xafa4z7xl3qqzwhwf4jq950v90q9hmxsm8ig8nh1wm2" + "commit": "6aa772c4cbb08b84e1c6712c98517e4afa495e23", + "sha256": "1ff08pkirkwxcgsw4kfca5h5x7mjz3z2j3nkkz5an36awi3v35is" } }, { @@ -1881,11 +1899,11 @@ "repo": "jessieh/adwaita-dark-theme", "unstable": { "version": [ - 20230215, - 2027 + 20231016, + 1744 ], - "commit": "4792fed63a44a2337832644db909c1663100605e", - "sha256": "0nrvdx3lzkdaiy99mq9ramp4zd7fp4bhksbjb1mk3al6f9026kvg" + "commit": "de32d1da1d04a43c413370eb94b0a338ce1cab27", + "sha256": "0nab5ib8zqs584lm3lswc1wqciyh9vpnp83acyg9s4a11r2isnmh" }, "stable": { "version": [ @@ -2042,6 +2060,29 @@ } }, { + "ename": "agenix", + "commit": "4056ea5e38bdc17a506795d3581cce730b2dba5b", + "sha256": "1sy9n65d0ykvjpj295qxq2qd6xb6shfq8vj72ysv5fcwql2r97w2", + "fetcher": "github", + "repo": "t4ccer/agenix.el", + "unstable": { + "version": [ + 20231016, + 614 + ], + "commit": "c3afc8d109dc19bfe2f97ce47184ca748dbe4816", + "sha256": "0h7lk050c7arhnvv2anlgqq39r3690fw9l0n8bjk5qh38dsgwmah" + }, + "stable": { + "version": [ + 1, + 2 + ], + "commit": "c3afc8d109dc19bfe2f97ce47184ca748dbe4816", + "sha256": "0h7lk050c7arhnvv2anlgqq39r3690fw9l0n8bjk5qh38dsgwmah" + } + }, + { "ename": "aggressive-fill-paragraph", "commit": "982f5936f2d83222263df2886ca0b629076366bb", "sha256": "1df4bk3ks09805y67af6z1gpfln0lz773jzbbckfl0fy3yli0dja", @@ -2177,6 +2218,30 @@ } }, { + "ename": "aiken-mode", + "commit": "7bb5e73e6e3ad0b70a8df76329d8d63c252e9d4b", + "sha256": "0p6z42zalh0n22mb3drs8qaa8n979bh47f81gfh41hjwvb3hxbyr", + "fetcher": "github", + "repo": "aiken-lang/aiken-mode", + "unstable": { + "version": [ + 20230920, + 1210 + ], + "commit": "1af54e4df02eb52cf62034acbe1c6dd54776d843", + "sha256": "10sadlqnrqq2mr1igqi2xjnhpl4x12hy575h1q1cghzadxqq2jp3" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "commit": "1af54e4df02eb52cf62034acbe1c6dd54776d843", + "sha256": "10sadlqnrqq2mr1igqi2xjnhpl4x12hy575h1q1cghzadxqq2jp3" + } + }, + { "ename": "aio", "commit": "95744cc13e7ac8d9acd794004d951f62e5880fa4", "sha256": "0sd8g2w4n9r2ndmp353v89xvky8043vmd92v2ggbl45chhpjl5zw", @@ -2596,14 +2661,14 @@ "repo": "wyuenho/all-the-icons-dired", "unstable": { "version": [ - 20230908, - 2208 + 20231007, + 2324 ], "deps": [ "all-the-icons" ], - "commit": "28f6f6c478f230c27526ef7a91afdf82d472c24b", - "sha256": "155cvmvl59ma72714r1hagd9fxyqjan74d3bv3ygqhx302qjcj4m" + "commit": "b3dd838e93325145bb55cec69d8b0a2b6f1bc348", + "sha256": "1igikh0nlzxh4lkcgmi9smvw2lqad2zxmbss6hd69m01h7mqg6k7" }, "stable": { "version": [ @@ -3333,11 +3398,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20230830, - 1428 + 20230930, + 1443 ], - "commit": "dbdd2a4663c49581a9bca77d4ea08e6eb98dbdcc", - "sha256": "19irn1k9lv2p2g54czb1n64bcknrpxlagjkk8lnibqfzz3pgqh27" + "commit": "eae9e73f2e36e421d7981aa2f47addc7993cc88f", + "sha256": "0y2qa0xg09w2a8wjrjrwcgh4f7im2wn2gyh28y5g73pvybchl2lg" }, "stable": { "version": [ @@ -3382,11 +3447,10 @@ "version": [ 2, 6, - 3, - 20230914 + 4 ], - "commit": "87a4e2f654ad9d3881e1afa284ba2792bb408315", - "sha256": "00f15pbdhf62vg4llk973c4b4scp4vwwcpk4vkyzfbpsjdq1bz9i" + "commit": "f42acb696e43d382639f04f869e9a99ab36a91c6", + "sha256": "0n4avd58j45rdcmnwgrmz5s0ril0z4n2z711mwwbahl50f7359ky" } }, { @@ -3752,11 +3816,11 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20230909, - 2313 + 20231021, + 1841 ], - "commit": "e944e24584393c1a4df130885b489795f7676567", - "sha256": "1167b28fk6bzgi9y3k5f03hb5r6nmskx08r5l9w2b8sbjmhlajqg" + "commit": "f4157e8c397896c0b984472ef7f82f444e0fc3e2", + "sha256": "1ama6x8dk5x2fw9jxwfcbygy96mx477zl368j46pjq91dkix6z48" }, "stable": { "version": [ @@ -3912,11 +3976,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20230915, - 2201 + 20230925, + 114 ], - "commit": "6618e26a833fdd2fbddf32075f1953cc4f86cb03", - "sha256": "0ip5xl24gjsyf07g22n044nbq4nn66nw87wlc2igfznh5bdiw9qw" + "commit": "ac2e16d23528dbc4efe1844f54366b9392d20ae6", + "sha256": "1rv0bj09lyylc3pq7vyg2y0pgpnx0lzmbvfjvpslmprb9vhfqbdg" }, "stable": { "version": [ @@ -4504,6 +4568,30 @@ } }, { + "ename": "asyncloop", + "commit": "4300e2f8e8377e95b432a179dffd51047727822e", + "sha256": "0xqac12hkfn6wcq2h9b8xvfq6isj9fvhcy18inb6x91gk93vhsab", + "fetcher": "github", + "repo": "meedstrom/asyncloop", + "unstable": { + "version": [ + 20231021, + 2251 + ], + "commit": "8ab4e373e7bd3217cad4d4130ac765abc5b83add", + "sha256": "157z9yr74a0m38vi1n2zl6rzm5d1vnzg963bvhrymdpxn7s2wcrc" + }, + "stable": { + "version": [ + 0, + 3, + 3 + ], + "commit": "1cab3bfbc8966fb72a6830ecb960906ffd1dc800", + "sha256": "11b9bi5znxhxwh6gxqrx27r47kxvwda02d45jy6djvndy3wbfygv" + } + }, + { "ename": "atcoder-tools", "commit": "314396ec5a51460ad679ee9fcf3aa3970cd44229", "sha256": "1rlsqqc7p351yyzmad4dvxrp5aj2788sg04019ybk83kacy0y5hf", @@ -5040,15 +5128,15 @@ "repo": "auto-complete/auto-complete", "unstable": { "version": [ - 20221231, - 1633 + 20230927, + 1851 ], "deps": [ "cl-lib", "popup" ], - "commit": "59c11c453bfa0794302848a004d1be3b1684f17b", - "sha256": "1psd8i1s507kp4km8izqv244xqzmgffxmnbv1zds5mql6hmpfr3r" + "commit": "56c178b07185e37c699fd27393c447bca88076a7", + "sha256": "0h0fqr3bi0v3wrd8wzhvi4rkdz44v2k976q0353l3x8yk34mcc2l" }, "stable": { "version": [ @@ -5331,11 +5419,11 @@ "repo": "LionyxML/auto-dark-emacs", "unstable": { "version": [ - 20230702, - 319 + 20231014, + 453 ], - "commit": "af19a779c6df1e371d26e4092e6a2113ad1f44cd", - "sha256": "0h1d0i8p4v89l4xq76q89fnfifq2bk1xf92df2j91zwn7clj7z3c" + "commit": "65cc6337de9030ea7cae4661389019b9443543a2", + "sha256": "0rvl40xqlf1b2n5nfhzbd0b0r0gp41m5w98sx0wvhp68brxpvx0g" } }, { @@ -5964,27 +6052,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20230130, - 1454 + 20230919, + 1907 ], "deps": [ "avy", "embark" ], - "commit": "784ce24a1ad37459041418182af49565cad4974b", - "sha256": "17ij5w1mv80j0rr3byahnldsbds8z1q2d61p9gsm0k8jdqxd4rrk" + "commit": "07af44c7de72efde79ac563cbecdfff0b48d8411", + "sha256": "1dmsaw1m819kzmai45c4cqh5lyyha451f7dxzwwfz9crmzg2w5sf" }, "stable": { "version": [ 0, - 21 + 23 ], "deps": [ "avy", "embark" ], - "commit": "784ce24a1ad37459041418182af49565cad4974b", - "sha256": "17ij5w1mv80j0rr3byahnldsbds8z1q2d61p9gsm0k8jdqxd4rrk" + "commit": "07af44c7de72efde79ac563cbecdfff0b48d8411", + "sha256": "1dmsaw1m819kzmai45c4cqh5lyyha451f7dxzwwfz9crmzg2w5sf" } }, { @@ -6100,6 +6188,21 @@ } }, { + "ename": "awk-ts-mode", + "commit": "39fe0d1224a5cadc3c9103ead854ad2535af633d", + "sha256": "1j825imi6gp24s4kbg6zmys4xkj33287qz9h15swhhkj7nf8r325", + "fetcher": "github", + "repo": "nverno/awk-ts-mode", + "unstable": { + "version": [ + 20231001, + 2221 + ], + "commit": "d142f0ab61da89d3bf311194f69b655b0b7855a9", + "sha256": "0d6wwx47c1z7vs2ql1497041fawya1xpbgzys5n4j2vqhl07lali" + } + }, + { "ename": "awk-yasnippets", "commit": "d25b1b6391e01096d6d3551db6c67ad7830771c2", "sha256": "1h7g378gdvs8hb15bfmaf3vik25vh5lb85108lh851m24wfis2gp", @@ -6585,19 +6688,19 @@ "repo": "tinted-theming/base16-emacs", "unstable": { "version": [ - 20230716, - 215 + 20231008, + 59 ], - "commit": "f7d41a7605dff1db3ff930cb0aa15e7de76f0523", - "sha256": "1yq9afvybrgkmn17h22ha9231am7hlh3wccxw7g2ks3g0k5vvds0" + "commit": "5993a1ab3cd1f22673f84dd35a2fae5493bed69e", + "sha256": "0f2kj9q4wjhka5nsbn0kjqxdsnlmk45krylk2mmr9siprk15yfh9" }, "stable": { "version": [ 3, - 1 + 2 ], - "commit": "f7d41a7605dff1db3ff930cb0aa15e7de76f0523", - "sha256": "1yq9afvybrgkmn17h22ha9231am7hlh3wccxw7g2ks3g0k5vvds0" + "commit": "a01e1fe184dbcd5d0c7ed706ae144eb9299cd417", + "sha256": "0mdnm6xam1md9yiy6y14yp59j2864brazqszm7vklgb40xpxaxsq" } }, { @@ -6803,11 +6906,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20230510, - 2235 + 20230919, + 1445 ], - "commit": "d334a5d9c00def0995a36fe89f3bb8d4595409ad", - "sha256": "1bri1imq2ycc2bp4zlx47bc1myfcv81x3z0jm3yvn2r54yxk5bar" + "commit": "769b30dc18282564d614d7044195b5a0c1a0a5f3", + "sha256": "047hwlfifnnp2iagf3jjh5hqqxsadkwqxphcnx98gf8kb19pl85f" } }, { @@ -7585,8 +7688,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20230717, - 959 + 20230918, + 953 ], "deps": [ "biblio", @@ -7596,8 +7699,8 @@ "parsebib", "s" ], - "commit": "ef07adfeda1e25d891875cb9a11983d5e26fc36d", - "sha256": "0iy3ikz0hfyghm5q2lgh71p2s3626d1nlc1fmgjp73w0nbxyrc77" + "commit": "95551744de8210867e9d34feaf47ae639ea04114", + "sha256": "0qgkws2dm55bvgrz2d4zamrdacm326141123q8bb45d1fjgwy0bc" }, "stable": { "version": [ @@ -7722,11 +7825,11 @@ "repo": "repelliuss/bind", "unstable": { "version": [ - 20230827, - 1429 + 20231001, + 2051 ], - "commit": "8e5ab488f0529565af5ba62bc047ac4b149ce945", - "sha256": "1yibxdigyim5wfqdl1rlcw274b50scfqli1s64lvcxy3ivzxb5ha" + "commit": "4c1698a7c1c9f3d45559c3be871d87d76a1cbe00", + "sha256": "0dv2jgis2z4cbss346wxxnka6ig6w88rf7pnrd3v9xf8r2x4zqj6" }, "stable": { "version": [ @@ -7880,20 +7983,20 @@ "repo": "liuyinz/binky.el", "unstable": { "version": [ - 20230905, - 346 + 20231020, + 2113 ], - "commit": "cf08e27e31ad4488bc6e78fa5b7ea2a46898d7c6", - "sha256": "0cadk0n2baw0zgxz7cm7b6qbvr6r9kcwjd4ddwqybjchsn2y0571" + "commit": "0078a4b0bab190e27cf011b6d1f685ae953fcc82", + "sha256": "0nnn17rjnmzkryckahzpsicy11shbzbrdjwgwnqxigy7bp39smd2" }, "stable": { "version": [ 1, - 3, - 2 + 4, + 0 ], - "commit": "ba06421b4224e212b26fd18e8b2269a900fc8cc9", - "sha256": "054qk7n11v5bzqr9m5z4n1wlg7px0p8n2d7v4jkpnvmlls3ydf4b" + "commit": "4285ecaf03f821892a83c2deebb9bc2ecad2995f", + "sha256": "0iy5xq5jyjcgqj6slklv0ywpqb4b5ln11xv5q1gj757ach2nmfiy" } }, { @@ -7904,8 +8007,8 @@ "repo": "SqrtMinusOne/biome", "unstable": { "version": [ - 20230819, - 1424 + 20231015, + 1930 ], "deps": [ "compat", @@ -7913,8 +8016,8 @@ "request", "transient" ], - "commit": "fc52a2b7ac1a08050499c5eb378d012cd26d0856", - "sha256": "1099abqa7vwx0g9vna3rq8f02k7k3kx6w7kx0rcfwsiscqlklc52" + "commit": "f931520566a31ebcc3392bb902f1c36e377bb2a2", + "sha256": "162mnjq0pxxakcrrhr0bcm2rnvx1di0hg6xmrbljkcgjs20yzsfm" } }, { @@ -8162,26 +8265,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20230519, - 2152 + 20230930, + 1047 ], "deps": [ "posframe" ], - "commit": "ab00e6a3ea482c342d918add9c20bfd3fa740aaa", - "sha256": "0icmwikzk8y417qqz3whzw8698s7ciaxrnhh1a126h5adbj63r2f" + "commit": "4b70b657f83542491b77a4dc512674f3fa5ce01c", + "sha256": "0hf6f4zix567a65283cn3wvngqppcazsicq9icrkmjw59sgl1hix" }, "stable": { "version": [ 0, 7, - 2 + 3 ], "deps": [ "posframe" ], - "commit": "ab00e6a3ea482c342d918add9c20bfd3fa740aaa", - "sha256": "0icmwikzk8y417qqz3whzw8698s7ciaxrnhh1a126h5adbj63r2f" + "commit": "4b70b657f83542491b77a4dc512674f3fa5ce01c", + "sha256": "0hf6f4zix567a65283cn3wvngqppcazsicq9icrkmjw59sgl1hix" } }, { @@ -8403,18 +8506,18 @@ "repo": "joodland/bm", "unstable": { "version": [ - 20230830, - 2243 + 20231008, + 2005 ], - "commit": "99869da686ab357e5536a262faf10c2bbe3d0574", - "sha256": "0ihs2dk04ip8j5580z875qsdj3d1kfm9b8hl3v4xb72x1fiv74fp" + "commit": "1351e2e15a7666e614c94b41414c8f024dc10a50", + "sha256": "0dv3b0bv4rxvmac388j0qfkdvw7mbd72nfnb9skzkz39is39jp9j" }, "stable": { "version": [ - 201905 + 202309 ], - "commit": "637dacf4cb9112fdfb949706a704dd53cbe79c7e", - "sha256": "180b3rc13asrmsdh7v405d54jkrininvaj52xhp71vw91ng51dkn" + "commit": "62fd17d27d5f16a92bccc9ce2ad3868c01413985", + "sha256": "1a47dcda196sb6qx45w94d0vfzyfprfs3g7yj0scjmna79rr3fqa" } }, { @@ -8741,15 +8844,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20230911, - 1633 + 20230916, + 2043 ], "deps": [ "epkg", "magit" ], - "commit": "8a5a718087989725cc85e123024a4945efc7587e", - "sha256": "1r7wasg7ih4bkxafiwbl6izxn14iv91zq3ni49f1vr1q89a9gyxi" + "commit": "2b38da4f44cba8931f84d7a8c73edf320dc60375", + "sha256": "0m55fs9qfi12xgwxps8f1db90fg7ja096xln4fssk3f8a30sa5r9" }, "stable": { "version": [ @@ -8901,11 +9004,11 @@ "repo": "museoa/bqn-mode", "unstable": { "version": [ - 20230718, - 141 + 20231008, + 1932 ], - "commit": "cd7a9956a03bafbc4beff96246cad94779b953d1", - "sha256": "0glf8vmgchc3sqlk2v2aiyyhap3ym7nh1hdaz9hjvznjbwai12b0" + "commit": "1a42e1cf87ae8a899a45573dfa9eaee1ab436d9b", + "sha256": "09jf445y01dh3lqz5hmzf9f1m6hpzwiprd4fgc3j33lbyi1wggqi" } }, { @@ -9294,14 +9397,14 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20230909, - 1118 + 20231008, + 1028 ], "deps": [ "compat" ], - "commit": "e0152203116424446eb1f24f7f83396a7b81f498", - "sha256": "04n93jm0g1l88n32hhqy8436yx32mgmggdc2yk66pfkhmmaflphv" + "commit": "9a0878dbfed33adf171bc389116d81f326161a64", + "sha256": "01b32xjlqc9h3dwkpmkgfq4mdpfj72ym7pw11h14s5lxv9l11mbk" } }, { @@ -9565,33 +9668,34 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20230830, - 518 + 20230925, + 118 ], "deps": [ + "burly", "dash", "f", "magit-section", "map", "pretty-hydra" ], - "commit": "06d67144778f80a19db58aef1495ba18bbbba147", - "sha256": "0gjh6pwjvaif9m8vmswx1bj89xih3naaxvhndhnxf273y2xnhzxf" + "commit": "8bfbcd54127f01f812d6e13fa11f55566034fa19", + "sha256": "0p6b6wjcsg2ls7jwgyf8k04jz57y6sw85hz1cky1v7hl2kdl5371" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "dash", - "dash-functional", "f", "magit-section", + "map", "pretty-hydra" ], - "commit": "d6c79f04b7d288174d8294fb30488b567586364d", - "sha256": "0l35ssjry15wqcxnr8rf5lrv856pgnm0k2d4d6ag14ypjx9nfhw3" + "commit": "3a6176d0e074bb00ea8b3fef4f7e03957a3ea058", + "sha256": "12xrjh8pdzq08dpjagqx7ribwzcpk6am9c040xram9m4sdhb2xv8" } }, { @@ -9791,14 +9895,14 @@ "repo": "alphapapa/burly.el", "unstable": { "version": [ - 20230831, - 558 + 20230917, + 1714 ], "deps": [ "map" ], - "commit": "3397eb2599bf76de1b96563e5a9201550e33a810", - "sha256": "04qqxwb6pavgvis0irfg4s5rj2j5zja6gp78inb67fbvb0g4h84c" + "commit": "f503fdc3af2f4e4a2a9023c763f71582e09eee8c", + "sha256": "01n7z6lgvsasid1ri2h58ycn0rsswr0y3ic0slvkwy3vlszwaa5k" }, "stable": { "version": [ @@ -9943,19 +10047,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20230418, - 819 + 20231005, + 2120 ], - "commit": "30c703d215b075aaede936a2c424f65b5f7b6391", - "sha256": "1rvc9r6swb74lhzd877jidkkf2cxl5v4zz302j2imqhsbk844qzh" + "commit": "3780eb081913d1aeef2bc5950891a3fbe3b3771d", + "sha256": "1lmiyipwhy5fi6yajx85c68drn5dxxy47yc2dpch8y9y2b2mbyin" }, "stable": { "version": [ 1, - 31 + 32 ], - "commit": "30c703d215b075aaede936a2c424f65b5f7b6391", - "sha256": "1rvc9r6swb74lhzd877jidkkf2cxl5v4zz302j2imqhsbk844qzh" + "commit": "3780eb081913d1aeef2bc5950891a3fbe3b3771d", + "sha256": "1lmiyipwhy5fi6yajx85c68drn5dxxy47yc2dpch8y9y2b2mbyin" } }, { @@ -10595,11 +10699,11 @@ "repo": "ocaml/caml-mode", "unstable": { "version": [ - 20230129, - 1145 + 20231011, + 328 ], - "commit": "959a5a27bfdbaa43a9ff99be136d62e0798f5e01", - "sha256": "145y73lrrwwcl7xg12aq42a1zc1cwgvm7kg3gk18j5k40cy9x696" + "commit": "47defafa2b08fb680e89bfee9cb9ce82bd9e3bcf", + "sha256": "0y0d6pq9jd5slih1n0n1235b178xvs2d0q05wm6qwg0xpkc1x3c2" }, "stable": { "version": [ @@ -10652,14 +10756,14 @@ "repo": "minad/cape", "unstable": { "version": [ - 20230914, - 938 + 20230930, + 537 ], "deps": [ "compat" ], - "commit": "4506ee82129a8e9ff9e4650a9b16eb8c4ae355f3", - "sha256": "0jif6d8bfsk3qxj50dgrl0ssdm4cqw42aidgh34c706q1xk91laf" + "commit": "116063b9ee912cbaa7318dbe6597ade4a62b3f59", + "sha256": "0p6waivxyg6mdr6xikv41j19ybbjwn7pmvbjxf309q42qgsvb4jp" }, "stable": { "version": [ @@ -11044,11 +11148,11 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20230913, - 2207 + 20231012, + 1710 ], - "commit": "653fa643f7f885bbd5b37be447e7ca9b3113f339", - "sha256": "0gjgla13vxxds778pmi8qnwkrrfpxv9v3n2nqgrqv51j8rmkjp3x" + "commit": "89e4013d9ad35f55666ca44c4542d32698641969", + "sha256": "1kzm3bgsy04pj5b04ljizl6jk614jl4r39lbnws1g0icsdbghqxh" }, "stable": { "version": [ @@ -11206,11 +11310,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20230915, - 948 + 20230920, + 942 ], - "commit": "42a2041df99d1d3da9e08d17ceb2eba111cc85ed", - "sha256": "00gglvv2y6b0bjry4q5qb7xs2wqymhzy1q1lh39ciq0h2qyz96bw" + "commit": "7521fa1b39de735dcbd32bca92a792d5261e9ce2", + "sha256": "1bdjcfk3xs85r2zkkl54dpk34x4dm9n8psw27ry69sa24nshqrps" }, "stable": { "version": [ @@ -11591,15 +11695,15 @@ "repo": "plandes/cframe", "unstable": { "version": [ - 20201222, - 1930 + 20231014, + 1347 ], "deps": [ "buffer-manage", "dash" ], - "commit": "38544521e82befc06e397123a118dd96dda2c6b6", - "sha256": "04bgmh4rknfkfash1igav55hflkkrnkchbph6z61w36dqam06381" + "commit": "054f4f8f69a56cce3f834daa9ecf9d13bc348055", + "sha256": "00msjrhyr9qsgpd5i8xas98dx47q1fjvw5dqk2b78rmdavvwcjyj" }, "stable": { "version": [ @@ -11656,11 +11760,11 @@ "repo": "GrammarSoft/cg3", "unstable": { "version": [ - 20230816, - 1122 + 20230920, + 1245 ], - "commit": "611ffa634c5af98843fa9477bcc5d6ee657da9f1", - "sha256": "0pvj137xmdgb41pl87ws1842nlkhhfpwlzvk2ch2xf9s7xs7f43s" + "commit": "14367436c123220a0bb84987db51b6c774ac813a", + "sha256": "0k8v4zxr0ijpzz7g0la18mb6imjlz3957incm01xzbivn5dkzlr5" }, "stable": { "version": [ @@ -12219,25 +12323,26 @@ "repo": "breatheoutbreathein/chordpro-mode.el", "unstable": { "version": [ - 20230821, - 750 + 20231003, + 2349 ], "deps": [ "compat" ], - "commit": "819a0913ca7967d4069f02fbfb24654352cb2a89", - "sha256": "18qdiz1kfwi1kf436hz82zdgi2l94h7y5lkpb21z2948hrw38a6d" + "commit": "c2e0d7e1b2d3b857678bc13cde9e2733cfb71e84", + "sha256": "1scqa1kh3p20mvk7jrvj061b33nk32ajs74b683632zxdb3qh4rb" }, "stable": { "version": [ 2, + 1, 0 ], "deps": [ "compat" ], - "commit": "0f1e0504636143a02c356bb57ef56c53de152c15", - "sha256": "0b1gkvrazsk1kg4iblgwzl1pr2pc5xayhffgyhfk3zqrgqrvx9p7" + "commit": "38bb541cf55b214862589ccc54f123271e4ff6ac", + "sha256": "0jq93fxx0b4s961js1iaipqwjr2ips4jjswggc4m0w1qgpqdwdij" } }, { @@ -12450,8 +12555,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20230914, - 1350 + 20231021, + 1221 ], "deps": [ "clojure-mode", @@ -12462,14 +12567,14 @@ "spinner", "transient" ], - "commit": "09d72192a4734653ca0b1b4b227c38760880fc63", - "sha256": "1h9dn82ms7kv6qj7z5j51iar1db8dmsyisz9wsqqi30q9hwwnyqf" + "commit": "4c99c02b5762c107cdf771a771a1216b040ba53e", + "sha256": "1nyrlbkqbn7bqj39xdzk6mgrhl4bg3ddhna4f3kggk2rhjlv7yx7" }, "stable": { "version": [ 1, - 7, - 0 + 8, + 3 ], "deps": [ "clojure-mode", @@ -12477,10 +12582,11 @@ "queue", "seq", "sesman", - "spinner" + "spinner", + "transient" ], - "commit": "f39e0b52014913f5acc1dc28ad94c68385c0834e", - "sha256": "0jqjgygdvny1vhjbx7k0l492fhamwndsjcbb2mccwp9j47k4qar9" + "commit": "944d6773ac254d9fcac55c05489bff3d91d91402", + "sha256": "12505hbyiqlf4m0mhnkf5r1yaa11rqw4786qxzw56641msv8fxfi" } }, { @@ -12761,30 +12867,30 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20230725, - 1020 + 20231019, + 2047 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "2c0547db57f2fb30ff071d126b256287a4e9452c", - "sha256": "1v5zqr2azgxsln4z413ldwj1b0hsx3rjlh3g6mw0nhv0jbfgcxjf" + "commit": "e21bf22b29d8ca40649517bb7dc503765f240282", + "sha256": "07q94iplkx29lggrs5xfzj42rxfcn2cnbr90jgifk29jshcz30pv" }, "stable": { "version": [ 1, - 3, - 1 + 4, + 0 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "0c6a8038e9b7f72c2e6837bd3342eab942c08d0d", - "sha256": "12chdrmkggnpci1kdkkrz4a2bnsbzc8pra318zbnn3qxinlpngyy" + "commit": "e21bf22b29d8ca40649517bb7dc503765f240282", + "sha256": "07q94iplkx29lggrs5xfzj42rxfcn2cnbr90jgifk29jshcz30pv" } }, { @@ -12795,29 +12901,29 @@ "repo": "pprevos/citar-denote", "unstable": { "version": [ - 20230708, - 403 + 20231014, + 421 ], "deps": [ "citar", "dash", "denote" ], - "commit": "2107142e3c621aa64f95c7820d4b12b69f1763f4", - "sha256": "1x82y75w5g84vjdvxl5xvlbrlph40rm9fg0cblixq12i4sdjb9ks" + "commit": "f093c37d28320a04b5e7ee87d5c442fefa749c35", + "sha256": "1bnyqvdawyxrafz7c79f6xq5h90rhdakmv6g1jhplh881zmkq25w" }, "stable": { "version": [ 1, - 3, - 0 + 8 ], "deps": [ "citar", + "dash", "denote" ], - "commit": "15b4ba4feae7659615a7478987831a681ae8b287", - "sha256": "1v8v01d6ywq20h4z7wniqqszgbz3n8wz4x7ca26cf52c1w11469z" + "commit": "f093c37d28320a04b5e7ee87d5c442fefa749c35", + "sha256": "1bnyqvdawyxrafz7c79f6xq5h90rhdakmv6g1jhplh881zmkq25w" } }, { @@ -12828,28 +12934,28 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20230323, - 1926 + 20231019, + 2047 ], "deps": [ "citar", "embark" ], - "commit": "0c6a8038e9b7f72c2e6837bd3342eab942c08d0d", - "sha256": "12chdrmkggnpci1kdkkrz4a2bnsbzc8pra318zbnn3qxinlpngyy" + "commit": "e21bf22b29d8ca40649517bb7dc503765f240282", + "sha256": "07q94iplkx29lggrs5xfzj42rxfcn2cnbr90jgifk29jshcz30pv" }, "stable": { "version": [ 1, - 3, - 1 + 4, + 0 ], "deps": [ "citar", "embark" ], - "commit": "0c6a8038e9b7f72c2e6837bd3342eab942c08d0d", - "sha256": "12chdrmkggnpci1kdkkrz4a2bnsbzc8pra318zbnn3qxinlpngyy" + "commit": "e21bf22b29d8ca40649517bb7dc503765f240282", + "sha256": "07q94iplkx29lggrs5xfzj42rxfcn2cnbr90jgifk29jshcz30pv" } }, { @@ -13402,8 +13508,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20230916, - 530 + 20231009, + 1104 ], "deps": [ "cider", @@ -13416,14 +13522,14 @@ "seq", "yasnippet" ], - "commit": "5555fab8e02f567d67a3c982ab178be5485310db", - "sha256": "03p70z2rjqb1vslhdpbf7z49pz294md5vsr7827wwfza7jl51gkp" + "commit": "b476345c580ae7cbc6b356ba0157db782684c47f", + "sha256": "100ngpgvff0xvw1h5krvh40sa3ympl241imwskcv62yk29m9z411" }, "stable": { "version": [ 3, - 9, - 3 + 10, + 0 ], "deps": [ "cider", @@ -13436,8 +13542,8 @@ "seq", "yasnippet" ], - "commit": "5555fab8e02f567d67a3c982ab178be5485310db", - "sha256": "03p70z2rjqb1vslhdpbf7z49pz294md5vsr7827wwfza7jl51gkp" + "commit": "b476345c580ae7cbc6b356ba0157db782684c47f", + "sha256": "100ngpgvff0xvw1h5krvh40sa3ympl241imwskcv62yk29m9z411" } }, { @@ -13731,20 +13837,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20230911, - 1653 + 20231018, + 922 ], - "commit": "5fab97d0efc1ed932518fba0cb90afe6dcd00191", - "sha256": "0knx3y53z0dn49xisa78bac55vhhkwxs2iw3jvalx41wfwvkirxc" + "commit": "525fc1b131b1fc537aa82d83d9eb2ea833cface6", + "sha256": "0g4x587fpzcj9y59k8sb1g7c6yvga9gjs8ximpmar7d8jq2cv5qa" }, "stable": { "version": [ 5, - 17, + 18, 0 ], - "commit": "5fab97d0efc1ed932518fba0cb90afe6dcd00191", - "sha256": "0knx3y53z0dn49xisa78bac55vhhkwxs2iw3jvalx41wfwvkirxc" + "commit": "525fc1b131b1fc537aa82d83d9eb2ea833cface6", + "sha256": "0g4x587fpzcj9y59k8sb1g7c6yvga9gjs8ximpmar7d8jq2cv5qa" } }, { @@ -13755,26 +13861,26 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20230911, - 1653 + 20231018, + 922 ], "deps": [ "clojure-mode" ], - "commit": "5fab97d0efc1ed932518fba0cb90afe6dcd00191", - "sha256": "0knx3y53z0dn49xisa78bac55vhhkwxs2iw3jvalx41wfwvkirxc" + "commit": "525fc1b131b1fc537aa82d83d9eb2ea833cface6", + "sha256": "0g4x587fpzcj9y59k8sb1g7c6yvga9gjs8ximpmar7d8jq2cv5qa" }, "stable": { "version": [ 5, - 17, + 18, 0 ], "deps": [ "clojure-mode" ], - "commit": "5fab97d0efc1ed932518fba0cb90afe6dcd00191", - "sha256": "0knx3y53z0dn49xisa78bac55vhhkwxs2iw3jvalx41wfwvkirxc" + "commit": "525fc1b131b1fc537aa82d83d9eb2ea833cface6", + "sha256": "0g4x587fpzcj9y59k8sb1g7c6yvga9gjs8ximpmar7d8jq2cv5qa" } }, { @@ -13847,20 +13953,20 @@ "repo": "clojure-emacs/clojure-ts-mode", "unstable": { "version": [ - 20230915, - 435 + 20230925, + 320 ], - "commit": "5e7506e61401f92df1f86677051b55fec0ad6ce8", - "sha256": "11ld54rnc1w72pz7wp0d6xaxiqcir2kc0a8a09hhakb0s3bdw6ar" + "commit": "8e61fe8ff4795975ec9e225af931d3a514c99445", + "sha256": "101c1xwrmkb9rq713jij105117y2d0ffiplxsnb3z1h2pgcil0p8" }, "stable": { "version": [ 0, - 1, - 5 + 2, + 0 ], - "commit": "4e18177a568027b464ea794c166d2eb4ebe080fc", - "sha256": "0y6nj0bh700s1bjiwj4y1hac4v5c440qv19p2mq3mxxvaqv51c9v" + "commit": "8e61fe8ff4795975ec9e225af931d3a514c99445", + "sha256": "101c1xwrmkb9rq713jij105117y2d0ffiplxsnb3z1h2pgcil0p8" } }, { @@ -14099,20 +14205,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20230914, - 1713 + 20231006, + 1308 ], - "commit": "7d3b4868d0306d4fcc430349241b5b78f76d543c", - "sha256": "0090pdvwz89cppqbar0lypi7dia5ifxa81b1mrl7gqi6k74aw4y3" + "commit": "9532e1cf5b238ee5da2ea0b2fbb0194eaa5aaf03", + "sha256": "0nc3g5cv49mzn3g4zakprc8z2iqwa19x8lyzic1691857n0im5k3" }, "stable": { "version": [ 3, 27, - 5 + 7 ], - "commit": "7d3b4868d0306d4fcc430349241b5b78f76d543c", - "sha256": "0090pdvwz89cppqbar0lypi7dia5ifxa81b1mrl7gqi6k74aw4y3" + "commit": "9532e1cf5b238ee5da2ea0b2fbb0194eaa5aaf03", + "sha256": "0nc3g5cv49mzn3g4zakprc8z2iqwa19x8lyzic1691857n0im5k3" } }, { @@ -14264,11 +14370,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20220917, - 1431 + 20231015, + 1328 ], - "commit": "fd68a33eb43b3cbd44fed767f48e230382903592", - "sha256": "072d5vldjfg9mj4a86bw8xmxl3hmywsnx4f2k6nayqy4whry5fmq" + "commit": "8a1f0281f88239b956250a8c76bada8aa9debe2c", + "sha256": "1yyfwxnq3wfaakij7yvlv8f6gs1y8r3q3vhyqic2q4z98kws7jm9" } }, { @@ -14896,11 +15002,11 @@ "repo": "hying-caritas/comint-intercept", "unstable": { "version": [ - 20200106, - 454 + 20230930, + 956 ], - "commit": "3c9a6125e450435b79ab5e6466f830e57c5e0a30", - "sha256": "06cvphbnhb89h4ss3y87lladb0dcsrkij8pfv65ky06brc1jl0hx" + "commit": "79cfa3f15558f99285734ff36e80e3c4628565ae", + "sha256": "1v34m2f0ni8zvvbqnv0i8daa05rg22wb11468xyq3c0h7pd0k7xv" } }, { @@ -15144,20 +15250,20 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20230703, - 2021 + 20231016, + 2324 ], - "commit": "3ec40b0a0ea751b6c48f24abd58c8304deb53014", - "sha256": "05zmjxrzgjaqcalxh2gf0xd5wvhza5c5f4skkk36r7hhvz9z6915" + "commit": "a0c7c1775ab15d5d7df57a2126b6b9699049b7f0", + "sha256": "09m5y7n8lvfyrvhlnx3yjqlaw28lsdxljald1kqj4r0pvb1kqwk6" }, "stable": { "version": [ 0, - 9, - 13 + 10, + 1 ], - "commit": "656ad10670512e135a0a5881f127bb7a789ef8ca", - "sha256": "1j5f8kqv36r18pg09a6139q7a0a39xdnc5nf6sv3c0pw3yfw1szn" + "commit": "d832d886d0dce655b44de8c5e1eec749b2bea3a3", + "sha256": "09v0q7kxyar5r06l4lv3v78vnd39v3b0pnxg0r3h3my4ki72by8i" } }, { @@ -15522,6 +15628,38 @@ } }, { + "ename": "company-eask", + "commit": "af01ec5452dbbf7a5beeb3d550ef669d50496316", + "sha256": "14j4a9aw2sdiyf9pbj2vfzsp2j11v9svxfd9rq19m5yvgvzkm60s", + "fetcher": "github", + "repo": "emacs-eask/company-eask", + "unstable": { + "version": [ + 20231008, + 1908 + ], + "deps": [ + "company", + "eask" + ], + "commit": "27f0a46259427df6a29f352b9bf1079812c3f7bf", + "sha256": "1736fzbcfm0f774459irxfmgdvjzj6a32ia4y70n3qpx6qwrx4x4" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "company", + "eask" + ], + "commit": "27f0a46259427df6a29f352b9bf1079812c3f7bf", + "sha256": "1736fzbcfm0f774459irxfmgdvjzj6a32ia4y70n3qpx6qwrx4x4" + } + }, + { "ename": "company-emacs-eclim", "commit": "1e9d3075587fbd9ca188535fd945a7dc451c6d7e", "sha256": "1l56hcy0y3cr38z1pjf0ilsdqdzvj3zwd40markm6si2xhdr8xig", @@ -17147,14 +17285,14 @@ "repo": "mkcms/compiler-explorer.el", "unstable": { "version": [ - 20221108, - 825 + 20230922, + 753 ], "deps": [ "request" ], - "commit": "36a2cbf0863d4563096546c38ff26db3d7a3e18c", - "sha256": "0529mwqp5p0lca010dxvjs1ka9fjbywpl0yii71wqc6rbc1kblvi" + "commit": "73a353c229aea84e6f24412b82f6f842fe01c55f", + "sha256": "08p55xyavvkjj816djxghwyzz0bwny6agcakg2brhic058dny909" }, "stable": { "version": [ @@ -17447,14 +17585,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20230914, - 1545 + 20231020, + 1932 ], "deps": [ "compat" ], - "commit": "4b8f8a55e875f705925b954822127bfbc7045c82", - "sha256": "16bvsnwjq2s2ylnw20lc21fw6xyv372ld4x2zxq7kk08kcz92dzb" + "commit": "8f22fbce8d645b9ed45c9ca62c4151644f338a22", + "sha256": "0s6gb6j7y1i1kv8gbhswqbys4pgs2b6g0maspa8dd8f9v96rgh2h" }, "stable": { "version": [ @@ -17799,14 +17937,14 @@ "repo": "rcj/consult-ls-git", "unstable": { "version": [ - 20230831, - 826 + 20230924, + 810 ], "deps": [ "consult" ], - "commit": "081bd9f4f8ecdafc11dab6b5379deea81654b00a", - "sha256": "1r9lv0mklyrkwx5mw84qswrqis81q3i0rj9faag04nbd710x3x59" + "commit": "3ccd9d80da73a05ef2a74616ffdc469860f74c21", + "sha256": "1gxh0zwfkm50493bbnvjlsx38i3sxmrajqm1gf65icp55s0slrp0" } }, { @@ -18011,6 +18149,36 @@ } }, { + "ename": "consult-tex", + "commit": "f102e1c21efddc3cacd1b37726e365f717c3c708", + "sha256": "1fphp9b9mjdgl9w4ddhxkk94qlg6j64xis4gpq0xs8rpklv5i3rq", + "fetcher": "gitlab", + "repo": "titus.pinta/consult-tex", + "unstable": { + "version": [ + 20231012, + 1121 + ], + "deps": [ + "consult" + ], + "commit": "81cf7d7e2ef52c01c291c4ec7215020cbce29085", + "sha256": "1wb8sfmx0y5xwk2yx5alqspm9ddq9mzxfwwcccw8267kqkm3gs3j" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "consult" + ], + "commit": "4f846ef7ef4ec0fbb4c62b603567c270860638e8", + "sha256": "1wb8sfmx0y5xwk2yx5alqspm9ddq9mzxfwwcccw8267kqkm3gs3j" + } + }, + { "ename": "consult-yasnippet", "commit": "da399d9149261f6fded5a465ba1b6f2353abfa5a", "sha256": "08piq6zfj8ixp8shyc69hmmxqqci0xp5mmg51ajddvz8k0sndgn1", @@ -18313,14 +18481,14 @@ "repo": "minad/corfu", "unstable": { "version": [ - 20230825, - 736 + 20231013, + 1857 ], "deps": [ "compat" ], - "commit": "ab12503bdbef9e428dbe4ed75cb26c7c6dfc580b", - "sha256": "1w5nrf3zzry780sb7xj133q6gkw36lidj43iaw14h03gciycp4p6" + "commit": "b2b9a2312f58117514724e729fda43efc4433ecd", + "sha256": "1vdj8h2linwmkhr1f8zhwhskdknaacid4mc6lnp3cyj7mnlryfq4" }, "stable": { "version": [ @@ -19122,16 +19290,16 @@ "repo": "AdamNiederer/cov", "unstable": { "version": [ - 20220727, - 31 + 20231007, + 254 ], "deps": [ "elquery", "f", "s" ], - "commit": "cd3e1995c596cc227124db9537792d8329ffb696", - "sha256": "1gyc0si60czhgrkm7kink1p1zj1h5j5nzif4ivm5bg78l28skmpm" + "commit": "42bf07c6ab51ceb45753c798bcbc3327a9230ed5", + "sha256": "1jwkwfyc1mxlywjhdb0322ihq2igjsy9k03wpwk0zbnmj4zdip0r" } }, { @@ -19592,14 +19760,14 @@ "repo": "bbatsov/crux", "unstable": { "version": [ - 20221121, - 859 + 20231013, + 520 ], "deps": [ "seq" ], - "commit": "f8789f67a9d2e1eb31a0e4531aec9bb6d6ec1282", - "sha256": "0bsyrp0xmsi1vdpgpx6n3vfrmh75bpp8ncync8srzx6clbl71ch4" + "commit": "3998b753d0eb4fc5a64ed9c9f05a1427ff4be22d", + "sha256": "00l0y7alcsgmhiif9isjkw6i7lgq540414m9kzadjqnf49jq28zr" }, "stable": { "version": [ @@ -20333,6 +20501,21 @@ } }, { + "ename": "cybercafe-theme", + "commit": "06c736bb0eed45aca46f1d46656e2804ee147baa", + "sha256": "1s4n0xdni9lsxygm1w8nlqyap5zk3izip9gy2fqb38cn3c34q69m", + "fetcher": "github", + "repo": "gboncoffee/cybercafe-emacs-theme", + "unstable": { + "version": [ + 20230923, + 200 + ], + "commit": "62346a69e59a9d19883e081c58cc4bce44dd0aef", + "sha256": "07aw90xmhvpdf7imsxykvrb90sfxh00brp3y5b1v698wddng43qi" + } + }, + { "ename": "cyberpunk-2019-theme", "commit": "1821a436d3d9f7c46cbd198f93951aa35bbf6ad7", "sha256": "09bg3avrsca308y3g86mrzi6klzr4ky8k5y2nbsmwarrarv29qyy", @@ -20730,8 +20913,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20230822, - 603 + 20231021, + 532 ], "deps": [ "bui", @@ -20744,8 +20927,8 @@ "posframe", "s" ], - "commit": "096070aacff875a09c13e596e5d60a55e0f07ab1", - "sha256": "16fvhyzddyqjsnvbhr9d3fziz910jfm0ch4hqn9ddczvmnza4h4g" + "commit": "1187c6982fbc886e633b68359d64f8e5d7750151", + "sha256": "11cpsrbmqzamq9ply0pbd983lqsas8wxym0r476bv2vx2bqkaqpc" }, "stable": { "version": [ @@ -20911,14 +21094,14 @@ "repo": "emacsfodder/emacs-theme-darktooth", "unstable": { "version": [ - 20230913, - 256 + 20231011, + 427 ], "deps": [ "autothemer" ], - "commit": "ac7c3a2322648b6338c93f01a0038007bedc7680", - "sha256": "0d4q9mmffafi6c09z0p3ggbm5bvhq9v6a0pwf0q0ik8azl6j363g" + "commit": "2358dd334b5dcb6dc9828422bd7bd1e4da556819", + "sha256": "0ivdwypamhnipfh5qg71icf1bbd0nqp17xpj31cs0iaik1s9pj8h" }, "stable": { "version": [ @@ -20935,17 +21118,17 @@ }, { "ename": "dart-mode", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "0zpvp86067a6l63wrpqxsm9fhv3n4ggbq8pg21vgiz54hk4x1xpp", + "commit": "f45ba7975ad81e534ac33cdf91a9fc602c808911", + "sha256": "16nnqpbgxrdlkfx1gl6x3h0zn3sw4swc869vsggrir2drjg4n1lq", "fetcher": "github", - "repo": "bradyt/dart-mode", + "repo": "emacsorphanage/dart-mode", "unstable": { "version": [ - 20220401, - 0 + 20231002, + 1138 ], - "commit": "ae032b9b30ebadfe1b8a48a4cf278417e506d100", - "sha256": "1b9mmpay68ssljbz6v5aghdn2v5509gmxaz3s6w9xzqc3gxkczc8" + "commit": "61e01142352f6813aca6512bedadb5007de3a0b9", + "sha256": "1pvyv1m2nk0hx05zjrphw7ad9y6xsixhjhm4gygpjjv99qbx4njc" }, "stable": { "version": [ @@ -21104,11 +21287,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20230914, - 941 + 20231012, + 1943 ], - "commit": "87bb28397d7af6ed6601bdd26478a5fa4ee2b7db", - "sha256": "1nx4f6kgn6vkagkw6y9b1qjbm6rbdvdz1f8aiyzck5jjvkm56wjl" + "commit": "427cd8e161232904745dc7870a36ad55ebf65753", + "sha256": "1pll099gz1v9kip24lmsfhn419fbfgjpavjl5w9zafj4yqmi2ipl" }, "stable": { "version": [ @@ -21281,25 +21464,26 @@ "repo": "doublep/datetime", "unstable": { "version": [ - 20230915, - 1845 + 20230925, + 2038 ], "deps": [ "extmap" ], - "commit": "4c422b6f9dbee8e090edc288d5e6a6d10a2be313", - "sha256": "1fxqb2rynnh3302zpqzg1qqn6pdx6xyp1vnanqsvavvpki1spl43" + "commit": "3def4bf0d1ed58cdd424980dd01a4b2e056a86ad", + "sha256": "0q4w76b5ay21k011kmsmqcqgibn79j26a593kyj2bqs9fwvsxc5g" }, "stable": { "version": [ 0, - 8 + 9, + 1 ], "deps": [ "extmap" ], - "commit": "3065971ce81c8edb5669bf74ad1351c4d3492c41", - "sha256": "01byg5c6ffhgpaiccdg1g5fkh1hk92br3hw3hpjqpwwpj9skg4yz" + "commit": "9d512244d32870c113785278d8db3c51206c98af", + "sha256": "0d918312gpdiyx7zq8kdy19bdww6jqg94hs4j5l0n63bwrxsqdx2" } }, { @@ -21531,11 +21715,11 @@ "url": "https://salsa.debian.org/emacsen-team/debian-el.git", "unstable": { "version": [ - 20211006, - 1939 + 20231017, + 1022 ], - "commit": "a3ef20c269b9192710567571b20718f572942bc4", - "sha256": "01d3hc6j8gqg8m3xh0jd35xygz41fw1md81xyxasrvngb7r4pqky" + "commit": "60aa194454a7adb82790b6455c130ecbe93cb2a7", + "sha256": "0n6idayngdsb5vsr2brzj1dhq2rxv7jdsf0jns386aq5cmpjzvig" }, "stable": { "version": [ @@ -22046,6 +22230,21 @@ } }, { + "ename": "derl", + "commit": "f661504203b6990094307244a1c93cb62c1521d9", + "sha256": "03j9jn4xidbvs2llp7nm0lx55x4ian6dk5d54ji58zkis3qpjy84", + "fetcher": "github", + "repo": "axelf4/derl.el", + "unstable": { + "version": [ + 20231004, + 821 + ], + "commit": "6f31592bb3083de366cdb13a7db0ed69fc72de47", + "sha256": "1nqzw42vn1w1dh871izyalwkxvrq73ykyzkggrv070cyfyhbc177" + } + }, + { "ename": "describe-hash", "commit": "8c6c5cd96acd3deeb86503341dd9cd729e20185e", "sha256": "0a26d46p46fypq3snh52grnjcgp6isb5k4qv2fm2m6ha2n7jdi5a", @@ -22278,11 +22477,11 @@ "repo": "susam/devil", "unstable": { "version": [ - 20230816, - 2251 + 20230925, + 2240 ], - "commit": "95677d158fba0f0248e9cf5aa1357bee4b293d8e", - "sha256": "0xi41n5m2j6hl1x4hqj8gxik99ymygvlqcvbhjq3pyq9bmazqpx2" + "commit": "ad8320c647ec0078caf5f0745520e5c340b191ca", + "sha256": "1dicp7n2yas40n3vjyikmx3pzawl9b9y09agrvnz9fwas41x8axj" }, "stable": { "version": [ @@ -22641,14 +22840,15 @@ "repo": "pkryger/difftastic.el", "unstable": { "version": [ - 20230904, - 1049 + 20231018, + 1043 ], "deps": [ + "compat", "magit" ], - "commit": "bfeb7dd4186ba954860d7ceff0397135b6a1fd71", - "sha256": "19fc522hr8dprbrw3fbd7b989psnjmvpcp2g400qiy7zlzg61pcp" + "commit": "3e63dc1dd6eb7c2b7910d9b31a84fab7addaa7f3", + "sha256": "14za0r446pw3yby6kx8rfkaixx6lcx3blq2nv6l5rly3bkidprjs" } }, { @@ -22986,14 +23186,14 @@ "repo": "tilmanrassy/emacs-dir-treeview", "unstable": { "version": [ - 20221103, - 35 + 20230922, + 2328 ], "deps": [ "treeview" ], - "commit": "bdcce576c4e8e8da7f82192cecc650e76d068958", - "sha256": "1g1vkp3rzcicc8y6sf7r6qy5lxd8kfg7r0gkxz95fk3l4symfdsf" + "commit": "9024df99284414aa9dc2dff5f3ee9f874830ab74", + "sha256": "11wzi9wfib1gaag3g88mn3yfx313vzky93cgjxxc0040zrqlxfp5" } }, { @@ -23414,11 +23614,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20230812, - 604 + 20231016, + 2048 ], - "commit": "b2639051a2cbc56be7f9b5df2f4391c159770a6d", - "sha256": "0kbfx8h53d7av46izqrhyhmn396xlf67417pcq9p3npa5yywxs19" + "commit": "d36bbed96ca8db8e18b005568f79c3728ce0171b", + "sha256": "07f4dh3zm4p5pxa0wyjr5pdsd5ks66q9qv3rcbxnrjm6m96g2rqi" } }, { @@ -24804,8 +25004,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20230910, - 1911 + 20231005, + 1918 ], "deps": [ "aio", @@ -24814,8 +25014,8 @@ "tablist", "transient" ], - "commit": "6997c86a24d440fa04035aa8c9499a52df6e655d", - "sha256": "0fqrbzbiwzrk3qzczcx7bwrqy5kfhp7qvxrwyg4bgbwi2qs87yn8" + "commit": "61bb3ac0f2195a7a592df0453fe9f404bd92f9b1", + "sha256": "0g7sgf38ihza30mli1bi82nmn8plkjx3xm76ykg1s66j1ihfhb3p" }, "stable": { "version": [ @@ -25074,14 +25274,14 @@ "repo": "alphapapa/dogears.el", "unstable": { "version": [ - 20230916, - 20 + 20231016, + 2356 ], "deps": [ "map" ], - "commit": "46c57510f4d2b372d3fa376eea11d8b56fadbaf7", - "sha256": "1hvkdm9yyr46waxzx3payc6f69m0fm5wfc66s9jfa6kac25i364x" + "commit": "1136f28ceaed522351369fb97cc098763293a7a6", + "sha256": "0sp513bigq0ckkq9hb8fd4znmv8k99awryaa72zddwibi2adb42f" }, "stable": { "version": [ @@ -25192,16 +25392,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20230916, - 446 + 20230930, + 2212 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "e71a566f76051d49649a67da58faecd3d0f3a34e", - "sha256": "1kzagd0plfvchiqxn9grs021796lvknd63mwpsyvl81c4dsk0kq2" + "commit": "d739ab51d58b76c1d9cc29e7a0e4abe9c30370dc", + "sha256": "0l6w019gngrqb0scign188pyx06yvfiqanjvvl64yjgl5fryr1k2" }, "stable": { "version": [ @@ -25245,14 +25445,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20230912, - 1924 + 20230916, + 2032 ], "deps": [ "cl-lib" ], - "commit": "9b427b3663896d49c78eab26db0c3da16c6f5c59", - "sha256": "1y0d8avf6838gx98x4xmfzp5ills9k3hrap8h5v8dx4k3lz3p120" + "commit": "4aee1f5a0e54552669f747aa7c25e6027e73d76d", + "sha256": "019phmlxllzg51c6kxyaixmby1vxd1i512kv5bjs0wklj8p2pcr5" }, "stable": { "version": [ @@ -25525,20 +25725,20 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20230904, - 933 + 20231013, + 821 ], - "commit": "8e73c675816faadcf4d052b1ba09dc1b00aa1509", - "sha256": "0mb7pix1wbmg4laba06fvcb8q822584iq0cw8mwf0nzaf1yh12l8" + "commit": "29d5180f7e34c0c858a520068fb650f705b8cfc2", + "sha256": "0hjimiv6a0kaszypndb5l0axhiv0zih728p8wffil6jff9k8pr38" }, "stable": { "version": [ 1, 8, - 1 + 2 ], - "commit": "8e73c675816faadcf4d052b1ba09dc1b00aa1509", - "sha256": "0mb7pix1wbmg4laba06fvcb8q822584iq0cw8mwf0nzaf1yh12l8" + "commit": "29d5180f7e34c0c858a520068fb650f705b8cfc2", + "sha256": "0hjimiv6a0kaszypndb5l0axhiv0zih728p8wffil6jff9k8pr38" } }, { @@ -25767,8 +25967,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20230601, - 1417 + 20230924, + 2038 ], "deps": [ "cl-lib", @@ -25776,8 +25976,8 @@ "s", "seq" ], - "commit": "c3214bcab4076ac7855a19b52a2925e279477e8d", - "sha256": "07iq0870yjl65d0kdw8ss8inckpf3q2gji7zs0nfqxpybkwv4nwb" + "commit": "5d7fc18eee0d219f52585e05b303f494dc5831cd", + "sha256": "1hbzxir6b0r6cr0sl8yjabk9c7khrqwyjzd5pq90wsslgik3zg4x" } }, { @@ -25934,20 +26134,20 @@ "repo": "ocaml/dune", "unstable": { "version": [ - 20230731, - 1217 + 20230402, + 1815 ], - "commit": "fc382520272012638088848d7f3dd1ef6687a284", - "sha256": "0zwih4fwwrc8lwi2i4mmps9ng7z6mf46pps2i503lmx0dh8dl606" + "commit": "e53368337be3c353fd654bdbead322605fc875c5", + "sha256": "1x3z9wr1zfncd39ya3bqlfbq54hsv6a1kik8x1snsr6qbsy1an79" }, "stable": { "version": [ 3, - 10, - 0 + 11, + 1 ], - "commit": "fc382520272012638088848d7f3dd1ef6687a284", - "sha256": "0zwih4fwwrc8lwi2i4mmps9ng7z6mf46pps2i503lmx0dh8dl606" + "commit": "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf", + "sha256": "1lzhm12sd51m39a0r442afbb102ypvfmac79ngkmz9knn1w2ng50" } }, { @@ -26080,11 +26280,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20230910, - 1543 + 20231010, + 2046 ], - "commit": "aaef014791938dd841aa8d368c7f18b08873709f", - "sha256": "17q4m4wss6bw5p5010akh9m0b9c8j123h3h1rbqw2sd5qkv7j9rl" + "commit": "1f865701105de5bbc62d88071a05381c14026732", + "sha256": "17gb87av3zflgi9nzm2igfcgby9m9s9lay16w6j2hx6kbwzqdngf" } }, { @@ -26541,6 +26741,63 @@ } }, { + "ename": "eask", + "commit": "b6b10ed23943942c0646441e65cd6fca4ef22c10", + "sha256": "015j4zdg8s2wdas9rrr2axl922l2rsbk6c1zkac2n2v602nnljx8", + "fetcher": "github", + "repo": "emacs-eask/eask", + "unstable": { + "version": [ + 20231017, + 1227 + ], + "deps": [ + "dash" + ], + "commit": "224798a5660717fd4325f13d66ba275a4d2031dc", + "sha256": "0ixm0dkzdxn35il16ff2r2xjqw7sbfqirkf3w664lrdwa56wzm1b" + }, + "stable": { + "version": [ + 0, + 8, + 3 + ], + "deps": [ + "dash" + ], + "commit": "be79e9fd4ba705308ed26a801c1072c0fd46a58c", + "sha256": "14wxlmmm6pylj6zw18q76p82bmlvd4sqgfwmd57fs7gjdv0qgqis" + } + }, + { + "ename": "eask-mode", + "commit": "505644c87b0a92e30a4cf97ac2e2d85a39dba842", + "sha256": "1x3q6glwy5zzgbv4131dkq8lfm9frb9kq1s11g1wfrnlrw7zxvv6", + "fetcher": "github", + "repo": "emacs-eask/eask-mode", + "unstable": { + "version": [ + 20231001, + 1914 + ], + "deps": [ + "eask" + ], + "commit": "2fb19f30812c5c0db2bcc7078fdd43958731bfef", + "sha256": "1ncja693h4xdn96vvb5mzxj900xj29xgv3rynfckkcsfakkpp3r9" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "8925f1bd998d1297ebd93278add0be0b809e473c", + "sha256": "0l3s5x97kzn8qdix5xlvwnsirgn392pcydnklaj7lhn5y0mrxfd1" + } + }, + { "ename": "easy-after-load", "commit": "384ffc463cc6edb4806f8da68bd251e662718e65", "sha256": "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys", @@ -26578,21 +26835,21 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20230314, - 2338 + 20230928, + 134 ], "deps": [ "popup", "request", "transient" ], - "commit": "a26364acba671e2891ce3aa457103691e10e244e", - "sha256": "1n4jxp6d3vb5jyh2s6cgc4fff76ifknsyc12yzrhkniq9zh4x14v" + "commit": "1441922d26da1edad0e9020826c4ea26d63e22e1", + "sha256": "04qk4njcdl32cjnskg3cj64d0i4f3nqcpqay0faycnkkp2zfswa2" }, "stable": { "version": [ 3, - 9, + 10, 59 ], "deps": [ @@ -26600,8 +26857,8 @@ "request", "transient" ], - "commit": "a26364acba671e2891ce3aa457103691e10e244e", - "sha256": "1n4jxp6d3vb5jyh2s6cgc4fff76ifknsyc12yzrhkniq9zh4x14v" + "commit": "1441922d26da1edad0e9020826c4ea26d63e22e1", + "sha256": "04qk4njcdl32cjnskg3cj64d0i4f3nqcpqay0faycnkkp2zfswa2" } }, { @@ -26758,14 +27015,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20230221, - 2204 + 20230920, + 825 ], "deps": [ "parsebib" ], - "commit": "5a03e4662dccbffe63605bb8e88bfb691ebe0afa", - "sha256": "0yakr2ai341nzhvibs3r7z06wjf0wnzwdavvagklwciq693w2hz7" + "commit": "568aa9c28a86c58b8c11a6fed468f355a80013e9", + "sha256": "1z67ssllrji9fc7hg378bhsdjw6rkz3djwhr924gvw2wyb6b2xvz" }, "stable": { "version": [ @@ -27295,14 +27552,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20230830, - 2226 + 20230919, + 2101 ], "deps": [ "nadvice" ], - "commit": "2fed9599bcfea5d1aa9fb57dc9118d0f82b6c999", - "sha256": "194f2yqgspdfll652925gzr4r8b1x4m7ww5y5bkw0x01aa57q9g0" + "commit": "4bf871b7a2f2433d1032ef2b251bfb08c23347f4", + "sha256": "0an4krh3i2xg156hlc6vmgcjk9chzgicq9jdnx5mkcrqzpfry6yr" }, "stable": { "version": [ @@ -27464,8 +27721,26 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20220521, - 1345 + 20230926, + 2146 + ], + "deps": [ + "auto-complete", + "auto-highlight-symbol", + "dash", + "erlang", + "f", + "popup", + "s" + ], + "commit": "5c3cded3fab56baa60874f4e1efd14155cec587f", + "sha256": "1gqb7v51xgwjd68nb2msfbg8s83f5082ha0ybqh7765qdlhrxfpf" + }, + "stable": { + "version": [ + 1, + 2, + 0 ], "deps": [ "auto-complete", @@ -27476,8 +27751,8 @@ "popup", "s" ], - "commit": "77e0dc91f603e8bedebfdccc90352ebbfd217c99", - "sha256": "1ny3nk6x428ksfnhpgfy6z0rd272nbsnqdzaxdshld8b0cj5rz6b" + "commit": "5c3cded3fab56baa60874f4e1efd14155cec587f", + "sha256": "1gqb7v51xgwjd68nb2msfbg8s83f5082ha0ybqh7765qdlhrxfpf" } }, { @@ -27720,15 +27995,15 @@ "repo": "yveszoundi/eglot-java", "unstable": { "version": [ - 20230213, - 218 + 20231013, + 153 ], "deps": [ "eglot", "jsonrpc" ], - "commit": "ff0f9515d78f94b8dfe158bf9a2c4f52216504c0", - "sha256": "1m64ddix0h4s22mfbagwkn0q69ck12hvzzpmdr134k7k8ryals6c" + "commit": "ee319cf87a7caaed52acbeb1b3ea00aa44d116b7", + "sha256": "0s0202adv19krb2qkk5dql49i76sgm5a1vls473qvdmd9f8pl38w" } }, { @@ -27951,26 +28226,28 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20230810, - 316 + 20231007, + 340 ], "deps": [ + "llm", "triples" ], - "commit": "c668d397add6b84a7e35dfae04cdfb2be451f032", - "sha256": "0yyhr3wl9dxhqqbjw2c67h5y7lz4s3ww4fk810mlcrmjraymy95z" + "commit": "bd7bb3bde2508455471a848d7013e169a81f1de0", + "sha256": "00sj500009y45jf1apdvdl8p5l163vxjk07bryzp4bbk2q6qsfyp" }, "stable": { "version": [ 0, - 3, - 3 + 4, + 1 ], "deps": [ + "llm", "triples" ], - "commit": "c668d397add6b84a7e35dfae04cdfb2be451f032", - "sha256": "0yyhr3wl9dxhqqbjw2c67h5y7lz4s3ww4fk810mlcrmjraymy95z" + "commit": "74d43f53cf9b11c40cf97de26d871a39c2ec596f", + "sha256": "0gj7ka0whp7wv1izfzgrsrkcizzpvmpjc0v1kzc1hqm8wsd9l4sq" } }, { @@ -28491,11 +28768,11 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20230912, - 1955 + 20231011, + 1840 ], - "commit": "7845c4312092e2d2f21ab6ba665332eaa2d5be63", - "sha256": "1923wavk72aills4rgp7gfvz7qk2rbmhj6s0mrsmza1qkz7f8381" + "commit": "ed9828d074f53a135c62e989b90c3320642ded5a", + "sha256": "0b6mxz5r830gd14j4jbyifg3k8cqhdl97xxfbgplgj4xxirmpn96" }, "stable": { "version": [ @@ -28514,11 +28791,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20230810, - 503 + 20231008, + 2250 ], - "commit": "73345daa47a5612f298896e5eb044e10a79496e7", - "sha256": "0ra8akja47zph1fln86yrj4nmrl7qswm3fr46bl0kdqz1ijh1363" + "commit": "06c905bb4ac6bb35035d65ef5de0de9ce6dff763", + "sha256": "0fzdzks18lyx19kigydbdi2lg260p3wiq0v6sf4xb13ypsx6pyfv" }, "stable": { "version": [ @@ -28546,6 +28823,36 @@ } }, { + "ename": "eldoc-eask", + "commit": "c3cc8f216da4f9b39b4a602ecb2168279c4a5836", + "sha256": "1wsfy8dc6lwcf1bhvmpv5hfmrvj1ag63hamzvsnhmc3xfmzhszgi", + "fetcher": "github", + "repo": "emacs-eask/eldoc-eask", + "unstable": { + "version": [ + 20230906, + 611 + ], + "deps": [ + "eask" + ], + "commit": "c82dedc41772f6a84f02b2fe24bea7ba9512e246", + "sha256": "100s4vafs6y4pr6v4dchv9m7cca33w5qr1wzya0c1ipljakvp67s" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "eask" + ], + "commit": "c82dedc41772f6a84f02b2fe24bea7ba9512e246", + "sha256": "100s4vafs6y4pr6v4dchv9m7cca33w5qr1wzya0c1ipljakvp67s" + } + }, + { "ename": "eldoc-eval", "commit": "63ba2004d3db4c5a71676dca82ad880328cf6073", "sha256": "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c", @@ -28678,14 +28985,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20230828, - 801 + 20231014, + 1107 ], "deps": [ "dash" ], - "commit": "cb21b85b43255f9c1681995e7e36912e7f4e17b3", - "sha256": "1sfvgkni8xxm5zpvay125h93vmrgmjpsi2a97w2pc53v5614p6vh" + "commit": "18e555a5cdfd7264c179f810d7fd4c71a80b715a", + "sha256": "1r5g2n4lzns65lil9291jhxzwm3q4s1z99zhmyj9nmnxl3mf7aax" }, "stable": { "version": [ @@ -28890,6 +29197,36 @@ } }, { + "ename": "elfeed-curate", + "commit": "7e2c6aa3e0b5f47d87b0007a6cb23e9c7c1919f6", + "sha256": "0xk3h2hhi7s8l4bnhmf2i67b3fz5mvac11ps0c7bmcqim6885819", + "fetcher": "github", + "repo": "rnadler/elfeed-curate", + "unstable": { + "version": [ + 20231001, + 1926 + ], + "deps": [ + "elfeed" + ], + "commit": "1f687356d5c5c0a661e22c16ef8c8062cf3d375b", + "sha256": "0xx1fd8gkr2clwijqggskqgwhy17hcqnhw2y0mzwkfnxpimpsyy2" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "elfeed" + ], + "commit": "1f687356d5c5c0a661e22c16ef8c8062cf3d375b", + "sha256": "0xx1fd8gkr2clwijqggskqgwhy17hcqnhw2y0mzwkfnxpimpsyy2" + } + }, + { "ename": "elfeed-dashboard", "commit": "40ba169fd28e3fee01bc51055a811ae78d4d6eab", "sha256": "16r2nwlsjlfh48mbgyp3bqnqmxgaj5f4md1i2m8hvvhpyihq7969", @@ -28937,16 +29274,16 @@ "repo": "remyhonig/elfeed-org", "unstable": { "version": [ - 20230914, - 700 + 20231009, + 1125 ], "deps": [ "cl-lib", "elfeed", "org" ], - "commit": "7f3ad868f2fa3c17492340f7af84f208b9c25635", - "sha256": "1z02xqbsbkybczi0sh0zg7iykjr94bx1js4vcambd19l9p8y4fm7" + "commit": "fe59a96969bd321f5f9ec7317a4bc80943b94c86", + "sha256": "1ag0864vgvwdz3kmk5sj5hq25l7v7pqn33iyhhsd897wgqcmr2dk" } }, { @@ -28957,28 +29294,28 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20230512, - 950 + 20231007, + 1535 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "51983fba76f2287d4f6cbbf3705d1c8fa13ac747", - "sha256": "12z88j2nm40z818i7vm51h4w6jgg09diyd0vr5hw1n68zjyrynh5" + "commit": "bcefb85a1d4075f36e73a94bda569e71f28a52c2", + "sha256": "1n5bns7181j6n603a626jsv26v06s3wm86ml7vixlp234p0frypp" }, "stable": { "version": [ 0, - 8, + 9, 1 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "b813574faefc1ac4825da19b40f620339b6badff", - "sha256": "0k9rkghp9rg7aidmx7q0n4wpb9z5cwr7j8z167yzaqgf9s3y4jj2" + "commit": "bcefb85a1d4075f36e73a94bda569e71f28a52c2", + "sha256": "1n5bns7181j6n603a626jsv26v06s3wm86ml7vixlp234p0frypp" } }, { @@ -29051,15 +29388,15 @@ "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20230627, - 1930 + 20231021, + 605 ], "deps": [ "aio", "elfeed" ], - "commit": "3f801e340ee92e4850486fea5f08bcbdbc89254c", - "sha256": "1zm35xc3vswr5jkf4yj6dshc7axk2dgxsq02v0hk9i149ga4ygsn" + "commit": "1e61ba02afa7e4258e63b5243e2efebe93f28ae4", + "sha256": "1h5841lkcf9029q4zb6cr4z5zgn1x7n17r0jdddd00dwcf5pclrf" }, "stable": { "version": [ @@ -29223,11 +29560,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20230820, - 648 + 20230929, + 17 ], - "commit": "fb280f362a1ef5015841ac6b97697cba9784d86c", - "sha256": "06wh3cc90mkh81l44b1iww28ksblr3psan43fjs9d0adzmibmy04" + "commit": "9263ed12f653872c70dfef537848e4b3e4a1c4a6", + "sha256": "00l52q82xg3rpbyylbnv8kaynsm7i0z6r9db1css7vzqlk7nbzlf" } }, { @@ -29390,15 +29727,15 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20230831, - 1516 + 20230920, + 201 ], "deps": [ "dash", "s" ], - "commit": "9b6839c37977b5760784f644fc74bff1cbcebaa3", - "sha256": "134bzq04dyf71n6fj24d9kmv47vad2q64zxpga2x93rl463sn76r" + "commit": "541a064c3ce27867872cf708354a65d83baf2a6d", + "sha256": "1hgg66cxrv7iaj5dskl7f1a165xc01d9lj5gihgb37pk5gahm4jn" }, "stable": { "version": [ @@ -29489,14 +29826,14 @@ "repo": "wkirschbaum/elixir-ts-mode", "unstable": { "version": [ - 20230403, - 823 + 20231007, + 1031 ], "deps": [ "heex-ts-mode" ], - "commit": "6671c0ffe0e59d82b99948b08d200bd744cc9d26", - "sha256": "01cmapzx87z0vnk8jkbwcw2s3nrichi5rg1dsax1jgswsr38wlv6" + "commit": "411ab0a8594040573a2b6bc30f35fa4eea02ba02", + "sha256": "0ws6l9pz3l1wzn71nb49prav5ffskv9c4q6mcgn8y8pkiczir1pj" } }, { @@ -29530,6 +29867,24 @@ } }, { + "ename": "ellama", + "commit": "fce51577c24bdd80f72a1fe7abaf4ed9118324fe", + "sha256": "0iz11dz0jxz5jpy8b0wrw5rziwcxmzvjy6whqvlsn9dbm7s9r7vs", + "fetcher": "github", + "repo": "s-kostyaev/ellama", + "unstable": { + "version": [ + 20231019, + 905 + ], + "deps": [ + "spinner" + ], + "commit": "f9e0de5af6a48659dc39914e61964231fe75ca69", + "sha256": "1826m9nhyn67dsj8gmvff3nps1d4ldxrcdr3kxhdb88wmnwm7z7b" + } + }, + { "ename": "ellocate", "commit": "fac47d8b4937c714df7b61ce4914831bfd7fcd20", "sha256": "1i31gr3hdl1mjqwkkrfb7x1dpddyxnl1n9l7p7jiqbg3nn85gsxx", @@ -30202,17 +30557,17 @@ }, { "ename": "elune-theme", - "commit": "408bd151d7ca6d1fd4551ae02175eccf24c268de", - "sha256": "12zjwhjif6v0l8ndad4mpifm4fc7dpkml0i9jjaa1szpqq1v1syj", + "commit": "f6eb088a263e150e190209ae437a608671e81bfc", + "sha256": "0babdvn8ipxgivkl4ab3jdad6m7dy42m2mpk2p49xzpzwdc9w63y", "fetcher": "github", - "repo": "xcatalyst/elune-theme", + "repo": "hsnovel/elune-theme", "unstable": { "version": [ - 20230526, - 2238 + 20231009, + 1709 ], - "commit": "e0f3f4def066e679cfdde3bbade4c83dcfc38cd8", - "sha256": "0jlddm7cp6ncc3ynkz6hwcz9031bzh4l65vzcs6ljrb1r920924z" + "commit": "4d0217a7601e34fa84fc174ccf7945cd598d4135", + "sha256": "0xgnyyd1dw9xjxf3ih8s03m9is2i3lgxjqnrkk7vmhdyriw5djbi" } }, { @@ -30633,25 +30988,25 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20230915, - 1304 + 20231007, + 1902 ], "deps": [ "compat" ], - "commit": "0d89add290f9176b77a2d7155a9935e30351d90f", - "sha256": "0m3bdapxndic5kbi04iylrq55z5wypfm80h3imjb97q9c0xd16yg" + "commit": "b22bcc42c70e75e5c7cb479eb830ecebda0b8cc3", + "sha256": "16vgg0xfv1xpkkwizcim1xp3ns9dzs4cln2d2lir4lyid8hp4x2p" }, "stable": { "version": [ 0, - 21 + 23 ], "deps": [ "compat" ], - "commit": "784ce24a1ad37459041418182af49565cad4974b", - "sha256": "17ij5w1mv80j0rr3byahnldsbds8z1q2d61p9gsm0k8jdqxd4rrk" + "commit": "07af44c7de72efde79ac563cbecdfff0b48d8411", + "sha256": "1dmsaw1m819kzmai45c4cqh5lyyha451f7dxzwwfz9crmzg2w5sf" } }, { @@ -30662,27 +31017,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20230616, - 2243 + 20230919, + 1907 ], "deps": [ "consult", "embark" ], - "commit": "b48412f62c07e056425044e7d528a0aae2ee8d8b", - "sha256": "04r563c902vyadl23ks1s8a677ydrldwyapjzbbpafrywr19hw24" + "commit": "07af44c7de72efde79ac563cbecdfff0b48d8411", + "sha256": "1dmsaw1m819kzmai45c4cqh5lyyha451f7dxzwwfz9crmzg2w5sf" }, "stable": { "version": [ 0, - 21 + 23 ], "deps": [ "consult", "embark" ], - "commit": "784ce24a1ad37459041418182af49565cad4974b", - "sha256": "17ij5w1mv80j0rr3byahnldsbds8z1q2d61p9gsm0k8jdqxd4rrk" + "commit": "07af44c7de72efde79ac563cbecdfff0b48d8411", + "sha256": "1dmsaw1m819kzmai45c4cqh5lyyha451f7dxzwwfz9crmzg2w5sf" } }, { @@ -30838,16 +31193,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20230818, - 1438 + 20231017, + 1937 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "4567938c2c4182ba1ad01e7b3133d32a10095fb5", - "sha256": "17c9g7f02r35fjwyqm5dyna7aq977j5lilqd94sapk4wrhxnryk5" + "commit": "b1c1c2ef579b1737a86b9d9550261c77afb93992", + "sha256": "0d9frqn01hnqq4gr7i158mh5nlx94myqb2js9xbzncaavxja1r5d" }, "stable": { "version": [ @@ -31216,14 +31571,14 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20230908, - 1950 + 20231007, + 1911 ], "deps": [ "s" ], - "commit": "1b1bfba5932bef8f031756d4d26e1e67580df3b7", - "sha256": "00v7pjizwfpzqmymxxrkmk425wrgwchpab4ch3q7xxif84564h56" + "commit": "4af3b3624a4714558081d693c91602b9304e8fcb", + "sha256": "07xwxqjzah7dg62q0sz6ii8gi1aianqzp51aqql7mg8hyssjzpyj" }, "stable": { "version": [ @@ -31663,8 +32018,8 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20230810, - 1304 + 20231009, + 2058 ], "deps": [ "closql", @@ -31672,8 +32027,8 @@ "emacsql", "llama" ], - "commit": "b22da65653418290dc93f7c8b167e8600cdaedb0", - "sha256": "0ww33n02av72a1c1wk2j1q2xrikmqrqzbzwnjq00m3i3z01bm3nc" + "commit": "2a002fbded9fdc51e45e4d4eb47a30becda3266c", + "sha256": "0c1ikfpkgkmlv5jgxp950b5bk3bkzdhny5mn18gl5qbpzl59igfi" }, "stable": { "version": [ @@ -32330,11 +32685,10 @@ "version": [ 2, 6, - 3, - 20230914 + 4 ], - "commit": "87a4e2f654ad9d3881e1afa284ba2792bb408315", - "sha256": "00f15pbdhf62vg4llk973c4b4scp4vwwcpk4vkyzfbpsjdq1bz9i" + "commit": "f42acb696e43d382639f04f869e9a99ab36a91c6", + "sha256": "0n4avd58j45rdcmnwgrmz5s0ril0z4n2z711mwwbahl50f7359ky" } }, { @@ -32386,11 +32740,11 @@ "stable": { "version": [ 26, - 0, + 1, 2 ], - "commit": "d051172925a5c84b2f21850a188a533f885f201c", - "sha256": "1l1r4ya64lzvj63vykjyh6hkqnpym2lfbjn0l5l9hyyljir7yc8v" + "commit": "c41d424db42ba84b72f3e25167470c3555723d87", + "sha256": "0h7v9py78c66nn56b7xrs7lcah21vixxyw6d4f4p5z7k1rvcn4kv" } }, { @@ -32969,11 +33323,11 @@ "repo": "zwild/eshell-prompt-extras", "unstable": { "version": [ - 20230815, - 1251 + 20231019, + 1405 ], - "commit": "f490ab511a36166f09b97811495b09d72c9d37f9", - "sha256": "04wgffj43lw1i853s8vkw8hvjx29vv5lnmhjyqcclwfnbj7ddvn9" + "commit": "14eabe593e110ed6937ac3b95f7979263d716a26", + "sha256": "0rybn2hvii87ad2bk9xg71izbyr7w2s7d8qzakmjif7yn462rfnq" }, "stable": { "version": [ @@ -33194,10 +33548,10 @@ }, { "ename": "esmond-theme", - "commit": "96f12c1ea4f1f49fa5bfe66ce17bb58b1b94271e", - "sha256": "1jy1784qkd1v38mg1hgybcdsfiibv2rrsfms08pp0pq3r9y01rf7", + "commit": "a7cb5e559f70d3656fe184382834e997fe179e12", + "sha256": "1v7d2crjpnxbzf0gx07f9p3q0fy5p74nsdpbkbb1i7qq6cp1919f", "fetcher": "github", - "repo": "xcatalyst/esmond-theme", + "repo": "hsnovel/esmond-theme", "unstable": { "version": [ 20230526, @@ -33992,15 +34346,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20230908, - 544 + 20230919, + 2206 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "5fc16776c5eb00c956ec7e9d83facb6a38dd868d", - "sha256": "1q3nr0p6kmbpwr290g57ks3fk4p3rhfyi4sh7s2wmg6pqx8njqkx" + "commit": "d28206ccff74bc07ba335b8ff77805564f6928d7", + "sha256": "1jdrrj1rh43nx0kzh5h7cnrr9yjs6mkm5p7ld82sbq77mbnghzkn" }, "stable": { "version": [ @@ -34122,8 +34476,8 @@ "repo": "emacs-evil/evil-cleverparens", "unstable": { "version": [ - 20230529, - 2117 + 20231001, + 1423 ], "deps": [ "dash", @@ -34131,8 +34485,8 @@ "paredit", "smartparens" ], - "commit": "9ee249509281c387500e397df625ccb759804df4", - "sha256": "1lhy3b6ka6r488vjmzqkccqnfpgyygn8cjgs1xhhbjdah1bip91i" + "commit": "134fe3396f975fb1ad261f52cd113f42ac1da4fc", + "sha256": "1jaakqfrhb0xr1ffph9qnpl0hlgggskz0lz9d880v6dlkg6w7z85" } }, { @@ -34193,15 +34547,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20230915, - 230 + 20231019, + 1228 ], "deps": [ "annalist", "evil" ], - "commit": "0f558f36c1e91835e3daa32254ae081d8c9f0e98", - "sha256": "05jbdc4ad2hh097v6j6nz9h7cx2p5ff2xpcbwys43ghsabkf02gd" + "commit": "18304d9d9e4243687a7bf915dc7e591a216873c6", + "sha256": "1qcnxs22ghan5jsla05cprvgl6mswyaymby2z2yrhykrch4zak7g" }, "stable": { "version": [ @@ -34505,14 +34859,14 @@ "repo": "edkolev/evil-goggles", "unstable": { "version": [ - 20230630, - 754 + 20231021, + 738 ], "deps": [ "evil" ], - "commit": "0070c9d8447e1696f8713d0c13ff64ef0979d580", - "sha256": "1pc6impc9x0m5j1b5bib98d62bnkn034lyhfx45rcwgnixaz7vlq" + "commit": "34ca276a85f615d2b45e714c9f8b5875bcb676f3", + "sha256": "1bcw7b2mi3chglg40nxzg1khbx6fpspjgcnbljycg658pkziz29m" } }, { @@ -34554,15 +34908,15 @@ "repo": "TheBB/evil-indent-plus", "unstable": { "version": [ - 20220106, - 931 + 20230927, + 1513 ], "deps": [ "cl-lib", "evil" ], - "commit": "b4dacbfdb57f474f798bfbf5026d434d549eb65c", - "sha256": "1hlw0zv5niap3vwm4fkqqk8c1bysij76s54ksp84wb8sggkga53p" + "commit": "f392696e4813f1d3a92c7eeed333248914ba6dae", + "sha256": "1ib1yqcw9w1scc9lng2w2kiczabbkg1q4lh4dy06lsd85d9i9sik" } }, { @@ -34741,11 +35095,11 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20230625, - 302 + 20231011, + 1119 ], - "commit": "f27b2a87bab75e3b8a87c277049a4363cdfcbf61", - "sha256": "0igz4kcfb01f9h49n5x9p1idzap54nkw62i1xrql1zlj54s8rv6b" + "commit": "fe4cc5243a23ba7aa283803b200993f23b5dafef", + "sha256": "0zjlnl40yx1n5d275m5kd46hx758g301akr2jbnbrrifv18p3j7h" }, "stable": { "version": [ @@ -35046,15 +35400,15 @@ "repo": "laishulu/evil-pinyin", "unstable": { "version": [ - 20200927, - 849 + 20231016, + 1558 ], "deps": [ "evil", "names" ], - "commit": "3e9e501ded86f88e01a4edec5d526ab0fab879d7", - "sha256": "14by4ilj5bw9jx6kglbm63v2cpy1flijikpymqqvs1z4flmj7cgr" + "commit": "0fae5ad8761417f027b33230382a50f826ad3bfb", + "sha256": "1byr9hpsa3gli4bvbsksc8sq7wpjidy7ilvprv386kjnq4l8z9mc" } }, { @@ -35398,14 +35752,14 @@ "repo": "emacs-evil/evil-surround", "unstable": { "version": [ - 20230912, - 1705 + 20230917, + 1541 ], "deps": [ "evil" ], - "commit": "0d860be74165ceb8314742e4191cdad693f40a6d", - "sha256": "1v21vwswlmck34hklpbdf9ixl3zbhbz3hk5hm5f1r0p24vijg5f7" + "commit": "bd98f7f5492446885dc4c6b0a7579c75c22ac829", + "sha256": "1lj97qnzzi2dwgcak8vaaq5vhrkh84cxzzcsxs6jl93ghjyfmykr" }, "stable": { "version": [ @@ -35676,15 +36030,15 @@ "repo": "laishulu/evil-textobj-syntax", "unstable": { "version": [ - 20181210, - 1213 + 20231016, + 1544 ], "deps": [ "evil", "names" ], - "commit": "2d9ba8c75c754b409aea7469f46a5cfa52a872f3", - "sha256": "031p5i3274dazp7rz6m5y38shfgszm1clmkcf58qfqlvy978ammc" + "commit": "c1a7afe81bca3da6a2fdc7ea9376fdc2e1e9249c", + "sha256": "1xlav0ii17b4j3d7q6mkn48q3cxnmq0kyipxrayqn5njn6rg31ap" } }, { @@ -35695,11 +36049,11 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20230817, - 557 + 20231013, + 1706 ], - "commit": "19979843f5fc437917f9a4dae977f5e6d4793726", - "sha256": "1mqh6zqjnbdmqblqpv1409rmx7h1wqprp1z7h68mvmyl80c8r6bd" + "commit": "db6ab405980dc350b7db411cc25e4bba1be0c092", + "sha256": "1xgzcv6bhnw4dl5c21f54lrhpsl12g9bn18mhjknfyh2cqsaypva" } }, { @@ -36240,8 +36594,8 @@ "repo": "anonimitoraf/exercism.el", "unstable": { "version": [ - 20230822, - 1147 + 20231007, + 1253 ], "deps": [ "a", @@ -36253,8 +36607,8 @@ "s", "transient" ], - "commit": "6b3d7ba0347aeb17098eb6d7656176a91280f88b", - "sha256": "18b0mb83dqy5vr2cw91zg3ix8bqvprpbfny6p38327s7dxdjnapb" + "commit": "9d164a54fd7be933e6f65d4cc7112c99bd957b26", + "sha256": "1b73274krk38jb8znnp5q788jh66g3s8w8lslf79b34s586p8ih4" } }, { @@ -36319,20 +36673,20 @@ "repo": "magnars/expand-region.el", "unstable": { "version": [ - 20221030, - 957 + 20231020, + 620 ], - "commit": "b70feaa644310dc2d599dc277cd20a1f2b6446ac", - "sha256": "1lzqkcc08gjnwypcwydd81bva1d4s6l0c14k3z3fsjpsa3kynv5x" + "commit": "9e3f86c02c5e2ab6f0d95da8a34045b54f6166d1", + "sha256": "0mw1jlgdp17k56rq4g801z7y35h4infm9cy3mh8jw5wqqar5ifa6" }, "stable": { "version": [ + 1, 0, - 11, 0 ], - "commit": "0bc14fc7fbbcca5da4fdd9695cfd7cbd36eb3b96", - "sha256": "0h40dhc3kn8fq86xnwi5lz7ql8my8737y7wkqr897p15y90swr35" + "commit": "9e3f86c02c5e2ab6f0d95da8a34045b54f6166d1", + "sha256": "0mw1jlgdp17k56rq4g801z7y35h4infm9cy3mh8jw5wqqar5ifa6" } }, { @@ -36473,11 +36827,11 @@ "url": "https://repo.or.cz/external-dict.el.git", "unstable": { "version": [ - 20230313, - 118 + 20230926, + 748 ], - "commit": "7ef87709c09792dfa6332fb41a6ec1edd917120a", - "sha256": "19va4agjjx70hza70rj0bjk20xm6265q8cxqy87dggyv0vlafv7v" + "commit": "5ff41c9151647ef68bf61eff318fc76a3fe558f2", + "sha256": "1rwhkxxs5hzpc80qza7rfxh18q3hs02azlcal468zl3q67vhwnaw" } }, { @@ -36564,16 +36918,16 @@ "repo": "walseb/exwm-firefox-evil", "unstable": { "version": [ - 20220318, - 1958 + 20231002, + 1316 ], "deps": [ "evil", "exwm", "exwm-firefox-core" ], - "commit": "a377326e2e4ac386a0abb3fc9b1b356a0d955b61", - "sha256": "0gn221al5sf6zcpgd7rl3d8kg8c8l6plf9v5ii0z6ib14g0wvpgb" + "commit": "fe1e30029b7e44eae2a2b0bbab8719dd8a9457db", + "sha256": "1kyyf2g0ichi9y6hza3wam91x43bz1aj6njfnlk2kz90dg5kbpiq" } }, { @@ -37126,14 +37480,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20230619, - 1600 + 20230926, + 1849 ], "deps": [ "s" ], - "commit": "72f6a7d038507203bbc1cd2d4e4b8cf00efeb3ed", - "sha256": "027sv4k12iclir3phxl0j1jwjv0hhpkxjwvrjmw382p6mr61zymk" + "commit": "df91f2d69b7dbd9b7ebb8f54085aee74f22ad3f5", + "sha256": "1ksnqsan3naglcvh866znq4rk2wxcnyynwawzjmcp3gjzvpxv2az" } }, { @@ -37458,11 +37812,11 @@ "repo": "martianh/fedi.el", "unstable": { "version": [ - 20230911, - 1933 + 20231016, + 1415 ], - "commit": "ed2cd678db920f074213f67691b8eeac304420a7", - "sha256": "0s181b13cyigz6v7ssnyxhzcr4ypns9yj8m452323aq5w4vc373m" + "commit": "a9f5c41f14dcde42bd384274de9b45c2d39f1dc2", + "sha256": "00gacr1rf40r8zgy7gkd7maq905mx6g4mcnczjc2jlxh4iwp6gw1" } }, { @@ -37667,15 +38021,15 @@ "repo": "Artawower/file-info.el", "unstable": { "version": [ - 20230822, - 1634 + 20230929, + 924 ], "deps": [ "browse-at-remote", "hydra" ], - "commit": "5dcf0df5be52a264690e81d9911306879371e4d9", - "sha256": "0jcwz2zv2a4vckfxg4pjdir15j54wbibpnlasyx222x3wixq2767" + "commit": "21fb5d779be88364e464e54c8bb94d04518f6474", + "sha256": "1gj41r4fyiq876bg57a3kvxbf53x2dww4vhs551mqn8sak3lwmlv" }, "stable": { "version": [ @@ -38072,8 +38426,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20230730, - 834 + 20230921, + 1805 ], "deps": [ "async", @@ -38084,8 +38438,8 @@ "s", "transient" ], - "commit": "b19bc85657c3d0d12a7f828b668cda23f1524fdb", - "sha256": "18rlb9wi1q0df89pvpl1xqzlgl8y0i13jjiamd83b27yz0f4zf8z" + "commit": "8ae51b38a496f01b379b1535c6935d36d786b13a", + "sha256": "1agpg6d8y6ib6w05dvpidigx5nc9r42asl38s3aav2sj440sr8lh" }, "stable": { "version": [ @@ -38668,6 +39022,21 @@ } }, { + "ename": "flexoki-themes", + "commit": "a7328b13097d6dcbf0e2ad6cc530ce03625e926f", + "sha256": "1ikim26d8w4k8p8264wwrzcl335x11dd79g0yndbbzh4sd6d9d9f", + "fetcher": "github", + "repo": "crmsnbleyd/flexoki-emacs-theme", + "unstable": { + "version": [ + 20231020, + 623 + ], + "commit": "262db9e912c9cde370f1981121778e9f3bf2beee", + "sha256": "0czcy6v5fsvkbx4hc2ssbhi029jl8dzxi1jfw73pa17779x92a8h" + } + }, + { "ename": "flim", "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", "sha256": "0s1xjvizn3jwn9h5iq83vdmw6lgmpfk7dhvlj2ayb59q7bmf4xla", @@ -39890,15 +40259,15 @@ "repo": "falcosecurity/flycheck-falco-rules", "unstable": { "version": [ - 20230302, - 2340 + 20231020, + 1534 ], "deps": [ "flycheck", "let-alist" ], - "commit": "1ad301d497ade9556327053ca571ee51bf0c0633", - "sha256": "0z1p2np23gmd07ssaaf9mp4halazf79fldmirff09m1zckcan5p9" + "commit": "4bdc576abb13569354281badeaafe4abeee7fb3d", + "sha256": "12d5r2f6r5rh1a8aq87bm7hi1dck8pm1f59f8gnsad8dl5fbx00m" }, "stable": { "version": [ @@ -42053,11 +42422,11 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20230301, - 1441 + 20231018, + 1900 ], - "commit": "82b1345c699172b6092e13be2c4cc10551d88b90", - "sha256": "0clwrn05hkc45y46q76xv25bp2gdnrk9c96n43fzxadzhw8ivv7p" + "commit": "e30c9a14e79c7151d92773fcc8c5bf3bcf4a3a6a", + "sha256": "0xr455qcnzjbgbnxzy0pk56nwgv48i552ygj00b2i0maifny70ya" }, "stable": { "version": [ @@ -43555,11 +43924,11 @@ "repo": "jaalto/project-emacs--folding-mode", "unstable": { "version": [ - 20220110, - 1718 + 20231003, + 959 ], - "commit": "1ce338b991c69358a607c37bfb16ffb7de7e91c4", - "sha256": "0c2w6w6cw1vypzqgz4hgnrr0jhnsjv61kyc7j448mlvzhqdc0s13" + "commit": "f6fc3af1de39ac94b1642595232457b9060c3f45", + "sha256": "1s2adff853w1ix0s1zapqcql4vhmyy56rixkcb06niv5pr2pwpg7" } }, { @@ -43821,8 +44190,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20230901, - 1233 + 20231011, + 2149 ], "deps": [ "closql", @@ -43833,11 +44202,12 @@ "let-alist", "magit", "markdown-mode", + "seq", "transient", "yaml" ], - "commit": "adb802eb08046a8b89d83524a17c966ee4541e2b", - "sha256": "0gxwx8jv99n3vy1kapjdnhkq3cjax4xk6x01b73ac33kmz7wxwja" + "commit": "6c040484eec3e95335909589b01103dd2b484a58", + "sha256": "0cilqdk94y45f3pxrward07qr6nvqcg2i1f62v99hv8j7znz4l6p" }, "stable": { "version": [ @@ -43885,6 +44255,21 @@ } }, { + "ename": "form-feed-st", + "commit": "365f14c97ab9d7f128450c1e57f342fcaca7fc9a", + "sha256": "0b0xzxs26pwii9vr6dn2xaaiv24zq0qishg9nrqvbhqv10a15c9z", + "fetcher": "github", + "repo": "leodag/form-feed-st", + "unstable": { + "version": [ + 20231002, + 2211 + ], + "commit": "f91c8daf35b7588e0aa24c8716c8cfd8ff0067c8", + "sha256": "0wj7icy2nj2kc1ayzgmrnn3slcw1ws6l9m89yr8h8j7wyrcnhkxz" + } + }, + { "ename": "format-all", "commit": "f53143ebd42ef5be793b86d50b23f0a57617d6cc", "sha256": "1kmnv8ypxvgm3p79cc1wk8032fh7bl1pripys180vw89r2748qs9", @@ -43892,15 +44277,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20230910, - 923 + 20231020, + 1907 ], "deps": [ "inheritenv", "language-id" ], - "commit": "22e48b831d64ca1647ae28f9e9485378577ea4f8", - "sha256": "0f3s6mc7zhas1m2i590y1k7qfv0pd7iflzlg7pxl59hsqf372c5d" + "commit": "27704b8f072525b02249ae21c4db9071950d9a01", + "sha256": "13xmz3va3haa03qjarvhdk3y8qqqckd06gvlrlvp3li1vx44rddb" }, "stable": { "version": [ @@ -43977,11 +44362,14 @@ "repo": "larsbrinkhoff/forth-mode", "unstable": { "version": [ - 20220629, - 519 + 20231016, + 640 ], - "commit": "162b79f005a64b1f91e60b8f4c022d1d90cd3d95", - "sha256": "09x4ghfk1wri7awfmhk5l2xgidx590g979n5qk16ydk6f87nlxw0" + "deps": [ + "cl-lib" + ], + "commit": "aaacce775b910afe06a02a56ecfceb3288c84b64", + "sha256": "0pj7fr7lh6s6kanz86zhyxf2s56dl7dffc1ifh3zjwwk85dhrr9m" } }, { @@ -44037,26 +44425,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20230714, - 609 + 20231021, + 1102 ], "deps": [ "seq" ], - "commit": "86e5c479c40a6c53b7032868946bbca4dbc561bb", - "sha256": "13vi5wkd8k48vsh4iakw6jcwpjrzlh68qdjy5dpga9bza9r0509m" + "commit": "0717a12ef3a1c5b847f961a4ae944cd0198805c6", + "sha256": "1jnb0l4sc9w0yh0mf1z4jz3lvpj7rpfq1m2am3ddipfj9zyipv59" }, "stable": { "version": [ 3, 6, - 2 + 3 ], "deps": [ "seq" ], - "commit": "1a0482e03e9cf05e481a57c057cf9b985c6ca4d5", - "sha256": "0mml0in6xxhfv4mdb7rl9k8m6xwmrjl5bb301p8d56sfng982pdl" + "commit": "1f2004d6e905dab5b8dd7e1b068e4df86596d955", + "sha256": "18s1dp2n9q6f3py3f1yc3918yqpncdkwkgi3b3bc2868n6sw0n84" } }, { @@ -44377,8 +44765,8 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20200828, - 1218 + 20230916, + 1426 ], "deps": [ "cl-lib", @@ -44386,14 +44774,14 @@ "friendly-tramp-path", "with-shell-interpreter" ], - "commit": "1b1ba2033e59e5968380640280bd853701fbbb21", - "sha256": "0hh6y21vcpxazqsk9qdr3d120ai9qb5rkdjdh99ck2s26zvm1hjs" + "commit": "5cafa3f6313ce04a47c8996ea1ac6b617d155d46", + "sha256": "1f3wdddk178xwklf6xxnxq2sqb3fw6rx07xwdw6crkz6d7pjqikr" }, "stable": { "version": [ 0, 2, - 4 + 5 ], "deps": [ "cl-lib", @@ -44401,8 +44789,8 @@ "friendly-tramp-path", "with-shell-interpreter" ], - "commit": "1b1ba2033e59e5968380640280bd853701fbbb21", - "sha256": "0hh6y21vcpxazqsk9qdr3d120ai9qb5rkdjdh99ck2s26zvm1hjs" + "commit": "5cafa3f6313ce04a47c8996ea1ac6b617d155d46", + "sha256": "1f3wdddk178xwklf6xxnxq2sqb3fw6rx07xwdw6crkz6d7pjqikr" } }, { @@ -44413,29 +44801,30 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20220309, - 1711 + 20230916, + 1426 ], "deps": [ "cl-lib", "dash", "with-shell-interpreter" ], - "commit": "e530e359848e8bdad09d26529f17eb25e5558b3e", - "sha256": "0n4p0682k6q7p4kn8khb87zbaa9by36gr7iz218p1bnv3v8c42b8" + "commit": "5cafa3f6313ce04a47c8996ea1ac6b617d155d46", + "sha256": "1f3wdddk178xwklf6xxnxq2sqb3fw6rx07xwdw6crkz6d7pjqikr" }, "stable": { "version": [ 0, 2, - 4 + 5 ], "deps": [ "cl-lib", + "dash", "with-shell-interpreter" ], - "commit": "1b1ba2033e59e5968380640280bd853701fbbb21", - "sha256": "0hh6y21vcpxazqsk9qdr3d120ai9qb5rkdjdh99ck2s26zvm1hjs" + "commit": "5cafa3f6313ce04a47c8996ea1ac6b617d155d46", + "sha256": "1f3wdddk178xwklf6xxnxq2sqb3fw6rx07xwdw6crkz6d7pjqikr" } }, { @@ -44446,30 +44835,30 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20200828, - 1218 + 20230916, + 1426 ], "deps": [ "cl-lib", "dash", "with-shell-interpreter" ], - "commit": "1b1ba2033e59e5968380640280bd853701fbbb21", - "sha256": "0hh6y21vcpxazqsk9qdr3d120ai9qb5rkdjdh99ck2s26zvm1hjs" + "commit": "5cafa3f6313ce04a47c8996ea1ac6b617d155d46", + "sha256": "1f3wdddk178xwklf6xxnxq2sqb3fw6rx07xwdw6crkz6d7pjqikr" }, "stable": { "version": [ 0, 2, - 4 + 5 ], "deps": [ "cl-lib", "dash", "with-shell-interpreter" ], - "commit": "1b1ba2033e59e5968380640280bd853701fbbb21", - "sha256": "0hh6y21vcpxazqsk9qdr3d120ai9qb5rkdjdh99ck2s26zvm1hjs" + "commit": "5cafa3f6313ce04a47c8996ea1ac6b617d155d46", + "sha256": "1f3wdddk178xwklf6xxnxq2sqb3fw6rx07xwdw6crkz6d7pjqikr" } }, { @@ -44872,14 +45261,14 @@ "repo": "jojojames/fussy", "unstable": { "version": [ - 20230714, - 53 + 20230921, + 1850 ], "deps": [ "flx" ], - "commit": "9cd9fef9c0b319f7e33f687760cc6efe7e11faba", - "sha256": "1hiisd255ivrszfwsjpd827pzqq4sq50qc99fnhvd4p270x4w9vq" + "commit": "2ff8317c403b15d3c898f7dcd8511b6d16f92c1d", + "sha256": "10xf40xsl3x91d2b4c4vqg4cb99izv8n0gcic5nybdxcm7f8sfpb" }, "stable": { "version": [ @@ -45139,17 +45528,17 @@ }, { "ename": "gams-mode", - "commit": "0c7f6a46adc9bc4b256006e86653a77f8f891db6", - "sha256": "1qlzmrs8771cgp63agwr2j1826jck80420plqy704ckc24f85i00", + "commit": "8b6568f0b8a52659864b90c455fd16c7ccfa7b05", + "sha256": "18nv0s9njlsrphpgi05srgvadcqv3071sqqn0jm715f0cd6b1ral", "fetcher": "github", "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20230915, - 149 + 20231005, + 1425 ], - "commit": "555611e3b86bf7d4d25e68a9a116717a5609b7ec", - "sha256": "0d652z73fizavybc6xp3miqa6cfdzysqc2wrb7isz8mbk59vp8bh" + "commit": "0e7382bf9613329d2e411ced73536205326a910b", + "sha256": "01hbkylql40p4yczckc22gm3g5qsh4aw1xcp3vmj8bc9n63k77zj" }, "stable": { "version": [ @@ -45353,14 +45742,14 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20230806, - 1857 + 20231001, + 1932 ], "deps": [ "project" ], - "commit": "d743a8cd1df4101a6dc2226ccfc3b4883ec761c5", - "sha256": "1jbjhljjbwz2inh8x0ivsx6l1amm550cji6q2rdaay2jl8a8db0q" + "commit": "58bd510da5d09d9de52f4a6e60882b35445ca17a", + "sha256": "0n4346dc6kd0czj666lpmfq6ir6mrw0i45nkwpym6fhpg9cdynhy" }, "stable": { "version": [ @@ -45645,14 +46034,14 @@ "repo": "emacs-geiser/stklos", "unstable": { "version": [ - 20230707, - 237 + 20231004, + 2013 ], "deps": [ "geiser" ], - "commit": "3358d0cc01436bd8f71a500175db2716e75b2eed", - "sha256": "1zwaw482d3yhlsd7zi0whvaj5a11r1mfir9k54xr504ihxzqlcyi" + "commit": "c634fc2049f1616b772f5e9cb78c6171dcc4c34d", + "sha256": "0knzjrfkilzksqd482900wbv2p649azmgg5zb65q79mlkqf2qmxp" }, "stable": { "version": [ @@ -46156,16 +46545,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20230901, - 1234 + 20231012, + 2152 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "ad956f967a989fe19715f7bb4d584839ccc1e3c8", - "sha256": "15l9n3i5x7y66k9xfbv03lllqqkwsjzyzjpb93i507sg8b9jnfpr" + "commit": "636a46327384780dc2e4f5ab081bf6046a29af87", + "sha256": "0i2p12ff55wx8pkm44yhfgkggwrj67l113zla2l2sz1vdlzvjs24" }, "stable": { "version": [ @@ -46484,6 +46873,36 @@ } }, { + "ename": "git-cliff", + "commit": "ed389b952e88592ea8a5d60e5154dbfc07e612b6", + "sha256": "1ry26aap3yj2nkvs9wp580rgh73qxam4nnimjv7csj601gaagni0", + "fetcher": "github", + "repo": "liuyinz/git-cliff.el", + "unstable": { + "version": [ + 20231016, + 915 + ], + "deps": [ + "transient" + ], + "commit": "60db3f5a9350865ec78c652ef53a1335c6534239", + "sha256": "0jislk9rnnx0zbx5jik9w8hqrb3i3pd3rmhvk1i7rjfps0rxf7ps" + }, + "stable": { + "version": [ + 0, + 4, + 3 + ], + "deps": [ + "transient" + ], + "commit": "06a57cd964013cfde6a21f8dee32626034310a84", + "sha256": "0jnhxfwjmi1cza4dlk19955h81dizs966a52liacw4ipjwkbrknm" + } + }, + { "ename": "git-command", "commit": "8a55d697bc95a7026c7788c13e4765e1b71075e3", "sha256": "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg", @@ -46524,16 +46943,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20230911, - 2217 + 20231015, + 2008 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "7a1d50347086678217cf90a32dda277b76ea3081", - "sha256": "1yn3v24w0sx6r8jqw8blfvyjdjfz5xa7c3x8p6xw1lj7b81l8i0l" + "commit": "dd14e0c3c6604f97a447967f0c1ace9947a09e66", + "sha256": "1mfhqgk8ag6pwnim9xvw1jpqd3jndqckhf7zix2j3qjj1qhyjzqw" }, "stable": { "version": [ @@ -46870,14 +47289,14 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20230511, - 2134 + 20230920, + 1224 ], "deps": [ "compat" ], - "commit": "44d536ba637235c9dd203410281397417a3e60b6", - "sha256": "0b9fywqwccdvyg1cfnlzl61gq1gryjvzp32cw91l4igv7ppmq684" + "commit": "3889534bdafb04fab84c083ccfc510202926c5a0", + "sha256": "10irpnccixwf6whxhdm9r8x66npd0439y2rv18fcn8f650d6pxac" }, "stable": { "version": [ @@ -47133,11 +47552,11 @@ "repo": "Justintime50/github-dark-vscode-emacs-theme", "unstable": { "version": [ - 20220313, - 2040 + 20231011, + 2034 ], - "commit": "2123bcd08fe42094b07180632be2cd2af606ee21", - "sha256": "1n41px99cs6q53lfs2dn9h7ml6hc4yz7mbjlg30hp4l8a3j74lz3" + "commit": "9906e1412d692ea0c115998c1809bcc135e263f6", + "sha256": "087vycm8wjzwv271c2wqymplcwyrin5pj9pwcr1y44di658rckj4" }, "stable": { "version": [ @@ -48959,6 +49378,21 @@ } }, { + "ename": "gofmt-tag", + "commit": "9ebd49ac4b3c37cd0185b0bd18e994024d898349", + "sha256": "1gi4yr5c9qg0kqic5q181aqws1yv9pw1kc86l5lf22hx1pv2ww1h", + "fetcher": "github", + "repo": "M1ndo/gofmt-tag", + "unstable": { + "version": [ + 20231008, + 2315 + ], + "commit": "45295db2106140cde6099b15847de79076468405", + "sha256": "0hdkrj9g8is58l2afb7v11mj911ns6mj3yal7rlganggbb6zkk0v" + } + }, + { "ename": "goggles", "commit": "18a8df7ef7e5858f07f563058c0df7d630a92695", "sha256": "1d2czwlv2mgd45avkhch29wxp6c7bv8m7k8kmybcwr7frq1c2jm6", @@ -49469,8 +49903,8 @@ "repo": "vmware/govmomi", "unstable": { "version": [ - 20221216, - 1712 + 20230927, + 1905 ], "deps": [ "dash", @@ -49478,14 +49912,14 @@ "magit-popup", "s" ], - "commit": "c82a709c50c0cd1ae560dd4c8da2d5b266114c50", - "sha256": "1a9x8x45ylr3q87ryfrm3d4s5pahqvwrymvn9db194bx1wxj7mp6" + "commit": "23cd3186674c69cbe9a29e32a9176640bccc14fa", + "sha256": "0hzafgkcp2psgciry3q84xwkbd69kd85mnv474zqjym4jh8v6197" }, "stable": { "version": [ 0, - 30, - 7 + 32, + 0 ], "deps": [ "dash", @@ -49493,8 +49927,8 @@ "magit-popup", "s" ], - "commit": "46fd9d2d9b51098101affd161167d6bd93b78dee", - "sha256": "1jfhdnd9fq44lb0p5269hgbf6fvf2qq3kw128fblf05rcgvm5h7i" + "commit": "a8d705a003ec4a4316a38af03bcca56e5e4eedd1", + "sha256": "04x73r6dnzagf67vixxd5c36rykj6s4kqh6lzsa13iwrvs01cwqs" } }, { @@ -49648,14 +50082,14 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20230813, - 1808 + 20231003, + 2147 ], "deps": [ "transient" ], - "commit": "f0b18c5f8bad3fb67f8e2c40b97ad0104aded723", - "sha256": "0v1nafa15qqk0m7j1yb7p2dqgf33hk3a5jyihk48vi8nzrabkyrh" + "commit": "648fa228a1ccb3ba399a511db8d154fa9fa95b4b", + "sha256": "0g0ryxb2z72f7mwwannqan3w388rcxvkaq0sbnp8inmpdfbd7ki9" }, "stable": { "version": [ @@ -49914,11 +50348,11 @@ "repo": "rdallasgray/graphene-meta-theme", "unstable": { "version": [ - 20161204, - 1607 + 20180615, + 1335 ], - "commit": "62cc73fee31f1bd9474027b83a249feee050271e", - "sha256": "1ydl6dlg5z4infq8j09izwgs6n97yza6nbq5rs1xfv00zd9gr63c" + "commit": "a4deb38957ee2aeb861d5601b304bf28d9f867ec", + "sha256": "0d85xny9zvp3aaz07bgv6n9z7g53dbyh7w61c1pjv6bb0zdinp4j" }, "stable": { "version": [ @@ -49994,11 +50428,11 @@ "repo": "davazp/graphql-mode", "unstable": { "version": [ - 20230411, - 1943 + 20230923, + 1315 ], - "commit": "0ad4ae0160cabad46109dfbb394297a185eb2525", - "sha256": "1cqyhdchnbkj2pdyw22g9vzp19wpgkmai1c8waazy506v8i1aakp" + "commit": "49a391b5290e3354b07f7b77ded97a154c084f46", + "sha256": "15hzpcyc73ixlqm4bnl60n07lvci76wgj7d3fc0wanvmfwqhp6py" } }, { @@ -50448,14 +50882,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20230607, - 21 + 20230921, + 120 ], "deps": [ "autothemer" ], - "commit": "456060ed1b831c1edc6f3486be9a54247a08e39f", - "sha256": "0dnmhfgk2lajccq8q5vc931sw9jbdg0qslm6rmg361rr77y306rd" + "commit": "9ee1159acd15ee014d5643cdaa4e00e06efa6d63", + "sha256": "1nm0rspn7d53ymcmgvnk69rnlzcqn87m332dncwzj9d2f4mz1l6b" }, "stable": { "version": [ @@ -50719,8 +51153,8 @@ "url": "https://git.savannah.gnu.org/git/guix/emacs-guix.git", "unstable": { "version": [ - 20230828, - 1734 + 20231005, + 1419 ], "deps": [ "bui", @@ -50729,8 +51163,8 @@ "geiser", "magit-popup" ], - "commit": "3fba3f46483aa8ad4482ca2ae02d83a6f0fefd46", - "sha256": "0py7aa8wk85vji4fzyfww8c61fz6nj2zh9lavqyfxg1kahi5bzjl" + "commit": "9ce92d95d0246f9fe3d767eb718b24e1ee20d11c", + "sha256": "02vdbrz4v71pzm25w1ba1j1ks4rdlfrb1k7i1jdq0i42am2161q7" } }, { @@ -50987,11 +51421,11 @@ "repo": "idlip/haki", "unstable": { "version": [ - 20230902, - 724 + 20230918, + 1541 ], - "commit": "e7d6d5c16b66c1abf3d8aed3a1107300081c9e57", - "sha256": "0awv9ynpjqm3inrmyj6vfl1vshqfpdj321njhmgw10jkv1dm0zcy" + "commit": "3726a2884fa02fdb83c8a4f43acd11d4b0883c1d", + "sha256": "0fpzfgbi3kybz649x2mzfbx6sqqz1y6672244q0xd4iz28zqln4p" } }, { @@ -51010,6 +51444,36 @@ } }, { + "ename": "halloweenie-theme", + "commit": "0b58ede0e3576427ffe746548544e1317afd9fe8", + "sha256": "18vbyrq4w57z8d78swjwp65mbc9xhz5c0kx3m2an8jrvnsmrhz1m", + "fetcher": "git", + "url": "https://cicadas.surf/cgit/halloweenie-theme.git", + "unstable": { + "version": [ + 20231011, + 1252 + ], + "deps": [ + "autothemer" + ], + "commit": "db39ff0516e071aa890585c39fe411ea355e8b06", + "sha256": "033ignsigx8z5hxrry9yzl0dxc2vwdjlc9nrdpwhbbl15xgpjq7n" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "autothemer" + ], + "commit": "db39ff0516e071aa890585c39fe411ea355e8b06", + "sha256": "033ignsigx8z5hxrry9yzl0dxc2vwdjlc9nrdpwhbbl15xgpjq7n" + } + }, + { "ename": "ham-mode", "commit": "1e6aed365c42987d64d0cd9a8a6178339b1b39e8", "sha256": "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz", @@ -51138,15 +51602,15 @@ "repo": "alphapapa/hammy.el", "unstable": { "version": [ - 20230904, - 237 + 20230927, + 530 ], "deps": [ "svg-lib", "ts" ], - "commit": "f005898d015289ce8709bf96813941c29715a312", - "sha256": "0zlwz8v4ldhadymjpdw1xbcvhyw8sv73jkxzigm1pwl3b409fm7z" + "commit": "cc885461c6f7cb4bb08e563f0324ebd2b415b17c", + "sha256": "18avl13wripi7nxbwbxmyg64cx2gj27kd46q4m4ycpps5nhs0fyc" }, "stable": { "version": [ @@ -51424,11 +51888,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20230816, - 1227 + 20231010, + 819 ], - "commit": "3e146c1a89db257bb75c7b33fa2a5a1a85aabd51", - "sha256": "1vckkl5jhijzqwfj9q26rjdkwhavci1v8wf9wjy3c5hsid3vd0bz" + "commit": "167421abf1db7dd4d297392b58b89bd72e2a9a63", + "sha256": "14196d4jbfwa44z0xhfdgzpga5v6n3c1b366cf7vn1c3qcxk1wmp" }, "stable": { "version": [ @@ -51736,11 +52200,11 @@ "repo": "wkirschbaum/heex-ts-mode", "unstable": { "version": [ - 20230316, - 553 + 20231007, + 725 ], - "commit": "a61a4b6f158c19c1d583722bc35d95b09152551e", - "sha256": "1li4ql6c3f5l3jxxddw6l5snrga3hgpvx4980m3kxna8snb92qxl" + "commit": "80f35c61eb99393179b58a75c0fdd9b546d25136", + "sha256": "19ivdadhxxdgc34ghwb3nlp02l81r083l6w6c7zz384y08amal3p" } }, { @@ -51751,16 +52215,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20230916, - 512 + 20231017, + 449 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "fddf8e32aa4ff865f2ed725c3ab9e226837f5541", - "sha256": "00s8izxbzv89s9bc2226kck93rfxs4vm5whqx0ksn374zk9q7734" + "commit": "372167f13f496242263c7014a555e40db12627fb", + "sha256": "1gi1bx64lskmk0b9n2qmcva9005cjxv21fvqs4p4h8scb51l3bj2" }, "stable": { "version": [ @@ -51883,25 +52347,25 @@ "repo": "emacs-helm/helm-apt", "unstable": { "version": [ - 20230905, - 1109 + 20231005, + 423 ], "deps": [ "helm" ], - "commit": "7c486d63995337a6585bdaabd69694aa296588bd", - "sha256": "1pvwbwcwnskanqa15mah0fkjraf0z3iwhqav1k56i2mmm3kmvnbb" + "commit": "3ddbb62f483d2bbdbfcab4160040eaad22a82d67", + "sha256": "09d18xi57h9c0m3j1wfqhfwdj6asn93zdrm6jn2bxd1gfa86625v" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "helm" ], - "commit": "42923e367f6ccc1c94b1a5c070993e0ad96c9ea3", - "sha256": "1q5pxd0vjxqrvk0gf0nxbc9b77xidaijkddh6zz3j7fbjmzyrp4x" + "commit": "f020465c18908efe00807e1e0f828a3766fc6916", + "sha256": "01jcsfms5bg599nskgg7qa367z9b6iq74rdziy16cvw6xzygxdk3" } }, { @@ -52027,16 +52491,16 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20221114, - 1204 + 20231009, + 1014 ], "deps": [ "bibtex-completion", "cl-lib", "helm" ], - "commit": "8ebf50d5bd368082d0b7ab79d26a52f372cdef98", - "sha256": "1x6nfkprj95cp4ldb485v13hrkd7rvzp750d9xz80vk76gpvaw3l" + "commit": "d8baeaa4c69fde4a179102c8271c1db804e5155e", + "sha256": "0jpx75nx546cd4c8ph8nz5a8kq8g711z3r96nm08jm264fgr3dl0" }, "stable": { "version": [ @@ -52197,27 +52661,27 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20210708, - 2217 + 20230916, + 916 ], "deps": [ "bufler", "helm" ], - "commit": "cb10234bc35fb3f2489c8bfd5b4e80fd1dc05c5e", - "sha256": "0h8mkcp00qd4cwlnkimlw1n86gk2ai02vzwb1f7z29yffsgy58pc" + "commit": "938b186f09739196fe0e65e8e370f90b47008054", + "sha256": "1nqw36yyba214sy1ddm0429g8v6ygrf7j8racgq01xjj84v7f154" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "bufler", "helm" ], - "commit": "d6c79f04b7d288174d8294fb30488b567586364d", - "sha256": "0l35ssjry15wqcxnr8rf5lrv856pgnm0k2d4d6ag14ypjx9nfhw3" + "commit": "3a6176d0e074bb00ea8b3fef4f7e03957a3ea058", + "sha256": "12xrjh8pdzq08dpjagqx7ribwzcpk6am9c040xram9m4sdhb2xv8" } }, { @@ -52554,6 +53018,24 @@ } }, { + "ename": "helm-comint", + "commit": "24afcd01cde3590c87a9ac82395858342f964b96", + "sha256": "0zanskdwykhy6zdrbc0k3w2cpsnwiwf29yd3myqhs241yxv970hh", + "fetcher": "github", + "repo": "emacs-helm/helm-comint", + "unstable": { + "version": [ + 20230918, + 537 + ], + "deps": [ + "helm" + ], + "commit": "2998787568b67ffe9fb898a9150d13b37387707a", + "sha256": "1bw74z53s0zs3yqqgxyhlxhmg8s5wmlrskr1033lyga05wbzblsq" + } + }, + { "ename": "helm-commandlinefu", "commit": "7eaf1e41ef2fa90b6bb6a80891ef1bf52ef1029b", "sha256": "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd", @@ -52626,14 +53108,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20230916, - 652 + 20231017, + 449 ], "deps": [ "async" ], - "commit": "9514cfb55daa3fd3928b0730a6d85e181fc19fb5", - "sha256": "0a6zl2b5kfny6bqfgkfxhnqcz810yrkn27q7b50y29bgkpi941gs" + "commit": "372167f13f496242263c7014a555e40db12627fb", + "sha256": "1gi1bx64lskmk0b9n2qmcva9005cjxv21fvqs4p4h8scb51l3bj2" }, "stable": { "version": [ @@ -52809,14 +53291,14 @@ "repo": "emacs-helm/helm-dictionary", "unstable": { "version": [ - 20220514, - 714 + 20230922, + 1111 ], "deps": [ "helm" ], - "commit": "65fdf36e9a5c6dd8dffa71dfb6c65bc03879abe2", - "sha256": "1r62xrq95lzgg3if0q86idl9l8gmks76pgpxr615vm8ndhq8a545" + "commit": "fc1c097cc53dd3451bfb49ea7e99fdfc6d93bc16", + "sha256": "1fypysfpl8n6np7mz2wrfy3clhbyy8lnr6c69nlxxs4nznlwyvip" } }, { @@ -54242,14 +54724,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20230901, - 1732 + 20230924, + 1610 ], "deps": [ "helm" ], - "commit": "cb5de7155662fc876f53a954163a03d16069b97b", - "sha256": "1dlrxy7fz86hb3cfpimnhram9kasw0ryamfbyg5zbn053ahd79nh" + "commit": "35b3a548694039463749cc18bd628e8f4e3c8019", + "sha256": "0j762wgwmyls60q8w3g960c0b6ba2l0p91iqylz03ww1ipgixrwj" }, "stable": { "version": [ @@ -54711,8 +55193,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20230906, - 2357 + 20230927, + 521 ], "deps": [ "dash", @@ -54720,14 +55202,14 @@ "org-ql", "s" ], - "commit": "d776e205d53adccd1d66a9c666fd885a2334262e", - "sha256": "1k71v445qxsn754s913h39smavgz2kwfqwy6iqil1yfx345zhv5j" + "commit": "f9d4f6241546166f98b5b3b74db4f4532620235a", + "sha256": "1nxjhk0yd0njlscnxvsxnlf1wy6027spcaks64qgvnrzzq9vnzrj" }, "stable": { "version": [ 0, 7, - 1 + 2 ], "deps": [ "dash", @@ -54735,8 +55217,8 @@ "org-ql", "s" ], - "commit": "d776e205d53adccd1d66a9c666fd885a2334262e", - "sha256": "1k71v445qxsn754s913h39smavgz2kwfqwy6iqil1yfx345zhv5j" + "commit": "f9d4f6241546166f98b5b3b74db4f4532620235a", + "sha256": "1nxjhk0yd0njlscnxvsxnlf1wy6027spcaks64qgvnrzzq9vnzrj" } }, { @@ -56477,8 +56959,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20230911, - 1547 + 20231007, + 2141 ], "deps": [ "dash", @@ -56486,8 +56968,8 @@ "f", "s" ], - "commit": "66ba816b26b68dd7df08e86f8b96eaae16c8d6a2", - "sha256": "1n8dk324nna1nnxc1a7krlgw4q78vka8wm8w47h0r8r25xap9dy6" + "commit": "737ff828d763e156a6072a532f2c3d2d0c26178e", + "sha256": "1d46rscvjhpdn1nlydgcsxhk670dabwckdk9jljyblnzh4mn5g5k" }, "stable": { "version": [ @@ -57611,16 +58093,16 @@ "repo": "narendraj9/hledger-mode", "unstable": { "version": [ - 20230721, - 1812 + 20231001, + 834 ], "deps": [ "async", "htmlize", "popup" ], - "commit": "ae551c0601dc39e0f751fe52a97fab01f4844e0a", - "sha256": "0v8pm91fvnnpx72ihg33dakiw1jwy4w45p7qabxzj7vwjdp7w6yq" + "commit": "1b9c65298c34933d6667773d7fa1e89c9841038d", + "sha256": "1a0mdclam4s7f8cbikzcb17613x42bq0dyzbsxy1fqgil5n3qhv2" } }, { @@ -57987,16 +58469,16 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20230816, - 1650 + 20230928, + 549 ], "deps": [ "org", "promise", "request" ], - "commit": "5a8d7878689d2c4fedbe040268bd5a43c169d16f", - "sha256": "0qmpwrw5slzrk7amicw9qj9pqz1wq1i7vkknvv85vbyvp0r6qz7b" + "commit": "10f31a10803c3fd4c304f3a4495d57a0b9cf9ab5", + "sha256": "04rq68czkw4zlsa5mfcb68hzmpj6wr98jylx5hnas4l8hr0hs081" } }, { @@ -58446,6 +58928,30 @@ } }, { + "ename": "hush", + "commit": "d64bf92ea17ecdd2bcb594530c3c990540902fe5", + "sha256": "1g8bakhqlzqpyycm87dqcwa9s43j63w52kvfidw3wwsl07axzrds", + "fetcher": "github", + "repo": "tirimia/hush", + "unstable": { + "version": [ + 20231008, + 2125 + ], + "commit": "51c7960820de0576bbf0c3c286cb1264854d20aa", + "sha256": "18yspmwn9wd00arfj80wj6lk7khcgn1arjbs2y8zqv8g7ms9xvh6" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "commit": "51c7960820de0576bbf0c3c286cb1264854d20aa", + "sha256": "18yspmwn9wd00arfj80wj6lk7khcgn1arjbs2y8zqv8g7ms9xvh6" + } + }, + { "ename": "hy-mode", "commit": "fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154", "sha256": "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m", @@ -58610,17 +59116,33 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20230911, - 1954 + 20231021, + 15 ], "deps": [ "compat", "map", "persist", - "plz" + "plz", + "transient" + ], + "commit": "dbf3d5063f7a6c95ac27dff23eb4456ce9a270b5", + "sha256": "0c65f8kvz08997mx5jz03hw7ggyvs368fb98x9ziandq61vhhhwc" + }, + "stable": { + "version": [ + 0, + 2 ], - "commit": "997c57ba7a7ea5414c5a655d5b9d733141732f72", - "sha256": "0aak917qfpyc28rskp3j7mvlzf1a9j9iwah7dxdjgy1aygbhqlpn" + "deps": [ + "compat", + "map", + "persist", + "plz", + "transient" + ], + "commit": "262f4bf033fe10f7593ebbc156cfa83d04d5d5ba", + "sha256": "00d6m2bvpi1xgrqnfh2plv38dm96izcz99ywbb6mycxbm376wylp" } }, { @@ -58823,11 +59345,11 @@ "repo": "ngraves/ibrowse.el", "unstable": { "version": [ - 20230813, - 2116 + 20230926, + 2056 ], - "commit": "0ace95c948b8fae87aaf08cc2b80ceb0b1713835", - "sha256": "0dqdldb5hmb6r99fkx1cjfr1b40nvf4i6hh44rk8y78kw9yfd4s1" + "commit": "addfec54f2c33d505d10bb5f17c084876db5baed", + "sha256": "1kbxgp713br7riz9mxh4ziivm86iii66zgiin02fc0sx2r5g2raf" }, "stable": { "version": [ @@ -59070,15 +59592,15 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20230626, - 2045 + 20231021, + 1949 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "fdf2a280f27def4b633a3a74ebdf3a6c95471e3d", - "sha256": "14182x7xzhwkr3n5fp7acl7rfa34nf4j0yqk01jpffmiwnn8vnh3" + "commit": "24c013486fd56386946eadc9a2f653e9f0d3f4de", + "sha256": "1bsjbyckcq8rr9a4v2rkq06j5brlizj3by5v6nxq5xidapmcj01k" }, "stable": { "version": [ @@ -59707,28 +60229,28 @@ "repo": "KarimAziev/igist", "unstable": { "version": [ - 20230903, - 1133 + 20231021, + 1749 ], "deps": [ "ghub", "transient" ], - "commit": "b8b38136694c74a377d00eadbfb429f644e8ccbd", - "sha256": "01fpl1fd419vkanm8qvsbja715278s99lfnqb6g7zvcxppr46hgy" + "commit": "a47d3da93e9f8be3d3fb45cd939ef727203411eb", + "sha256": "1z8xbw40zrmplgfpk4znafq61f00pjbjrsgjcb84fvg3c465jx0i" }, "stable": { "version": [ 1, - 4, - 1 + 5, + 0 ], "deps": [ "ghub", "transient" ], - "commit": "64e6b1a865f51a02116a26ebac7e80b852e9e563", - "sha256": "0mk77p5iw04jrndjkz93kxsih1fqqc668w398nw9f62dir8lzl5v" + "commit": "a47d3da93e9f8be3d3fb45cd939ef727203411eb", + "sha256": "1z8xbw40zrmplgfpk4znafq61f00pjbjrsgjcb84fvg3c465jx0i" } }, { @@ -60103,11 +60625,11 @@ "repo": "Elilif/emacs-immersive-translate", "unstable": { "version": [ - 20230910, - 851 + 20231001, + 1557 ], - "commit": "b68d8c111e730ba5fde8a8dcff08d3c270f04f6f", - "sha256": "1fb2rda1h2s69c3lidqh639mkxrliih5svyascn91gld59dfqjqb" + "commit": "1d00d558363985fa988fc40cd5093bfc6926d83e", + "sha256": "1ghqc6si6yv3fp9s6yg45i5nnr5x66kxd90qg2jmjg2h1fjj61ci" } }, { @@ -60333,11 +60855,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20230831, - 957 + 20231015, + 616 ], - "commit": "4ba467cd54037ff4aa184b8417e2328a9b238ba8", - "sha256": "1zrkw27jasy9jh2fzibzkpgf3295lcxxinzy6mz49hcbrsp16y39" + "commit": "5d83d5fb581db8eaeb7f200ddc53c15a9b9a8b62", + "sha256": "0vsfqycwrwyq0dwmhylgwnsr53ak1h9ix901ygdpamx6lr7ljm4n" }, "stable": { "version": [ @@ -60456,11 +60978,11 @@ "repo": "paddymcall/indian-ext", "unstable": { "version": [ - 20190424, - 1547 + 20231009, + 740 ], - "commit": "a5450fe467393194bc2458c0d5e0a06c91bf117a", - "sha256": "0phbs9cx73vg9k9gp60vhlrn065skpva6gx0abp0g6rbzys2qx0b" + "commit": "80ea22eea203c8eb4c28f59fceb8d276395ecb0f", + "sha256": "02ig5vs2l26c708mpdnkdxbx9d2lg371f61281ji34n9n8fyyy5j" } }, { @@ -60642,20 +61164,20 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20230822, - 1406 + 20231002, + 1229 ], - "commit": "03475ac1cca410ee63a523f5c63f859cfafe1aeb", - "sha256": "0dc01y4cnkv2sbk93nc4y4wk49qd38zkzr9n86qdzcaqg6qqpgz0" + "commit": "991fe74b1c1b83412b42832a39aafc2d88ae625c", + "sha256": "0dxjcr34xsa0m25yw8pp4iwjq8cqdgs6r8ls4lwfb69rnii7jmn5" }, "stable": { "version": [ 2, - 5, - 2 + 8, + 0 ], - "commit": "d2cc45ac1a035286decb12c4f49c696ad5f03d27", - "sha256": "0a1hhvfbl6mq8rjsi77fg9fh5a91hi5scjrg9rjqc5ffbql67y0v" + "commit": "991fe74b1c1b83412b42832a39aafc2d88ae625c", + "sha256": "0dxjcr34xsa0m25yw8pp4iwjq8cqdgs6r8ls4lwfb69rnii7jmn5" } }, { @@ -61441,6 +61963,30 @@ } }, { + "ename": "iota", + "commit": "4062b8df284ac67c8324c7aee82c6be955e6e3a8", + "sha256": "0gc6x32nmxqr4xapp2kr9ygn1b6nrhpfgidzr59cjj1dgnvkx4m1", + "fetcher": "sourcehut", + "repo": "mango/iota.el", + "unstable": { + "version": [ + 20230918, + 1028 + ], + "commit": "c065c087567f074bff639eb12fa53018654b8ce2", + "sha256": "0xyzx50b1x9vvfixccq88h1j7msgri654bc6ii3m7kc8cb232qbw" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "commit": "9dbf2741a2471044e58ccee6635ae8c6e311b7a8", + "sha256": "1ralzgj8psrvy2dx6fjkmwy5974np4bcgik10k55nnzvi95zi1p3" + } + }, + { "ename": "ipcalc", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0hw5g30pnqwzvbhf6kggyj6wij5iw7d8jgmr88pyw63kxach8vkv", @@ -61611,28 +62157,28 @@ "repo": "Sarcasm/irony-mode", "unstable": { "version": [ - 20220110, - 849 + 20231018, + 1915 ], "deps": [ "cl-lib", "json" ], - "commit": "870d1576fb279bb93f776a71e65f45283c423a9e", - "sha256": "0iv3nfa6xf9qbq9pzfa96jc3n2z5pp6lvj58w69ly2gn47jqgnxc" + "commit": "40e0ce19eb850bdf1f77225f11713cc816250d95", + "sha256": "1w0rd74kjgda7mjbf853yavppkgzdfyw1a2hgskbqbbjii3mr1zy" }, "stable": { "version": [ 1, - 5, - 0 + 6, + 1 ], "deps": [ "cl-lib", "json" ], - "commit": "b9c64abf81e73860e39ecd82dfa00cca90b53d99", - "sha256": "1ilvfqn7hzrjjy2zrv08dbdnmgksdgsmrdcvx05s8704430ag0pb" + "commit": "40e0ce19eb850bdf1f77225f11713cc816250d95", + "sha256": "1w0rd74kjgda7mjbf853yavppkgzdfyw1a2hgskbqbbjii3mr1zy" } }, { @@ -63279,8 +63825,23 @@ "memoize", "s" ], - "commit": "8cfe5788348c1f370058ccc0ec01b45300a36c98", - "sha256": "154zjyyv3z5qhbnsvgh6s67zcyjya02gjj40303zi946fzmpph5l" + "commit": "b510a29f1fc1bea218a6230fb219922775687c78", + "sha256": "0c0jfi3gg85ccid7h9ll0a160lsjb11wxqncs4qnz75d3npmgsw9" + }, + "stable": { + "version": [ + 2, + 4, + 2 + ], + "deps": [ + "dash", + "flycheck", + "memoize", + "s" + ], + "commit": "b510a29f1fc1bea218a6230fb219922775687c78", + "sha256": "0c0jfi3gg85ccid7h9ll0a160lsjb11wxqncs4qnz75d3npmgsw9" } }, { @@ -63657,14 +64218,14 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20230914, - 1043 + 20231019, + 1708 ], "deps": [ "compat" ], - "commit": "c9c5bde6a5abb7410f58ef51006ba44f76622779", - "sha256": "0bf97mp9rv1hc6vl15qyipvb09z300w4pzd2v02bvsqcql4610fm" + "commit": "884379eeea2cd5329788a3948418133ad762ed31", + "sha256": "1n6z49gxmn3ga34m62n3npjmhrzbjfrmbm4rhmv87mqq8gibk4ig" }, "stable": { "version": [ @@ -63914,11 +64475,11 @@ "repo": "nverno/jq-ts-mode", "unstable": { "version": [ - 20230826, - 1925 + 20231018, + 1047 ], - "commit": "a495509f6920756dcf5cbf87ef1907b5abda2e5c", - "sha256": "0l3rxdr01msiyvls1pbplhwm3dkvd3kmrbsf35xwnm4h1gbk34js" + "commit": "14a4df0ed089bc9d322b9846d1b87f603c241161", + "sha256": "19rvid30zc561v88d45q51q1xrgs28m6s0njiph0rkfw4ffkcg5l" } }, { @@ -64398,14 +64959,14 @@ "repo": "taku0/json-par", "unstable": { "version": [ - 20230819, - 339 + 20230917, + 624 ], "deps": [ "json-mode" ], - "commit": "9fff40e04a1956af6fcf48b5206e81143aec23f3", - "sha256": "05yxvl11b1nlv7f3wfxi7ai1q7h6pv6bqz2js0l1na9iy6qb3c7d" + "commit": "bbafcc911fce4ebfb30d9f9a0bc226b1983cf7b1", + "sha256": "0mphal0j5hn5hi9i8gpb95csqbw06b7msszggpkxl6lhp3d5sbbm" }, "stable": { "version": [ @@ -64767,8 +65328,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20230829, - 546 + 20231019, + 455 ], "deps": [ "dash", @@ -64777,8 +65338,8 @@ "s", "spinner" ], - "commit": "49c13ad005b66724bde385e45ef8aa448e40f233", - "sha256": "0wbcfxkh8x8p3nh7370ac36li7ky6j2pip66bj6w5428p922492b" + "commit": "249dd96cd112f4a2f9a15555aeed5a315cee8cb5", + "sha256": "1k34gn05rqlnmrvw8x0z0lq3zjdd10w8s7hkgy11yzfsks9r8fr3" }, "stable": { "version": [ @@ -64806,14 +65367,14 @@ "repo": "ronisbr/julia-ts-mode", "unstable": { "version": [ - 20230711, - 2009 + 20230921, + 1433 ], "deps": [ "julia-mode" ], - "commit": "1c5b01753bee57de2d480a80c2b267009ac93e9a", - "sha256": "1cy9x6801jvkfqs085c85128ndcc9fa1144g2mdii6ay7whl31ca" + "commit": "44260b265359c7ed4052398e099ad019ce899109", + "sha256": "0wv3pk08278f47bivh17c1gwd7xyybxr5np3pdr5i6fyw0pk4cwm" }, "stable": { "version": [ @@ -64989,8 +65550,8 @@ "repo": "emacs-jupyter/jupyter", "unstable": { "version": [ - 20230706, - 139 + 20231020, + 1901 ], "deps": [ "cl-lib", @@ -64999,8 +65560,8 @@ "websocket", "zmq" ], - "commit": "1baabc8f2d0631f8f4308400f9a53f1aadd58d14", - "sha256": "0kki4rs1hc3vpxf6i3lmwjz2slp9wpq6x7p6s2716hvrdbhaw8h1" + "commit": "3a31920d48dc5e0d1028fb676cf20d13ea9f78ad", + "sha256": "17fblp4pwgm3vf415rp6l510nhrl4s3ssiimnwjmghyc2v2988j4" }, "stable": { "version": [ @@ -65378,11 +65939,11 @@ "repo": "wsgac/kanji-mode", "unstable": { "version": [ - 20160826, - 1139 + 20230928, + 1113 ], - "commit": "5e9d5b72468ece11cfb81b729be6babf63ede425", - "sha256": "1zh7klqaza840q5f44zzh1wrnd6sqa2k93z3dgx3yhhsxfd1dxvy" + "commit": "731b3a5447bcb899ba1d86b645a344e0915d04f3", + "sha256": "0qgwl8iza0dkrpfsc5xpc1fgjmrxd6x4gxkid8wxn270s9mzal68" } }, { @@ -65427,28 +65988,28 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20230915, - 2338 + 20231004, + 243 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "e1c8590d83e3259d35b01892bedf7b68c5a6bb09", - "sha256": "00kxglsdw5y04zmw7q8v45b820mn7b6pmhs1r2l8vzqc8rfcc99s" + "commit": "8f2cd166b3e5d19d83ab7de73a62069929238306", + "sha256": "0f5y1ri1pdgy088lxp9h8h5cvnfyi5dkvyvyxzjh00kaj10d3va5" }, "stable": { "version": [ 1, 6, - 8 + 9 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "facb2a08d3179103d4c3a9905b37c87831fe1665", - "sha256": "0r8lc175iswvwwqf2yqdc8sx07m8b8l0mylw0p1gxri45qd69hcq" + "commit": "8f2cd166b3e5d19d83ab7de73a62069929238306", + "sha256": "0f5y1ri1pdgy088lxp9h8h5cvnfyi5dkvyvyxzjh00kaj10d3va5" } }, { @@ -66176,28 +66737,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20230829, - 1844 + 20231018, + 1043 ], "deps": [ "dash", "transient" ], - "commit": "74409c2c64da3bff37a027537b3521849d395cc6", - "sha256": "1wrnps2xhbxik7830lbcaaals9m3sgq4yr95kkanc4l88xjrnwiw" + "commit": "8346e1193cf31ce8d66de7793b958bdd06c9d2b9", + "sha256": "106hvr7awd4mnfr7pjlpf0np749mmaffhyfg8di70chq0rmf142z" }, "stable": { "version": [ 0, - 11, - 4 + 13, + 0 ], "deps": [ "dash", "transient" ], - "commit": "74409c2c64da3bff37a027537b3521849d395cc6", - "sha256": "1wrnps2xhbxik7830lbcaaals9m3sgq4yr95kkanc4l88xjrnwiw" + "commit": "8346e1193cf31ce8d66de7793b958bdd06c9d2b9", + "sha256": "106hvr7awd4mnfr7pjlpf0np749mmaffhyfg8di70chq0rmf142z" } }, { @@ -66633,11 +67194,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20230913, - 1227 + 20231018, + 1342 ], - "commit": "6b807fcf0eac023b493730349703a256ed4eb7d5", - "sha256": "0wv0r08299slbmn98ysd1dg22jkvw8kl27il637ls2mdbhrx82b6" + "commit": "6c2568693cd80b1cf57c7950d9458bca5af371ce", + "sha256": "1v51n5vb5gmx01vxqkwdwawcjp0g92316273v4qx3w3k7dr0k85h" } }, { @@ -66755,11 +67316,11 @@ "repo": "r0bobo/kubedoc.el", "unstable": { "version": [ - 20230513, - 2014 + 20231018, + 1913 ], - "commit": "c07e356326b6f373694d43369c7110c2873e24cd", - "sha256": "1isrss1b79ms8mx9lmmc7mvqpbn6bpcvszbbqdvbp95z3830qbkv" + "commit": "e169cb7e7254d0c0f1e7a7eda5e27a0092366e1d", + "sha256": "0jw5v17yl06whnms25zfcxcabjfm99khqszbpjpjxkv8lg6kdl38" } }, { @@ -66770,8 +67331,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20230905, - 2159 + 20231013, + 1753 ], "deps": [ "dash", @@ -66779,8 +67340,8 @@ "transient", "yaml-mode" ], - "commit": "f7eb9e3ba4d0fad567c9ddf19faaa74129b3fbf7", - "sha256": "0rv139rg40f2b0vx1fs7xrac6xq24ilnmrcpw76r41flm45gn7ph" + "commit": "b882de32b6f6a6ee371eb7a7a308f3936031e681", + "sha256": "1ddavmfyyd2rxffvb3cbv28dxrjsa58jbywzgplnx6zyv05frx44" }, "stable": { "version": [ @@ -67333,11 +67894,11 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20230722, - 1141 + 20231018, + 1049 ], - "commit": "ff09e3ef89a90d0707a77d6b7f4d2d7d67f4c03a", - "sha256": "1q3fblbg4qj5zjzgjqs55ywm504sghg7r9n5v9nhsa5k6gx6msw2" + "commit": "84d7b997a78b78b64fb4b348008a9aaa67467d27", + "sha256": "1bpkny62i8w25743ziqj4cv9vblfa0hbgq22zlmgifsihx21h5fd" }, "stable": { "version": [ @@ -67493,6 +68054,29 @@ } }, { + "ename": "latex-labeler", + "commit": "c8bd5d93f8f58ec4609b0c9797b2066d61211007", + "sha256": "1jyqqz8n7f5hv48k3qcf3lws0n0l4175mix1yvgph7rsb4yyxwq5", + "fetcher": "github", + "repo": "X9hRRDys/latex-labeler", + "unstable": { + "version": [ + 20231014, + 2110 + ], + "commit": "d45dedbc74887c59f15c5a3dcd7546d2c29c30a4", + "sha256": "1qss7fw2b9rnl6fzb230z5jgs1m8glpaq1qhjkxa7fpm52zc49s5" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "d45dedbc74887c59f15c5a3dcd7546d2c29c30a4", + "sha256": "1qss7fw2b9rnl6fzb230z5jgs1m8glpaq1qhjkxa7fpm52zc49s5" + } + }, + { "ename": "latex-math-preview", "commit": "9e413b7684e9199510b00035825aa861d670e072", "sha256": "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr", @@ -67793,6 +68377,21 @@ } }, { + "ename": "leader-key", + "commit": "171c9f6597a5e012493f7cc8a0e8352a9300f422", + "sha256": "0ibbbrcrnzqdhk9cb12nlg73kk351adn99za3ab40v2aa35q5zyx", + "fetcher": "github", + "repo": "Havner/leader-key", + "unstable": { + "version": [ + 20231001, + 2236 + ], + "commit": "64d2a29e2f667399869f2b0334855a647211e50e", + "sha256": "02pyqgml6mfsj70qvingq8ff2qvfs35nb28z465mqpcgfvb8xapv" + } + }, + { "ename": "leaf", "commit": "24afe5b39979e2f17e104ae97d840645d2a5c2f1", "sha256": "0h4v3fswbwa40hws8l29mmnka5wl9kyj6f01dnvadc725a34az38", @@ -68057,11 +68656,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20230810, - 1707 + 20230925, + 1013 ], - "commit": "6ca9e1b487ba642dbc28a2d81e0dbbb1a5a617ba", - "sha256": "1rj9lq5k0h0slqs9qp1f2aqnd23ghq4g3kmi8ndwnj565zqwmz3y" + "commit": "105d67626e91acb4550ab860e0dc4247c8a4c79e", + "sha256": "03g4w8n5zdbpzx2rbjqa95ybybpnxgshznnrhlfa5191afgci7a6" }, "stable": { "version": [ @@ -68149,15 +68748,15 @@ "repo": "martianh/lem.el", "unstable": { "version": [ - 20230905, - 718 + 20231017, + 1432 ], "deps": [ "fedi", "markdown-mode" ], - "commit": "8d7484f819f47861fa5c5ca831f9dcc4db9fabc7", - "sha256": "1lvp880gyhz4kz8f6dh797ivapwabfh4paw86kjj87qall2wmfl0" + "commit": "44b9535698384851f93257fd132319fb62c13c9e", + "sha256": "1ww05yqdrkgxnv37q2wa0al4k25cz1nwyygvycbcbawisqk3pmbk" } }, { @@ -68737,20 +69336,20 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20230912, - 2145 + 20230927, + 1841 ], - "commit": "8698d2d952c2495a54ddf171b37c415a946190eb", - "sha256": "1sh75iiaslc40kkpnyh97cl4l21bb6l9zrw97s8riwcdvnhn9k1l" + "commit": "a392154388b1abe974f424b71a66d618010f9e95", + "sha256": "0qd8ziv9j59s4q61bs1qdm5cvsd396pp3g2ymb1kxzpmbblaf0nc" }, "stable": { "version": [ + 1, 0, - 73, 0 ], - "commit": "48b0382cbd8be4c0be5140b952be780313861593", - "sha256": "1ljalnh60zggf0grgzdny1gqxdz4w462hc216igqc4pdxdif70gp" + "commit": "a392154388b1abe974f424b71a66d618010f9e95", + "sha256": "0qd8ziv9j59s4q61bs1qdm5cvsd396pp3g2ymb1kxzpmbblaf0nc" } }, { @@ -69466,15 +70065,15 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20230916, - 611 + 20231021, + 804 ], "deps": [ "dash", "s" ], - "commit": "3beadbeccdce30da7957a219690ff653f2f6c4fc", - "sha256": "0ffvk6cyxn7mm5r0gm2x1pkini9v22alz8xwchm6yy1dffv4x5ii" + "commit": "2579d7b28994bb16c3e02577953e7d9669121288", + "sha256": "03hzahbjv19krp9jfrh1haqicm9n8ldb05swvbwzy6cq1paslhj9" } }, { @@ -69626,20 +70225,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20230430, - 1540 + 20231004, + 537 ], - "commit": "c927feefa62f4ce9b3b5029063f9654a317267ef", - "sha256": "0ylyil5pck91lhn425akkjgr0qq4ngsw3vbqdvclnbslbc8nb97p" + "commit": "5a94b98a15fb8c4c539b37d8583db1e427308b44", + "sha256": "0y23dfncncfpddhxqf449d46qrc10bnhdb516yydkqqa6q5jlysb" }, "stable": { "version": [ 4, - 10, - 2 + 11, + 0 ], - "commit": "c927feefa62f4ce9b3b5029063f9654a317267ef", - "sha256": "0ylyil5pck91lhn425akkjgr0qq4ngsw3vbqdvclnbslbc8nb97p" + "commit": "5a94b98a15fb8c4c539b37d8583db1e427308b44", + "sha256": "0y23dfncncfpddhxqf449d46qrc10bnhdb516yydkqqa6q5jlysb" } }, { @@ -69763,6 +70362,24 @@ } }, { + "ename": "llama-cpp", + "commit": "8b9d579a2f699afe35784bf3ef6e5cdd9b18a32f", + "sha256": "0nbc973crzs81l883ml3c20j3gfnphd0432dwrq6nbl7kqzx89gf", + "fetcher": "github", + "repo": "kurnevsky/llama-cpp.el", + "unstable": { + "version": [ + 20231015, + 717 + ], + "deps": [ + "dash" + ], + "commit": "3e406c53cb82ec1be056dcef40ac37d474852524", + "sha256": "01jy3va6d02z2y9a5abzc3jajmwzcbfkz8p9q4hi8zp0b66ji35r" + } + }, + { "ename": "lms", "commit": "7d6c24152f88dad15ef9f304c0016a97ede71dab", "sha256": "1nksla9i7b4nmnzppyw6fq5kzh8jyqjfxn45g60c4mi2mn3p95a1", @@ -70130,27 +70747,28 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20230818, - 1411 + 20231014, + 1840 ], "deps": [ "datetime", "extmap" ], - "commit": "cabaf93f1df86c92aa022dde4a92d92371d72572", - "sha256": "0l09ayjwj5fwampbpfzdfn83h2vcj1l8n0hh91r9p1lvl1kz9lsw" + "commit": "9140067afdc2f0d1eb493dc4dfdb53645289dd2b", + "sha256": "1sjyxm1a1h971ak5l1js4inx921pf3wx15h220j2pvj4d7arj6f8" }, "stable": { "version": [ 0, - 17 + 17, + 1 ], "deps": [ "datetime", "extmap" ], - "commit": "a0f0ad3e0145eab382ff325cc95ec8ccbd6d68e3", - "sha256": "0i23hyxypagz0rs7wb5l77xwz38wxng21p57n5f0vnz4p24yv108" + "commit": "daaa89e969c6a6bb6d93526449a697b4e64bccf2", + "sha256": "12vahr4nln20yflxbav9q7y0clhni28h2cajji8q11jyrd4w84jx" } }, { @@ -70286,16 +70904,16 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20230903, - 1714 + 20231015, + 1458 ], "deps": [ "compat", "map", "seq" ], - "commit": "a337730314318e7878ce824a03d15001f01fbcf1", - "sha256": "164c9wlv3ab626x771wzbla7x8zdxvrhgbpci0ir135gk1ppm9x4" + "commit": "0780e281e12742803f5aac8f2126156d4271d567", + "sha256": "1vv9gsswb03hmfxw7d517nx1qncax7mdgx1dfsqp9hcg3s3nwycs" }, "stable": { "version": [ @@ -70563,15 +71181,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20230824, - 850 + 20231011, + 1723 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "c443f1536404c252dbd16cf44eb47cabdcd6c45f", - "sha256": "05gmys1sljpn4lx8c5rn8gyfyjdiyyzj3rc4qwyaqz6db915p3pv" + "commit": "89d16370434e9a247e95b8b701f524f5abfc884b", + "sha256": "0j1a6c1vz57xvk64n32qlaqwpvg91zh14ik7ajpyb7xm8gbw5ahv" } }, { @@ -70633,8 +71251,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20230827, - 428 + 20230922, + 1154 ], "deps": [ "dap-mode", @@ -70646,8 +71264,8 @@ "request", "treemacs" ], - "commit": "bc89297c72136f7250df6b745ae2364b5a4f10a2", - "sha256": "0pyvc7a8dbmiv1q0k3vglrr91vvbcvssbnmci88jpqr8y05jcg3h" + "commit": "449673da7221a30f1b1756cedcc48b9a2b52a51e", + "sha256": "1y1dr9nk50ji48z91gd1drfxqkq2189shria83cclm0lna45zfy1" }, "stable": { "version": [ @@ -70822,8 +71440,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20230817, - 827 + 20231017, + 911 ], "deps": [ "dap-mode", @@ -70836,8 +71454,8 @@ "scala-mode", "treemacs" ], - "commit": "811f02e4416d208102350ea48404e0310ffea647", - "sha256": "0q5piqh9k6sg8788dg3s0q59drgbj5d2sf444f413ryr3dph2gbk" + "commit": "da7e54ed65f4e153c94b9c54689908dce142ef37", + "sha256": "17zs7s6dmaprdc000b9779flk4iw61gi1xgn2wxwq9bxn1l2p9ny" }, "stable": { "version": [ @@ -70867,8 +71485,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20230914, - 1237 + 20231021, + 455 ], "deps": [ "dash", @@ -70879,8 +71497,8 @@ "markdown-mode", "spinner" ], - "commit": "1f5afbdcfbaa79811dd9737fef93d4df02a1c89d", - "sha256": "11k68ffiamkrg8ifxk8l3vpddyjzpicpz82yxgdl2qmwla7rqlcn" + "commit": "2134ca09245815487f395a4c53000da1082e8823", + "sha256": "0721z42hfh768b0cr57i7cr212962hx5k1fjsy9b6z19rvhr4ddy" }, "stable": { "version": [ @@ -71027,16 +71645,16 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20230225, - 1118 + 20231006, + 1212 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "54a2acddfdd7c3d31cb804a042305a3c6e60cf81", - "sha256": "1256q00zsh4q4p3qx5jwih1j7j7nfgmwvv9m0bn6j588wj97aiy2" + "commit": "2f2631ae242d5770dbe6cb924e44c1ee5671789d", + "sha256": "1gk23a56jf1v4f4ag07hzji5pw3mq1rq622ggbvqcbc2i2bnvdn1" }, "stable": { "version": [ @@ -71818,8 +72436,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20230914, - 1251 + 20231014, + 1408 ], "deps": [ "compat", @@ -71830,8 +72448,8 @@ "transient", "with-editor" ], - "commit": "4f4ad9c091daf769f8a0a562f6d14a71aa6c3192", - "sha256": "05kvn9micbhq2jbvslwh516cxk00s4lbmrzr30q51hdkxs6c4km0" + "commit": "c6a62accc5ed4bbdae4e1dc2060210ecfc4cdb8a", + "sha256": "1m1ip8ly0gjs3brmgkijb2vmyfrr489src9zgpn6whl1l10d7wa6" }, "stable": { "version": [ @@ -71858,15 +72476,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20230407, - 1200 + 20231010, + 425 ], "deps": [ "cl-lib", "magit" ], - "commit": "255e443e19a32e716ff414e09ad5e00f6f8bc8fb", - "sha256": "1l4fwvlgw8pfrvdws29b8pghk58yb70wfywh0rfvaw30ymv4v2n2" + "commit": "7c308decfc56270a0cf3cc8292c3bf7122103331", + "sha256": "0z2h6lc42whjh7wmf1cajzqy4f1nqy4m2h51pm01b7ldk0kz5j5z" }, "stable": { "version": [ @@ -72008,15 +72626,15 @@ "repo": "emacsorphanage/magit-gerrit", "unstable": { "version": [ - 20230309, - 2251 + 20231002, + 1538 ], "deps": [ "magit", "transient" ], - "commit": "a97521574c5b7d4b7ab89e25c358c87fd5b1887f", - "sha256": "0p6h67x7f6iraw6jqn7dmqy2m2mwwvbwcs61hq8jc602v6hkslqn" + "commit": "9b6c476a4a5e715d68081dda45312f7e2bedd484", + "sha256": "0gs6zhgywjikxr1lkbbih1ayxl4i4w82vsfg0yqsj6cdbi6r109c" }, "stable": { "version": [ @@ -72321,15 +72939,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20230909, - 1052 + 20231014, + 1405 ], "deps": [ "compat", "dash" ], - "commit": "7bef529ce9b07808d5c14692c5ab2d248e7b5bd1", - "sha256": "1a306vfn40a1pjcs991228r7agfc7q6wgg53vdv3qb4dpbjkwpby" + "commit": "22c99839c9fad89461412f153a290779cf3af82c", + "sha256": "1qxr3nfs7nnnn41gxsc1lmr6pyvc5yyrzsh9snvgwa8n9d2593kr" }, "stable": { "version": [ @@ -72667,15 +73285,15 @@ "repo": "jerrypnz/major-mode-hydra.el", "unstable": { "version": [ - 20210221, - 834 + 20231003, + 2050 ], "deps": [ "dash", "pretty-hydra" ], - "commit": "84c1929a5153be169ca5c36737439d51dffde505", - "sha256": "1yw9xdyqbf285ljsspg8ajjx1bp1g27xpg85p84fsh88nr015rh5" + "commit": "d0a5dadee97c3752fcdef113cf2ba1923972a480", + "sha256": "0waghp59ybzcgy1l0bg29qfiqps95vc062p3x80a3ksl68ylll89" }, "stable": { "version": [ @@ -72909,11 +73527,11 @@ "repo": "Iacob/elmame", "unstable": { "version": [ - 20230906, - 1549 + 20231021, + 1522 ], - "commit": "a0656eae4152ae30a0ec62284843afa3a5ec4be2", - "sha256": "1npxc462dq64ny0ipp814qd1irvfk3apwjfnrjz6n39f1w2qmzn4" + "commit": "04322e0b036198112417cf688ddf6b711010561e", + "sha256": "15slirx6x9rp2dfkphzrw3v09m2wbz6my8zkhf7cnlfdb9fmkhbi" } }, { @@ -73148,14 +73766,14 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20230910, - 739 + 20230925, + 1627 ], "deps": [ "compat" ], - "commit": "f1734375a5d8fa18e9cecb47ae4b5ae86c72399f", - "sha256": "0pig4wgnxkmdjrbxpg2p8i89y558zx8d7x0kyr66lj4gz1882ips" + "commit": "4e14bc0fa05ae8c35e019721d19acdec8b51248c", + "sha256": "0mv54hgb8cadwdhmn20d30fairhvvrvlvvp9awfi32dw91hma8gv" }, "stable": { "version": [ @@ -73192,14 +73810,14 @@ "repo": "plandes/mark-thing-at", "unstable": { "version": [ - 20230805, - 1701 + 20231019, + 1111 ], "deps": [ "choice-program" ], - "commit": "22ce137450890421c8dce79943c96dec79a65d77", - "sha256": "0fw3198mlxa22pq0qg0xakckc3hi540nv72a21gh071ii2mc2wl1" + "commit": "06cc38fb92c0c1badb06f6744f0110742ffdfe6c", + "sha256": "12dnkicqqk22sqf9vmrxf9bdlmjq2z0x9b3vv3qf817rskz7xkwh" }, "stable": { "version": [ @@ -73275,11 +73893,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20230830, - 1338 + 20231021, + 738 ], - "commit": "50e4452c95113df55953cfc310d7e18d8e6205de", - "sha256": "1yry9aza55x626yxcj938kyc19cs17fygyiz6b7kxhirk8yaz7qp" + "commit": "2a0556c5b7dbf29ce437eac6ee9b6636e1b95234", + "sha256": "1mkwqprh09328hqk1f40i8l09ksmphz7nyn3fzhghalgr40b1ij8" }, "stable": { "version": [ @@ -73605,28 +74223,28 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20230831, - 1012 + 20231016, + 946 ], "deps": [ "persist", "request" ], - "commit": "d4c105cc39315de3c9f3f29b97de0c0dec718770", - "sha256": "0jzgkbr7dmpv66cabmf8lnz3223m5vs25v06v27s1dfpy3grcxwf" + "commit": "cd2d6f23b4f7af63df3000f2fb68227c22bc8dee", + "sha256": "1b2rhb18md2n2xg2d5ikl95m4h78x8l566970r5xc2y5p199b6hi" }, "stable": { "version": [ 1, 0, - 0 + 12 ], "deps": [ - "request", - "seq" + "persist", + "request" ], - "commit": "b3649a12a398537ade7136d704f2f05ccc856e23", - "sha256": "13swcbvwhjl8ksrgzvmfafkgd3iz8znk49bs1n48w3g9qvh097w7" + "commit": "cd2d6f23b4f7af63df3000f2fb68227c22bc8dee", + "sha256": "1b2rhb18md2n2xg2d5ikl95m4h78x8l566970r5xc2y5p199b6hi" } }, { @@ -74344,11 +74962,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20230916, - 756 + 20231005, + 1938 ], - "commit": "ba0cf4d1607971374351a68e48581d3ff4184c0e", - "sha256": "0gz6dp36mgbjx9p4s8dz1f83w3pddzhmbs67qrap53s0g39zgaw4" + "commit": "f885c02e1c72da722dfc681af30476096528dc5a", + "sha256": "0di4pwyz8mbj1x5pbyhrnmi1idyxqb05w1msays1ayv6qc2xjjhv" }, "stable": { "version": [ @@ -74368,11 +74986,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20230726, - 900 + 20230920, + 824 ], - "commit": "fd1bac38fcfe601094ce8e01895333666733e664", - "sha256": "1411ccdcwik11pay532vgh4mksy1wy14wkaaz3kc14kb21ca0dvs" + "commit": "a74d0d11f400e679bfdb48e714da2b595ebb268b", + "sha256": "17dnmq9g7wn5jkxypzk52vbz2bzkg3yfm517mg05wq7qc14dnbjl" }, "stable": { "version": [ @@ -74509,6 +75127,21 @@ } }, { + "ename": "mermaid-ts-mode", + "commit": "ca1484ddee30e4882685525645d1307db8cf5713", + "sha256": "0cq2d310lacrz1m51w6nq2shza84izwjd1w6z8kqnx0lb0q2vci9", + "fetcher": "github", + "repo": "JonathanHope/mermaid-ts-mode", + "unstable": { + "version": [ + 20231001, + 1704 + ], + "commit": "3f3a537d249b44e939d6a0d65a6c316761ff8c41", + "sha256": "08081a15wzwxljf68mznygjk6v2x5k4v9grx97cjr8ymcjbqnbcj" + } + }, + { "ename": "meson-mode", "commit": "4702a31ffd6b9c34f96d151f2611a1bfb25baa88", "sha256": "16yg217ghx6pvlxha2swznkg12c2a9hhyi0hnsbqdj2ijcdzca80", @@ -74649,8 +75282,8 @@ "repo": "seblemaguer/metal-archives.el", "unstable": { "version": [ - 20230509, - 1130 + 20230919, + 851 ], "deps": [ "alert", @@ -74658,8 +75291,8 @@ "metal-archives", "org-ml" ], - "commit": "ab8f3fcb5bdf7374c27445c8ae756d67658ccde0", - "sha256": "0svccgz1r2nlqjm7f68lpdmrqjm4mirp5knpipi52xz2p5g9rw9m" + "commit": "15ea07747bd223f111f7fb6ca7b28c9dd0bcc4dc", + "sha256": "1dabjg2lhh7bs98fg41w0006v52z49m1i4a9118jfzrnv9p2d2zf" } }, { @@ -74748,14 +75381,14 @@ "repo": "ianxm/emacs-tracker", "unstable": { "version": [ - 20221030, - 42 + 20231006, + 1213 ], "deps": [ "seq" ], - "commit": "ace35dfb6d00749a24993f3fb8f838938826b45e", - "sha256": "0r0lngyf076gbx6dhzwwpn2jr3vn688sbv2qkyw5gxrmlynvy8wi" + "commit": "3f32267635e7b73334cc661a01f3b4d31580eaf5", + "sha256": "1zhpmzd7g42d7sgl7d1wkr3br2588vrvq319gn0cpn555wnlw5wc" } }, { @@ -74851,20 +75484,20 @@ "repo": "purpleidea/mgmt", "unstable": { "version": [ - 20230420, - 2202 + 20230925, + 2253 ], - "commit": "c5efe7a17b5b66a4bf2096b6213998287637c64a", - "sha256": "0aqfv2hqv3syzidb45f8jynvsw640k0iqn3hdx59kv4j6nc9sddy" + "commit": "53f9f352335857736f625a019fe14c6750f78434", + "sha256": "13jx2ndbjqa5rgslaplx551nnm240pdzcw7bx63wihk85c617lyg" }, "stable": { "version": [ 0, 0, - 23 + 24 ], - "commit": "c5efe7a17b5b66a4bf2096b6213998287637c64a", - "sha256": "0aqfv2hqv3syzidb45f8jynvsw640k0iqn3hdx59kv4j6nc9sddy" + "commit": "53f9f352335857736f625a019fe14c6750f78434", + "sha256": "13jx2ndbjqa5rgslaplx551nnm240pdzcw7bx63wihk85c617lyg" } }, { @@ -74875,14 +75508,14 @@ "repo": "yoshinari-nomura/mhc", "unstable": { "version": [ - 20201227, - 406 + 20231006, + 1305 ], "deps": [ "calfw" ], - "commit": "1cd9cbc7f8cfe40833d1af726644ae45a3d07dc0", - "sha256": "1cm7y1nfbl8625rpk5i9zcmp9p6rzqdzxy9wcjs8yrdfsc0biq3q" + "commit": "186d17bece0419c114db2474bc82e3eeeb1dbb9d", + "sha256": "0mwsyk6k9hrcabbkg8f9147fpf3x4dqld20qrc5n4lfk8510dqpy" }, "stable": { "version": [ @@ -75456,6 +76089,29 @@ } }, { + "ename": "mistty", + "commit": "8a66484b8aff8298222e70466f8f9b09b31bc598", + "sha256": "1xymccwmffccf5b5a29mmhwymmllmkd4nbmxk52g7c81xrwnrcnb", + "fetcher": "github", + "repo": "szermatt/mistty", + "unstable": { + "version": [ + 20231016, + 1730 + ], + "commit": "2524edeff25ec4d51fbef1ac005a0b6a92a10b56", + "sha256": "07ixq2fgsjik0iyv6hizrci8jcr7zlyfghxpfs6agpb6appvdn7m" + }, + "stable": { + "version": [ + 0, + 9 + ], + "commit": "c1f73167f010e0961acfd919ead5b6a211518ecc", + "sha256": "06sh1hijgyh7ixy1ryz2mx49mhzik52f0v4j1di7vn8cv8plw1j7" + } + }, + { "ename": "mix", "commit": "aaa1958ac6a0e59613e1b71e0eddbe4989d93e67", "sha256": "1wflzfr7jgvd01il9zz96wasdyjxxi5nrzva9hlrkgqhp0h877sk", @@ -75573,26 +76229,26 @@ "repo": "dgutov/mmm-mode", "unstable": { "version": [ - 20221228, - 1931 + 20230917, + 28 ], "deps": [ "cl-lib" ], - "commit": "171bf6395b8a95a2d08d41fa38cc1799025d3916", - "sha256": "1m6nqkjy04s5c4v3a952gx79dnc3ihc5w5vj6lg26ps9syzk3b0b" + "commit": "96906747e862449b722b6e2c741b61871894ac3a", + "sha256": "1cj5cam607a4imfpicjm3k60lz7r1g06kbia11hdzqgrvy63sy57" }, "stable": { "version": [ 0, 5, - 9 + 10 ], "deps": [ "cl-lib" ], - "commit": "8725cfc12bded653d52a6a223c4d34bec2b1d538", - "sha256": "12dn3zp17kw1cj3a883mn1g3dgdai5qy9p799zg752ishp3dqan8" + "commit": "96906747e862449b722b6e2c741b61871894ac3a", + "sha256": "1cj5cam607a4imfpicjm3k60lz7r1g06kbia11hdzqgrvy63sy57" } }, { @@ -75762,20 +76418,20 @@ "repo": "DCsunset/modaled", "unstable": { "version": [ - 20230825, - 152 + 20231014, + 255 ], - "commit": "98f58e6857877bc1b593e86ee0ee61ad64daaf24", - "sha256": "1x9zc9c2w7slihc2zkbc5msx48fjhcmsmc6kp7ljhgnz8v1dlvig" + "commit": "ace80c0bd5d37803fdd1cbcb3ddb8a5e3b0cce98", + "sha256": "0ksl9jz4620myzhr2bfnw30ljni3bxn1drcydqnbs3ii94ysjm3d" }, "stable": { "version": [ 0, - 6, + 7, 0 ], - "commit": "98f58e6857877bc1b593e86ee0ee61ad64daaf24", - "sha256": "1x9zc9c2w7slihc2zkbc5msx48fjhcmsmc6kp7ljhgnz8v1dlvig" + "commit": "ace80c0bd5d37803fdd1cbcb3ddb8a5e3b0cce98", + "sha256": "0ksl9jz4620myzhr2bfnw30ljni3bxn1drcydqnbs3ii94ysjm3d" } }, { @@ -76037,20 +76693,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20230913, - 1540 + 20230926, + 1524 ], - "commit": "b4ae827560374624c2d4cb175445b4861e7ec16e", - "sha256": "0ipyr161fm43gfrrgw0wqjpk1fbzmqs34wjanfyd4kscbwmp53qd" + "commit": "284433625ed7cd3b19d2e34589c3041e16dd0deb", + "sha256": "1mmrgl8apqd6zjqxh7hrbnwjp2xg6xa4q8b3zxwnscqhz21abrvj" }, "stable": { "version": [ 4, - 2, + 3, 0 ], - "commit": "b4ef90bb950b820a3bf316d7b212320a5b2f84d7", - "sha256": "1r6m2jsfn6066155pnlkdgs6dz2fdsampdhdz796z2jy53k7srsg" + "commit": "fe08a02c4c0501a984b15af3f8c3c5e4769b93ad", + "sha256": "12i32y7y6hcv7mqc6g7pcmxr2f54xf3vl2yavdv76643vlhay32v" } }, { @@ -76061,11 +76717,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20230818, - 554 + 20231006, + 639 ], - "commit": "51795cd85ea5f01f3b2a82476914419a5bd89a55", - "sha256": "157mqrlwwkf5pzpnxf5y69qjr0nf4rb6xj40pph8h5gdb9pqdchh" + "commit": "1872aebc016e1c1a8d4e2a4037cd54b618de5453", + "sha256": "04hipaz7wc46axnjqgbwzcjghiyw9fc6kslifs3263h96cfxib0m" }, "stable": { "version": [ @@ -76351,11 +77007,11 @@ "repo": "jessieh/mood-line", "unstable": { "version": [ - 20230126, - 917 + 20231016, + 1735 ], - "commit": "58e85c815092ac93d02dab584fe537fd1be3828a", - "sha256": "0davxbpw2a15n1wcza3qszdvmyzypffz8rdkizlq6xhccdyk0rvd" + "commit": "bcd8725b21a64df4952cb0c52ece953075cbee66", + "sha256": "1d5zx3wjcdnbqp6xpmb80ank40yyrbv4i2w7xyg3rwal4l6yq3lv" }, "stable": { "version": [ @@ -77305,32 +77961,6 @@ } }, { - "ename": "mu4e-maildirs-extension", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0bisxm0rph5q1p3zjr7vyyr0jqr3ihs6ihiwyfr8d3dvba1zhffc", - "fetcher": "github", - "repo": "agpchil/mu4e-maildirs-extension", - "unstable": { - "version": [ - 20220517, - 1852 - ], - "deps": [ - "dash" - ], - "commit": "cdc2e141d8ecd59508a5cd50d6d02120073bf4f1", - "sha256": "0nkkz4x0wk3sc1d97zl47x4d80d29r5nmh6f3sy7xw342gnb8gsj" - }, - "stable": { - "version": [ - 0, - 8 - ], - "commit": "8b384b0bbda46c473dea3ee7dc68c2b3f2548528", - "sha256": "1lyd8pcawn106zwlbq6gdq05i2zhry1qh9cdyjiw61nvgbbfi0yx" - } - }, - { "ename": "mu4e-marker-icons", "commit": "d1fb8cc83e74cf9993c3123213d195935c61aa13", "sha256": "160ycz6bbnczhxz3zixjbqa0d4rb8240lwjvk7aijgypzbgn95il", @@ -77356,11 +77986,11 @@ "repo": "mkcms/mu4e-overview", "unstable": { "version": [ - 20221107, - 833 + 20231021, + 46 ], - "commit": "21d4fbf44f67b786a61072afd20065a56b3952a1", - "sha256": "1lsb080ff134ibxq0lcc99qq3ysyikiabkfiyldnjwcs41ixihha" + "commit": "18b74e26616f7fe4d2db13d9def4b5a0fa44ddcd", + "sha256": "0ly0fcffdb73923hr1m5s1zfl9c7m9wh0khsn1zxj6bw7azjqk6i" }, "stable": { "version": [ @@ -77778,14 +78408,14 @@ "repo": "zevlg/multitran.el", "unstable": { "version": [ - 20220903, - 510 + 20230920, + 2009 ], "deps": [ "cl-lib" ], - "commit": "6244e227bcf57eed391eecb34bae445f9c17e809", - "sha256": "0zjl7zyydx2pan2ashbwbp70nlmw17hq5w03sfk12wi7j1nihwbz" + "commit": "285b625b5e94f5dd960cb4a3292407aa7568073e", + "sha256": "0br5gy1jxanj7sjvrhqgni6bfins6nr79pccyjibqc8ca29zvgsz" }, "stable": { "version": [ @@ -78858,20 +79488,20 @@ "repo": "babashka/neil", "unstable": { "version": [ - 20230322, - 2035 + 20231002, + 1014 ], - "commit": "19bc12d1c868eb5c1f200963c240a2a107982556", - "sha256": "135dfbmkqd9g4bnxbhhfp80pk5v6vijivkrafvcs5a9ajmxrylq0" + "commit": "f597921dcbf4774d799be62d8fbbce7171b12c3f", + "sha256": "143lbva2bh723qgk6mjnbawbx9sr3x3pnpgp42hvnr072gcpl9nd" }, "stable": { "version": [ 0, - 1, - 60 + 2, + 62 ], - "commit": "19bc12d1c868eb5c1f200963c240a2a107982556", - "sha256": "135dfbmkqd9g4bnxbhhfp80pk5v6vijivkrafvcs5a9ajmxrylq0" + "commit": "f597921dcbf4774d799be62d8fbbce7171b12c3f", + "sha256": "143lbva2bh723qgk6mjnbawbx9sr3x3pnpgp42hvnr072gcpl9nd" } }, { @@ -78959,11 +79589,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20230914, - 1316 + 20230925, + 235 ], - "commit": "5346d28cfb5b721bd0840f57377ff207bb3cfdd1", - "sha256": "0hjnd3ba7qvzl3qd6mjynnipr0pfp57yhvfdh67p2j25qp22l217" + "commit": "0262a8c4fa41541438e489572bba8f0b4b689ae7", + "sha256": "1c7pf6fp99y3gsn8pb73h1gwlz3ag2i0h5i8pl7i0f09p3ra9jr3" }, "stable": { "version": [ @@ -78994,6 +79624,36 @@ } }, { + "ename": "nerd-icons-corfu", + "commit": "f91192e3f7cc342a61a00dff449124d004ab9ea8", + "sha256": "1n7qlqj1fw78zvranvxmsh3yqs0c5r6ca2ws3gffamycll9swi3y", + "fetcher": "github", + "repo": "LuigiPiucco/nerd-icons-corfu", + "unstable": { + "version": [ + 20231019, + 1618 + ], + "deps": [ + "nerd-icons" + ], + "commit": "7077bb76fefc15aed967476406a19dc5c2500b3c", + "sha256": "13m20k242zma6jw7pkbw89fk3dnbkwdajcpiyay5xx2l9241snb7" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "nerd-icons" + ], + "commit": "cbc14c73032ebe1b2043757221d198ff6be1b670", + "sha256": "05hnq6yv0xcisk5vkdzjz2sdzn4cayirf3zyz40xj1pzf33lra4r" + } + }, + { "ename": "nerd-icons-dired", "commit": "652390de595accbfa3c5708f99000c2f7084e1b0", "sha256": "117dgj9219gm3k30mfz6r7x2p1b5w5gwh8kwi5z29dgjf2z69dki", @@ -79001,14 +79661,14 @@ "repo": "rainstormstudio/nerd-icons-dired", "unstable": { "version": [ - 20230905, - 2232 + 20230917, + 210 ], "deps": [ "nerd-icons" ], - "commit": "b7605208215194fb97da703dff8c1a71738a6533", - "sha256": "129n2979pn757dsdk35vc4710g5czzskpf3c582s5yvxlf65f688" + "commit": "4a068884bf86647d242c3adc8320cd603e15dac3", + "sha256": "1nn9xa0vhn0szl0xaz7hrkpj1xpq3yr5ym4043j3qh1h75048isf" } }, { @@ -79489,8 +80149,8 @@ "repo": "nim-lang/nim-mode", "unstable": { "version": [ - 20211102, - 917 + 20231013, + 1142 ], "deps": [ "commenter", @@ -79498,8 +80158,8 @@ "flycheck-nimsuggest", "let-alist" ], - "commit": "744e076f0bea1c5ddc49f92397d9aa98ffa7eff8", - "sha256": "0jjrjsks3q8qpipxcqdkm8pi3pjnkcxcydspbf0rkvy3x6i5mwkv" + "commit": "2cdbdf10d504d8ff4db7a655276e3c554043ac14", + "sha256": "1sibj1xy7hy5pyqbs71wnk1ysdzbwm12fjfkjlylx28f4f0grh3l" }, "stable": { "version": [ @@ -80264,6 +80924,30 @@ } }, { + "ename": "non-edit-mode", + "commit": "6b0aafa28b53c49796016c34b6e35d6e8af974cf", + "sha256": "11ss7gil0psc8xpqwcsba9dfspnw4wkl6clwxbf7kdbplbw3azrh", + "fetcher": "gitlab", + "repo": "aragaer/non-edit-mode", + "unstable": { + "version": [ + 20230926, + 1404 + ], + "commit": "bc9d29e437d70675c725f3ef8a66abe574b9a142", + "sha256": "1nqxw9s41ln91gjrglrbyhqasakgk0542ymhbwivw9l19yyizmaz" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "dfe065acdd06be176fce3ab150fae699b2ad1a13", + "sha256": "1nqxw9s41ln91gjrglrbyhqasakgk0542ymhbwivw9l19yyizmaz" + } + }, + { "ename": "nord-theme", "commit": "34b4c3be2d0d62d8550966067fdb61606cf7c006", "sha256": "1cg1iad4gbzqaiiybk9f56s3y54n48b58p95nafa7w6hndx40d60", @@ -80416,11 +81100,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20230912, - 1137 + 20231006, + 2337 ], - "commit": "60b5ea319a45900b1e610715481faaa339ea3a4c", - "sha256": "1x0h5z2476qsfi1qfywlfdn68gydlyqfmvpjr92yw3pmp28ilrl3" + "commit": "e4ead7656c72092bf30c43283057c2d4c4107962", + "sha256": "0wab9n0rn9k76js1sl4wwiivvifqnjf58n8iwyscqsmkrkhcdc47" }, "stable": { "version": [ @@ -80563,16 +81247,16 @@ "repo": "tarsius/notmuch-transient", "unstable": { "version": [ - 20230511, - 2054 + 20230917, + 1004 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "3eeabdd9c922836d24433786265ef7c25fb599b2", - "sha256": "00b0x34gzcjfdpni8xfy8a51w66gb869888k44jjm6pm7c5c6z64" + "commit": "b2a318be18ad2fc7553601f564132fa6882a4a0d", + "sha256": "0p90mdcwhfqpw6jzs8l4iw5072ziq82hm4xc18qyjj32h8lbs9p3" }, "stable": { "version": [ @@ -80948,21 +81632,6 @@ } }, { - "ename": "nummm-mode", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1gdq00f3x0rxxj917x9381v2x7cl9yabj7559zr5vj1clwza8jn4", - "fetcher": "github", - "repo": "agpchil/nummm-mode", - "unstable": { - "version": [ - 20131117, - 1014 - ], - "commit": "73b1aa8643d86197c82cd28acdaefcb48a1e0abe", - "sha256": "1022dchkh0hbhsqds6zncfayjgq5zg2x2r5gklr0nyx8j2qd8g7j" - } - }, - { "ename": "numpydoc", "commit": "e7e20f00482f143ac67589a48f7bc591e075b5da", "sha256": "1p2ls9qmbl58p4cyrk4f769blc72lfgbwd3sy4hhkv75m4qj4lws", @@ -81009,6 +81678,21 @@ } }, { + "ename": "nushell-ts-mode", + "commit": "4348aeb18bafda4f06b2b181381962b90085c0be", + "sha256": "0v3rqszggd10cl3r6iig1s0binqs3abdbg1cbw0phzqfyq0dnhsc", + "fetcher": "github", + "repo": "herbertjones/nushell-ts-mode", + "unstable": { + "version": [ + 20230911, + 152 + ], + "commit": "68afe1a8275880995b4d9a122fecf4accca15183", + "sha256": "0kd4pqsfyjpi8wdrqnbl18hz3i64gvfs9aarmxq86v8vj519z0wd" + } + }, + { "ename": "nv-delete-back", "commit": "7542fa39060b507a6f455225367e45e89d3e2f92", "sha256": "13izzym4alda05k7ra67lyjx6dx23fjqz2dqk7mrzhik9x552hsr", @@ -82157,17 +82841,17 @@ }, { "ename": "ob-powershell", - "commit": "3490006379a8aaa3d6bd8d28b115475d3e2164f1", - "sha256": "0k7l2s2181mwz20sskgk3dxhxid861c7b9hmk2pgknb6dizi00hk", + "commit": "d97a205d5bf6431f7f1f6e0fac66f09fc056e1f0", + "sha256": "1hmj18akqbrr8kamrag28rdjmwpbrf1171950v7hszn35jgsj38b", "fetcher": "github", - "repo": "MoisMoshev/ob-powershell", + "repo": "rkiggen/ob-powershell", "unstable": { "version": [ - 20220314, - 1359 + 20221227, + 1106 ], - "commit": "f351429590ed68b26a9c8f9847066ca4205e524b", - "sha256": "1lk3xikq4j5nw0z1mj1wq9p1i39zbjhznw0fn7s0wk0as7kd4nkn" + "commit": "e514efa7fbbdac80082761580ed23fd5ae3abc5d", + "sha256": "1rkgrylcz07y1b5iyp0xh3bmckacwkm4x399lzl97i4cnpfl67s0" } }, { @@ -82244,14 +82928,14 @@ "repo": "alf/ob-restclient.el", "unstable": { "version": [ - 20230301, - 1951 + 20231021, + 1002 ], "deps": [ "restclient" ], - "commit": "ded3b7eb7b0592328a7a08ecce6f25278cba4a1d", - "sha256": "0992xs7mkljgql7g4jrbvnm1dqkbzajfaj7jfrrxfrcd4b7i5ny6" + "commit": "3fb2c99c37c9972ecda143c826725819357e0de9", + "sha256": "15dcl1js20d9csmsj7xn4y0nzr6b0q1p1vfa5kl103i4l2v6cj62" } }, { @@ -82477,15 +83161,15 @@ "repo": "xenodium/ob-swiftui", "unstable": { "version": [ - 20230421, - 1542 + 20231009, + 918 ], "deps": [ "org", "swift-mode" ], - "commit": "da6bd8d13da6bf6b949c4c9b1d4754fecb0345c7", - "sha256": "0f8nshmllp8pp8za23kv5cyaim466v659rzwvykda75d08cv4pa8" + "commit": "af65a8e60602ca90ab3f61811190a3da67ac0414", + "sha256": "1cyv3f4h7dj9fhlgivgh7mqgaaf7q5mxs4mmp833sh0mgk4p6vmk" } }, { @@ -82706,18 +83390,19 @@ "repo": "licht1stein/obsidian.el", "unstable": { "version": [ - 20230831, - 1430 + 20231010, + 1715 ], "deps": [ "dash", "elgrep", + "f", "markdown-mode", "s", "yaml" ], - "commit": "53413f651fced9318777db9b9c8eccfce38c2c1f", - "sha256": "0nc7x5zahamp3910xigqsrpj81gwlihkbvgy33vpawnhkawxrjdm" + "commit": "d02c3e78ac8b7ef711658f8ce282d6afe4b3fc1a", + "sha256": "0zb7pmw2kp1283zkxj7gxy30n2qrdxcav7xdpw8ccbxkczsk8hq9" }, "stable": { "version": [ @@ -82989,26 +83674,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20230912, - 1059 + 20230925, + 1039 ], "deps": [ "org-re-reveal" ], - "commit": "7e4d2a43e6a821f5a4360bf243854c6a6503e04d", - "sha256": "1mv92lk3cvzcspcr31z1li454nxnj4milqhpxih4m71x4ylp17w9" + "commit": "008a4433d64389d00ae86e00a391041e12a9cba7", + "sha256": "0wxzbgxc0yh5hl5z3c3cpzwdqhzczcvsz14yb1fbg7qr7365kyah" }, "stable": { "version": [ 4, - 11, + 12, 0 ], "deps": [ "org-re-reveal" ], - "commit": "7e4d2a43e6a821f5a4360bf243854c6a6503e04d", - "sha256": "1mv92lk3cvzcspcr31z1li454nxnj4milqhpxih4m71x4ylp17w9" + "commit": "008a4433d64389d00ae86e00a391041e12a9cba7", + "sha256": "0wxzbgxc0yh5hl5z3c3cpzwdqhzczcvsz14yb1fbg7qr7365kyah" } }, { @@ -83165,11 +83850,11 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20230729, - 403 + 20230929, + 428 ], - "commit": "a644ee9d24c7283435ce42e11498951e100608c9", - "sha256": "1c65bi13v2liqglzh4kx9wf53m0cnw1xygxcl3hpv9s9w6fbpnn4" + "commit": "8404b53a24393a7edcf3a295b958ca85971edc13", + "sha256": "0ywbx0wwrqxm6p6yfw7hiqdx4hshw2kgb317wmsnn5369bmn1xfn" }, "stable": { "version": [ @@ -83833,11 +84518,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20230802, - 218 + 20230920, + 553 ], - "commit": "6936fe46ef07df168a423f04efeda130b4e69753", - "sha256": "0irmid327qanjgp7x80zc1cm1v0ib6g1kli4kbm4gnfsq2fkybd9" + "commit": "d6b402a89e234d0e6166247ed6025f9acc8b4d9a", + "sha256": "00233wp3dlzxbnxbxq1ph9j93d25mnqn6iagr7rfp83b7d9s9gbb" }, "stable": { "version": [ @@ -84155,11 +84840,14 @@ "repo": "alphapapa/org-auto-expand", "unstable": { "version": [ - 20210923, - 243 + 20231006, + 854 ], - "commit": "dfb909d9fd0a658df8a05613a5b95b645b855344", - "sha256": "1slb8sy6zjdb3rs67vw0k1hd12fwlby1kbjyhn4n7v3kblxff2y3" + "deps": [ + "org" + ], + "commit": "86e3b24e894ab377ea005b1a574e77daace0451d", + "sha256": "0kxi76z95dqsj3z2spihjzizxhvl72wf9sl21n03x3wxyfwkqxfp" }, "stable": { "version": [ @@ -84453,14 +85141,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20230708, - 134 + 20230928, + 1922 ], "deps": [ "org" ], - "commit": "f6bf3c402918d0a5f958a7d18e86ad9df2e4a9bc", - "sha256": "0n7l7hicvfy9zh0rybpc1pasz5jld8k5vbpigwyc2vrga7nvs2na" + "commit": "8610bd4a1c5726d85d999c9abab2b2d6044ab895", + "sha256": "1pixliwsxgybvyhjmjspxhyynrzvb1x9ms9wpdnlq2zsahh2x3v5" } }, { @@ -85450,15 +86138,15 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20230803, - 1640 + 20230922, + 1258 ], "deps": [ "dash", "org" ], - "commit": "588acb063f1c73025f973cbbba64a9f65a737bdd", - "sha256": "0zbynga4az8kh3iw3r7pz39mvi55vk2y19z8f13027sq2vff7rla" + "commit": "45b598c7971d149ce4eae5f790469d89f691c8e6", + "sha256": "1zqd9a4fm93l9psa1xg4lmmhvwq6hq465fkw791yqk6zp33s80y3" }, "stable": { "version": [ @@ -85723,14 +86411,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20230309, - 1240 + 20231013, + 1147 ], "deps": [ "org" ], - "commit": "18df4d5ae5e15580df42562c143d007c6d28d75f", - "sha256": "0vbafihx0p7prxkhssv32spz4kz0f0xglwyimz0lvh7nqqs83i50" + "commit": "ac0832f02a1259c10d3691b35496a01b54f0a3b9", + "sha256": "02ax78319p8iy8qqxrlcc32a3mkmawybb1qv37m34g1f49wlx0d7" }, "stable": { "version": [ @@ -85876,15 +86564,15 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20230807, - 1144 + 20230929, + 546 ], "deps": [ "fb2-reader", "nerd-icons" ], - "commit": "af5fdf59fb77424845ac98416826bb9c42e15528", - "sha256": "0ysfxw9by3ykf8z6vz5f432vfayzxk1zlcp970a41hd1r7l64sij" + "commit": "23b7b6662e5abcc164e3f3bf1f1faa2fee1b4a08", + "sha256": "04f24w06ssm9cc6zwi1ibww8nm98v0rj7a3iy4r87x64zlj8gsk4" } }, { @@ -85973,11 +86661,11 @@ "repo": "aimebertrand/org-mac-link", "unstable": { "version": [ - 20230228, - 1127 + 20231016, + 2047 ], - "commit": "3a30a937e135a6637a5126e2ac096b6c90584045", - "sha256": "0hnbwxzw4lgn4v2fh7pzf3h0wcr110ivvc0l0pnmckxpgyhc9jjb" + "commit": "e30171a6e98db90787ab8a23b3a7dc4fd13b10f9", + "sha256": "1d64a7h2p5fvypw1cwflj38qblbl9h5hv595yh8pficd5hia68xp" }, "stable": { "version": [ @@ -86292,6 +86980,38 @@ } }, { + "ename": "org-newtab", + "commit": "3cd50a5f676c70548c89f2f634e6a2779c3a8d6f", + "sha256": "1pm3crqnng52j58g1mbnvhbz3mgaa03zscbpzkzqjl0hl1blff1s", + "fetcher": "github", + "repo": "Zweihander-Main/org-newtab", + "unstable": { + "version": [ + 20231007, + 2103 + ], + "deps": [ + "async", + "websocket" + ], + "commit": "2b1f057f67838c9ea58292afa8bedb7f9eadd9e9", + "sha256": "0acv1f0f3hb1c7grd7gfblj7xv8b8hi4c8s6d841h6jgd5x1lwcl" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "async", + "websocket" + ], + "commit": "2b1f057f67838c9ea58292afa8bedb7f9eadd9e9", + "sha256": "0acv1f0f3hb1c7grd7gfblj7xv8b8hi4c8s6d841h6jgd5x1lwcl" + } + }, + { "ename": "org-notebook", "commit": "04149b1f158e857ea824fe120372ac52a000adcf", "sha256": "045xqmrik1s83chl7l7fnlav2p76xrfj21kacpjj215saz1f8nld", @@ -86817,8 +87537,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20230908, - 722 + 20231020, + 244 ], "deps": [ "dash", @@ -86832,14 +87552,14 @@ "transient", "ts" ], - "commit": "131407814ebfd8d409f23bc5cceeeb2b5da1a8d9", - "sha256": "00zam576wn8bl9l1rd6qhzb75lbq0xx0fi4z46dyvqwr3vxqd7xc" + "commit": "ac2d43588aa96f0b7fe88f518d6fca4fd65b5aa0", + "sha256": "098x2vv7w7s4i9kic7q8jcnixm517247i31a2ng06jkad7q7gx5d" }, "stable": { "version": [ 0, 7, - 1 + 2 ], "deps": [ "dash", @@ -86853,8 +87573,8 @@ "transient", "ts" ], - "commit": "d776e205d53adccd1d66a9c666fd885a2334262e", - "sha256": "1k71v445qxsn754s913h39smavgz2kwfqwy6iqil1yfx345zhv5j" + "commit": "f9d4f6241546166f98b5b3b74db4f4532620235a", + "sha256": "1nxjhk0yd0njlscnxvsxnlf1wy6027spcaks64qgvnrzzq9vnzrj" } }, { @@ -86883,11 +87603,11 @@ "repo": "KaratasFurkan/org-rainbow-tags", "unstable": { "version": [ - 20230607, - 1927 + 20230921, + 2038 ], - "commit": "550cc521013ba631bb3ad5fc4acdb72b655b24b7", - "sha256": "1wxwc1n4zdnd6yw7dixxvb6a5gxp36dfxjd90d8mbm4xxzrsy92g" + "commit": "fd0b68921302fdc3f0d086db7a09b5196251160f", + "sha256": "01hrk4hw7ama2zsiccc0d7r95a5rg268laz0hiy4rai6c30fs2zm" } }, { @@ -86948,28 +87668,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20230907, - 1139 + 20230925, + 1309 ], "deps": [ "htmlize", "org" ], - "commit": "93396b531ba13219bdbb968c197d5c44535ce1cd", - "sha256": "1iwq5w021nqmlv9s9pzv4m773r6cgi2dfi5yisjkv4b4ljbx875f" + "commit": "d5c40e2c05ef9b45dc28e7dad2b50330b51dc515", + "sha256": "1ss71iy1xnhr3p4mmfbnbgvp7kjqxpqag49f851wgmmwwg8gajvd" }, "stable": { "version": [ 3, - 21, + 23, 0 ], "deps": [ "htmlize", "org" ], - "commit": "93396b531ba13219bdbb968c197d5c44535ce1cd", - "sha256": "1iwq5w021nqmlv9s9pzv4m773r6cgi2dfi5yisjkv4b4ljbx875f" + "commit": "d5c40e2c05ef9b45dc28e7dad2b50330b51dc515", + "sha256": "1ss71iy1xnhr3p4mmfbnbgvp7kjqxpqag49f851wgmmwwg8gajvd" } }, { @@ -87127,8 +87847,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20230830, - 9 + 20231021, + 1453 ], "deps": [ "avy", @@ -87143,8 +87863,8 @@ "parsebib", "s" ], - "commit": "af103782f077bd4044062e723af52f9a4c591f5a", - "sha256": "062i9c1yba8xrlxxlwk2qkzmnz24bxg65lxxwhsvhd51kcxdyqjb" + "commit": "b2eaf51c0082fab335475ef3e9761ec5a3858f79", + "sha256": "0w359ijj3qzp180wnialrjmgxfrygp9i3jjyhwyil6ka5gnbyycj" }, "stable": { "version": [ @@ -87360,8 +88080,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20230902, - 613 + 20231010, + 2223 ], "deps": [ "magit-section", @@ -87370,8 +88090,8 @@ "s", "transient" ], - "commit": "31b7de04430e2e989564cc58d82c2b92f2383ee4", - "sha256": "1wj6ark2a4lk2f95y6d7hf3m8calm98ws3mvdm6x459rnfmgx78a" + "commit": "eab43b342ee1e63e07e5d6bee5efa8180747f975", + "sha256": "10qc4aldqmg1w0pq0w3w3jw73lrlxrjva0sz3dldywnmvmgwwj8q" }, "stable": { "version": [ @@ -87583,6 +88303,21 @@ } }, { + "ename": "org-side-tree", + "commit": "b6d4afd131465bf190a2e5b6d36f31d63b5cae24", + "sha256": "1plfif51s9y7w0db943x781gkm94aca58fkcjlpsbkcc2z50xm2l", + "fetcher": "github", + "repo": "localauthor/org-side-tree", + "unstable": { + "version": [ + 20231003, + 2014 + ], + "commit": "1a7b9629023e41d11fb13de395e78084b374a1a6", + "sha256": "1mhl5iv0i2kfzvfq8klz23s7mi1y1ysi8j63mg1lp0kz974vd7kg" + } + }, + { "ename": "org-sidebar", "commit": "fa65cb74eabe0c46094c64f1384e31b31a6a58e5", "sha256": "0grzh47b6nnk1y7xqd1dfy2cyq688g589wfd5dp78g0wfqbmdl5c", @@ -87788,11 +88523,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20230625, - 721 + 20231006, + 1534 ], - "commit": "eebf509c3acbda760faa7fd12b2e8902ae09482f", - "sha256": "08rkpknan34wdzh9wlsgvnfxlrjrc66jrl22i22hwgxzia9mzpyi" + "commit": "8ef0d792d5afbca1d6ffc6469d829e15a8406b93", + "sha256": "0m8jw2w3hy0jxmyiw38jajfd6a3c3hxyrp8as4zcxcjdf1jxy9yy" }, "stable": { "version": [ @@ -87841,33 +88576,35 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20220826, - 2315 + 20230924, + 5 ], "deps": [ + "compat", "dash", "ht", "org", "s", "ts" ], - "commit": "f4f528985397c833c870967884b013cf91a1da4a", - "sha256": "0f0bafwbj70nfr2vj8h62az3sr8ff7zb7sir9isk853crzp0rclz" + "commit": "51c0022e4a194ba050c278b442f3592147a5607d", + "sha256": "0dr37f5dg5rjxs9k424582hxp7cd936f23biczwmi67q0sqffmjm" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ + "compat", "dash", "ht", "org", "s", "ts" ], - "commit": "857783ecd3dbe35c72b4eca046e0a5dc64041fdf", - "sha256": "10l9h2n09cql4ih7nc0ma3ghdsq9l5v9xlj1lg7kq67icdwjlsvy" + "commit": "0d7851e1b4bfa278a0ceca99f0130a795a825103", + "sha256": "07fv4zgmfc8ppppbr7ylhx89wcw6r6vmz4a6pg0iy4v7sn5pp1wa" } }, { @@ -88157,14 +88894,14 @@ "repo": "jxq0/org-tidy", "unstable": { "version": [ - 20230829, - 53 + 20231011, + 37 ], "deps": [ "dash" ], - "commit": "11f71638710d4c0fefd9bf7293145b9b24a7d70e", - "sha256": "00qs7zpgxwa2dz3hk0f4fd5a5l02afds0xfrqq86siqvbm3k94zp" + "commit": "789795a032b121825938e74e4bcbdede31de864f", + "sha256": "0zc1wy2qq4dgii7zjjk2vgp8d3qp1dyqrpwvdva5zcnailf15cwf" } }, { @@ -88200,6 +88937,43 @@ } }, { + "ename": "org-timeblock", + "commit": "a84291141ce7e5baa449cff808a81484bbd5d156", + "sha256": "1j4ry63222nparpv1hmzfcv363d7ykp1xmkgwyx376ibx4j8sdfa", + "fetcher": "github", + "repo": "ichernyshovvv/org-timeblock", + "unstable": { + "version": [ + 20231010, + 832 + ], + "deps": [ + "compat", + "org", + "org-ql", + "persist", + "svg" + ], + "commit": "0c7bd445800569a87eff5284ceef1ebcf13f281b", + "sha256": "11nwxvc10pbf0ykhjnrz2vivsyp7i4x1zp1k8y0xyr784lrngl8j" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "compat", + "org", + "org-ql", + "persist", + "svg" + ], + "commit": "f8acd4f5c511082633d75a32997dfb3fdc65a32f", + "sha256": "1gdmlrf87nxc1vsmczj12h9xasifcn82y733f0sidw5qhay8jczg" + } + }, + { "ename": "org-timeline", "commit": "298bd714f6cefd83d594b0eea731a01fb2faf1ad", "sha256": "0zlhjzjc7jwqh6wcys17hraz76n2hnjwffis02x71maclrf2cfdd", @@ -88487,15 +89261,15 @@ "repo": "unhammer/org-upcoming-modeline", "unstable": { "version": [ - 20230905, - 717 + 20231019, + 735 ], "deps": [ "org-ql", "ts" ], - "commit": "bacabc9368b11554c04216bd0a9c756ea9fd4ee6", - "sha256": "04vgscv5g09bcin5jl4czvxrb34k6vay0cg8ajg1xa37q1l7sd2g" + "commit": "136a6a76d770d351559091c8d9ad5a189f1f2622", + "sha256": "0p12jg3pwa2r3ilw6ln6x7cxg0kqhrdk27i85dhaw4i84w0019r3" }, "stable": { "version": [ @@ -89036,16 +89810,16 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20230901, - 1236 + 20230917, + 1001 ], "deps": [ "compat", "magit", "org" ], - "commit": "1f2785f78be31d65aa036aa4b1c9a41c5fa48a4e", - "sha256": "01lb9wpd6fji5c8w9p7n6cigih7cky1cbymyy4xi8hrg14w87a7c" + "commit": "b60efabc4a1b15d7eacaabc5bdfe6f3c20fee161", + "sha256": "0q1l7kgicsr1dab1dn33h6icpxcjd7wvhpfy1l6gsfaxc5gda3q1" }, "stable": { "version": [ @@ -89070,8 +89844,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20230603, - 1232 + 20231009, + 1937 ], "deps": [ "compat", @@ -89080,8 +89854,8 @@ "org", "orgit" ], - "commit": "8ba92a54aee9693b1bf03baf14f83550a7c89b18", - "sha256": "0b7266k8n2wby5qc6kdi4b9850mnf646bp6q8n8wbsss1mnwaf6z" + "commit": "f595a30aa75af55522b1203cd29198fb9aa3a0a5", + "sha256": "034shn5x2ar0a2sy90bkxrppada30i0nxsxwpv3sc173i2vppni9" }, "stable": { "version": [ @@ -89161,16 +89935,16 @@ "repo": "isamert/orgmdb.el", "unstable": { "version": [ - 20230522, - 1817 + 20231003, + 2144 ], "deps": [ "dash", "org", "s" ], - "commit": "292a58b3bd19b61d24d897efefeee1a309a666fd", - "sha256": "10niqkw7gd4j9fs42lpskdzcc74z062jp0pwdv1hbwszi8hpwnxb" + "commit": "4338a0a34d500a214df8293590960011f761fe24", + "sha256": "1yr553kf6kmq2n328jr6pgxxifkwy2nk1c4w1xjy9m3x7zs1rpsq" } }, { @@ -89433,25 +90207,25 @@ "repo": "minad/osm", "unstable": { "version": [ - 20230825, - 919 + 20231014, + 1337 ], "deps": [ "compat" ], - "commit": "7961f5bf615a994a6ca756218c809bb998790946", - "sha256": "01cvaa6yk66wqi40ci0lr822f8yqwxsiyg0wh85cr4zp0h9lbbk2" + "commit": "cccaf20de935b265832a6fc5c6a25eceb175d23c", + "sha256": "0bva1n1ij1xw8wdwhqs1258ihk7lw8f6ppbadw9s1ixq8fqja75l" }, "stable": { "version": [ 0, - 13 + 14 ], "deps": [ "compat" ], - "commit": "b2481ef66d4443402bfbac66cbbfe51a52152407", - "sha256": "0i1lks8724i2nz9jk5csl4nfkyi49fc928a117sn7438z82r9gyr" + "commit": "1957cf75127471bce0ebe91b5afdf566d5bec033", + "sha256": "1y0zkfc27pnhz5hqpapsqin2kc6al1zjgd6cd4nhzqmh49h81bsb" } }, { @@ -91142,11 +91916,11 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20230901, - 1236 + 20231002, + 1121 ], - "commit": "a60f0b539b5f85f1a45c4ae2e0dc9a5ffbe091fa", - "sha256": "0qkrcb2gsw9461gif5am50yqlsaxmsiagniigjmg0qbdpgmh5j6l" + "commit": "03f878a18c15432d084402e6ca5309c3ba51c78e", + "sha256": "0pf3prlv0l63qgxrkp5cgixykmqwjny4rqwdlqadca6jlg4gb71f" }, "stable": { "version": [ @@ -91556,11 +92330,11 @@ "repo": "sebasmonia/panda", "unstable": { "version": [ - 20200715, - 338 + 20230930, + 2224 ], - "commit": "6508ac3228975c39d10a1caa70b9ce34ff3ed21d", - "sha256": "019nigy5yh1qrzw0agp2kgjfpfm503fgkj07c9m2xqs9hww781x1" + "commit": "3c0e3e4e91c5a7e75eacc07e9efa6e6631aa9b90", + "sha256": "0ws0xjapp3zliba6si2b7fkagpxp5ckb818138wdpx1ai0sxbzgb" } }, { @@ -92080,28 +92854,28 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20230911, - 1516 + 20230929, + 1500 ], "deps": [ "map", "parseclj" ], - "commit": "5772dc9cb5e0ba6e8fe0b25f0897582b5348b5b5", - "sha256": "186rczvy3zf2kb05cnprdg69szr6zxwp1pc3hjvakzlb9b9lmrnf" + "commit": "c8f07926a688bfe995fde4460103915d401a1aff", + "sha256": "1pxm50i74id3c4c0j2ifac0wx5zkdq431dmcqbyb6w6k0s05l23c" }, "stable": { "version": [ 1, - 1, + 2, 0 ], "deps": [ "map", "parseclj" ], - "commit": "ea7b5281ec80aca0bd1cc93a348aebb302497339", - "sha256": "01j8nrkcm2s0ps277b5zb4pys29lk4cq49rlcqpj19gbfpkwcvdv" + "commit": "c8f07926a688bfe995fde4460103915d401a1aff", + "sha256": "1pxm50i74id3c4c0j2ifac0wx5zkdq431dmcqbyb6w6k0s05l23c" } }, { @@ -93192,11 +93966,11 @@ "repo": "Bad-ptr/persp-mode.el", "unstable": { "version": [ - 20230110, - 1045 + 20231010, + 1804 ], - "commit": "df95ea710e2a72f7a88293b72137acb0ca024d90", - "sha256": "0jf4wsq13bjdr0wdm9jv702xxyhadfglxhvf9f7ahh3g4izjfqyr" + "commit": "345baaa520ab2d62205f85cc5f29d57d6063c141", + "sha256": "0y29vyvqdfxcpmzkyv2c6msbshx2f680izk2r0djrqj08ii8zmpr" }, "stable": { "version": [ @@ -93459,19 +94233,19 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20230907, - 1549 + 20231001, + 1501 ], - "commit": "a848042aa3c3f87c3e0101bf2f059cd7b9e7aa0f", - "sha256": "0ns2siw2hj4mva6391w4f01vp1wyxa73z6fcx22529cw26l6zg6i" + "commit": "842c3b88abaa4bbe7300db84d3c70e1719f5659d", + "sha256": "0228yig42g3x79gj1yakgmsj119v0agzvyn888nq6qgcd04i1w0d" }, "stable": { "version": [ 0, - 20 + 24 ], - "commit": "f91d546a35ed3479cdb656b17525285e11565892", - "sha256": "0a38rvl5rwfb77p4xxmjhrs6s67pfkzjfm0pdxvf0b6xh7h404kh" + "commit": "842c3b88abaa4bbe7300db84d3c70e1719f5659d", + "sha256": "0228yig42g3x79gj1yakgmsj119v0agzvyn888nq6qgcd04i1w0d" } }, { @@ -93825,11 +94599,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20230815, - 1051 + 20230929, + 123 ], - "commit": "c421658d7049a2b1dfe04e75c1e8a9e4a9e5e21e", - "sha256": "05gddb5bzvnpz8dwfjg2mmxqw97ajlf4lvs57rnrpqxrmi8bzjfd" + "commit": "4a29636243ba7f4afba476348587713531d994bc", + "sha256": "1gavi8gr1hwj1hrnciwc7ckcycl32l42bp2ablw66h1nr12qm698" }, "stable": { "version": [ @@ -94342,14 +95116,14 @@ "repo": "xuchunyang/pinyin-search.el", "unstable": { "version": [ - 20160515, - 358 + 20230919, + 538 ], "deps": [ "pinyinlib" ], - "commit": "2e877a76851009d41bde66eb33182a03a7f04262", - "sha256": "0bp4raxqv34jyg3yvdcsh9lav28x376gngm9nn8vjgmq9wggzf3i" + "commit": "3632bb98a5b8c0a396cd0a9d107e323e1ed3b7e7", + "sha256": "0mfxgxrwa3rs09pvmafifbihlkdyy2r2n2k7p272mn538hqjy6z5" }, "stable": { "version": [ @@ -95065,11 +95839,11 @@ "repo": "emacsmirror/po-mode", "unstable": { "version": [ - 20230617, - 1058 + 20231006, + 1425 ], - "commit": "d68aa1da2b95a17d7fe400afd414ce3ede09db86", - "sha256": "1px8bd3m4s20f5qzg1g3gvql1wipr6sxgppz1avjrxwvjd92l0ds" + "commit": "ca125eba813a6b29b5fbe7ea8a2e3d92f225ab8c", + "sha256": "0367gim5wvr3hpc7jwqfkzvjhpd9bqdkwgnbqbvbml5n3jgn93zn" }, "stable": { "version": [ @@ -96627,16 +97401,16 @@ "repo": "jscheid/prettier.el", "unstable": { "version": [ - 20230515, - 2017 + 20231002, + 1153 ], "deps": [ "editorconfig", "iter2", "nvm" ], - "commit": "1d9d789d91651a8773c7a3a688ec0cf3635fa94e", - "sha256": "0n23cvvy3xg12ynrf7p2lwcdp9ld9s9qm86zmbdr3qndhd1zgbf9" + "commit": "d6d7a6ac9e8a08ab497d2cf4d7e2317f6b93dfbf", + "sha256": "0612snvsf6y0g6qfirjvnxk0labnm35wgbxvidyy0rzsasfszl9l" }, "stable": { "version": [ @@ -96740,16 +97514,17 @@ "repo": "jerrypnz/major-mode-hydra.el", "unstable": { "version": [ - 20230516, - 2122 + 20231003, + 2046 ], "deps": [ + "compat", "dash", "hydra", "s" ], - "commit": "72bdce649245df276a3f49fb57f890c10fbf0a31", - "sha256": "0b9hkwfrlv5sl1w30cl5w9gn6mxkcd21n1xi8cjf3s9nnxrqp75r" + "commit": "5181a31631589ffd870f70293aeee00b7b773b58", + "sha256": "019rnqz3mhakpx5vilgv8kicp3xrlh91rqacllr35jkziz9bnmm7" }, "stable": { "version": [ @@ -96885,6 +97660,21 @@ } }, { + "ename": "prisma-ts-mode", + "commit": "4638e8fa4352a8cf9725502807d6eb2d33ac4e6b", + "sha256": "0x9v71gmfhqr1vfkla2fr7j0l85xs1mcsld4rnj8nisfpcrclgcw", + "fetcher": "github", + "repo": "nverno/prisma-ts-mode", + "unstable": { + "version": [ + 20231007, + 904 + ], + "commit": "b597a437a96c0f03cf2bc038794d6a98ba1bd48b", + "sha256": "1m4lv4isfd0szyy6dj75kpid6qs6zvj2jx80glndm0qqyznrkl94" + } + }, + { "ename": "private", "commit": "e036ca25bced52cdacc4e56dcdea4282360aa5da", "sha256": "1rq4vyfjr8b2fnwjnw28if9y9svvaxw1pwisys5p8rx0mff48cn3", @@ -97038,16 +97828,16 @@ "repo": "rejeep/prodigy.el", "unstable": { "version": [ - 20220523, - 1728 + 20230925, + 1820 ], "deps": [ "dash", "f", "s" ], - "commit": "a3be00d3b90a77118c2d7d9f5a2f26151091fa07", - "sha256": "0pijzj4a8q6acm8rsrx92gam04vhz5xgc5jzzv5ykl6d4xx4zskk" + "commit": "cc68fa9d604a0739a63247237a801b03a184aca6", + "sha256": "0g032xq19g5k29wypbk7klhkf602r3ih3ypq7h5zpd1gknkcqlbp" }, "stable": { "version": [ @@ -97304,14 +98094,14 @@ "repo": "hying-caritas/project-shells", "unstable": { "version": [ - 20210625, - 647 + 20231005, + 641 ], "deps": [ "seq" ], - "commit": "900369828f1a213c60a2207a71d46bc43fd5405c", - "sha256": "1igs3dr3j9lw8lyww1wp69v5i9k2ifvblmsh862vx7l6rvy98f5h" + "commit": "15f70d99b6d5f078f490ceb64b6f13c000b37e24", + "sha256": "0lmlky8nk7rd4j4f9fl9yc2prwx6hxrkmmwchdhp6grdg2jjacw2" } }, { @@ -97379,20 +98169,20 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20230713, - 1023 + 20231013, + 1509 ], - "commit": "971cd5c4f25ff1f84ab7e8337ffc7f89f67a1b52", - "sha256": "1jdl8yvx7yrjgfbsq00mdjwx0ykvi03pqxf3w5qkhvic726mi9ki" + "commit": "e6889d7f4bc0d2c48ceac56dfe6f4a3d742a3b69", + "sha256": "022ca1185ywmw8pjpkrxkd6d2wp4vbq67x2w724iiw2asy69j7wb" }, "stable": { "version": [ 2, - 7, + 8, 0 ], - "commit": "14beeaee7a77601aee4d4982811f6a27f696403c", - "sha256": "0ybd41iss8vd56qv6czpxqq7a99s4h7i3a2r4khy4rf5blj5zdqi" + "commit": "e6889d7f4bc0d2c48ceac56dfe6f4a3d742a3b69", + "sha256": "022ca1185ywmw8pjpkrxkd6d2wp4vbq67x2w724iiw2asy69j7wb" } }, { @@ -97644,16 +98434,17 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20230910, - 1707 + 20231016, + 1934 ], "deps": [ "compat", "f", - "project" + "project", + "s" ], - "commit": "c3fbf532bdc8ba3ae798ca2639751edd3b05fa95", - "sha256": "04gy3i1k2hr8rlwx9q4137sspkv85l3hfggdysdi3fg087wscm5a" + "commit": "e3bd95ee6f729b578f5ee9e15a3dd77e6836c7b6", + "sha256": "1bi5dz5d4r7y8nh3mf08fvk4w9h7628qnyijn6pyfxmzyi9k6n8i" } }, { @@ -97664,15 +98455,34 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20230910, - 1702 + 20231016, + 2008 ], "deps": [ "compile-multi", "projection" ], - "commit": "6fb860799ac0773dac408fdb984978ef1608c881", - "sha256": "1i4ggsqjg35rb0i6lxd74gdgqh5wxch00gcyvqmyj49v0pcy7m71" + "commit": "89020b23ae607944b1e1071ffbd123a6003fa2cb", + "sha256": "1x71w70316j8apflfxz91gjz0364hd4551gj99813b51f9ww9zly" + } + }, + { + "ename": "projection-multi-embark", + "commit": "14a84eaa24d7f4534054377fa26632ae2a6e9fae", + "sha256": "0q1ysbpiajhkbnar3r1wzfk9h1hgpwfrg9g9awg6p211jd720dfc", + "fetcher": "github", + "repo": "mohkale/projection", + "unstable": { + "version": [ + 20231008, + 937 + ], + "deps": [ + "compile-multi-embark", + "projection" + ], + "commit": "928602ddd3003913cfefe343b5f057bfa360c0fe", + "sha256": "08p8igrlbzvw6h8j066nh7yvxgqzi9csjzbjhv34csasfd14mznx" } }, { @@ -97839,11 +98649,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20230414, - 931 + 20231005, + 1645 ], - "commit": "dac9b5d32ec1404d35e3dd83070591806f8977b0", - "sha256": "0nr80w94i7v17hbgxr751v4hl2yxr960ydci25aj7xk74589bcgf" + "commit": "bd3615b442974f1e1c3fca0252e081a05525d26b", + "sha256": "0vmp2kqf5g5a8h79110r4mw8xkag0kwsi50dbpxbifpaabk4drzh" }, "stable": { "version": [ @@ -97952,10 +98762,10 @@ "stable": { "version": [ 24, - 3 + 4 ], - "commit": "ee1355459c9ce7ffe264bc40cfdc7b7623d37e99", - "sha256": "1plv0ssah2fa71niljawn0x7jjdjk5f25xkm5pg81vrsz9dr0wf1" + "commit": "7789b3ac85248ad75631a1919071fa268e466210", + "sha256": "0ss3man0b959rxvbd6hbndg2bsk69kzpsm8rzngyzcwfh6myvr93" } }, { @@ -98122,15 +98932,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20230105, - 503 + 20231001, + 432 ], "deps": [ "async", "cl-lib" ], - "commit": "ca5bed69f803aab71851c46b0118b66f58455b8a", - "sha256": "0j2bgcy803qnwbrxqr9f26g593vwzjznnwbsy4r2s7nilgcy3anq" + "commit": "fc60f1253aeb9c38a08dc74f9c7dbfe0d535a19b", + "sha256": "15x1h104krici21ipsn6jr1y3yhyif5mkw38s3bwd5xhmsa3lazz" }, "stable": { "version": [ @@ -98362,6 +99172,24 @@ } }, { + "ename": "pumpkin-spice-theme", + "commit": "0b58ede0e3576427ffe746548544e1317afd9fe8", + "sha256": "04f3wqfcak6pvs8ijkhbfvzlmag2bc3cpibq2f77wz7p7lfkh0lx", + "fetcher": "git", + "url": "https://cicadas.surf/cgit/pumpkin-spice-theme.git", + "unstable": { + "version": [ + 20231011, + 1253 + ], + "deps": [ + "autothemer" + ], + "commit": "8d38276f6b2d16325ca372dd3630653b21e6e7ed", + "sha256": "18zla4ajw9x5dizs83lii8b4picsdr5a1nkmwi59d4gh85blqjvz" + } + }, + { "ename": "punctuality-logger", "commit": "76ac7178ee5381e08ae881f3fc6061106eeb1c1d", "sha256": "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm", @@ -99439,26 +100267,26 @@ "repo": "jdtsmith/python-mls", "unstable": { "version": [ - 20230811, - 1519 + 20230920, + 1915 ], "deps": [ "compat" ], - "commit": "2b7ef51d5dee57dfeb30bc8ebe10a7e4d12e7700", - "sha256": "0sl0ldsjf7zx1n4b3nfz5gw2k4w1svhrpmbh6zg8yasq80avib0w" + "commit": "821b93ff7c94a13090598c22fd92bd19b5ad951b", + "sha256": "1p9dcjz8hgjb8gz742pxqdrjh68mnyr2hssy6glhd2qb78d4927y" }, "stable": { "version": [ 0, 2, - 1 + 2 ], "deps": [ "compat" ], - "commit": "d90035d50a5079aa981aeac3f67f3867ae19cd92", - "sha256": "0ky1jazd1mvgkcjkqk6cqbdvf6rr4jb2wxalp6x8zr41drx0vvyc" + "commit": "821b93ff7c94a13090598c22fd92bd19b5ad951b", + "sha256": "1p9dcjz8hgjb8gz742pxqdrjh68mnyr2hssy6glhd2qb78d4927y" } }, { @@ -99997,11 +100825,11 @@ "repo": "eyeinsky/quick-shell-keybind", "unstable": { "version": [ - 20171023, - 613 + 20230927, + 1036 ], - "commit": "5f4541a5a5554d108bf16b5fd1713e962161ca1b", - "sha256": "19hqywwf80q6ay886xmcjjpr4pghkw78hzdg0mrpkpkqn2vj06gk" + "commit": "be830a69cf7eec92d4ea269fd389ac39b0c162f1", + "sha256": "0ks3chy0jgbpn4pnamam2wnw3i88l4wk1xm3lq4pk9dc8dzyyv8s" } }, { @@ -100196,11 +101024,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20230905, - 1421 + 20230919, + 1539 ], - "commit": "bfe5a8fc418e9710e474db3e6dcbe66f6b177ecb", - "sha256": "0yp7nwi20mxbxra52wrhwblasvgs7a9m6v3g1kb7yf1c3fx7p4cl" + "commit": "b5162323d0ba590c368b1c67039bb3ee44cfcaaf", + "sha256": "03l2ha1wlqazml672gn7vdph0grrb8ncz0sqf1zlvmbw6yg1k1al" } }, { @@ -100959,16 +101787,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20230619, - 1158 + 20231021, + 227 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "2c77776a4797805d8633636fd68148dfb32fab65", - "sha256": "1jc0i2p40vj4da9jw0cghh0avkl7dxbd8yw4a7llhmy0716klisr" + "commit": "445340ebc5819eeedd73695c9182349349c90b6a", + "sha256": "1x493djnj5012c7jr29gmzy6sdw7s6xh855dgslr16aqimkz7zg8" }, "stable": { "version": [ @@ -101535,14 +102363,14 @@ "repo": "minad/recursion-indicator", "unstable": { "version": [ - 20230909, - 1633 + 20230924, + 818 ], "deps": [ "compat" ], - "commit": "a48146f9146df72a9c4413f3faab9924aa91023f", - "sha256": "0chsq6rmnn2gz9xcggzks3sxxsg17sc9qv8cnhsz09bsx5mly0d3" + "commit": "52b40acd95d1be370cad90805acd6f1a9a02f596", + "sha256": "029a0nf8rh6kc4kjr2l344r3q1ysk2ayhhmim0181r0zgyrfs51b" }, "stable": { "version": [ @@ -102130,8 +102958,8 @@ "repo": "alhassy/repl-driven-development", "unstable": { "version": [ - 20230912, - 1 + 20231020, + 1039 ], "deps": [ "bind-key", @@ -102139,11 +102967,15 @@ "devdocs", "eros", "f", + "hierarchy", + "json-navigator", + "lf", + "peg", "pulsar", "s" ], - "commit": "b00f6c359ad105fc4ac42343b6c23e85c83bd2f1", - "sha256": "0433xg01xyzyzmmcz1alia6k2hwxj9z6b7j453ggylr1kx2vgqqn" + "commit": "106712f43d4cb8d891837a670dabad08a7629528", + "sha256": "0xad9xksjgiw02rw1174adgaqjpvyqx0hp61qd4r44y40rzns5kp" } }, { @@ -102505,11 +103337,11 @@ "repo": "pashky/restclient.el", "unstable": { "version": [ - 20221203, - 1808 + 20231010, + 1327 ], - "commit": "0ba72816f92f3d5906cdf76f418fd0a3ee72809b", - "sha256": "16npyzj4d9qaby1nw8dhs5llqkl2jdy1gmxjayjvn0chkjlidq9x" + "commit": "e2a2b13482d72634f8e49864cd9e5c907a5fe137", + "sha256": "1s7rkm1j08g64ymi5ayhkw9546av9rkyhnap6ndr0988dkpa7rfm" } }, { @@ -102794,20 +103626,20 @@ "repo": "galdor/rfc-mode", "unstable": { "version": [ - 20230307, - 937 + 20231013, + 1353 ], - "commit": "c938c8134e7434b623ebfd92ad22586205cb1c92", - "sha256": "17kx7kpawjmps22pavzfjxy9qpwipp921mqbfwlpmqig9q3h5vm9" + "commit": "ab09db78d9d1baa4da4f926930833598e1e978ce", + "sha256": "0sym5pji4ba4jy79zfs7gb2n9kqa60ma4z622s0mz647g56z09f4" }, "stable": { "version": [ 1, 4, - 0 + 2 ], - "commit": "73bb2a18bb34136c9eeddef5f138840872ece752", - "sha256": "1b4wd9ny6rmlw0cr2kvhs0kn33gx0zq4hv6vgr91a9wwj5y33lav" + "commit": "ab09db78d9d1baa4da4f926930833598e1e978ce", + "sha256": "0sym5pji4ba4jy79zfs7gb2n9kqa60ma4z622s0mz647g56z09f4" } }, { @@ -103261,11 +104093,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20230829, - 241 + 20231011, + 525 ], - "commit": "9a53f0775765b5d77fa5fc65afeef0433e64a729", - "sha256": "01knssl3h5v9a8aqmw52i9155h0q0cmzszhwidxpi4sv79j3dr5c" + "commit": "f693bb31605d6e8a0b98f74d35e2a728e33f0af7", + "sha256": "1pvmcxdv9lw6gzgx5wgpbvws6z9lwxh8vrf4vykqdym5g9wdk3hb" } }, { @@ -103276,14 +104108,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20230327, - 113 + 20231021, + 48 ], "deps": [ "inf-ruby" ], - "commit": "a8d2c3293f0760194fd138f346bcc8876cbd8640", - "sha256": "0rvrpk2wnkh146rvsyhzdkykjqxpxwmd3s5il9dpld8sgrmgwfbr" + "commit": "0095a48075f366e195d4861c3a91467bcf423c73", + "sha256": "1qa3w3g5ayrxh20l0948sr7yhz480qc8q1r34iv50jv8i6flsb5w" }, "stable": { "version": [ @@ -103465,8 +104297,8 @@ "repo": "mbeutelspacher/ros.el", "unstable": { "version": [ - 20230618, - 1116 + 20231016, + 1402 ], "deps": [ "cl-lib", @@ -103479,8 +104311,8 @@ "transient", "with-shell-interpreter" ], - "commit": "2776746295d7b0c12c18d4b95e0b8705287666a0", - "sha256": "1k3g9sfw5qdlh9y5nqp4zqjnv6fmi9ncjgrzk73mq23xxd02kp15" + "commit": "aaf32cde6835826551f2b73e4dc8b63d0ff26eb0", + "sha256": "1fy4rbz9101vj8jla0l0f5dqsxn8bx2b0ccmrvsw13sd5rf63akv" } }, { @@ -104069,16 +104901,16 @@ "repo": "semenInRussia/emacs-run-command-recipes", "unstable": { "version": [ - 20230823, - 1307 + 20231003, + 1823 ], "deps": [ "dash", "f", "run-command" ], - "commit": "ccc4022431ed82dbfcfe4e8b6aa1e9f2d0f76eab", - "sha256": "1f6jin8fxn9yixs3wdcgq4fwjbykgydzzadcynhbcnvrh7bqszvj" + "commit": "3d4c05225d54c97a4aef375113e6f4de9ea3aaef", + "sha256": "1kgk12p6gv8bgn9chcxpfazzgmw7rsadhii37j62llvx7bnyj13w" } }, { @@ -104457,16 +105289,16 @@ "repo": "sagemath/sage-shell-mode", "unstable": { "version": [ - 20230710, - 913 + 20231013, + 1408 ], "deps": [ "cl-lib", "deferred", "let-alist" ], - "commit": "70296a6d7775a6cd7630796207b69920e829b6b1", - "sha256": "0adznwdggam41jr58p67imzwsrcb1p655jn6zl4m4w2wvshsanq3" + "commit": "2f069323cb722c608405a3621d8185f4b7130fc3", + "sha256": "16mchj8glijkn1ycqzgkc424ij1gxa9qp6dhkhgrskqcyjgxxaly" }, "stable": { "version": [ @@ -106460,11 +107292,11 @@ "repo": "elizagamedev/shell-command-x.el", "unstable": { "version": [ - 20230702, - 1852 + 20230918, + 1955 ], - "commit": "416dad677314e3eec704d5b02594b5f8a7e7fd65", - "sha256": "0my8yar603zdirr0wbyff0y8lqinkf808mipzf1j9skbgyjqfghc" + "commit": "5ad0a0270e22e6f89f2163e2dc65a0f39915793b", + "sha256": "1irgvim6b3ncdf1612r4z9rr7d6fymg7fs072pgkgcd7c6cs1h49" }, "stable": { "version": [ @@ -106856,11 +107688,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20230911, - 530 + 20231020, + 743 ], - "commit": "329cfcfc0448a45a0779ded7b51332a343d02a18", - "sha256": "1v8nyqpb2sg241aqxwd1p85vkycb3gcw4537b7fjlhk4kah5zjcq" + "commit": "622038d8e24c542f29bccde2db84a6a6d6af19a2", + "sha256": "0yi9dmayyr8di6kczbya37zym32cxwzcwkkac2fw5jwsm63kyzan" } }, { @@ -107324,11 +108156,11 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20230913, - 2149 + 20231020, + 621 ], - "commit": "b63cea69948d386f007004ba6a272fc0e944ffb9", - "sha256": "1hqwhfmxw4bs9mrp09av21pb321bqsv2rn9l8jj3nsx0jya1125i" + "commit": "1c6a15d23d50df218c8c1546bbcc31b5fabe8af9", + "sha256": "0hiljzbxnz980x3arc88190lrcxkkfvd7asn8k7s91l26v9lis0s" }, "stable": { "version": [ @@ -107348,15 +108180,15 @@ "repo": "emacs-sideline/sideline-blame", "unstable": { "version": [ - 20230406, - 2312 + 20231015, + 1917 ], "deps": [ "sideline", "vc-msg" ], - "commit": "4d3343795bc95662adb65c85bcbb41947862699f", - "sha256": "171ax9zm6r754gk2bf5vd0k4l4jxcz2v6y9gnwkslz9bl4g3pcal" + "commit": "014ac17de30b4fcafa7b73d8c886cffa3807d8b1", + "sha256": "16jircw28fhamzppjqfnga6qv6bfxfyj0dlj1mqyv64j3v21dnqm" }, "stable": { "version": [ @@ -108239,15 +109071,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20230730, - 1734 + 20231004, + 1552 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "1e4b7417a1ade842ba4938f66445af68a93176b9", - "sha256": "022v6xk8kwnvvlv5b2lp5snwbvkl0297whs6vyqch2qyf22jdb8y" + "commit": "0cc2e736112a0bc2a048ef6efd11dd67e3fbf7ad", + "sha256": "14yqa8m44d5qll1fidh0d4g9hmpri8ywxfvgq43bzy00lshnprzg" }, "stable": { "version": [ @@ -108382,6 +109214,24 @@ } }, { + "ename": "slint-mode", + "commit": "38af585f0e5966cca0cd1723b0530cac1d3c241c", + "sha256": "0nz3xn606ng689g5jpdkvjyhps194fqg28ln4wjc73hlp0pzisic", + "fetcher": "github", + "repo": "nilclass/slint-mode", + "unstable": { + "version": [ + 20230922, + 1143 + ], + "deps": [ + "lsp-mode" + ], + "commit": "1ef68ca9cf0cffd2c863c3135f96202a19cf8182", + "sha256": "17gz8yw7sqz1lh79v9nqqz0c3p4hbmrh532rkxbbljz58y2fip7i" + } + }, + { "ename": "slirm", "commit": "6407db0f265c49fdddaa6e8f85f295e2b90a077b", "sha256": "061xjj3vjdkkvd979fhp7bc12g5zkxqxywvcz3z9dlkgdks41ld7", @@ -108478,11 +109328,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20230624, - 1930 + 20231009, + 2150 ], - "commit": "df62abae73bd511885c9c7ec0ea7ea1469a00923", - "sha256": "1nxijv52bja6la2i3asq7kklpj5li25454n52sgsc6xnnfvakbsv" + "commit": "9c43bf65b967e12cef1996f1af5f0671d8aecbf4", + "sha256": "15nyr02ykkws4q79jcmxcawddg8sgq9v5l8k7jv7gg3hnpzxjlb2" }, "stable": { "version": [ @@ -109002,15 +109852,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20230529, - 1017 + 20231021, + 1239 ], "deps": [ "cl-lib", "dash" ], - "commit": "79a338db115f441cd47bb91e6f75816c5e78a772", - "sha256": "094hljk0zf1190k1xgp28abbv755ljdz3w2i7n4wy87k4kijg0fa" + "commit": "e3e563b20e405d87e3f1b3792174803bb8de2b7b", + "sha256": "1vkxskgh1qbr4l2k6ghvpyws3192gay0shsj5vds6432q7ckyr5v" }, "stable": { "version": [ @@ -109572,15 +110422,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20230910, - 1252 + 20231020, + 614 ], "deps": [ "dash", "s" ], - "commit": "b3e9ecc7bea0c049894889f24529b698219cc515", - "sha256": "0lyalivgpdcn93c9ds6xg1frchwb3921b1df8wz2yfd4p1c88z58" + "commit": "cf1e6ae475c053ec18c3722b4591b863a788adce", + "sha256": "043p574fqfjbh1yqgxnihrjf2mmqra4s4wabb64y6acc9jpbpavw" } }, { @@ -109816,11 +110666,11 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20230816, - 1732 + 20231008, + 1300 ], - "commit": "07a681fff27ff22d268b726b05576ef93fc4e615", - "sha256": "0mip5da7glzylmagxkmi2f68i19phbbzn72vh3jd3w76labcvbzm" + "commit": "cd737ed7e0eac299844a9b453758dec4a392c7c9", + "sha256": "1xlidpis2b5r30lnh3j8bljfkciz9gc6zsinqiypm76qiz2gnld5" }, "stable": { "version": [ @@ -110131,15 +110981,15 @@ "repo": "emacsorphanage/sound-wav", "unstable": { "version": [ - 20200323, - 728 + 20230929, + 721 ], "deps": [ "cl-lib", "deferred" ], - "commit": "8a18f8a62f4fdde80dfa069986aa959091a42472", - "sha256": "18iahla8m9b6bdn63x2yrvr3rzyw5ybipf44q9avyy6s1pqsby2a" + "commit": "b522e7fa0ef24ec669d0b02935287c2a6cc8c314", + "sha256": "1cpy916q2hf48j0wiginpsi9srqs9zkjq5m3pc4p1aj95cgaib2v" }, "stable": { "version": [ @@ -110368,8 +111218,8 @@ "repo": "TheBB/spaceline", "unstable": { "version": [ - 20230821, - 1443 + 20230922, + 1127 ], "deps": [ "cl-lib", @@ -110377,8 +111227,8 @@ "powerline", "s" ], - "commit": "3b1ae4d429f12bac65b0f3764f84eace2903a417", - "sha256": "09v2i6i1r5456gpp8dw9bkxyz1ca9nbmim0nnbjaswzf2x8mixwr" + "commit": "086420d16e526c79b67fc1edec4c2ae1e699f372", + "sha256": "1qld1rsvi9a2kq8w128sp0gv7dppp7cxmgrlyg5zdvvp9av3d90i" }, "stable": { "version": [ @@ -110581,11 +111431,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20230915, - 59 + 20231022, + 103 ], - "commit": "01aa58cf83d97329f456d29e57ed324cf1b2dca6", - "sha256": "0m8ch7r5whr8ikj5wlafn9nnqhzmbsizj817yllglk4jl2nb1j67" + "commit": "e930e89a87f15cfba3f7cc61a287a9044e2cd652", + "sha256": "1b86hyq0380yb99xbl3wkln4b8210y6fhsbniy1mjvvy9yw7x9m7" } }, { @@ -110638,14 +111488,14 @@ "repo": "dakra/speed-type", "unstable": { "version": [ - 20230206, - 1330 + 20230926, + 838 ], "deps": [ "compat" ], - "commit": "4f8553632d71e827b4da6e091143779d2ad970a8", - "sha256": "1qf68jqkc4v8i0rbia2hyy9srn5paymz5bbv5s222rbjzc66n5hv" + "commit": "28b8e8c1cc24511758168f30bcac18d8fb93706d", + "sha256": "0vdkpka364cgb1y15z3klcdcqszxzys9rrdqb0ww3my2yssay93l" }, "stable": { "version": [ @@ -111332,11 +112182,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20230503, - 34 + 20231012, + 2016 ], - "commit": "d340e344cbc57b63952ba73c750986f8e13e616e", - "sha256": "0zakid69b8n0k20g7h5awmfh2kckmwy9zpxv64zbxkgyqamz9pr3" + "commit": "5a9e177517d7de3a79a1d4f09294d49ffd6dfe7c", + "sha256": "0k47d6gfngl1zb9c0p44342k49fsgknl4yqanmbvwnx991h61bmj" }, "stable": { "version": [ @@ -111804,20 +112654,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20230819, - 2343 + 20231008, + 2236 ], - "commit": "505ddcd2f01b563187da5f901da1fc9825e797b3", - "sha256": "0q0c5wkbd4nlri5xq39qqh5spl2nnai3a52ilr57cm76ikkmf0xd" + "commit": "f9b9280b570cb13696493ab4d39d64736edd2ca3", + "sha256": "12pznqs1aycg6syiwrca6v8agrka0l7gh4in0papkkqss54lsaps" }, "stable": { "version": [ 2, - 3, - 2 + 4, + 0 ], - "commit": "505ddcd2f01b563187da5f901da1fc9825e797b3", - "sha256": "0q0c5wkbd4nlri5xq39qqh5spl2nnai3a52ilr57cm76ikkmf0xd" + "commit": "f9b9280b570cb13696493ab4d39d64736edd2ca3", + "sha256": "12pznqs1aycg6syiwrca6v8agrka0l7gh4in0papkkqss54lsaps" } }, { @@ -111873,11 +112723,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20230830, - 1917 + 20230925, + 1808 ], - "commit": "9a763725249dfa1a2644b5f26a8cfedfba312eee", - "sha256": "032lq95r3zr59q3500sxc4hhjysxjdxxh0b4pr0r6h4rzdx0zh00" + "commit": "6d0f9b34eba1abde6ee72e10c2b4dfdd18712065", + "sha256": "0p0pgfwd987ylsm8lhdkammqy6afx2bb582fb3lrjhj27dn572f1" } }, { @@ -112443,8 +113293,8 @@ "repo": "Wilfred/suggest.el", "unstable": { "version": [ - 20190807, - 851 + 20231003, + 404 ], "deps": [ "dash", @@ -112453,8 +113303,8 @@ "s", "spinner" ], - "commit": "41782f0d36c346670011f927d8fcd93ec75ed783", - "sha256": "0n8xypnrprjmxx52bxr85lr8hgavir17ivsd3cwzw30wpbfcyg2h" + "commit": "eca8f6f03b0a77ab649c791f21cb01f4ecae3e73", + "sha256": "0wrdig7nwr4fzhcnpnkxmisxbgjzg77qmal06h47b0csgphvfc9l" }, "stable": { "version": [ @@ -112498,21 +113348,21 @@ "repo": "kiyoka/Sumibi", "unstable": { "version": [ - 20230727, - 1249 + 20231019, + 1246 ], "deps": [ "deferred", "popup", "unicode-escape" ], - "commit": "d934aee4d6a2493e40db3d848d459d97c8e2e229", - "sha256": "0q7r80lsnx4mm74ybnhd9lpwkr4mcm96kdrdx5yia78mawkiym03" + "commit": "d6bbc65b71f0c59a471fffe13797d1ab6cac80f8", + "sha256": "1fpjm1r1k4idgn6k34v5x4mprh4maa842s19p9b29mnfkslz75kn" }, "stable": { "version": [ - 1, - 8, + 2, + 0, 0 ], "deps": [ @@ -112520,8 +113370,8 @@ "popup", "unicode-escape" ], - "commit": "d934aee4d6a2493e40db3d848d459d97c8e2e229", - "sha256": "0q7r80lsnx4mm74ybnhd9lpwkr4mcm96kdrdx5yia78mawkiym03" + "commit": "d6bbc65b71f0c59a471fffe13797d1ab6cac80f8", + "sha256": "1fpjm1r1k4idgn6k34v5x4mprh4maa842s19p9b29mnfkslz75kn" } }, { @@ -113000,26 +113850,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20230831, - 832 + 20230930, + 903 ], "deps": [ "seq" ], - "commit": "2b2e8581baada838a7ac667a244f61fcfdd647a9", - "sha256": "05iyczjg4h9wxfhmgs8k279kp8h1lirf6wgixsnwq1bx7c8hldxj" + "commit": "e58417ec871d260fe47183ffe4b7e47ac09bc682", + "sha256": "17gcg55jajq3am3nrzlsibkdwskq1rbg3lhgxynkpky0ihci35nr" }, "stable": { "version": [ 9, - 0, + 1, 0 ], "deps": [ "seq" ], - "commit": "55da7a32c97c84c2d12295a0eeb1f8fca8a6f71a", - "sha256": "1bmlbfhxly0lgpndk5p7m7ld5w85gvnax1bvlaqxjvw1l55vhyxh" + "commit": "e58417ec871d260fe47183ffe4b7e47ac09bc682", + "sha256": "17gcg55jajq3am3nrzlsibkdwskq1rbg3lhgxynkpky0ihci35nr" } }, { @@ -113365,11 +114215,11 @@ "repo": "liushihao456/symbols-outline.el", "unstable": { "version": [ - 20230824, - 857 + 20230920, + 905 ], - "commit": "c5b077d79846bb7507ca5cb11795403a5eda71dd", - "sha256": "0zc5wgljhhxzad3mqlk3kg9q5ir95vn5gsqpw5vfflb84drzp7va" + "commit": "7a4e2f827ce76d522bb8c5202c4fc3cca7a7079a", + "sha256": "0j86jns2vh32biaalz2rikg5rjh0njzlkdgakri2zkgrsisd7wcj" } }, { @@ -113996,8 +114846,16 @@ "repo": "emacsorphanage/tablist", "unstable": { "version": [ - 20230321, - 705 + 20231019, + 1126 + ], + "commit": "fcd37147121fabdf003a70279cf86fbe08cfac6f", + "sha256": "1n1isr98xsc66n8ax0lcld2p80rr3b9s0pnh0jllhvmbkkb88xzi" + }, + "stable": { + "version": [ + 1, + 1 ], "commit": "5f7b71a92bfb25418d7da86ad9c45f14b149496f", "sha256": "11vmvrhmsxy97bfj7jndpc58bik7177i3wvc45mlyldxwyirs962" @@ -114011,8 +114869,8 @@ "repo": "shuxiao9058/tabnine", "unstable": { "version": [ - 20230801, - 219 + 20231019, + 632 ], "deps": [ "dash", @@ -114022,8 +114880,8 @@ "transient", "vterm" ], - "commit": "ea7a6caea7061df61fbd03f9bc9ed4974cf4a1f9", - "sha256": "18adl4sgsmvzsy454rxkhx9dbmqz9k6s26sbyc76dldzlpam0jvq" + "commit": "9d66dd9a3aadd6bfdd3dbbfdc11e6451b15f79e8", + "sha256": "1hlfn8khvgfm41nhim4byj7mp1m96jiw0z7v8d9fl2hj5ac5lziw" } }, { @@ -114034,14 +114892,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20230913, - 1408 + 20231018, + 1932 ], "deps": [ "project" ], - "commit": "4e4f3ac2deb375cfef9be5f67511442a518ebe63", - "sha256": "1xx6rx627hc8dwlaqlpy6db00s6w74mys2iy62hg0avf7mxjnb2k" + "commit": "a971a63ae4bca93f2faa963d6a71eed413f0e37b", + "sha256": "00r7v97ndvs7szcv7yfym3qzi859kryjj2sr2yfkrzygp336v88l" } }, { @@ -114117,11 +114975,11 @@ "repo": "jcaw/talonscript-mode", "unstable": { "version": [ - 20220204, - 1441 + 20231015, + 2358 ], - "commit": "b6eb61f56349e0d47276270163ec611c2d5b188e", - "sha256": "1a2x0972psaaz4d89adcr37440a71jm0vbdwca3ixj7rs7l4myp9" + "commit": "b5e78b7866c9dee5f8bc5ce3924e1916c46e2b9b", + "sha256": "0myr0izky5bhb7z8cfi1bmwi2dpkxn70g58b0zrv5ab7k6kkpwfd" }, "stable": { "version": [ @@ -114431,15 +115289,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20230831, - 812 + 20231004, + 1321 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "8a4475edb80431c2845a7bd9882ec3f38ff86b2b", - "sha256": "15c2sdzqrfqg7j8f5li6b9qlpxf6lr7g719kc6fmacjvc9gawhak" + "commit": "17bfa50c8f2e70daeb8866f3bf195f15623ab520", + "sha256": "1057zr4g8llxmzy47l5klyi89x66q8qx5vrd50pmpsp4c6772jz9" }, "stable": { "version": [ @@ -114599,14 +115457,14 @@ "repo": "Crandel/tempel-collection", "unstable": { "version": [ - 20230726, - 1409 + 20231021, + 2032 ], "deps": [ "tempel" ], - "commit": "b6694d385c6eb04f4931af219de5c4b2b8541599", - "sha256": "1b0lh6zzwxb6f58dpaj6jzl7rrx95yzsi0m0r9bb7wnyzyzxakhx" + "commit": "4a1d717eb30a78680c8f4df2d71e395c846c5371", + "sha256": "0ifmzn5d9mpsjwvg2ir0sy3r4czxa7d6j97l8rrp8ai7jqvydadm" } }, { @@ -115233,6 +116091,25 @@ } }, { + "ename": "test-cockpit", + "commit": "8b34749f3aade924928d5e058d819ff2011453ab", + "sha256": "1l5vswm13b3rxg9vzcq67mqnqmmngizg39w3vgghhaxjdyqq6g4y", + "fetcher": "github", + "repo": "johannes-mueller/test-cockpit.el", + "unstable": { + "version": [ + 20231021, + 2149 + ], + "deps": [ + "projectile", + "toml" + ], + "commit": "98a15ab65d45e2053c587b2f2fde37d16fd45a21", + "sha256": "16296dhqbprsbvq7ld2c806qw6ivj7p14y5djpxj0li7m8wr7v5s" + } + }, + { "ename": "test-kitchen", "commit": "420d18c76f593338fb28807fcbe3b884be5b1634", "sha256": "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0", @@ -115264,14 +116141,14 @@ "repo": "rocky/emacs-test-simple", "unstable": { "version": [ - 20200722, - 1121 + 20230916, + 1634 ], "deps": [ "cl-lib" ], - "commit": "29c2c1ca7c240c8dfdba93dba6201e542a5a3b43", - "sha256": "07czfm00fqc771sasqvxnh2mzlcbmkvpxcld5sfqbnlp2xd0kqcz" + "commit": "8b191842318bb05da74052025192d32ebebb033a", + "sha256": "1mg4l4y818fcjd3a2hwaaab826z0sgzirpz175m499ixmjdwi21f" }, "stable": { "version": [ @@ -115410,11 +116287,11 @@ "repo": "WJCFerguson/textsize", "unstable": { "version": [ - 20220427, - 1445 + 20231005, + 1335 ], - "commit": "df91392c3c928d7841631f5809716b9cf0f7309e", - "sha256": "0pmd5hb6ysfp8yyghghxvqdj1lvrqwqdlk5jfwsviiqwdqi23q5r" + "commit": "d61fd65d823b17ff71a61fba5590a9e9b60e0e92", + "sha256": "02n4dsy4xlhxcinag4xhlqajww81pspkfhxvrz75zmqab01qa6ib" }, "stable": { "version": [ @@ -115505,11 +116382,11 @@ "repo": "GongYiLiao/theme-anchor", "unstable": { "version": [ - 20220204, - 321 + 20230924, + 2041 ], - "commit": "c6f715d4ccd30e83922e39cab856578ce19224bb", - "sha256": "1k6vb1r1lzksnki4rxjjcbvcpc59q76vhc3dq7kmi5d20fdgrm9v" + "commit": "dd69fe04d901e771cafde3992042a212e4a62620", + "sha256": "0dbywc25v7gjh34mrx7kg6hvjk2gd86rf59vx185sb2q0ywfzwnk" } }, { @@ -115690,21 +116567,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20230910, - 1712 + 20231014, + 28 ], - "commit": "9f60376de40b48561ac50263089468b779195003", - "sha256": "1yiw1ff6p2i6ps0ajpw76f18fkbcdm6jhada33j29l5kaf561545" + "commit": "aed0ba17906360dd1ec566a6184ef02f96c919cd", + "sha256": "1ckp7alxng8r505zggqp82v3w4mlfpgixsl1v36gzgqlcb6hqzs9" }, "stable": { "version": [ 2023, - 9, - 11, + 10, + 16, 0 ], - "commit": "9f60376de40b48561ac50263089468b779195003", - "sha256": "1yiw1ff6p2i6ps0ajpw76f18fkbcdm6jhada33j29l5kaf561545" + "commit": "aed0ba17906360dd1ec566a6184ef02f96c919cd", + "sha256": "1ckp7alxng8r505zggqp82v3w4mlfpgixsl1v36gzgqlcb6hqzs9" } }, { @@ -116096,6 +116973,35 @@ } }, { + "ename": "timu-line", + "commit": "07bb8531decd7607f2c97dbad11d1990a4ad0941", + "sha256": "0z0wysnmf5pkxjs4gjr581dn8flibbsmch3p58adj8wqy7n3n40h", + "fetcher": "gitlab", + "repo": "aimebertrand/timu-line", + "unstable": { + "version": [ + 20231002, + 1016 + ], + "deps": [ + "f" + ], + "commit": "836cb92063076981f93e44f72dccd46a37e96785", + "sha256": "0ndhqsv11ai16y2pqcglqyhpzids4b7bzksmx5fs762vmmvm3r5z" + }, + "stable": { + "version": [ + 0, + 8 + ], + "deps": [ + "f" + ], + "commit": "676389f0f1609833e72701edc0a5fc80912167db", + "sha256": "0jxj3dyjppk8xiqjbq62z60hqrbzsa14x3yx5bjgzsghn27sq80f" + } + }, + { "ename": "timu-macos-theme", "commit": "326e7cad6877d42bc1809b549503332c98547dcb", "sha256": "0bxlxjn7fivv72pxchs164941g3y3bylhhzsssik0gwrsyd7x8ay", @@ -116149,19 +117055,19 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20230911, - 2108 + 20231002, + 1522 ], - "commit": "c4d027ae7f6e6c2ccbb5e274b6dc58fff3c44434", - "sha256": "00lz79xxkzw4wi1n6ryc8nqf5xykzfjdm5j7976d5mii07gaw6ni" + "commit": "145ee85b9d65bbef32687681d65f72e227e52225", + "sha256": "1li13z0202qrjzipw9azy9yp028rrzyjkb9538cnf297caqdmqcl" }, "stable": { "version": [ 2, - 6 + 9 ], - "commit": "0d0d977c2149f695de0e4de55ae64a672c34bfac", - "sha256": "0j4p7qckrywpph63m140l4d713c9kx91didyflfpnr1wgy6pzq3v" + "commit": "0505a7c0d306632972f29e584e83e0cd58eba2ce", + "sha256": "04b6lyrn9hj754ykb07ks60c602h5gla11scyisnzga662li16ib" } }, { @@ -116337,15 +117243,15 @@ "repo": "laishulu/emacs-tmux-pane", "unstable": { "version": [ - 20200730, - 520 + 20231014, + 25 ], "deps": [ "names", "s" ], - "commit": "923524efe8e6e5e0d269de6bb253b45e02d9a663", - "sha256": "0bhck6vrb48zxfh5id637mq57k7jv4f2ax0lrhyvr0nw8m0ndqmx" + "commit": "c38b063a7669ee3bc16cd93a805cd46c2ee80827", + "sha256": "00gz33r1h3csh7ys8k4ack7ri5d8h45akqxjry9rd2mywahbx3k4" } }, { @@ -116508,11 +117414,11 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20230908, - 1644 + 20231019, + 947 ], - "commit": "3a7c30afac5e94a41cc42eb1469501809a637162", - "sha256": "03jc88fqcgnr4df4y17sx31n81s2qax36sg8sksz8347cf638s9a" + "commit": "61c86fd2902b6342efe4463230dffdd185159d1c", + "sha256": "03n75dmsmlhpkra6scqpvanbcfplc08np8hzarn4jcnysybji0f4" } }, { @@ -117022,14 +117928,14 @@ "repo": "magit/transient", "unstable": { "version": [ - 20230915, - 1911 + 20231019, + 1421 ], "deps": [ "compat" ], - "commit": "b150b48b310d06db87e673f5aef672b341bd001e", - "sha256": "1cd2p17kqfj7f92xrc55psr5wrk671cqsafsmvlk1bllbnx5m4gd" + "commit": "a81eff942bb2cd5bb5b6450dcf7db78c876abd1f", + "sha256": "05y7qppq0ldmsmy61vc9zfnqgsijjsjv9q3gi2dsx37rm3jy9r7g" }, "stable": { "version": [ @@ -117317,15 +118223,15 @@ "repo": "tarsius/tray", "unstable": { "version": [ - 20230511, - 2102 + 20230917, + 1002 ], "deps": [ "compat", "transient" ], - "commit": "d620957377e451e8bf7c2eb7a2509a75f1ee160f", - "sha256": "1lf91cpylwl359ji2pd7cy2097mn416r3jnclycwfq69im9ybd7y" + "commit": "b8d48c81de06261926420d75608cc69f99970563", + "sha256": "1l8jmkpdc9mc6z6znmxa7g5n6sgvpy78rgrpxfcafgjiki8lmqqr" }, "stable": { "version": [ @@ -117496,26 +118402,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20230910, - 547 + 20231013, + 651 ], "deps": [ "tree-sitter" ], - "commit": "2f0f97abbd97e17773a24eec3f329d262f81d020", - "sha256": "0mjqphv9sqbfpm6qwbgmxk9m4169cc52736yz4dr6kjdxq1yrvlb" + "commit": "fc1aeedb484584d1dd5df5759a43cd6da018bcb7", + "sha256": "09chs0rh5dz7jb1c4yw4aqimfxyxjq9lrnlcrr6ibxm81aajjaar" }, "stable": { "version": [ 0, 12, - 49 + 72 ], "deps": [ "tree-sitter" ], - "commit": "2f0f97abbd97e17773a24eec3f329d262f81d020", - "sha256": "0mjqphv9sqbfpm6qwbgmxk9m4169cc52736yz4dr6kjdxq1yrvlb" + "commit": "fc1aeedb484584d1dd5df5759a43cd6da018bcb7", + "sha256": "09chs0rh5dz7jb1c4yw4aqimfxyxjq9lrnlcrr6ibxm81aajjaar" } }, { @@ -117526,14 +118432,26 @@ "repo": "purplg/treebundel", "unstable": { "version": [ - 20230911, - 2103 + 20231007, + 1424 ], "deps": [ "compat" ], - "commit": "7c7fe656e2b33cd25629f16f5d2b41a13f47f53a", - "sha256": "00xxd9a3h681lh672knh84k70sl69j41471652nhlcm4f2myxq3g" + "commit": "0e63d0b3c9029b63b3e446e6317bd7d366c0436a", + "sha256": "0adfx4hbklvgnkv6bkrs7lfh2d4ncksmapg72fywpa2mapww6fqg" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "compat" + ], + "commit": "869e79dd95997e76443b3aea1567532d58e61956", + "sha256": "1hk2xnjsr85in48h02xbzi8lsccp36li2bp9v9j0r8qn1bis2vv9" } }, { @@ -117580,8 +118498,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20230912, - 1707 + 20231016, + 2107 ], "deps": [ "ace-window", @@ -117593,8 +118511,8 @@ "pfuture", "s" ], - "commit": "56691a530abb61564c8df0456a18ff0f301c2055", - "sha256": "12p8sh69c4npa71gmgqwgr3wyjpxcn0c9s02dl40wa0a0q6cjjfy" + "commit": "474febd6c3f2d5059ed26c13277b9a3a8a5a8a82", + "sha256": "0kzaf06aszv1gcmaszv31kxj1sz20x0ilkzgpi3sxqavcb03mad9" }, "stable": { "version": [ @@ -117685,14 +118603,14 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20230408, - 1109 + 20230930, + 1141 ], "deps": [ "treemacs" ], - "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97", - "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95" + "commit": "f4795c7172c64f5c7a8e66042019a56465632bbd", + "sha256": "00wmk9w9cnxld8qvk930fkas0g03bbic3yq4nk5qbsjx9r0cysny" }, "stable": { "version": [ @@ -117918,20 +118836,20 @@ "repo": "renzmann/treesit-auto", "unstable": { "version": [ - 20230320, - 1555 + 20231009, + 959 ], - "commit": "bac3b9d1d61a4d759f87c80de7be3b808d19cbf6", - "sha256": "0g6v8lvlvrdybbgsfgfyl08laxjwhb5mndim0rdfdcxz27w810ji" + "commit": "e60ad69b7c42f9fee8d5f7c41acb9ab362ec99e6", + "sha256": "0hb98im9z5w799a6jz2j90mlrz2awdpydq038nbzk970bynd08r2" }, "stable": { "version": [ 0, 6, - 3 + 4 ], - "commit": "bac3b9d1d61a4d759f87c80de7be3b808d19cbf6", - "sha256": "0g6v8lvlvrdybbgsfgfyl08laxjwhb5mndim0rdfdcxz27w810ji" + "commit": "1fcec670bebb0426dea2b638ff58bf21508c460d", + "sha256": "0qdi24x7snc8yvis6dv75w9ip8xs3cx101wcqsjrni2xdfqahz5d" } }, { @@ -117942,11 +118860,11 @@ "repo": "tilmanrassy/emacs-treeview", "unstable": { "version": [ - 20220928, - 43 + 20230728, + 2343 ], - "commit": "d9c10feddf3b959e7b33ce83103e1f0a61162723", - "sha256": "14s0b6zbapsvgyxki59lglwb3s8wjsjwkgj5r66af9nj2bgz5ms9" + "commit": "c6888e5f3aa0d72a7b4db625fcc2a847fd3bb1ce", + "sha256": "1jr9lw7hjwa2cajphy9y19gn3dlacdp1kggp823vpx5p1d5fsvgz" } }, { @@ -118167,6 +119085,21 @@ } }, { + "ename": "tsort", + "commit": "ccd853a83f5acaeb74859fc2b5899693985c6ef7", + "sha256": "1xcc8k1bi3vbz87g969chqkdz5nqajcf2qj6sfcm4s01705p7r23", + "fetcher": "github", + "repo": "ehawkvu/tsort.el", + "unstable": { + "version": [ + 20231015, + 2136 + ], + "commit": "844a983841798a5e9de4a442674d691fea6d09ff", + "sha256": "06kz39dflgzpx4afb3qwgx2gyahahhwqsdabxip99wfllhsqwa32" + } + }, + { "ename": "tss", "commit": "d52e20f5ca38ed399d19f18f778b8601baf78460", "sha256": "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm", @@ -118240,14 +119173,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20230718, - 2055 + 20231009, + 2143 ], "deps": [ "caml" ], - "commit": "d484910213d6a241d72a651cb46b7de17dac1ad5", - "sha256": "1v34hng4nzmg0al3vwsypdz1spd4nvv4ckvhkp6k5cfmpd13ismn" + "commit": "1d53723e39f22ab4ab76d31f2b188a2879305092", + "sha256": "05afiixj9ag3r36k4xhfizb7frldc2g6i3jr3mxmdgnbm08r3l2v" }, "stable": { "version": [ @@ -118538,6 +119471,21 @@ } }, { + "ename": "typewriter-roll-mode", + "commit": "4b17337429ea28905a8d8da0de1faf93149d7a3c", + "sha256": "153c9ij63r24ys8xgv06lyzbz89sxdnz1p7b34cg8wpm1jacmz74", + "fetcher": "github", + "repo": "KeyWeeUsr/typewriter-roll-mode", + "unstable": { + "version": [ + 20231009, + 2207 + ], + "commit": "3114d05731517d40972e2ed896806b25bdc0d8c2", + "sha256": "0ns5warzk9hy4wivw5qc51lj95ik66wv4d82qxr49grrmy47924f" + } + }, + { "ename": "typing", "commit": "e6e75695594ce17b618ad8786c8a04e283f68b11", "sha256": "0k2lplqzq3323nn7rybcs377sr87kbww8ci99rrka3yyb5bh1fa1", @@ -118659,24 +119607,6 @@ } }, { - "ename": "typst-mode", - "commit": "592de7dc2dad8b81286d25cc244c5613bc2f6f76", - "sha256": "0l6w9i8b03riwg78lkarhb7bp3g6sy74pzbvlqqhpkvjfmbvqvdz", - "fetcher": "github", - "repo": "Ziqi-Yang/typst-mode.el", - "unstable": { - "version": [ - 20230819, - 928 - ], - "deps": [ - "polymode" - ], - "commit": "bbc08e88b5454849debb1c4022af56ff3a7f916e", - "sha256": "1ss8wb9jg6l81jrm151d2yybcfbjxq97yhgcwk7dc1pypajldfzc" - } - }, - { "ename": "tzc", "commit": "f5b1c5830ac36a39860eb1a3c2383b12d8dc3024", "sha256": "0k7sq9bdh6ig4dpz3g13xrdv1pcasyj6sg1cvf6mvlgp2bf27gci", @@ -119227,8 +120157,8 @@ "repo": "rolandwalker/unicode-fonts", "unstable": { "version": [ - 20220713, - 1837 + 20230926, + 1502 ], "deps": [ "font-utils", @@ -119237,8 +120167,8 @@ "persistent-soft", "ucs-utils" ], - "commit": "44d0a22420c39709d1e1fa659a3f135facf3c986", - "sha256": "00qdwkphwpc5kddn3k3ck1isykbhlvqmfb45877a65274am79pd7" + "commit": "6245b97d8ddaeaf1de4dbe2cd85ca0f3b20ef81b", + "sha256": "1ckcvy10sz4qvjy1bqrpvaijw92q2da4b6bxbgxaxvrw5d0ih81f" }, "stable": { "version": [ @@ -119520,6 +120450,137 @@ } }, { + "ename": "universal-sidecar", + "commit": "cb0d2d9b78993596b932c632b017eb86540fb35a", + "sha256": "0gc0la1riddiw84wacmll4z923nfyr6w24ic4074bd5cm1xyy5g3", + "fetcher": "sourcehut", + "repo": "swflint/emacs-universal-sidecar", + "unstable": { + "version": [ + 20230923, + 31 + ], + "deps": [ + "magit-section" + ], + "commit": "0cec1fa196df55cfb13c1e2ee226b55ff740e7f2", + "sha256": "04fvzla00lbbz94ihi9vn5cwxpj4ivfcxifjr19h8nycm7h2xs8n" + }, + "stable": { + "version": [ + 1, + 4, + 0 + ], + "deps": [ + "magit-section" + ], + "commit": "0cec1fa196df55cfb13c1e2ee226b55ff740e7f2", + "sha256": "04fvzla00lbbz94ihi9vn5cwxpj4ivfcxifjr19h8nycm7h2xs8n" + } + }, + { + "ename": "universal-sidecar-elfeed-related", + "commit": "a38574ffea50da0db58b9b3da1c4022a6bf909cd", + "sha256": "158zh9vjyx1cp8rpzqwfqw8xy1vxkwc9vc96gwmrmac135j741vz", + "fetcher": "sourcehut", + "repo": "swflint/emacs-universal-sidecar", + "unstable": { + "version": [ + 20231002, + 22 + ], + "deps": [ + "bibtex-completion", + "elfeed", + "universal-sidecar" + ], + "commit": "8e9b4ce2faf304aedc485e7bedb6f0e460d9ea09", + "sha256": "1f2km4v4pvjmlr4fp5q51x0ycq0na8b6yd3las50slrf01wd3f48" + }, + "stable": { + "version": [ + 1, + 4, + 0 + ], + "deps": [ + "bibtex-completion", + "elfeed", + "universal-sidecar" + ], + "commit": "0cec1fa196df55cfb13c1e2ee226b55ff740e7f2", + "sha256": "04fvzla00lbbz94ihi9vn5cwxpj4ivfcxifjr19h8nycm7h2xs8n" + } + }, + { + "ename": "universal-sidecar-elfeed-score", + "commit": "e3f4ac4e727b453082552fc26f97c74bfe9942f8", + "sha256": "1ral9kfp5ylkhkfpnjrhpwi9x997sz9f1jacaxxn20rrz60pbpaz", + "fetcher": "sourcehut", + "repo": "swflint/emacs-universal-sidecar", + "unstable": { + "version": [ + 20230925, + 9 + ], + "deps": [ + "elfeed", + "elfeed-score", + "universal-sidecar" + ], + "commit": "dfcd0cd9d8f1e7fc3d8d4d1ed1da32d657acb088", + "sha256": "1mjkdzczkzpplfa23kwyk8iy57khzpxbclfbgyijf9i8i1cpnc53" + }, + "stable": { + "version": [ + 1, + 4, + 0 + ], + "deps": [ + "bibtex-completion", + "elfeed", + "elfeed-score", + "universal-sidecar" + ], + "commit": "0cec1fa196df55cfb13c1e2ee226b55ff740e7f2", + "sha256": "04fvzla00lbbz94ihi9vn5cwxpj4ivfcxifjr19h8nycm7h2xs8n" + } + }, + { + "ename": "universal-sidecar-roam", + "commit": "6f3b4016348e6775998ff0033358dd2fc7a8cf68", + "sha256": "1f71w35jx4pyciby7h3dcq3fz4i7n9p27zylqaapw3l6dv5fpl5w", + "fetcher": "sourcehut", + "repo": "swflint/emacs-universal-sidecar", + "unstable": { + "version": [ + 20231008, + 1742 + ], + "deps": [ + "org-roam", + "universal-sidecar" + ], + "commit": "d8311910fae3ea65fb4153e3872ec24b64d5d8aa", + "sha256": "0ckm8a0ihj4ds3w6ls8yzq5z6qy24ck3gdyd3ii3zz5rh01galf8" + }, + "stable": { + "version": [ + 1, + 4, + 0 + ], + "deps": [ + "org-roam", + "universal-sidecar" + ], + "commit": "0cec1fa196df55cfb13c1e2ee226b55ff740e7f2", + "sha256": "04fvzla00lbbz94ihi9vn5cwxpj4ivfcxifjr19h8nycm7h2xs8n" + } + }, + { "ename": "unkillable-scratch", "commit": "822ac5610f333e41b676a29ef45a6f8bfea3162e", "sha256": "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7", @@ -119653,14 +120714,14 @@ "repo": "davep/uptimes.el", "unstable": { "version": [ - 20191121, - 1030 + 20231015, + 1458 ], "deps": [ "cl-lib" ], - "commit": "29ae6585eeed5a00719b2e52f5ae1082087c1778", - "sha256": "0njpgw4is5lbv499jpc9c987yfvr6srhcmvg6wl631kpv0h8q9a9" + "commit": "84407aba479117344080ebf373e3e9186a96f05c", + "sha256": "1q88n13l873397gibfgzj68winnhfw9xfwa4qdlrp57dm09blgbv" }, "stable": { "version": [ @@ -119712,19 +120773,20 @@ "repo": "ursalang/ursa-ts-mode", "unstable": { "version": [ - 20230910, - 1024 + 20231019, + 2145 ], - "commit": "a950696ab4f92a8ce63ccc5afe76eff67854b5c9", - "sha256": "0176dn84m8wznlkhahs95r9w2azlk1yb4w8lp1ldnyk9bnsb2pal" + "commit": "e5cb898e831976d9ac0e5b73e676a7976a77e693", + "sha256": "1m6c446irknfd1n01wcm1r6zq3hqk8rgna5lykd0rysjabg5xqzc" }, "stable": { "version": [ 1, + 3, 3 ], - "commit": "b64577de63f55f065065991111f838f570d94f21", - "sha256": "1hq9hz9rrrrs5ixgvsgpbb28ci3qkigc54n8zfbw9vm11jiqwwdy" + "commit": "e5cb898e831976d9ac0e5b73e676a7976a77e693", + "sha256": "1m6c446irknfd1n01wcm1r6zq3hqk8rgna5lykd0rysjabg5xqzc" } }, { @@ -120086,11 +121148,11 @@ "repo": "kborling/uwu-theme", "unstable": { "version": [ - 20230110, - 153 + 20231020, + 154 ], - "commit": "6b66376b9d7053eb9c23449a601d24511a0b44e6", - "sha256": "1rkxsnxzgcqmhvll156ipncpcc252j2y1m2jbh7yq8h5m1sz1az9" + "commit": "d113229b84b44d756fddaaaea1c246bc2e4df5ba", + "sha256": "0lm2azh6xvqbi78ji6ifjbdy6sf0a12sbry4b7vh96mqj3xr5186" } }, { @@ -120101,11 +121163,11 @@ "repo": "non/uxntal-mode", "unstable": { "version": [ - 20230707, - 1623 + 20231010, + 438 ], - "commit": "0f0bb416d43a940ee7a057db075bf5804708dc5c", - "sha256": "0p1ig2wmldpiymz59gnz9yrrla58x8zyfpklj6rwdf37n6q64ykx" + "commit": "9cc325992309e7b6f6ea75d64e12fde2a85320ed", + "sha256": "024nwljjl9bkdl815j1l4qp1zkd2nmv6xl94aym393k6dnlvplwi" }, "stable": { "version": [ @@ -120851,14 +121913,13 @@ "repo": "gmlarumbe/verilog-ext", "unstable": { "version": [ - 20230916, - 128 + 20231020, + 1553 ], "deps": [ "ag", "apheleia", "async", - "eglot", "flycheck", "hydra", "lsp-mode", @@ -120868,20 +121929,19 @@ "verilog-ts-mode", "yasnippet" ], - "commit": "0b42058d8fd1ea45be395ecc7038594c3fac0395", - "sha256": "000pqp8hd6l4kl6kjzr032k22fa94a8mmsm17vy0p9i4d6nqsmqv" + "commit": "31bc0f38a83cbfd34abe3858081d290d16d8dc7a", + "sha256": "0csi1a6j71l4nl7x31gd6655mp79lyqrjl9kbb2ywrfiiz97gfyc" }, "stable": { "version": [ 0, - 2, + 3, 1 ], "deps": [ "ag", "apheleia", "async", - "company", "eglot", "flycheck", "hydra", @@ -120889,10 +121949,11 @@ "outshine", "ripgrep", "verilog-mode", + "verilog-ts-mode", "yasnippet" ], - "commit": "fd5f46346f5e4522c4e76cd8943cb52108fdb951", - "sha256": "1krpsyg6rhp7gjvgxd4y4mx20mnm02ckyvyzim3aib8acyyks1bl" + "commit": "72698f6f8ac71c29a877ee129f04511a11bb9978", + "sha256": "158xs928k7dl80j78fgx786zf4z3r5d61yv2dg7ki69xdc0bggwp" } }, { @@ -120903,20 +121964,20 @@ "repo": "gmlarumbe/verilog-ts-mode", "unstable": { "version": [ - 20230913, - 908 + 20231016, + 1204 ], - "commit": "dff279d27073fc1ebde7865bba9211ee6e27f96e", - "sha256": "1sliw11fjpa99j7678vgy0mm73j4m9a29dxlvarzs1ngwn9m7hx7" + "commit": "d0403317b7e643c25ef786c40ce711dddc60fcd0", + "sha256": "1pv6bq6nkgp8kxp5ci2q85jfmc4yc0962mvssqbzs2gz1ahjbppj" }, "stable": { "version": [ 0, 1, - 0 + 1 ], - "commit": "dff279d27073fc1ebde7865bba9211ee6e27f96e", - "sha256": "1sliw11fjpa99j7678vgy0mm73j4m9a29dxlvarzs1ngwn9m7hx7" + "commit": "1e4a7cd562c2a710d5b0323f9c7a651e76a4202f", + "sha256": "05k28mc5i611392siymh40mx0wzdzryicsvik85n9l7gzc8zp6dr" } }, { @@ -120987,14 +122048,14 @@ "repo": "baron42bba/vertica-snippets", "unstable": { "version": [ - 20200423, - 1200 + 20231010, + 1104 ], "deps": [ "yasnippet" ], - "commit": "6ced718d9120878878700592fab430a8542b748f", - "sha256": "1x04wrf3h6f4wsh4n2cl3n4byj9pxni918ri49hqxzm8h8hivigc" + "commit": "6f0df19d36a9670484e84b347716f305301359ad", + "sha256": "0nrvc569bfbd1qvzlbgns2vasnxsrq7inkaykiy1jqma8rd4cy9h" } }, { @@ -121005,14 +122066,14 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20230912, - 939 + 20230930, + 1918 ], "deps": [ "compat" ], - "commit": "81bec39151f0a2fc6cad541f2290b4ab6282e6e2", - "sha256": "0yxjj6zlf0jxwcxpaqvb62c7w6ijh0447ppmp5xb7pv3wyxazhxa" + "commit": "5c9a4af57b38fb1a6e78d3e23d50fc59b951241d", + "sha256": "1sg0jp02kqii8dn7p54wqmlwvprpjbqw0xly6vizwhbsqpjy0ka2" }, "stable": { "version": [ @@ -121109,13 +122170,12 @@ "repo": "gmlarumbe/vhdl-ext", "unstable": { "version": [ - 20230916, - 127 + 20231020, + 1600 ], "deps": [ "ag", "async", - "eglot", "flycheck", "hydra", "lsp-mode", @@ -121123,28 +122183,28 @@ "ripgrep", "vhdl-ts-mode" ], - "commit": "f64d7c187b64ef198250787ba48e66f78722320f", - "sha256": "0gdzydsi0rdcyjbiqsyydcqkvcvgkvc2vw3b26mw7h5gkx1ip356" + "commit": "0ccedf602afcbde7e4add7ff6e294ff29c4310ce", + "sha256": "19xfanby7242jk9nwx5k2hfsk3gavk1l0h8az7g86dx465pba95a" }, "stable": { "version": [ 0, - 2, - 0 + 3, + 1 ], "deps": [ "ag", "async", - "company", "eglot", "flycheck", "hydra", "lsp-mode", "outshine", - "ripgrep" + "ripgrep", + "vhdl-ts-mode" ], - "commit": "b571cce006ccaaa48949f1750c64bde4a187c0d8", - "sha256": "0y7xgd7zfn5j56034fh0gvpy0sxmm143z232yy5l33fxkgg70kzp" + "commit": "53df7c40f954fd40e542db51333a3abfa6df5ad3", + "sha256": "17yjkq3099sv39v89n2m4n21qkxkfi0md9kazia6wap1m09dhw69" } }, { @@ -121188,11 +122248,11 @@ "repo": "gmlarumbe/vhdl-ts-mode", "unstable": { "version": [ - 20230913, - 922 + 20231010, + 1133 ], - "commit": "5836c668eea4e3e208bc3149287dfc1971885ce7", - "sha256": "1s6lpd6896cyn1nry77qp3k9rqqrmhy7sa3qsqk15kqxyzrn92qf" + "commit": "8162a4e83460db503801f7dfdad3df75d6653fdb", + "sha256": "1ldz58gws5pqrnzzr7diva2qdfvk8bi4jfad6x9cal3cqp6dv961" }, "stable": { "version": [ @@ -121366,6 +122426,21 @@ } }, { + "ename": "vimscript-ts-mode", + "commit": "7a9e01779e3796960f08ebea41bdae5910f07dc0", + "sha256": "1jn30kkxb72i209xfqa98609lv6hydksmfxfslbsvvv2wfw1yp7n", + "fetcher": "github", + "repo": "nverno/vimscript-ts-mode", + "unstable": { + "version": [ + 20231020, + 1008 + ], + "commit": "84c061f4f80f0768fbe2a8e4b7fb337da83bd150", + "sha256": "1w648mk17ysvcx70nawdp83df15q52qwq9nk5hyamn00ldw6wl0s" + } + }, + { "ename": "virtual-auto-fill", "commit": "a77a66240098fe2e6a4a8097ca9d0f85f3c2b9af", "sha256": "14832wgn6kl122v3lddcnshgl6rk80cpm6xmmxcqcimhiybb9vcx", @@ -121713,11 +122788,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20230910, - 334 + 20231020, + 542 ], - "commit": "0228ccc52cffdc5fe170100de73a866ebd383fe9", - "sha256": "17mhrczjckjcg2px79p7lgjgasi3c0i6hmnpzxcshxqbcrgczbad" + "commit": "2ec99feff875e0e8a850cb423c798da0315f1bd1", + "sha256": "0a03xg4dg07wxmdxsq2173zn27zs63h5gvfqx9f4cysxxkzc4277" }, "stable": { "version": [ @@ -121736,11 +122811,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20230910, - 334 + 20231020, + 542 ], - "commit": "cc0799b5fec46e83439181e70bbbfa7b0e3a1f8a", - "sha256": "1wnkw5wbnw5ic0kla8k5fbrc98ada81zj6f2kkp4r476ziiw03kw" + "commit": "6d64f04575d9629ecf240f73fd8e051cae7f0127", + "sha256": "1knkajh1zlhvc1q3ljcjp5ib1p6dx9f7crvvdx75yi2gii6q09ah" }, "stable": { "version": [ @@ -122071,11 +123146,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20230830, - 510 + 20231003, + 113 ], - "commit": "90341ba84a4239964896505a76eeab871fb276fb", - "sha256": "06qrr1rp3xd53afpqrg1zizp59j1dvyhgdn294qashfy9r516nzf" + "commit": "3aa5d009f57a4d416127080938c846f4234d3619", + "sha256": "1c4i7ghap5qrgh1qc1szg374vwjqpla7zhi5dyrjn4yqz68vfv3m" } }, { @@ -122148,11 +123223,11 @@ "repo": "wakatime/wakatime-mode", "unstable": { "version": [ - 20221110, - 1632 + 20231012, + 1227 ], - "commit": "ef923829912c3854d230834f81083814b7c9d992", - "sha256": "0m29817s2din4n42pflvzg2538i91s0n06y78pf8q94qf0mfspcl" + "commit": "5483d915eb35a24a30551abb64c55797f6749a20", + "sha256": "15dxgalfglz8c8q74g2bbmz94ig98idnlva6yqmcqq7fv2ps3086" } }, { @@ -122336,16 +123411,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20230818, - 1424 + 20231016, + 1405 ], "deps": [ "apel", "flim", "semi" ], - "commit": "1389dcec6e3242948682eb3e3ce8ead8be2772d8", - "sha256": "0vnd9sib11v0w7swkmkcssvn0fp303dirigdg7rxa5k94f8akdbv" + "commit": "3e8cf26abd9c5c8e4fc611032e259ca930665641", + "sha256": "0k9r3j7pcnvnnj0km8ggjdrf2nfgn1mfq7r7267bk3r3x92cvqh9" } }, { @@ -122379,6 +123454,21 @@ } }, { + "ename": "wat-ts-mode", + "commit": "c36d467638bc9f3578b4699c7d1ae513fd23b782", + "sha256": "0yv553nqjcq6a1xsh18smi9hnvnyshmnxcd04f2gz79nsmsj6kar", + "fetcher": "github", + "repo": "nverno/wat-ts-mode", + "unstable": { + "version": [ + 20231006, + 223 + ], + "commit": "d2bbd7dbb57482dc0407574d61b2dcad31b96204", + "sha256": "0dxb0szs6kszp2drhxqy4kq8bq7rjarar13s274241lbpdv8ylmq" + } + }, + { "ename": "watch-buffer", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "05f58kg05kfl4srwwjaf7w9jml50yx6bn4x8m1npswp882dsjyh9", @@ -122727,6 +123817,21 @@ } }, { + "ename": "webdriver", + "commit": "07ed09ce54f3ab01abe3b4b0f10a9547ab8fcdb5", + "sha256": "1a2qi61ikgr87s4n2f1s93icnhn8fymwks5dgql146ga357pclf4", + "fetcher": "gitlab", + "repo": "mauroaranda/emacs-webdriver", + "unstable": { + "version": [ + 20231016, + 1331 + ], + "commit": "f73fc53aea5733d630e66d8da178218983d5898a", + "sha256": "1m1zd3dyp1jy3ki6jsmmn583s0vbpvk12g0dy34kfdjxdlp7sx8y" + } + }, + { "ename": "webkit-color-picker", "commit": "af9d2e39385c6833eff6b7c7e5a039238563c00f", "sha256": "1i9244zghabyavxhz86d22fn40qspzdn2sjql8pl3mm8ks7a49a3", @@ -123025,11 +124130,11 @@ "repo": "thierryvolpiatto/wfnames", "unstable": { "version": [ - 20230819, - 1122 + 20230924, + 1538 ], - "commit": "ea336972227a5ffe29fed0aaa1ccaadf90743db3", - "sha256": "15np6d09081a84y3ildgadmkqjpmbwmd7rrgaa2lxvcj8r1gb2pn" + "commit": "19b452fb698a5ba3b0f1d6e7d69a5e19af2c83e7", + "sha256": "0iihs4iam27m2ggmhy9x0np0awirxhzy78q677ng734zdig6bccz" } }, { @@ -123595,15 +124700,15 @@ "repo": "progfolio/wikinforg", "unstable": { "version": [ - 20230630, - 116 + 20231015, + 2127 ], "deps": [ "org", "wikinfo" ], - "commit": "525ab7d72ffbfbb57868f430a67cad010904ccf5", - "sha256": "0igzg5adbqcb2zz336d5fvn71l8jnjjsl0g4zzj12dh0sacc33py" + "commit": "70260785e89b682f4dfde1aadaa345ad8b4b36ca", + "sha256": "0mk283dk6w312k3c1vh13hp09i1q5g32nvhf0kpl2qjgjivbhfsi" } }, { @@ -123614,11 +124719,11 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20230914, - 2328 + 20231015, + 30 ], - "commit": "ea7ca5641eaa32707a619588fe1b3465bdd0eec6", - "sha256": "02gf6gshg86b7rh2q44rk21pxjjiaad7iz7almcjzzwwpj9y1rdg" + "commit": "14f29cfa8d185b544a481012e3bc33cbe5338dd4", + "sha256": "1z4rj4bryfs8x0wyg0bk27pxykaszkrlhjs7cgg99s9ihs963zqf" }, "stable": { "version": [ @@ -123637,11 +124742,11 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20230914, - 2328 + 20231015, + 30 ], - "commit": "ea7ca5641eaa32707a619588fe1b3465bdd0eec6", - "sha256": "02gf6gshg86b7rh2q44rk21pxjjiaad7iz7almcjzzwwpj9y1rdg" + "commit": "14f29cfa8d185b544a481012e3bc33cbe5338dd4", + "sha256": "1z4rj4bryfs8x0wyg0bk27pxykaszkrlhjs7cgg99s9ihs963zqf" }, "stable": { "version": [ @@ -124070,14 +125175,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20230829, - 1917 + 20230917, + 958 ], "deps": [ "compat" ], - "commit": "d5f3f06cb830311e60c58f656988ef37c05a99e0", - "sha256": "1wzzymlka4f798m75kizjh1yvnh49y8m029c7p5pg7gbv6d0wd8a" + "commit": "fcd186d1e684c2dca6497c89af77b27b2b036c11", + "sha256": "04libc0dk0vz3z9l77z8nnvh03pync1kvf0ky7j3y607cg0mrg73" }, "stable": { "version": [ @@ -124149,26 +125254,26 @@ "repo": "p3r7/with-shell-interpreter", "unstable": { "version": [ - 20200828, - 1217 + 20230916, + 1420 ], "deps": [ "cl-lib" ], - "commit": "45b7d6ad63165c82a95966b291abbfe305d3ada2", - "sha256": "0amqw629ah23ngw99iciiljycgikzsrcwpskgbzg0xbv0zzbyjgn" + "commit": "bef977d8058d26d82ab11a7227c88b3011edd127", + "sha256": "0v087wr1hgqi7ln9h5x26a4hbwi50lvk1q74inbbcdhij6ydknpn" }, "stable": { "version": [ 0, 2, - 4 + 5 ], "deps": [ "cl-lib" ], - "commit": "45b7d6ad63165c82a95966b291abbfe305d3ada2", - "sha256": "0amqw629ah23ngw99iciiljycgikzsrcwpskgbzg0xbv0zzbyjgn" + "commit": "bef977d8058d26d82ab11a7227c88b3011edd127", + "sha256": "0v087wr1hgqi7ln9h5x26a4hbwi50lvk1q74inbbcdhij6ydknpn" } }, { @@ -124387,11 +125492,11 @@ "repo": "martianh/wordreference.el", "unstable": { "version": [ - 20230710, - 1203 + 20231008, + 1456 ], - "commit": "00e563c3b5f1634c8f43516d0e5a9674db7b6099", - "sha256": "1jp6dila2vjglicm9v72jb4zvsvr3q83irb7aaawv6sfal56676a" + "commit": "da8bfc29c1500bef27423c2be03e46aff1b9bdd4", + "sha256": "1d267ddzxns95zn4xgwyp55jz6ca3df1lq8npjskswnyvcczrxrb" } }, { @@ -124503,15 +125608,15 @@ "repo": "akib/emacs-workroom", "unstable": { "version": [ - 20230123, - 1630 + 20230926, + 1631 ], "deps": [ "compat", "project" ], - "commit": "360420501a239f74bff60941d28052fc19a92bce", - "sha256": "13d1qmkls8dbrm2wagrvrffyis87pyy2l2hsmnxrp2mqzk0vx541" + "commit": "cb8654191b23c9b02a79660c3d8c969709c6fcbe", + "sha256": "0337gkcz2bk5hkivl2z3mi8dwjiys6gjzplfazxd7kvqd0yqypnq" } }, { @@ -125005,21 +126110,6 @@ } }, { - "ename": "xit-mode", - "commit": "d891efd536e7c93c35761de34ab10b640974d93d", - "sha256": "1fv97ym57qzrwjsz8cxzva33vrx0l0kn6v59crc6yv5h3x7p1n30", - "fetcher": "github", - "repo": "ryanolsonx/xit-mode", - "unstable": { - "version": [ - 20221006, - 717 - ], - "commit": "f9f8f07c54090f03107180b125c54e329493a1a7", - "sha256": "1jq2aikfk9wnqxvxl2z4xccz1vhwgyipwc68kv0b4yxjjnppv6fw" - } - }, - { "ename": "xkcd", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0gy2952zg1rq5gl10x7iwbchz5jibfcvikd3chifqbmil80wh6b5", @@ -125138,11 +126228,11 @@ "repo": "xml-rpc-el/xml-rpc-el", "unstable": { "version": [ - 20221228, - 2346 + 20231009, + 1432 ], - "commit": "8272789df8a4deab4de7d50e63b73b7d0543bc7f", - "sha256": "1l57q1gskkdjfhnl3jil1gblj2jz6j1l0njwnz5bs76dajhlmjpj" + "commit": "fb6183597be1361be02f46c9a53257ac1dd9715e", + "sha256": "0c3w2x4pp7fsg6gps3aix1z55a9cwb67xwyb1wixan06v21md0ri" }, "stable": { "version": [ @@ -125518,26 +126608,26 @@ }, { "ename": "yabaki-theme", - "commit": "149f2219404fddc58a94d0ff4aba7fdc7043d814", - "sha256": "1dzh6ry23x5dbw40jiyj97r5clrd2kzdmj89z9x0ijm7alqycsjg", - "fetcher": "github", - "repo": "seamacs/yabaki-theme", + "commit": "5fa6723074280729c8ea5e94f2a3e642b072730c", + "sha256": "0js3z8hysy87sxrg4x67afpz5hw384589r5s17xsxhak46q53y10", + "fetcher": "codeberg", + "repo": "seahorse/yabaki-theme", "unstable": { "version": [ - 20230327, - 630 + 20231004, + 2023 ], - "commit": "5face6a1194b039e09fe19238aa5db05450d7df1", - "sha256": "0q59di5qg9zh9k714bvjbzk8ap829vgnaxk1mvw1z06bxqgin48l" + "commit": "209f2be321509dac00631fff1b0f7ea01ba382de", + "sha256": "1qlfnnlc1av630vc89csg29ps54l4ld4aw8f55kqkpfm84l4ki5s" }, "stable": { "version": [ 2, 0, - 0 + 1 ], - "commit": "5face6a1194b039e09fe19238aa5db05450d7df1", - "sha256": "0q59di5qg9zh9k714bvjbzk8ap829vgnaxk1mvw1z06bxqgin48l" + "commit": "209f2be321509dac00631fff1b0f7ea01ba382de", + "sha256": "1qlfnnlc1av630vc89csg29ps54l4ld4aw8f55kqkpfm84l4ki5s" } }, { @@ -125647,20 +126737,20 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20230907, - 1302 + 20230928, + 103 ], - "commit": "7c4b2ec9a551c0d2ce0094b030f2ab596f3c32ee", - "sha256": "09vq7fl9sx7i7y8n2fpwn4jlrl7bbvislzx42q3yjxacsnzrbdqv" + "commit": "fe08b8f5307af1e7b876ece64b7303213f04b63c", + "sha256": "10sdcihgd8yvdf7yab5fsvq65amp25msjh7mbrxgk3w4zc96fxzi" }, "stable": { "version": [ 0, 5, - 3 + 4 ], - "commit": "7c4b2ec9a551c0d2ce0094b030f2ab596f3c32ee", - "sha256": "09vq7fl9sx7i7y8n2fpwn4jlrl7bbvislzx42q3yjxacsnzrbdqv" + "commit": "fe08b8f5307af1e7b876ece64b7303213f04b63c", + "sha256": "10sdcihgd8yvdf7yab5fsvq65amp25msjh7mbrxgk3w4zc96fxzi" } }, { @@ -125701,20 +126791,20 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20230714, - 440 + 20231003, + 1142 ], - "commit": "13728b4b1b1bd33d3a754236a0f23e4c76d6ba91", - "sha256": "09im8s8chwa59xag30zk3qlrc1dx9hxngp0z4wrj84mf1yyg1wxp" + "commit": "23395dfcf004c952850691b70e63f97f169596e8", + "sha256": "0jqg2hmh7qsgqywwd6fy3k8z8j45nqhpdzr3hw4hd5s2hry3zhg1" }, "stable": { "version": [ 0, 0, - 15 + 16 ], - "commit": "fc5e1c58f94472944c4aa838f00f6adcac6fa992", - "sha256": "0gsa153yp8lmwrvcc3nzpw5lj037y7q2nm23k5k404r5as4k355l" + "commit": "6bb9e7f6e1c9224f743a8a68bc210d10eb8cb788", + "sha256": "0jqg2hmh7qsgqywwd6fy3k8z8j45nqhpdzr3hw4hd5s2hry3zhg1" } }, { @@ -125725,14 +126815,14 @@ "repo": "zkry/yaml-pro", "unstable": { "version": [ - 20230315, - 320 + 20230921, + 39 ], "deps": [ "yaml" ], - "commit": "50fc911b9015708b77872dc60c53f4a4740bef1b", - "sha256": "1ml7rp89alx6g1c5n325gzygwlgywxa40qf8xc0ag4nwzyp6z109" + "commit": "c04e8a2a3549095cb7c84491aefed54543373512", + "sha256": "0v061q3hpdhjjzxnhm5x6409kx9djc83vrcrwm5qhk5ngiva1wrj" }, "stable": { "version": [ @@ -126191,26 +127281,26 @@ }, { "ename": "yeetube", - "commit": "857cc1f2e5c2c8dce454ff1c37cc50a944857dfd", - "sha256": "17m8ln1k2r94n40i6h84nghl97bqvh9p29jc1pf43b934c8jkn7k", - "fetcher": "sourcehut", - "repo": "thanosapollo/yeetube.el", + "commit": "c4e808c643026327acace51a587dc17ea094d829", + "sha256": "0ll70490px1hz35rgkkbnxxbpxip7dzbr1hqyilqqc1as20n3fig", + "fetcher": "git", + "url": "https://git.thanosapollo.com/yeetube", "unstable": { "version": [ - 20230831, - 1426 + 20231017, + 634 ], - "commit": "68f6d965871b91e0210630538f233b0016ddb0d6", - "sha256": "0k911a8g80karcy95cf3lkqdgfzji16pcfyq5f9gvip3a9dpfnw6" + "commit": "610609061226c38a68267172e8975d8df1a1848d", + "sha256": "05w33431dfr1ldcg3yq01qvz0alpv8q88r0dsb278qbwszw9cfz6" }, "stable": { "version": [ 2, 0, - 0 + 7 ], - "commit": "eef53f8d1f382554654815ad089e1a38a4854959", - "sha256": "0a41r1gfs8zxizgpazwvighjwvv4xmf9p9x0cfglkahyqk89hn47" + "commit": "610609061226c38a68267172e8975d8df1a1848d", + "sha256": "05w33431dfr1ldcg3yq01qvz0alpv8q88r0dsb278qbwszw9cfz6" } }, { @@ -126357,8 +127447,8 @@ "repo": "xuchunyang/youdao-dictionary.el", "unstable": { "version": [ - 20200722, - 1705 + 20231005, + 1920 ], "deps": [ "chinese-word-at-point", @@ -126366,21 +127456,23 @@ "popup", "pos-tip" ], - "commit": "8a4815a43565b9bfd257246e4895b8bfafb9d573", - "sha256": "0h8hgq76ja3fjrn8vsndkzvns4ar13qsydcrqjsj77jqw9kx9a43" + "commit": "eae8efb1efd3fc82cfe87a357fe8f764116d94ef", + "sha256": "12hsi8n7mwmf81bl6kjnssdp09hnlhaggaj1g7jvs9y1x78jk6hd" }, "stable": { "version": [ 0, - 4 + 5, + 3 ], "deps": [ "chinese-word-at-point", "names", - "popup" + "popup", + "pos-tip" ], - "commit": "a6e44e4fb93cc1b9f1067f10cf854b0bfc3fe732", - "sha256": "1m4zri7kiw70062w2sp4fdqmmx2vmjisamjwmjdg6669dzvnpawq" + "commit": "eae8efb1efd3fc82cfe87a357fe8f764116d94ef", + "sha256": "12hsi8n7mwmf81bl6kjnssdp09hnlhaggaj1g7jvs9y1x78jk6hd" } }, { @@ -127024,8 +128116,8 @@ "repo": "WillForan/zim-wiki-mode", "unstable": { "version": [ - 20230211, - 1650 + 20230927, + 1410 ], "deps": [ "dokuwiki-mode", @@ -127034,8 +128126,8 @@ "link-hint", "pretty-hydra" ], - "commit": "cf3d5a0dfb53d6cba8d7d35420ec18bf81b5bf2f", - "sha256": "194wcyz1zwwkizpblq4pwixigpjyy3br7psiaj0p7fmrcicdfmlv" + "commit": "7c62e0304750654709b4173bcc1e2681cf1fbe49", + "sha256": "1vfc48vz0ajcqcdx89wrwd3ksncwjlvi1via681d88y9in9bpbv4" } }, { @@ -127118,14 +128210,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20230712, - 1103 + 20230930, + 1422 ], "deps": [ "zk" ], - "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5", - "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p" + "commit": "afb7c078863b1b7e631019647d53d37f59a1554a", + "sha256": "1sfa864gkw13mbk6wjpys65r7rl7a58xj3qz39gn99cmp7a3v98z" }, "stable": { "version": [ @@ -127147,15 +128239,15 @@ "repo": "localauthor/zk-luhmann", "unstable": { "version": [ - 20230505, - 2107 + 20231009, + 1303 ], "deps": [ "zk", "zk-index" ], - "commit": "be0d6aa9fb856736406a43e3908fc4a01e073b99", - "sha256": "0z3v7k0vy99k0vgp8r8ba2bhcyn5jg71c22xvb6vyw7ikn757pi8" + "commit": "e2af1477e5fc59cd4499eede991114561d8a7a37", + "sha256": "1apr9mvb5hsdw59f7dn3gmg9jxn3v3433wxrvkcv02ndp81vngn5" } }, { @@ -127513,11 +128605,11 @@ "repo": "mpedramfar/zotra", "unstable": { "version": [ - 20230819, - 1747 + 20231014, + 2139 ], - "commit": "9cd9eb36bbc65efcc38ca38fc96730dbbe882fd8", - "sha256": "0n3iw00ip4hrmg8c2j5m7v67ib3fjr19g8ijgnf8m3rrvhjriss2" + "commit": "fe9093b226a1678fc6c2fadd31a09d5a22ecdcf1", + "sha256": "04a7h183kbl8nfkhn2386yljmv7hgxg0cdyw1ir3x60i3nji179z" } }, { diff --git a/nixpkgs/pkgs/applications/editors/helix/default.nix b/nixpkgs/pkgs/applications/editors/helix/default.nix index b75a6b11f9e9..7d3b964fb15c 100644 --- a/nixpkgs/pkgs/applications/editors/helix/default.nix +++ b/nixpkgs/pkgs/applications/editors/helix/default.nix @@ -2,24 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "helix"; - version = "23.05"; + version = "23.10"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. src = fetchzip { url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; - hash = "sha256-3ZEToXwW569P7IFLqz6Un8rClnWrW5RiYKmRVFt7My8="; + hash = "sha256-PH4n+zm5ShwOrzzQm0Sn8b8JzAW/CF8UzzKZYE3e2WA="; stripRoot = false; }; - cargoHash = "sha256-/LCtfyDAA2JuioBD/CDMv6OOxM0B9A3PpuVP/YY5oF0="; - - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/helix-editor/helix/pull/7227.patch"; - hash = "sha256-dObMKHNJfc5TODUjZ28TVxuTen02rl8HzcXpFWnhB1k="; - }) - ]; + cargoHash = "sha256-B8RO6BADDbPchowSfNVgviGvVgH23iF42DdhEBKBQzs="; nativeBuildInputs = [ git installShellFiles makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix b/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix index b9d0ab4ec23e..a8483f0db348 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "neovim-qt-unwrapped"; - version = "0.2.17"; + version = "0.2.18"; src = fetchFromGitHub { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "sha256-UJXaHENqau5EEe5c94pJuNxZU5rutJs642w9Cof8Sa4="; + sha256 = "sha256-BitFHHwL2aqBUpY/8eHaZIFvnDCeABC6w33Vmbx0z2g="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/applications/editors/setzer/default.nix b/nixpkgs/pkgs/applications/editors/setzer/default.nix index 640a00eaaa2c..8da51bd97a62 100644 --- a/nixpkgs/pkgs/applications/editors/setzer/default.nix +++ b/nixpkgs/pkgs/applications/editors/setzer/default.nix @@ -20,13 +20,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "60"; + version = "61"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - hash = "sha256-SfMqGQKJtPTMSv4B70jOvTAIzNQc0AC16mum4fuNch4="; + hash = "sha256-7qkQelB0Y+DBihhaYVVQjK66pk8p2Sjhno87bW554SY="; }; format = "other"; diff --git a/nixpkgs/pkgs/applications/editors/textadept/default.nix b/nixpkgs/pkgs/applications/editors/textadept/default.nix index c2b82321d4e9..153bc248f643 100644 --- a/nixpkgs/pkgs/applications/editors/textadept/default.nix +++ b/nixpkgs/pkgs/applications/editors/textadept/default.nix @@ -1,6 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, qtbase, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, fetchurl, cmake +, withQt ? true, qtbase, wrapQtAppsHook +, withCurses ? false, ncurses +}: stdenv.mkDerivation rec { - version = "12.0"; + version = "12.1"; pname = "textadept"; src = fetchFromGitHub { @@ -8,15 +11,19 @@ stdenv.mkDerivation rec { owner = "orbitalquark"; repo = "textadept"; rev = "textadept_${version}"; - sha256 = "sha256-KziVN0Fl/IvSnIJKK5s7UikXi3iP5mTauP0YxffKy9c="; + sha256 = "sha256-ce7U/GR/4zkjnRN3fx3FLecc9vuvFqCONy275SWnpNc="; }; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ qtbase ]; + nativeBuildInputs = [ cmake ] + ++ lib.optionals withQt [ wrapQtAppsHook ]; - cmakeFlags = [ - "CMAKE_INSTALL_PREFIX=build/install" - ]; + buildInputs = + lib.optionals withQt [ qtbase ] + ++ lib.optionals withCurses ncurses; + + cmakeFlags = + lib.optional withQt [ "-DQT=ON" ] + ++ lib.optional withCurses [ "-DCURSES=ON" "-DQT=OFF"]; preConfigure = '' mkdir -p $PWD/build/_deps diff --git a/nixpkgs/pkgs/applications/editors/textadept/deps.nix b/nixpkgs/pkgs/applications/editors/textadept/deps.nix index b0117f40224d..4f352bf19b76 100644 --- a/nixpkgs/pkgs/applications/editors/textadept/deps.nix +++ b/nixpkgs/pkgs/applications/editors/textadept/deps.nix @@ -1,36 +1,45 @@ { + # scintilla "scintilla536.tgz" = { url = "https://www.scintilla.org/scintilla536.tgz"; sha256 = "sha256-ib6CeKg+eBOSWq/il32quH0r1r69F7AXn+cq/dVIyyQ="; }; + # lexilla "lexilla510.tgz" = { url = "https://www.scintilla.org/lexilla510.tgz"; sha256 = "sha256-azWVJ0AFSYZxuFTPV73uwiVJZvNxcS/POnFtl6p/P9g="; }; + # scinterm "scinterm_5.0.zip" = { url = "https://github.com/orbitalquark/scinterm/archive/scinterm_5.0.zip"; sha256 = "sha256-l1qeLMCrhyoZA/GfmXFR20rY5EsUoO5e+1vZJtYdb24="; }; - "scintillua_6.2.zip" = { - url = "https://github.com/orbitalquark/scintillua/archive/scintillua_6.2.zip"; - sha256 = "sha256-vjlN6MBz0xjBwWd8dpx/ks37WvdXt2vE1A71YM3uDik="; + # scintillua + "e88bbcfecae46b48b79d8156ea7129411b5c847d.zip" = { + url = "https://github.com/orbitalquark/scintillua/archive/e88bbcfecae46b48b79d8156ea7129411b5c847d.zip"; + sha256 = "sha256-sWqpVtcAwysGn86XFwaEkKSPemk2247SydOQi6klFrQ="; }; + # lua "lua-5.4.6.tar.gz" = { url = "http://www.lua.org/ftp/lua-5.4.6.tar.gz"; sha256 = "sha256-fV6huctqoLWco93hxq3LV++DobqOVDLA7NBr9DmzrYg="; }; + # lpeg "lpeg-1.1.0.tar.gz" = { url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz"; sha256 = "sha256-SxVdZ9IkbB/6ete8RmweqJm7xA/vAlfMnAPOy67UNSo="; }; + # luafilesystem "v1_8_0.zip" = { url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip"; sha256 = "sha256-46a+ynqKkFIu7THbbM3F7WWkM4JlAMaGJ4TidnG54Yo="; }; - "cdk-5.0-20200923.tgz" = { - url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz"; - sha256 = "sha256-AH9d6IDLLuvYVW335M2Gc9XmTJlwFH7uaSOoFMKfqu0="; + # cdk + "t20200923.tar.gz" = { + url = "http://github.com/ThomasDickey/cdk-snapshots/archive/refs/tags/t20200923.tar.gz"; + sha256 = "sha256-rjL4oMSDJZWAZJ8pG8FApfpvrVNJvY+6D8ZV+gwvDnI="; }; + # libtermkey "libtermkey-0.22.tar.gz" = { url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz"; sha256 = "sha256-aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA="; diff --git a/nixpkgs/pkgs/applications/editors/typora/default.nix b/nixpkgs/pkgs/applications/editors/typora/default.nix index 5332e0b5d05b..936cc9f7bb87 100644 --- a/nixpkgs/pkgs/applications/editors/typora/default.nix +++ b/nixpkgs/pkgs/applications/editors/typora/default.nix @@ -22,10 +22,10 @@ let pname = "typora"; - version = "1.7.5"; + version = "1.7.6"; src = fetchurl { url = "https://download.typora.io/linux/typora_${version}_amd64.deb"; - hash = "sha256-4Q+fx1kNu98+nxnI/7hLhE6zOdNsaAiAnW6xVd+hZOI="; + hash = "sha256-o91elUN8sFlzVfIQj29amsiUdSBjZc51tLCO+Qfar6c="; }; typoraBase = stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index a38f9c137edc..e63b4601ebae 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,12 +173,12 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2023-10-17"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "c711309a673a755652a90a080fd23dbab5dd61d5"; - sha256 = "1cyv4mhvysv8yrfp80kjnr56jd35rg4sb8bf72s1p8sx81ma3lc9"; + rev = "e7130c8250c403140ce504bde9e973d5a301ab4c"; + sha256 = "0riz7djpmfald4dy41rwml7fr11jm85kqs3bkb020dhi9lgh22zw"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -257,12 +257,12 @@ final: prev: QFEnter = buildVimPlugin { pname = "QFEnter"; - version = "2022-10-15"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "yssl"; repo = "QFEnter"; - rev = "fd5d378f97ee4847ce4fcb58b3719864228607da"; - sha256 = "009lpb3hygcw09535bajnd18xq6hbz19pdbwx9l9cykwaniciahi"; + rev = "426c04312ae67ac28dce38ccc5fafdd1ed4a3d9f"; + sha256 = "02s3mq0hxszi7fbm256xgh4nz5mc5frg8rz6dnll7sk26as8fgrd"; }; meta.homepage = "https://github.com/yssl/QFEnter/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2023-10-17"; + version = "2023-10-19"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "847f69b4bd50ad09c7d66943bc690682a3e35573"; - sha256 = "0jg3hdw26s8bmfirdi2nbchkmkakmggl0h5x2jx7hn5d9yn3ps4h"; + rev = "e0268efbb748bc12c024311540acb91d7ed1148e"; + sha256 = "1nm0gsmz0mfb815ahqhm4wsdh4lr9i1bsljyi9mlfg11xqc0a62i"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2023-10-16"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "ffdda791c0d739154a73af09e4ed14c9147a354b"; - sha256 = "0v9p62znlk17jx0i9c65dcz651q0p4a7fkfriv96hjqxih560sl6"; + rev = "3a3baf0930444c78d19964fdb401bd3a6a23270f"; + sha256 = "0nb6q36hd71migzzqrdrhak0a55l7li3v1vlij95wwi9yf8pry8n"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -763,12 +763,12 @@ final: prev: asyncomplete-vim = buildVimPlugin { pname = "asyncomplete.vim"; - version = "2023-04-11"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "b3fbac1930be2c9cdf956f4a0346c1dd0e9abd44"; - sha256 = "0jm2bqsqk0jjdm69lpxgnsms7c12pfkrn1lljpqqf2cx1xjql19r"; + rev = "016590d2ca73cefe45712430e319a0ef004e2215"; + sha256 = "1mpdhh9vmjasigw9r5zv5ikvia2vsqpm3l3bd3sqriwv597jcyb9"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -2047,12 +2047,12 @@ final: prev: codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2023-10-14"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "6b0f2bbbbd7669af50775ad27eff0077858aa9b8"; - sha256 = "0i4y0nl9ncmsz4sal33mnah99gp8v67adl5rpqrwzami4ms1ji4g"; + rev = "7b2f57ba35bbff7dabd5e3eaa6e60d0490516c78"; + sha256 = "0icqlhb09grf2ivw7rzwc3krc78g3q1qpv9d3x8yqywyb95p5yyi"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2119,12 +2119,12 @@ final: prev: command-t = buildVimPlugin { pname = "command-t"; - version = "2023-10-08"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "8e5e827754b255452b21b8acf31afedb3e123e1c"; - sha256 = "1akp63i9ffrl8g2mjd7mf332aq47p6xck398gqr6920kk0vlkyk7"; + rev = "a2ff356633bfc2b4638925eee172d43173420d3b"; + sha256 = "1pi4jgc8h48gqdik5kzvlvswh9y9f8rbz6hchng5n5ybnsf3w88a"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; @@ -2285,6 +2285,19 @@ final: prev: meta.homepage = "https://github.com/rhysd/conflict-marker.vim/"; }; + conform-nvim = buildVimPlugin { + pname = "conform.nvim"; + version = "2023-10-22"; + src = fetchFromGitHub { + owner = "stevearc"; + repo = "conform.nvim"; + rev = "7f5ff6d253ae3543f186787bccafdc411d3f4b0a"; + sha256 = "1iargrkz4k51bppp7qm2hlqy334x1qjg0d1ax8dr6qpkhi6al36v"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/stevearc/conform.nvim/"; + }; + conjure = buildVimPlugin { pname = "conjure"; version = "2023-08-27"; @@ -2347,12 +2360,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2023-09-20"; + version = "2023-10-18"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "998cf5ab1b85e844c7e8edb864a997e590df7182"; - sha256 = "1sf566vwyj21h9vbs64j8458v4ncqpmfb5cr74pyl59qi33yq1zd"; + rev = "59c02393c99335392e9cb572cb47951bbb4de6be"; + sha256 = "0w16vq683qddb5d7gc1f5kb5m0h3b01srnkakwnjbvbyb6l8ar9r"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2431,12 +2444,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2023-10-09"; + version = "2023-10-19"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "58bf989736765cae41fa5d0971027efeca033301"; - sha256 = "06yxlwmas7cz856y1ppbih261mipwda5sjvqzcci37igg6wgbkcq"; + rev = "aac57ef84cf4fecf7907114b22e875f84a6128ee"; + sha256 = "0xqpj6zhydx8n08s00i3zji2383dp13xy3smsvzgim8wmwfklk6s"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2551,12 +2564,12 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2023-10-16"; + version = "2023-10-19"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "fd68b9d05aedc57e5d97a6b66a4e3db877872f64"; - sha256 = "1rdljb9kpr45dpapjxx2msw3v721bai6icf0xj22dd128z05ivzg"; + rev = "c71cab740e2add248c54c458b5ca9d6e77c30fa6"; + sha256 = "1xn6ib211p4qd3is5ldgr1g14j7sh8ys50460hx1dh0frb8ra2v2"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -2647,12 +2660,12 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2023-09-07"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "68f607d93a9758d15c0d63d3268aa420ddd29edd"; - sha256 = "0k15zc28a8pmr34xxkfjfy5kbhi4n2h3h9iswrn7vslhh4pnx076"; + rev = "ea7370bf5d323e83ee13ccba35f56e06db5753e1"; + sha256 = "1c105rdj87fbgi1vir9crm3d7ibb3b4hhgkwjbh1gdyym9pqw4fn"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; @@ -3033,12 +3046,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2023-10-07"; + version = "2023-10-21"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "79309dccd5e5b94f9ddf5ee8587691d2bfea2858"; - sha256 = "0wg1bq10z4ykwdniznzs6zv2v6888ykh3x3immxz30rix3j109m1"; + rev = "36b7cc1cc9e9d0525a3a841b1a048473ad1d619e"; + sha256 = "05504x6r4zpk4jvcidhhycmr1xrsmd2z239di6k2jhhhlja87k0l"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3118,24 +3131,24 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2023-10-10"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "3fade5690e31f80b70eb5fc5a7fa7a8da6644fe9"; - sha256 = "13vwc1nb4xzm99iv9pbnw3gq3bda4sbfx2jy3f2zv41gfxxzzc4x"; + rev = "83263bd5679400adb07e41a0d85e056b6c865a05"; + sha256 = "1svwgg3lmwddwfc08ghpk3zlg3wfkb8h4w5jf0fxbg1as58q1a7i"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2023-10-02"; + version = "2023-10-19"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "4b3c1c23a83361559676981575083436cf9b7245"; - sha256 = "02aprmr3jchlr16l9r0c02cf1hrc7cmkvm00w0wa3saps5a59nsr"; + rev = "83d3b7946cf1ee2ec7eb69dd23c47092f085cd47"; + sha256 = "1vanmr37zdq38fcjnip9scxjm787j8iw1hl87d4iqrp2apcl5wcw"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3333,18 +3346,6 @@ final: prev: meta.homepage = "https://github.com/wincent/ferret/"; }; - ferris-nvim = buildNeovimPlugin { - pname = "ferris.nvim"; - version = "2023-11-21"; - src = fetchFromGitHub { - owner = "mrcjkb"; - repo = "ferris.nvim"; - rev = "54943eaeb0d4534988d2378936052655c988c3c2"; - sha256 = "o4yY4IHYBCnanfy7dx/wGdiPFMLMKZsYrG2SqlPRvdI="; - }; - meta.homepage = "https://github.com/mrcjkb/ferris.nvim/"; - }; - fidget-nvim = buildVimPlugin { pname = "fidget.nvim"; version = "2023-06-10"; @@ -3420,12 +3421,12 @@ final: prev: flit-nvim = buildVimPlugin { pname = "flit.nvim"; - version = "2023-07-13"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "498b3a4864e697f1ed1145e518c4c78c776c55d8"; - sha256 = "0w56zv254hpw57zgwzaikj9ciyksvkbd0brynhgcaby8s6hhhgil"; + rev = "f4e9af572a62c808c8de214da672f2a115a98c35"; + sha256 = "10sd56dlgg9zisxp49lh9di3ag6w69rlzy067sp2rcbr84gz8spy"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3636,12 +3637,12 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-10-17"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "aeab02f60cab6c6caf8060eb183796a0dc030576"; - sha256 = "1cqk1fmm84c80x2x637bdgzawm02r67ipbc0m5mrzpn9rbbg52hi"; + rev = "04e7382528f3f4970cb1cd559d06ae6f7b44560e"; + sha256 = "0rlzcyp1l9kny2sx4k0mclzkhva9kilrvjd2dnfav2chm0amwzh2"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3732,12 +3733,12 @@ final: prev: git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2023-10-12"; + version = "2023-10-19"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "e4dafc79cc7dcf4eec0547dbc6f3f3821b2f2b14"; - sha256 = "004l5kd4q4cfpinp9i5p7c7mv3jm5bcaybq7kiwmpw2d6adp5hg8"; + rev = "1792125237260dc2a03ba57d31c39179e6049f07"; + sha256 = "1286zylvd10r0kq6g0f1rwrdbdwpy7f7n28kdmlrhsw5h25y5bcf"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3804,12 +3805,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-10-06"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "ff01d34daaed72f271a8ffa088a7e839a60c640f"; - sha256 = "0clyngmmz0qilnjykqc8n7c5kidspywazwy3axsikgh4x8wzdn17"; + rev = "5a9a6ac29a7805c4783cda21b80a1e361964b3f2"; + sha256 = "1vgs97iik9ziwbqv1xbs920qizcnshcpibj17mbsdr8lax8iycpl"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3864,12 +3865,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2023-10-16"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "d73ea5bc00f0d7b726b0ddfc29cea17a544459ba"; - sha256 = "1qaav736d4k70bixwc5qrf4pi9983b3i92bwnnvairg69b3fwa59"; + rev = "8732792d9c30a113188f85f75c19f0effd199881"; + sha256 = "17jzn8dgprgr5wh2v2dxd26i44yha3rnl9dkq9ipgxxqqax1rqlg"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4044,12 +4045,12 @@ final: prev: hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2023-10-09"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "4accbaa408ea6ddb8adf8fd735208570ed78d6f8"; - sha256 = "17za9cgcx72gnh3sp2ppd824c5iac70ahj7cpc74caxglzyqpczs"; + rev = "fb74735f5c85e3e090ab8a1c312c0110426f2a5b"; + sha256 = "0q8hpvy61qc5pbxbzkf5zna71j7h8xbvqjs23x8bimkhwgk21j0k"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; @@ -4079,12 +4080,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-10-15"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "f8c13fd41c09df18a25b20c44db85fcdfa8e04d9"; - sha256 = "0nb75d1hrgx555sh5pq9f4znk8kqkb51g4l6wfv2fqy5masn1zkr"; + rev = "ba37a4ff4c42aec0ba7d1d1aad17aa0c513d7461"; + sha256 = "0fjwx6s8pr63vjzxjgz2bshic4vkcci5sdn96qibp5fgsah10y0v"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4258,12 +4259,12 @@ final: prev: hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2023-09-14"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "1dc11eb47ca15828df8ed3c7a014eeca9c564e55"; - sha256 = "13siw00n3fa2s8lq7mz8pp4n2f2m7w3y5wd1kg6dsy4g3nvsiw0l"; + rev = "eb5531b5f6285656408d1ed07b4d9bcc8067bad4"; + sha256 = "0yl1l11dp58mg3bfk42ydcc7s2fxnnz6nlkkc09kxmdf4gxwr3wc"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -4354,12 +4355,12 @@ final: prev: image-nvim = buildVimPlugin { pname = "image.nvim"; - version = "2023-10-12"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "4033806015457cc4fe4a6706a21949d9c0fb4c14"; - sha256 = "0hawknjgqsjjnzyixlj1946rpvav4xf6bfisria6vnf1pgqga40r"; + rev = "1cb60be1cdc108e3a3b09cb0ed115ef75ce51320"; + sha256 = "1rdqmframawhjrb3jab4hl8mr0bsknry0i2wzbzkjysgxmp74gy2"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4426,12 +4427,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2023-10-17"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "9301e434dd41154ffe5c3d5b8a5c9acd075ebeff"; - sha256 = "1m27krw7zdlbnnip046acnndkniif2a6kg7aj61mf6l1ikbzy9x2"; + rev = "2546441840172cc41e70f67c52e205cc7aa3e6ed"; + sha256 = "00p9dyqaa6h67pnkn5wh4iyvi8ydpnyqvbq5n6jk82c5c48h2s2s"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -4787,12 +4788,12 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2023-10-17"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "7613ab2abb1bd99e039ae02030bc2c48b7626925"; - sha256 = "0n2xzi8n8ywn7w3zkmp7sx9di46m1k2ym6072awbi2wlknlxxxxs"; + rev = "e42fccc3cda70266e0841c5126de2c23e8982800"; + sha256 = "09n839bmf2j40cvvzkry968akl1iy1pw953sdw6ilzm97pdxywy3"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4811,12 +4812,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2023-10-15"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "811730250fb2a1aba424dbbdde528d9087807feb"; - sha256 = "0ddn7s5kvkfjpj896al22il1sjjr1c3xzby353y1g3bvcjrli1ji"; + rev = "a32d035d6f5c57b83335813bcc84fb498b4e2b0f"; + sha256 = "1srl1h3diz65ncq9jj7qyvlzqcqmdiiv795y26111zf1ksdqzsai"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4847,24 +4848,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2023-07-23"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c"; - sha256 = "093fzf1bki2ll3lrqbnrw9w7i7aajbma4zq83c2nkxwi5gj5jqgl"; + rev = "b6ae80f8fc9993638608fc1a51c6ab0eeb12618c"; + sha256 = "19nffffmczlqfsgjs10hqs9abgbygiv0ns64apk7gzf5anjaj0z1"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2023-10-17"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "bf39c4a792fb12dc29d825f072cb72aea5bce61b"; - sha256 = "03pjgi2bkkycadpwh7grmrl7lchgfg3g79q7iplw6s4p8rxvizs2"; + rev = "234e2ef8dec65db153c63a8b310c74155bb93ee7"; + sha256 = "051m8h7600f88ljn6m4mp49xi3pgh2ak8h01bb7gqk1lkq47d7ah"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4907,12 +4908,12 @@ final: prev: lf-vim = buildVimPlugin { pname = "lf.vim"; - version = "2022-08-24"; + version = "2023-10-19"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "e77c40a5ff3e900fb2c348939c636667df647bc8"; - sha256 = "0b5pmn5s2w4zvv05b4ysjxbfb0ivb4ljamza26g2jzq34sc1w04b"; + rev = "f2bab8f4a420ec434f1fb4b5fa4ee354f6dd2afd"; + sha256 = "044wgd5wscpss4jc5czwsjc4ycx3kykxijzr8c7kymy5ydalpmgj"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; @@ -5195,12 +5196,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2023-08-23"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "60b0e84f3793f7e8bcc9ec52f9c239fd497b2cd2"; - sha256 = "1dxlqn3zi0vwi8180gz4ang5hm0ds4faiii03kw88xsnzkzlrd6h"; + rev = "c51a9104de7fddff2351361d2dbcbd8d08600ef4"; + sha256 = "087z4p8mvmi1c8bvg8k5ay01vydv3npmm0x6vm8mp3d11fv1lm4v"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5266,12 +5267,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-10-16"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "8c7e03e2851cd16219b3b2d05192473ac07025a7"; - sha256 = "1m53dkr2wbf914jrbcpc8b9gj7grq5nnvlw6qq9gbsy98xf1l58j"; + rev = "199eb00822f65b811f43736ba65ab7e16501125d"; + sha256 = "0a8l000bk2ss4fv75v5c2ygld2gmfiz3q1xzpzxdbyki4f7b7gj9"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5302,24 +5303,24 @@ final: prev: lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; - version = "2023-10-17"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "1a3f6bba410aff5a51bf8c84287aaa3a8ba30d0d"; - sha256 = "19p6fqwsg1z92k8g1rhrb3qxj4158nm5g124pla1a7ik7sr356mg"; + rev = "2248ef254d0a1488a72041cfb45ca9caada6d994"; + sha256 = "1ccbbgn3a3304dcxfbl94ai8dgfshi5db8k73iifijhxbncvlpwd"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPlugin { pname = "luasnip"; - version = "2023-10-12"; + version = "2023-10-18"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "0df29db3543837f8b41597f2640397c5ec792b7b"; - sha256 = "05rczq2mj1bc1v8bdgj5pb0064f0lcmdl0fjkza5fijmsn082423"; + rev = "80a8528f084a97b624ae443a6f50ff8074ba486b"; + sha256 = "1pq2qd226kn9874dx97id9zg492snw16sb0fxj8fn61k8pw1mcpi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5399,12 +5400,12 @@ final: prev: markid = buildVimPlugin { pname = "markid"; - version = "2023-07-01"; + version = "2023-10-18"; src = fetchFromGitHub { owner = "David-Kunz"; repo = "markid"; - rev = "46d03e1b7d82c07bbf06ef2f6595fea73ae6410b"; - sha256 = "1mk96p5if9zd3apv7d2kn4c3h2ik39v80apr0qf10h8lwx5zx19c"; + rev = "9b249e4d2ad0767a1091017cd52264590e41a274"; + sha256 = "06yrg2xhk4hanm68cq84j4137na91k9wf2mds90af1gyrp4hlcf5"; }; meta.homepage = "https://github.com/David-Kunz/markid/"; }; @@ -5423,12 +5424,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2023-10-14"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "e7b64c11035aa924f87385b72145e0ccf68a7e0a"; - sha256 = "1khd5kicxm7dz5bv8jq9kqrmwp55xycf19v9scn4s30ym9cjm1r8"; + rev = "09be3766669bfbabbe2863c624749d8da392c916"; + sha256 = "07wr0xx1bdcyjgj6xp5jbd2lx3v98m4gk92wzsd02lrm23k9lmch"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5471,12 +5472,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2023-10-15"; + version = "2023-10-21"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "dfa4bc5340a0f0d2dd5b1bf6c2ebd5bb570a9d71"; - sha256 = "16rj09fv7hjp17ni9xdg7v6qvc149sb6kkmdza6p2wkalpsnc8a2"; + rev = "5485e2e91b4117d9a4977c4afb6d70504559e1ac"; + sha256 = "0fnjrvxgrii42nrhhp1yd1k5b0sgqglvds5v7s1jh87qrk27nfaq"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5519,12 +5520,12 @@ final: prev: melange-nvim = buildVimPlugin { pname = "melange-nvim"; - version = "2023-08-11"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "savq"; repo = "melange-nvim"; - rev = "517518347e41301bb2d1189d257f3918551a2ea5"; - sha256 = "0rh6bm12wkkwbhb1xfp3n57xjy9i99zc92wbzvalp8ylps9dvcpb"; + rev = "ca3444c8e5002ee5ab6f077660317f869c7b6a36"; + sha256 = "104lc4kfx5jr6fd684vx1bps7ifbqfx6iyi3nbczbhycw0wfw4r4"; }; meta.homepage = "https://github.com/savq/melange-nvim/"; }; @@ -5543,12 +5544,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-10-16"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "22f3f4396b4ec90c4c83b69f47e14d71b4c6c69f"; - sha256 = "1gvdzljf74ji9q8x0ach0rsp1c5a93lp3i6dx9g9gca94m5phwbq"; + rev = "66e3cdceaba8c0cd089d6f42cb95e04355718f7a"; + sha256 = "0sbznyd54snvvrgcj3pls1xnjg1f0b52fxdp9hsdaxivfar3qizl"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5579,12 +5580,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2023-10-11"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "f7e513a521f5926df034cf40ddd54b43ba73a013"; - sha256 = "1kc832ngkmzkzq4zzc910claf71f1brb71ypip2y5xjwmpqb90n1"; + rev = "8ba85f00fb6534ffa5d82edab033ccb8962d3e59"; + sha256 = "0pyly0s3qqmb9mljbw3wyln842sdqza0sqn1cij23p36fppg5v3i"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -5603,12 +5604,12 @@ final: prev: modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; - version = "2023-08-25"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "f0edf906a230a4ca37a32aa510d4cd346db46548"; - sha256 = "1gk97yr60s7i6kc7z4m2vxcqb6s5lb9ypgib6vy61g34vk6fld1d"; + rev = "e642104114dcaa7efcc7ea6887663e991b5a444b"; + sha256 = "1vl777vs9d9hjdh0my8sbvk75znk22sz46a7s6ci1y7b67n5c0fj"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -5627,12 +5628,12 @@ final: prev: monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2023-09-29"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "6b3bf9a4e0c988471969f62b36486023b33dd963"; - sha256 = "1frrsxvvklq6lpwclqsknqwpca1bgb13ijwj17x2x69bnzd13vhi"; + rev = "62cb35cf04499e33ee59bc00c4f9fa118733c12c"; + sha256 = "0mj4xg99jmfflc7g07flhgwgqh3lf4l4qrj66rkzrgk4dw4k9hg1"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -5663,12 +5664,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2023-10-16"; + version = "2023-10-19"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "38b06771cc6e867092a7d161096ab4e11bec182d"; - sha256 = "04b4h4b4m5dd2r9srym4zs6myd70f43hwxd4zpwnia5l24b52m06"; + rev = "b0c571caeff42090cc047cd97988dcfdb06b7fff"; + sha256 = "10whm17fh3clvjh2yiz78wxg0pn3fwhc3w6830fwvpwqy39q5n4g"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -5927,12 +5928,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2023-10-14"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "63ebe879ad4798b66d29c0b2c8d04942389d438e"; - sha256 = "1cn944l0mi7jvvrnybc4cs16gxqvqwyxxmjgc4wbmgw75q0867zp"; + rev = "2c782550d8a6675f1735970d18ef5d0701f2d789"; + sha256 = "101bwb6qi8rqr5c01zm7xg1p53lb6vxxrrm32zg4vls3xjrcbnrw"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5951,12 +5952,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2023-10-16"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "c87c862a14a4c8c0e2bc823d304e4da472fd7180"; - sha256 = "0cs33366wylq4k88hhqpxq69kj5pm3hwbi89gf0y6w3q0491rjkh"; + rev = "00dcf2b81c45de1768b4171faa16729f0888cfb8"; + sha256 = "053b283f0j9crkv6g1yhw1f6ff4pfh0k3qni4jg1110ijxx3prsv"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5975,12 +5976,12 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2023-10-16"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "24b403eabde652904077f84fd55441744e77a109"; - sha256 = "06jvqmdzs5g83fhkymbqmf0kxgia36m6h8x35idz41h4y3mlnzw5"; + rev = "d617d9eb27e73e701e446874c6ea2cb528719260"; + sha256 = "18d3hcszkd7inqnkwykjx8m5n3mbz7fqzbp6nic2i7sha5lplqji"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -6011,12 +6012,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2023-10-17"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "eb9d6b8f0840e4f2fa775bca7ec4a5df8b42ed6d"; - sha256 = "0pf6fq5xbai7lq451y8mmkiab1zhr15g5w9kyz9kd46xk7rcmx8a"; + rev = "51a6e6c8952b361300be57b36c8e1b973880cdd7"; + sha256 = "15y17j1qb84s8pb46r13k44vkiff2zq5wd0fwg52zx5bz6jiszlk"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6083,12 +6084,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2023-10-15"; + version = "2023-10-18"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "7c4e09d39d6be4494e8c2980a55837d982c8ef4b"; - sha256 = "1kws0xgqsqnw8iz9gb1r9h30z97p1sglmxzh1jrf27m9qcirm49w"; + rev = "073f04cdc5dc291f069935e36cdcd60927f67d5d"; + sha256 = "1razsikc03kv7imnkxm1fg96np37zz4w8qhql898h58xhpmlq4f7"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6155,12 +6156,12 @@ final: prev: neotest = buildVimPlugin { pname = "neotest"; - version = "2023-09-10"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "1e67a504d03def3a6a1125d934cb511680f72555"; - sha256 = "0pgqyvcjb233l2qw97c1gfn04fnl768djhji9y1p5fc4769znd1w"; + rev = "901891484db3d46ce43d56871273dc7d40621356"; + sha256 = "1w8lrwjcnd8fs8b7mwm12vnbnfdmcpkm7p13b3hjv1fm7k2d8pca"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -6228,12 +6229,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2023-10-15"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "d3ef9c96c4e4355383a83abd56255c2086feae65"; - sha256 = "01rnfbl8n08dblxkz2yvy7lbffpg8134fvp4iii5v32rk73i4zsr"; + rev = "0a4d66a59165418d025565b943725822b438ab14"; + sha256 = "017wvpxc4rrpvad2d2sn7lpzag6s7gzpmd4j88kylxwy28kqgv18"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -6408,24 +6409,24 @@ final: prev: nerdcommenter = buildVimPlugin { pname = "nerdcommenter"; - version = "2023-08-12"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "d2e21d417f6c788b11ae3b90d7ac478930dead36"; - sha256 = "140xp1kqj76gyn440bs62ff85b4xvlvxiyidvb5r4w0imrlacnpc"; + rev = "c52b6e731c2b558bc164419d4c369fcc45f0be51"; + sha256 = "17q4713nwsk3lkxbmww106mnpkzlg0xksf29yxb8sfdf386vi66c"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPlugin { pname = "nerdtree"; - version = "2023-09-04"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "32168889bdbc1e7d1d313e3e41c1cc794b38eac5"; - sha256 = "1g24dr58df398lbm0j7y8nh7k3gvv49xc9fndh5385pfj2l91fv0"; + rev = "334542c361bfd250042c6a1ecd147ffcbcc8049a"; + sha256 = "1q33h1hcnhg3p0f96fapnlmpg0bc25rgxwirb05kapkby1kyi2fq"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -6576,24 +6577,24 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2023-10-15"; + version = "2023-10-19"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "e50fc6de68333633fa9eaaa54cb4cdfe7de5f25a"; - sha256 = "018cmk4ypx02z1574jp7w4ja4q1qvhbnv392yjgqlqfdkijr2man"; + rev = "8f1b53ab85f83e0687d0f267085ad781ec240432"; + sha256 = "1v4na1rdxgqsyy5ra7c7qjg2cmd7hxpf321ybc1zgbm6v56y2a38"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2023-10-07"; + version = "2023-10-18"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "ae339f45590cc421a68de885fc5a3261cc247362"; - sha256 = "1ymhga4pv1xjvzlpxqc6knzr58h5w94b6ljqbvm68ybhhqbpdq73"; + rev = "dc9b7e28f5573a1a2225ffb33893d23d3e052ed6"; + sha256 = "1fyg6v34a7lh7j9jfhqxjlw6bhp8ddzqj2sbdksnvf7r0h91jcvl"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -6684,12 +6685,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2023-10-16"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "c56f1242dfc9c1fbba71fc3a22448d5d563703e0"; - sha256 = "0vkk8d9v3x7m7612z8r3nrmwxj25vwbv67wc2vjn0yfahmagf0fy"; + rev = "fd10af115e0507b3976d78123eda9748fe0e2d29"; + sha256 = "0ar0yfsnq9i708xxcv3c1y25n7q8xl7mfki62vrva2nz72nyjrzc"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6708,12 +6709,12 @@ final: prev: nvim-FeMaco-lua = buildVimPlugin { pname = "nvim-FeMaco.lua"; - version = "2023-08-28"; + version = "2023-10-21"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-FeMaco.lua"; - rev = "c4e9c71c9ca595772a360435bdf91bee3f9d32b1"; - sha256 = "0ri3bx03vzl9m0q5dbkr85cax2vm1abk1hiiwxzbdmc759p6mxvq"; + rev = "6af458f0196215f397db31a6e1fb2df795811693"; + sha256 = "0pvdbk48pyqvi75pzpsz9wsvhfrp5rya2dbccg2gfx3h5yvks6fn"; }; meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/"; }; @@ -6732,12 +6733,12 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2023-10-15"; + version = "2023-10-21"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "f6c71641f6f183427a651c0ce4ba3fb89404fa9e"; - sha256 = "0hi0p2036w23sins0aldiws1rq0zhgz0xa8bpf49gb37ryz02385"; + rev = "0f04d78619cce9a5af4f355968040f7d675854a1"; + sha256 = "0k2pibxx42qsdvxgbrdj7g44y5q6dnaw0g07gq025dpn27jk9ark"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -6804,12 +6805,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2023-08-26"; + version = "2023-10-18"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "5dce1b778b85c717f6614e3f4da45e9f19f54435"; - sha256 = "1yl5b680p6vhk1741riiwjnw7a4wn0nimjvcab0ij6mx3kf28rsq"; + rev = "d3a3056204e1a9dbb7c7fe36c114dc43b681768c"; + sha256 = "01y2grnq4kcj5d9v5r4klkzmi5yg8xl9p0s11lc1mpc7xink350x"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -6828,12 +6829,12 @@ final: prev: nvim-cokeline = buildVimPlugin { pname = "nvim-cokeline"; - version = "2023-10-13"; + version = "2023-10-18"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "857549678b426259af8e6fba52505e6a0f4f8e25"; - sha256 = "14x79mwnsr0vinhacv3ll06jsylqaq2ybw231acmq0vnz3cmkxiv"; + rev = "2e71292a37535fdbcf0f9500aeb141021d90af8b"; + sha256 = "140qc5gzss0nb00gp1qr3rz22swzcvkwg7c5772ki8yvj3yc9ini"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; @@ -6924,12 +6925,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2023-10-12"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "92dc531eea2c9a3ef504a5c8ac0decd1fa59a6a3"; - sha256 = "17lsa94if1j630spn2nia4bjync4ng2nsp0ld215z17fss0gg6fv"; + rev = "b595c820018a15b6d54bf53b5cbeaa6f2d7a27e2"; + sha256 = "0pbv21zbj5c2b14w02yspz6fw6bj2i4fy94abmmscpyhgmaxylvn"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -7175,12 +7176,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2023-10-14"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "6d596b87862909370f4d1e6535cc9fad80c89fe6"; - sha256 = "17c16fc94lzi04q7r6yfz50cycq6pbih884gkvlgkyyy92b6bcqn"; + rev = "a4b0511a9e757e78c8c9f9d3f201e0d8ff158b42"; + sha256 = "0laj6z74r3nz497nkgpyx9kvc5111hiaia57h5jx4qvajml9ysl1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7211,12 +7212,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-10-16"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "e49b1e90c1781ce372013de3fa93a91ea29fc34a"; - sha256 = "0pb33c3dgv6pvn6avc6zrbfrzr63wd9hxkz5rz6y05w633d61mc8"; + rev = "6428fcab6f3c09e934bc016c329806314384a41e"; + sha256 = "02hvjlk9i63xxrx52xvvrx0bhqajbhrdjvg6ws291dwmxyz285rs"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7271,12 +7272,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2023-10-11"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "7e302107366610ff0170495a130e6d7645b93795"; - sha256 = "0h38mkxdwmnpc2arqqxx7n99q7zj7r6b8ypw7cwk7a1p3vaav98y"; + rev = "dfcb4f5d915fbc98e6b9b910fbe975b2fbda3227"; + sha256 = "1r814zppad7ig8h2daza0adj8z6472m844a8hgvchb521crwrn81"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -7463,12 +7464,12 @@ final: prev: nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2023-09-09"; + version = "2023-10-19"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "5787f088c99c04309a8aa6363fd3ac9a5a26b780"; - sha256 = "0m68plmz4lb7ysxr5lx4kxx0g388z5bp8p3gnhiw5ybmhymc0v8f"; + rev = "318ab244f1e69fff4ebcd95b3aeaa9879c39f299"; + sha256 = "0rv86azx0h31zrh8f8j5139fwz571wxa5jprp2yss35xljdws3ay"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -7511,12 +7512,12 @@ final: prev: nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2023-08-18"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "1c2ef599abeeb98e40706830bcd27e90e259367a"; - sha256 = "06j190qns6fscxp7mnr6zl5bipzbc4w478z5x5g2awghc0iwzkcr"; + rev = "4f0e1f470595af067eca9b872778d83c7f52f134"; + sha256 = "16q85dd79rdn1v7wqshzhjgrsgbnzk04l4vjgp6g9hbj8p8sna4k"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -7559,36 +7560,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2023-10-16"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "40b9b887d090d5da89a84689b4ca0304a9649f62"; - sha256 = "018fnw95vlhac7y5ai1wzpd69b3qjxji57yyrg7gw4ccvj97dvqj"; + rev = "78a9ca5ed6557f29cd0ce203df44213e54bfabb9"; + sha256 = "1inh9vlzq3qxwv27zxjd61h8gs3ak3cp7bp1lbzi9fwfiz6gm6a9"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-10-17"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "9c4fc86b67c1d68141cef57846d24cbee9b74fb0"; - sha256 = "1ydmsvhl01s76qx0a10ipp7fkqazm1p19hspwj7cwlxvls952xfm"; + rev = "84544f5cd3b7c046ebe0db6763c9ce7f20f4fe23"; + sha256 = "0h2f20464609hmjc5qyymib1wv9vc78m740qpmp2xbjcsf1sbm7k"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2023-10-15"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "82c695951612911421e8e21068ba5fc2c2e2c212"; - sha256 = "1q0s84h15dkadjln27nmxfnviqilfn9y7py8nk7cmgk9djcx933c"; + rev = "8aa32aa6b84dda357849dbc0f775e69f2e04c041"; + sha256 = "0a7j21rvhgi2mayqbw0a9c0r5q50b41i8idbrv83h78r87qdc77z"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7631,12 +7632,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2023-10-16"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "78c49ca7d2f7ccba2115c11422c037713c978ad1"; - sha256 = "00z4adcq70j981a2v17xjx1izcqh716cqjp2vf8dsibplxbv4aja"; + rev = "eb208bfdfcf76efea0424747e23e44641e13aaa6"; + sha256 = "1vmhk5ag7dagi1kb6dip0rq1srhax0m3yhlvrq8d0jr8c7xwcr8r"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7702,12 +7703,12 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2023-10-12"; + version = "2023-10-18"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "f7eea53e88456403212df074b9aa3148a3908435"; - sha256 = "0vba56iij1hw9jby4zlqvz6msav0sy25pkgfsvb5lkmw8c4hrvi9"; + rev = "ebbab711d909d5f675e38ad489765bd22bd2c6b3"; + sha256 = "0cay5nznhry9g716pj7vzkyk58aagwqmbrysss8jfvwsx3pb93lg"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -7726,12 +7727,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-10-14"; + version = "2023-10-21"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "3af745113ea537f58c4b1573b64a429fefad9e07"; - sha256 = "103spgpvwm4pv32h954sv68p6qjizkm4fdvyzndjgw9x9bah5ksh"; + rev = "f0267921c845c42685968401bc49aa65e18d3e09"; + sha256 = "1qqcjaknnq7bm1rl73nzv9gfcfwx2jrxc8vh2l400m4hj0bgvp9k"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7846,12 +7847,12 @@ final: prev: oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2023-10-16"; + version = "2023-10-18"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "3275996ce65f142d0e96b9fc2658f94e5bd43ad5"; - sha256 = "08j4f2i4wqkz37nnbf8jmp8lvvz3v3fzgg3ap3pm5paa724bjf0b"; + rev = "4088efb8ff664b6f1624aab5dac6c3fe11d3962c"; + sha256 = "0csgywlmb092r1jys4x82bzzy4db491g4jczv4zcskckyjbqj7qk"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7883,12 +7884,12 @@ final: prev: onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; - version = "2023-10-07"; + version = "2023-10-19"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "826fb77e9ca92d3c0f3d937328663d4a6dc7fee1"; - sha256 = "0p8fr1hjp7ijyadvk0bf9c7gxh9gcn73hww9q4bqkyrwja3knrqk"; + rev = "b9acd92ded2ba155867ca5af9d618e933d96e3b0"; + sha256 = "03a42mqqhd18skf765n3cf41i31wdc14w7z0vra4ll7d0p6qrdsz"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -7907,12 +7908,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2023-09-29"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "7c02b4eeb310173ef6d741e60200d72b76923eae"; - sha256 = "1vmix76dr7sv199nwmvmxxgp7cqysi77m79p4bgsx2mynmkdx4p4"; + rev = "4c7a41e4379174384566bfc0f2c4d606e75aa1ef"; + sha256 = "1sy41m17msdk8zyccq3lfz5vdv7zciw23nzglj8n17q5nbfyiv3h"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -7931,12 +7932,12 @@ final: prev: onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2023-10-06"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "4c14ce82e389122bc3443494d784a9016f0abc5d"; - sha256 = "16gyikz3bpwdf0xj43kh374cw5z3haciq3r191kaan2733kwp95d"; + rev = "86273defb37a96a28d88ef4de99bbca6c8e3c204"; + sha256 = "0maz69j98n5c627m12i509n0w8asyj7gnjkmyaiahw9rms0gnvbk"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -7991,12 +7992,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2023-10-09"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "5ef11419116578a6cbfb0a18674e590237ded080"; - sha256 = "03kqwd6f49sczanfasdg5jb43fyab0vcxy30da82xi149a16kv45"; + rev = "346b6aaac4678832b80b1794d7873069e7efd423"; + sha256 = "1avspig0rg267ij6x40blcjxaf0xj86ka788v5a8zq7614ksd5n0"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8015,24 +8016,24 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2023-09-16"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "2752dd199d73342f13a1bd599a99822505e2803f"; - sha256 = "00jmwd8la3cadhy2dzl3gzq8wbgn6xwjb9l35h1w1k161pl5p882"; + rev = "93227da6bc7db5c0e331df81dd92e91520e084de"; + sha256 = "1rviifp2chzih4nyh3hdsha57vl37bi7546giyb1ccxxxk7znfqn"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2023-10-13"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "400e762648b70397d0d315e5acaf0ff3597f2d8b"; - sha256 = "04ixcnnls7jhdxsfm5s33c59vwgz5b8ni0ygvgsf4i3bdv6sxa66"; + rev = "5e8498131867cd1b7c676ecdd1382ab2fd347dde"; + sha256 = "05a13mxzja9wa3f3wcz6m7hhs8nsc67jn9ipdsakq28w7rlrxjhs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -8430,8 +8431,8 @@ final: prev: src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "9b5abed75493aac46dd2c423f72bdfcda9e521b2"; - sha256 = "12p3malaqpl2r9151s59sn0i975didkjrvfdcnk5jg16vng85dsf"; + rev = "14a80ffab90567e360eb97b19039c4c16913ad79"; + sha256 = "1ak24ydzrak1al1nf6kdfjivlfh03hsyibyf7x1gnzwgm35i1v4a"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -8498,11 +8499,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-10-15"; + version = "2023-10-22"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "f1ce55edcbd2c25a544c93357c66d4172a870766"; - sha256 = "0lfnpkf4cah217p1dp8306yy550h2xj0ll1zq0g4nbq4pw2yg149"; + rev = "9fda1322e704acfbb5a9691e2c4303368d591367"; + sha256 = "1crd6ybikdk768xsm769xvzia8wkg0hx9bh9h3nyak0gj779zdc4"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -8581,12 +8582,12 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2023-10-06"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "bebfcfcc4b604d3647fcce2f4aeb02a95d139c49"; - sha256 = "16q4fk034yljv68s8jb74y863n6jzfh78c99ya0918iqyzypmw8i"; + rev = "5831194debd23920a32abd9fefd5dddba44e34fc"; + sha256 = "16kwwfqj2kq8vzjpd6nsx4mxlrmq6f5m7rqivvbn4ccwsn4la8ks"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -8747,6 +8748,18 @@ final: prev: meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; + rustaceanvim = buildNeovimPlugin { + pname = "rustaceanvim"; + version = "2023-10-23"; + src = fetchFromGitHub { + owner = "mrcjkb"; + repo = "rustaceanvim"; + rev = "a994f6efb894aa9b504ffed655309c041d45a3e7"; + sha256 = "1c99h3aix51r1slrwqyv9rks0qxyvqvadkwkl2skqi1y1l6psqmd"; + }; + meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; + }; + sad-vim = buildVimPlugin { pname = "sad.vim"; version = "2019-02-18"; @@ -8905,12 +8918,12 @@ final: prev: sg-nvim = buildVimPlugin { pname = "sg.nvim"; - version = "2023-10-16"; + version = "2023-10-18"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "6185fcb842082b6871e1ee48b1c6444c1efdc681"; - sha256 = "0ifmzlg97i2jlajhyvi76a6m5zzlqg4zkr13sd829mf079yhxdjj"; + rev = "6c592e9e78e68cd2bf4385da1b2a633219a22aab"; + sha256 = "1a32yhdq9pbl9xz9brgn54171b059yrsp635r6crzp380nfpw1hf"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -8978,12 +8991,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2023-10-10"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "dbf2c13bad1b75ab207639ba817a7e8a8a450042"; - sha256 = "0328ay5c6hr8a9nx2xdhby9n39cizak8a8k2j0szvm3w11cx9jl0"; + rev = "c8a9173d70cbbd1f6e4a414e49e31df2b32a1362"; + sha256 = "0hxy3fv6qp7shwh9wgf20q5i8ba2pzng2dd1dvw27aabibk43ba3"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -9932,12 +9945,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-10-11"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "74ce793a60759e3db0d265174f137fb627430355"; - sha256 = "1m4v097y8ypjm572k1qqii3z56w4x1dsjxd6gp0z24xqyvd4kpa4"; + rev = "4522d7e3ea75ffddabdc39957168a8a7060b5df0"; + sha256 = "143bdqxfzlfbjrd80pw4wkz95szp21qs1zn7i230sdavvrq00b3b"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10185,12 +10198,12 @@ final: prev: tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2023-10-16"; + version = "2023-10-19"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "633039585dff7fd2b9b62fb190bf768702609d95"; - sha256 = "0akdw3v3xkzy5x3i684171haj93symddicjcr9mv631yqrgb7qil"; + rev = "531b04704fc9ff994d8b9c0720428fdc3c7d49d1"; + sha256 = "1ifmpzd77ca48s73888xynk3a1jc87s48i6694s18gf4999kp7c7"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -10257,12 +10270,12 @@ final: prev: trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2023-10-09"; + version = "2023-10-18"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "02219b557d4726a789be58c5d6bd6e139c46a9fe"; - sha256 = "0jvypyrb5ky84zkq5zvrxnlh0xb55szh3kddfmcsp0ba7zq9df0y"; + rev = "f1168feada93c0154ede4d1fe9183bf69bac54ea"; + sha256 = "0n5xi4bxfaizwjny5dv0k7zqc3gl60d5g1mkcdbfnq4y5f3f0wpj"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -10317,12 +10330,12 @@ final: prev: typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2023-10-13"; + version = "2023-10-19"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "47c0461f652b90bc088bcaf6481d488d3b86291e"; - sha256 = "035973311zh2kl6gag0xp6wp5zjq96r2z0358ynw4sc2p07xsvrf"; + rev = "102ba313f87e1f9f9864f681dd7779cac8f6d3ea"; + sha256 = "1sadhwdwcdb5qibp4xsw1g3skfgyq6rv86cmlb15ys6r4dv0lyws"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; }; @@ -10353,36 +10366,36 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2023-10-16"; + version = "2023-10-21"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "a48691aff95240b7199fbabb82d28b4ca7ccbc3e"; - sha256 = "1l8hldprdknq2bmsliph2ayhkfkwzn11d2wj0cnhjhd0s6dmfn3i"; + rev = "a0f2bb167617d871dc067b75ab72640f265990e4"; + sha256 = "1aapz1j152b5020v5vgny5c9gppfbzgl7lns4bybcn9h6jw2fyqz"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; ultisnips = buildVimPlugin { pname = "ultisnips"; - version = "2023-09-25"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "f6d1501b630cb783b0af8507c5588328f826d40f"; - sha256 = "0h0rcqrfk4r48phlsb8nhvxb89vm9820lhbmkqvk1bqkjblsv279"; + rev = "b393ba65386d47664421e1f8b246a87a6e8b218c"; + sha256 = "1g6r2nd3nplilgp6fj012smlhs857kn10mb8qab2phh2ja1r25c7"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPlugin { pname = "undotree"; - version = "2023-07-07"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "0e11ba7325efbbb3f3bebe06213afa3e7ec75131"; - sha256 = "15x5vsvvnr3sa78mh3gq0vagjcf3qv53b9hpni368p4m0f9a47b8"; + rev = "3ff3aa02fd3a18d7fc5be9ed3166d36c545707fe"; + sha256 = "08qy7k973xc2h2qa006v8gimgdbna16jhlxf6dn42k67nfckc99r"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -10965,12 +10978,12 @@ final: prev: vim-astro = buildVimPlugin { pname = "vim-astro"; - version = "2023-10-05"; + version = "2023-10-21"; src = fetchFromGitHub { owner = "wuelnerdotexe"; repo = "vim-astro"; - rev = "9b0d948aaf8c3f2bfbc97690e79d7ec115cc3576"; - sha256 = "04gy9ymzrjsdr3806d077ziynpnq1rf4q4gfl6vnvfn4jkxg3m91"; + rev = "9b4674ecfe1dd84b5fb9b4de1653975de6e8e2e1"; + sha256 = "1zx5dfmzd2bkj7widq89n5dxlqz8ixxr8pcyaafi09590j3kf15z"; }; meta.homepage = "https://github.com/wuelnerdotexe/vim-astro/"; }; @@ -12057,12 +12070,12 @@ final: prev: vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "2023-09-02"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "58c1d39ec42f92d23a1204b1869e5d1dece8b86c"; - sha256 = "11nbfrl8wpiy2cw1idc5dv41vkww065v9kv9iyvpp2nrrj0hrpl3"; + rev = "b6aa1cadbad4ac88f740d1d435aeec754ab3a9c7"; + sha256 = "09bnqgx3iissighkr01xsi9q5rl4753qcy4y9nirimzidzqw61f1"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -12851,12 +12864,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2023-10-13"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "3038ffac026a13edaf1bbb898f25d808b6b0c92a"; - sha256 = "1dh3jhfvv0vk1khxi3hfy80xnvk021vj3rrlmj3jjgarda06psmv"; + rev = "3029bdda0da9674682fe46bd6c4b946ad229dcaa"; + sha256 = "0m8dbdr9pdisjnfh6x6nfs27zslnzq7wq1h9jndp810b8prngai3"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -15542,12 +15555,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2023-10-11"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "cbb20643b7bfe721902dac5760bf0d4889fb5f7e"; - sha256 = "1zj03aq6yvd8mbfxihha426cipf02x7lg3hcbv5kl6kzk7ckiac3"; + rev = "e6264120d31d0b5e69d06041b52d40f9ec5ffec5"; + sha256 = "0h21v1bgpxwmd33887ibjd8rd8w7afjll2y0fi75s4r2ykzix0cj"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -15662,12 +15675,12 @@ final: prev: which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2023-10-13"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "6962dae3565369363b59dd51fb206051555fcb4d"; - sha256 = "1fcwd2cv9qlfhpdxza2syrqzdhhy672jwqbr8kl3mafg15wpkxaa"; + rev = "4433e5ec9a507e5097571ed55c02ea9658fb268a"; + sha256 = "1inm7szfhji6l9k4khq9fvddbwj348gilgbd6b8nlygd7wz23y5s"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -15903,12 +15916,12 @@ final: prev: zen-mode-nvim = buildVimPlugin { pname = "zen-mode.nvim"; - version = "2023-10-05"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "cb73b8bd0ef9d765b942db09dc762c603a89ae44"; - sha256 = "0075pic9z24rcwkf90jrd17szv5dxsggpimkn6k6w02v7wwv208v"; + rev = "50e2e2a36cc97847d9ab3b1a3555ba2ef6839b50"; + sha256 = "1xmc17cmjiyg9j0d3kmfa43npczqbhhfcnillc2ff5ai9dz4pm7s"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; @@ -15987,12 +16000,12 @@ final: prev: zoxide-vim = buildVimPlugin { pname = "zoxide.vim"; - version = "2023-05-21"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "nanotee"; repo = "zoxide.vim"; - rev = "cc5b702cacbcbb4192b2a619c0f9cf6ab6e76936"; - sha256 = "0dc1mg9x8flda59vl8d89m1ri1n0jl72q4jhmxj7mg9gp2r39l3m"; + rev = "b1e70b6fc1682a83929aee63680d2b43456fe9a5"; + sha256 = "025rqfs0n2ryi7xwzpq5h2r7jhvxbrb2gjp6fqa072hapgqr0igb"; }; meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; @@ -16095,12 +16108,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2023-10-15"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "f4f2197e704b52c0e12f2d03899e9de7f810a170"; - sha256 = "0k0w6i1ska0nc0p47a3jxms058q3pd2k8fhqf7c2qd9dg16r6mb1"; + rev = "9933e4079723311a94f428d64ac7ef9f900a7295"; + sha256 = "0342pwk8796iiaqjs56k2lcw93wib650gm5hcvxr6q2apd13c1qk"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 9990af5145d6..bb004e8bca1f 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -360,12 +360,12 @@ }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=7e447dc"; + version = "0.0.0+rev=e14bbac"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "7e447dc18a2d293498670fb5ea16138648c883e5"; - hash = "sha256-BCWtpTgEv/3ahiflK3wHmnhHjTmtmvJxHGo2X7FggsE="; + rev = "e14bbac8a0fcb6fab1b3becf6ed3fe464123c377"; + hash = "sha256-9CNKTaP9XudM6BDUlXmroJZ31c3eqjF2s0+Bb5mcfm4="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; @@ -745,6 +745,17 @@ }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; + gn = buildGrammar { + language = "gn"; + version = "0.0.0+rev=bc06955"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-gn"; + rev = "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"; + hash = "sha256-Sn6He4YRrKJe4QvGiaauquYBVQol0lWeIuOwkdUEzkQ="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-gn"; + }; go = buildGrammar { language = "go"; version = "0.0.0+rev=bbaa67a"; @@ -868,12 +879,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=d7ac98f"; + version = "0.0.0+rev=ca10c43"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "d7ac98f49e3ed7e17541256fe3881a967d7ffdd3"; - hash = "sha256-XEfZSNnvF2BMOWwTfk6GXSnSpbKVfAYk7I3XbO1tIBg="; + rev = "ca10c43a4c9bfe588c480d2941726c2fadcae699"; + hash = "sha256-HyS9Q6+WSUgyQ9mL5sZvQ4CHW+3MypT2U9b1X5NnMHc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -1196,14 +1207,25 @@ }; meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger"; }; + leo = buildGrammar { + language = "leo"; + version = "0.0.0+rev=91d7aa6"; + src = fetchFromGitHub { + owner = "r001"; + repo = "tree-sitter-leo"; + rev = "91d7aa606f524cf4f5df7f4aacb45b4056fac704"; + hash = "sha256-8nea6Qg0eT5ciif+tzD13TcFqP9/uJVxgVSW93OdiVY="; + }; + meta.homepage = "https://github.com/r001/tree-sitter-leo"; + }; liquidsoap = buildGrammar { language = "liquidsoap"; - version = "0.0.0+rev=bbef4df"; + version = "0.0.0+rev=4620ab7"; src = fetchFromGitHub { owner = "savonet"; repo = "tree-sitter-liquidsoap"; - rev = "bbef4df4dc5b324455ad1ea4770bbed0df5130ea"; - hash = "sha256-SGWO/sQ022atbX8qTXWeSnrYlSX13N03LhXJoc9YgPQ="; + rev = "4620ab746d1e9e5b6ebccaaa6afc5ebce06b4d75"; + hash = "sha256-M9HTG58WMvQ1PS7oRDeJ+bUwe+bmXf/fuTc6inEtkek="; }; meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap"; }; @@ -1441,6 +1463,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-objc"; }; + objdump = buildGrammar { + language = "objdump"; + version = "0.0.0+rev=64e4741"; + src = fetchFromGitHub { + owner = "ColinKennedy"; + repo = "tree-sitter-objdump"; + rev = "64e4741d58345c36ded639f5a3bcd7811be7f8f8"; + hash = "sha256-v5skJKQ/c0YeGVj3Vs+SNnFqTkp0mblZU4DyJ9hg7s4="; + }; + meta.homepage = "https://github.com/ColinKennedy/tree-sitter-objdump"; + }; ocaml = buildGrammar { language = "ocaml"; version = "0.0.0+rev=694c577"; @@ -1534,23 +1567,23 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=79e88f6"; + version = "0.0.0+rev=495ea4b"; src = fetchFromGitHub { - owner = "ganezdragon"; + owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "79e88f64681660f3961939bf764d8f3b4bbb0d27"; - hash = "sha256-cadmD6kXhA3TENHhM03+iX2J0+Z0UhHizFiZLnknXLk="; + rev = "495ea4b2bb2ca7ebc64c598e4a60d8c0856b2811"; + hash = "sha256-6xLeT4dfBnxysrfW7kX3KyW96dfJgN4L040xI8IWVMU="; }; - meta.homepage = "https://github.com/ganezdragon/tree-sitter-perl"; + meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=92a98ad"; + version = "0.0.0+rev=0e02e7f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "92a98adaa534957b9a70b03e9acb9ccf9345033a"; - hash = "sha256-/JI1eyf1UZmtQ7bhfBLpA+8mMfIc8jRncri8Mz2mf5M="; + rev = "0e02e7fab7913a0e77343edb347c8f17cac1f0ba"; + hash = "sha256-cHXstpU5XaBv9vO59DKol7PfrVLc0olBLlhkb3wFNDE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1587,6 +1620,17 @@ }; meta.homepage = "https://github.com/erasin/tree-sitter-po"; }; + pod = buildGrammar { + language = "pod"; + version = "0.0.0+rev=ea5d557"; + src = fetchFromGitHub { + owner = "tree-sitter-perl"; + repo = "tree-sitter-pod"; + rev = "ea5d557cbd185cdcb5efcfdb6bc846fe909d86ae"; + hash = "sha256-CFPfpFQYlaryMX/k6tBT9k0WbQRz2vdVzh++lIVYe80="; + }; + meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-pod"; + }; poe_filter = buildGrammar { language = "poe_filter"; version = "0.0.0+rev=d7b43b5"; @@ -2033,12 +2077,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=36c4de3"; + version = "0.0.0+rev=caf2938"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "36c4de35f76dfa732493aae606feb69dce4b1daa"; - hash = "sha256-D8gt0shaEU1zPjLHe+h/cCk6Z1xx5Va17A/0XDB1rvo="; + rev = "caf2938f1bc6b174e5bf5b6f3b5522cb723ee55b"; + hash = "sha256-PbbPp6CsnrFj7/OwF957MEbSf3PekXon7dMkcoHMO7c="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2470,12 +2514,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=bde9356"; + version = "0.0.0+rev=8abdb5e"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "bde93562c6dae6aaffd641cb367356386da412d0"; - hash = "sha256-Fv2tc7KmY9Hn5TqO5JKjbj33rYQvLQwpzBYO+W0bySU="; + rev = "8abdb5e1846a56004bcba6e1d9a735e22bb5fff4"; + hash = "sha256-Pmj7Tk9GSeRNIvWODo9StI1c0Hx35B/G15r4kGvErgs="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index b597fbeb6e98..dcb2eea0130e 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -999,7 +999,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-wJpJELVgzixzu8T9EHACur3LNm/sqfkkbGn+AkApzW4="; + cargoHash = "sha256-Rqs9INcc53SYGXHRyeTbLkGGU035i2i6n6A4ekFKve0="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index 828465764408..514eda395c4e 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -190,6 +190,7 @@ https://github.com/aca/completion-tabnine/,, https://github.com/nvim-treesitter/completion-treesitter/,, https://github.com/chikatoike/concealedyank.vim/,, https://github.com/rhysd/conflict-marker.vim/,, +https://github.com/stevearc/conform.nvim/,HEAD, https://github.com/Olical/conjure/,, https://github.com/wellle/context.vim/,, https://github.com/Shougo/context_filetype.vim/,, @@ -277,7 +278,6 @@ https://github.com/freddiehaddad/feline.nvim/,, https://github.com/bakpakin/fennel.vim/,, https://github.com/lambdalisue/fern.vim/,, https://github.com/wincent/ferret/,, -https://github.com/mrcjkb/ferris.nvim/,HEAD, https://github.com/j-hui/fidget.nvim/,legacy, https://github.com/bogado/file-line/,, https://github.com/glacambre/firenvim/,HEAD, @@ -734,6 +734,7 @@ https://github.com/keith/rspec.vim/,, https://github.com/ccarpita/rtorrent-syntax-file/,, https://github.com/simrat39/rust-tools.nvim/,, https://github.com/rust-lang/rust.vim/,, +https://github.com/mrcjkb/rustaceanvim/,HEAD, https://github.com/hauleth/sad.vim/,, https://github.com/vmware-archive/salt-vim/,, https://github.com/lewis6991/satellite.nvim/,HEAD, diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index fb6e709bba20..f2a69f62b2b7 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -377,8 +377,8 @@ let mktplcRef = { name = "Millet"; publisher = "azdavis"; - version = "0.12.5"; - sha256 = "sha256-gJIxCdoxWGThalY+qJ930UtRLFkvr34LfaSioAZH9TQ="; + version = "0.13.5"; + sha256 = "sha256-sWM7N+axgu1zOGWexR4JVupVmYhZrd4cZz3pmLxRj8Q="; }; nativeBuildInputs = [ jq moreutils ]; postInstall = '' @@ -3298,8 +3298,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "107.4.3"; - sha256 = "sha256-z1foIJXVKmJ0G4FfO9xsjiQgmq/ZtoB3b6Ch8Nyj1zY="; + version = "107.12.0"; + sha256 = "036ri011fd0cf91iwv59j57m05mxliy27ms4di2y9jlk7jzmr4s2"; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; @@ -3521,8 +3521,8 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.19"; - sha256 = "sha256-Tww1urq6CfLma254Sn5lwOYwbvxAeDZuBuFBQlzks1c="; + version = "0.0.21"; + sha256 = "sha256-u57U/MmxvionFZp/tLK/KpddaxA/SUffeggKBSzmsXo="; }; meta = { description = "VSCode language extension for Uiua"; diff --git a/nixpkgs/pkgs/applications/emulators/blink/default.nix b/nixpkgs/pkgs/applications/emulators/blink/default.nix index e522546078cf..bdaf36bf6615 100644 --- a/nixpkgs/pkgs/applications/emulators/blink/default.nix +++ b/nixpkgs/pkgs/applications/emulators/blink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib }: +{ stdenv, fetchFromGitHub, fetchpatch, lib }: stdenv.mkDerivation (finalAttrs: { pname = "blink"; @@ -11,6 +11,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-W7yL7Ut3MRygJhFGr+GIj/CK57MkuDTcenft8IvH7jU="; }; + # Drop after next release + patches = [ + (fetchpatch { + url = "https://github.com/jart/blink/commit/b31fed832b10d32eadaec885fb20dacbb0eb6986.patch"; + hash = "sha256-DfZxW/H58qXAjkQz31YS4SPMz7152ZzNHK7wHopgnQA="; + }) + ]; + # 'make check' requires internet connection doCheck = true; checkTarget = "test"; diff --git a/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix b/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix index d1cbf12b34d0..525682c603d2 100644 --- a/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix +++ b/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix @@ -568,6 +568,7 @@ in mame2015 = mkLibretroCore { core = "mame2015"; + patches = [ ./patches/mame2015-python311.patch ]; makeFlags = [ "PYTHON=python3" ]; extraNativeBuildInputs = [ python3 ]; extraBuildInputs = [ alsa-lib ]; @@ -581,6 +582,7 @@ in mame2016 = mkLibretroCore { core = "mame2016"; + patches = [ ./patches/mame2016-python311.patch ]; extraNativeBuildInputs = [ python3 ]; extraBuildInputs = [ alsa-lib ]; makeFlags = [ "PYTHON_EXECUTABLE=python3" ]; diff --git a/nixpkgs/pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch b/nixpkgs/pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch new file mode 100644 index 000000000000..5827ba141506 --- /dev/null +++ b/nixpkgs/pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch @@ -0,0 +1,61 @@ +diff --git a/src/emu/cpu/m6502/m6502make.py b/src/emu/cpu/m6502/m6502make.py +index da29fc722a..3de641dd69 100755 +--- a/src/emu/cpu/m6502/m6502make.py ++++ b/src/emu/cpu/m6502/m6502make.py +@@ -16,7 +16,7 @@ def load_opcodes(fname): + opcodes = [] + logging.info("load_opcodes: %s", fname) + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + logging.error("cannot read opcodes file %s [%s]", fname, err) +@@ -39,7 +39,7 @@ def load_disp(fname): + logging.info("load_disp: %s", fname) + states = [] + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + logging.error("cannot read display file %s [%s]", fname, err) +diff --git a/src/emu/cpu/m6809/m6809make.py b/src/emu/cpu/m6809/m6809make.py +index c3d5b0f66e..79f6f90cdd 100644 +--- a/src/emu/cpu/m6809/m6809make.py ++++ b/src/emu/cpu/m6809/m6809make.py +@@ -14,7 +14,7 @@ def load_file(fname, lines): + if path != "": + path += '/' + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err)) +diff --git a/src/emu/cpu/mcs96/mcs96make.py b/src/emu/cpu/mcs96/mcs96make.py +index ec5ec37a78..7ab806a653 100644 +--- a/src/emu/cpu/mcs96/mcs96make.py ++++ b/src/emu/cpu/mcs96/mcs96make.py +@@ -71,7 +71,7 @@ def __init__(self, fname, is_196): + self.ea = {} + self.macros = {} + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err)) +diff --git a/src/emu/cpu/tms57002/tmsmake.py b/src/emu/cpu/tms57002/tmsmake.py +index 62092097d9..78f9fe43cd 100755 +--- a/src/emu/cpu/tms57002/tmsmake.py ++++ b/src/emu/cpu/tms57002/tmsmake.py +@@ -326,7 +326,7 @@ def ins_cmp_dasm(a, b): + def LoadLst(filename): + instructions = [] + ins = None +- for n, line in enumerate(open(filename, "rU")): ++ for n, line in enumerate(open(filename, "r")): + line = line.rstrip() + if not line and ins: + # new lines separate intructions diff --git a/nixpkgs/pkgs/applications/emulators/retroarch/patches/mame2016-python311.patch b/nixpkgs/pkgs/applications/emulators/retroarch/patches/mame2016-python311.patch new file mode 100644 index 000000000000..6647e445a08d --- /dev/null +++ b/nixpkgs/pkgs/applications/emulators/retroarch/patches/mame2016-python311.patch @@ -0,0 +1,74 @@ +diff --git a/scripts/build/verinfo.py b/scripts/build/verinfo.py +index a73d8ad268..82a80c0984 100644 +--- a/scripts/build/verinfo.py ++++ b/scripts/build/verinfo.py +@@ -63,7 +63,7 @@ def extract_version(input): + build, outfmt, srcfile, dstfile = parse_args() + + try: +- fp = open(srcfile, 'rU') ++ fp = open(srcfile, 'r') + except IOError: + sys.stderr.write("Unable to open source file '%s'\n" % srcfile) + sys.exit(1) +diff --git a/src/devices/cpu/m6502/m6502make.py b/src/devices/cpu/m6502/m6502make.py +index 8bcd85f8e2..557b175966 100755 +--- a/src/devices/cpu/m6502/m6502make.py ++++ b/src/devices/cpu/m6502/m6502make.py +@@ -18,7 +18,7 @@ def load_opcodes(fname): + opcodes = [] + logging.info("load_opcodes: %s", fname) + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + logging.error("cannot read opcodes file %s [%s]", fname, err) +@@ -41,7 +41,7 @@ def load_disp(fname): + logging.info("load_disp: %s", fname) + states = [] + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + logging.error("cannot read display file %s [%s]", fname, err) +diff --git a/src/devices/cpu/m6809/m6809make.py b/src/devices/cpu/m6809/m6809make.py +index 8838b96019..e1ea25db06 100644 +--- a/src/devices/cpu/m6809/m6809make.py ++++ b/src/devices/cpu/m6809/m6809make.py +@@ -16,7 +16,7 @@ def load_file(fname, lines): + if path != "": + path += '/' + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err)) +diff --git a/src/devices/cpu/mcs96/mcs96make.py b/src/devices/cpu/mcs96/mcs96make.py +index b4844942e3..207208d2b6 100644 +--- a/src/devices/cpu/mcs96/mcs96make.py ++++ b/src/devices/cpu/mcs96/mcs96make.py +@@ -73,7 +73,7 @@ def __init__(self, fname, is_196): + self.ea = {} + self.macros = {} + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err)) +diff --git a/src/devices/cpu/tms57002/tmsmake.py b/src/devices/cpu/tms57002/tmsmake.py +index e2e12b5a4b..942ec09537 100755 +--- a/src/devices/cpu/tms57002/tmsmake.py ++++ b/src/devices/cpu/tms57002/tmsmake.py +@@ -323,7 +323,7 @@ def AddInfo(self, line): + def LoadLst(filename): + instructions = [] + ins = None +- for n, line in enumerate(open(filename, "rU")): ++ for n, line in enumerate(open(filename, "r")): + line = line.rstrip() + if not line and ins: + # new lines separate intructions diff --git a/nixpkgs/pkgs/applications/emulators/xemu/default.nix b/nixpkgs/pkgs/applications/emulators/xemu/default.nix index fddef8deef12..25f0511c476c 100644 --- a/nixpkgs/pkgs/applications/emulators/xemu/default.nix +++ b/nixpkgs/pkgs/applications/emulators/xemu/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.7.111"; + version = "0.7.116"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; rev = "v${finalAttrs.version}"; - hash = "sha256-j7VNNKGm8mFEz+8779ylw1Yjd+jDuoL19Sw52kJll4s="; + hash = "sha256-/fUTQYi6EDG4wUFc17nuBUt/F1zBdhk/MEizwTo5I8Q="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/gis/grass/default.nix b/nixpkgs/pkgs/applications/gis/grass/default.nix index 654aa6451fd0..0f250a80b970 100644 --- a/nixpkgs/pkgs/applications/gis/grass/default.nix +++ b/nixpkgs/pkgs/applications/gis/grass/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "grass"; - version = "8.3.0"; + version = "8.3.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = finalAttrs.version; - hash = "sha256-YHQtvp/AYMWme46yIc4lE/izjqVePnPxn3GY5RRfPq4="; + hash = "sha256-SoJq4SuDYImfkM2e991s47vYusrmnrQaXn7p3xwyOOQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index c6d3a83e0c28..d248b845ddf0 100644 --- a/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -30,6 +30,7 @@ , Foundation , testers , imagemagick +, nixos-icons , perlPackages , python3 }: @@ -48,13 +49,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-19"; + version = "7.1.1-21"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-SxvaodAjSlOvmGPnD0AcXHrE5dTX2eX1sDM/441rP64="; + hash = "sha256-DqVonNh6bFNK91Pd6MwIO1yMrshfGAWNWPpHHQUA2sQ="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -126,6 +127,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; }; + inherit nixos-icons; inherit (perlPackages) ImageMagick; inherit (python3.pkgs) img2pdf; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix b/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix index 8d376730a90b..cb7e1310a066 100644 --- a/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pineapple-pictures"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = finalAttrs.version; - hash = "sha256-dD0pHqw1Gxp+yxzYdm2ZgxiHKyuJKBGYpjv99B1Da1g="; + hash = "sha256-UZVpyrUFf/uJNs2GHLYXpb81e7yzC8EFuoD+0Bzj6xQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix b/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix index aa7f17b20c28..46e83d77ca9a 100644 --- a/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tesseract"; - version = "5.3.2"; + version = "5.3.3"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - sha256 = "sha256-49pTs9r9ebERC0S663+h/f70s693zDseKRziafCIaTo="; + sha256 = "sha256-/aGzwm2+0y8fheOnRi/OJXZy3o0xjY1cCq+B3GTzfos="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/nixpkgs/pkgs/applications/misc/1password-gui/default.nix index 89bad6757abd..5d5c981526d9 100644 --- a/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -9,7 +9,7 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.18" else "8.10.18-19.BETA"; + version = if channel == "stable" then "8.10.18" else "8.10.20-1.BETA"; sources = { stable = { @@ -33,19 +33,19 @@ let beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-siQ6w1byDkfNrbkvjLWmQRbJ5nVZZv24vg0RFWaRHmE="; + hash = "sha256-+wHxtlE0zeVEObzdpcIP75LKbbjsG8LMqdIPFkY0BoU="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-WX6NzBXBSBf/hIl1kTIuUvCnEZ1+B0NBHfKvMeIZOw4="; + hash = "sha256-BRsp/hhBwgQFU+5Tt1M9V5Lx8oRLN3uaqLrzrPo/xpo="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-HQRw1OGIT/cVjDk4PGa8x4QdYHQxtqMePsUh+cpyysM="; + hash = "sha256-WVP5a007cU1GR/lnL7C6QiJpTTsjzaiS69H2LJzYm70="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-1KcTgmxDhbvB6gzTqF3bhu5toCSjskGjCflrBSNYzk4="; + hash = "sha256-BBSUSSnot1ktC0ik7yMhqsgLdkeQBrJUpHBvwu0w9m0="; }; }; }; diff --git a/nixpkgs/pkgs/applications/misc/corectrl/default.nix b/nixpkgs/pkgs/applications/misc/corectrl/default.nix index 9c0a000bab0d..0771737eb266 100644 --- a/nixpkgs/pkgs/applications/misc/corectrl/default.nix +++ b/nixpkgs/pkgs/applications/misc/corectrl/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-HETD2+acxJf30iC6UwRXD/onFYo3ki4RwAAVs4NbSAw="; + sha256 = "sha256-a8cLtmv9nLtvN9o/aIwveTAT36XmTN1j85ZxVGIXO6E="; }; patches = [ ./polkit-dir.patch diff --git a/nixpkgs/pkgs/applications/misc/darkman/default.nix b/nixpkgs/pkgs/applications/misc/darkman/default.nix index 89678b7d0fa8..1b33b9fac3ed 100644 --- a/nixpkgs/pkgs/applications/misc/darkman/default.nix +++ b/nixpkgs/pkgs/applications/misc/darkman/default.nix @@ -44,5 +44,6 @@ buildGoModule rec { license = licenses.isc; maintainers = [ maintainers.ajgrf ]; platforms = platforms.linux; + mainProgram = "darkman"; }; } diff --git a/nixpkgs/pkgs/applications/misc/dasel/default.nix b/nixpkgs/pkgs/applications/misc/dasel/default.nix index 14a8f6013f2b..07069dce1ac3 100644 --- a/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-zxTT/CkSbH40R7itXAx0zD+haHOoMep/W4KfalJQ/8w="; + hash = "sha256-zxTT/CkSbH40R7itXAx0zD+haHOoMep/W4KfalJQ/8w="; }; vendorHash = "sha256-CbR0uHtha2OoHW9mcB1I2lGJbjerbZARVN/mTstv/Y0="; diff --git a/nixpkgs/pkgs/applications/misc/diebahn/default.nix b/nixpkgs/pkgs/applications/misc/diebahn/default.nix index a90dddb3162f..ea7403464218 100644 --- a/nixpkgs/pkgs/applications/misc/diebahn/default.nix +++ b/nixpkgs/pkgs/applications/misc/diebahn/default.nix @@ -15,6 +15,7 @@ , gtk4 , libadwaita , pango +, gettext , darwin }: @@ -54,9 +55,19 @@ stdenv.mkDerivation rec { gtk4 libadwaita pango - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreFoundation + Foundation + Security + ]); + + # Darwin needs to link against gettext from nixpkgs instead of the one vendored by gettext-sys + # because the vendored copy does not build with newer versions of clang. + env = lib.optionalAttrs stdenv.isDarwin { + GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; + GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; + GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; + }; meta = { description = "GTK4 frontend for the travel information of the german railway"; diff --git a/nixpkgs/pkgs/applications/misc/harsh/default.nix b/nixpkgs/pkgs/applications/misc/harsh/default.nix index 129de17fb18a..6d01105ac0de 100644 --- a/nixpkgs/pkgs/applications/misc/harsh/default.nix +++ b/nixpkgs/pkgs/applications/misc/harsh/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "harsh"; - version = "0.8.29"; + version = "0.8.30"; src = fetchFromGitHub { owner = "wakatara"; repo = pname; rev = "v${version}"; - hash = "sha256-LftLlKevxvjxnRUMaRXnh3TXQSauvnfuX6voglwZmZE="; + hash = "sha256-X9YCxDgxIuJyTUurDQ574nKBAUsdKHNx1T6DkcygYS4="; }; vendorHash = "sha256-zkz7X/qj8FwtQZXGuq4Oaoe5G9a4AJE1kv3j7wwQEp4="; diff --git a/nixpkgs/pkgs/applications/misc/kickoff/default.nix b/nixpkgs/pkgs/applications/misc/kickoff/default.nix index a17be0e092ec..89e0356309ea 100644 --- a/nixpkgs/pkgs/applications/misc/kickoff/default.nix +++ b/nixpkgs/pkgs/applications/misc/kickoff/default.nix @@ -10,23 +10,23 @@ rustPlatform.buildRustPackage rec { pname = "kickoff"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "j0ru"; repo = pname; rev = "v${version}"; - hash = "sha256-AolJXFolMEwoK3AtC93naphZetytzRl1yI10SP9Rnzo="; + hash = "sha256-9QupKpB3T/6gdGSeLjRknjPdgOzbfzEeJreIamWwpSw="; }; - cargoHash = "sha256-Twg2C29OwXfCK/rYXnyjbhmCClnsFHz8le9h4AmzXfA="; + cargoHash = "sha256-a7FZpMtgTdqpLV/OfgN4W4GpTJlkfEtPO7F//FmVA/s="; libPath = lib.makeLibraryPath [ wayland libxkbcommon ]; - buildInputs = [ fontconfig ]; + buildInputs = [ fontconfig libxkbcommon ]; nativeBuildInputs = [ makeWrapper pkg-config ]; postInstall = '' diff --git a/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix b/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix index df3dfd1ac0fd..5f870d51a5ba 100644 --- a/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Open source implementation of NVIDIA's GameStream"; homepage = "https://github.com/moonlight-stream/moonlight-embedded"; license = licenses.gpl3Plus; - maintainers = [ maintainers.globin ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/moonlight-qt/darwin.diff b/nixpkgs/pkgs/applications/misc/moonlight-qt/darwin.diff index f5406087ae0a..0c137fa0774c 100644 --- a/nixpkgs/pkgs/applications/misc/moonlight-qt/darwin.diff +++ b/nixpkgs/pkgs/applications/misc/moonlight-qt/darwin.diff @@ -25,7 +25,7 @@ CONFIG += soundio discord-rpc } macx { -- LIBS += -lssl -lcrypto -lavcodec.59 -lavutil.57 -lopus -framework SDL2 -framework SDL2_ttf +- LIBS += -lssl -lcrypto -lavcodec.60 -lavutil.58 -lopus -framework SDL2 -framework SDL2_ttf LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit -framework Metal # For libsoundio diff --git a/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix b/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix index cbbbdc4d7598..178265aeb733 100644 --- a/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix +++ b/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { pname = "moonlight-qt"; - version = "4.3.1"; + version = "5.0.0"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Utpv9VdX5vuUWDSGc3YcF8tHbvUZpPeXEDP4NKts+vI="; + sha256 = "sha256-rJCTISXN098A8CB34HM12WgdiSMNA31NO2x7u+iSwBM="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix b/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix index 90864dee69ba..ddc427654e98 100644 --- a/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix +++ b/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.14"; + version = "0.9.16"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - hash = "sha256-ThcB/BhnJbBHUoRh120iqN6LMGOnkekzALTTgd8uUx4="; + hash = "sha256-xHAn8NWSWSm95SIX1M8HIQwgNBq5/K5xsanbkAKfXSw="; }; # No tests diff --git a/nixpkgs/pkgs/applications/misc/ola/default.nix b/nixpkgs/pkgs/applications/misc/ola/default.nix index b016aa8719c7..5de5c157d370 100644 --- a/nixpkgs/pkgs/applications/misc/ola/default.nix +++ b/nixpkgs/pkgs/applications/misc/ola/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { broken = stdenv.isDarwin; description = "A framework for controlling entertainment lighting equipment"; homepage = "https://www.openlighting.org/ola/"; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; license = with licenses; [ lgpl21 gpl2Plus ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/applications/misc/oxker/default.nix b/nixpkgs/pkgs/applications/misc/oxker/default.nix index bac74b0ffe1d..2e22cdbd1b3a 100644 --- a/nixpkgs/pkgs/applications/misc/oxker/default.nix +++ b/nixpkgs/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.3.2"; + version = "0.3.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-HFZSIzP3G6f78gTOpzZFG5ZAo5Lo6VuxQe6xMvCVfss="; + sha256 = "sha256-2zdsVItGZYQydpC9E/uCbzOE9Xoh7zTqa9DpxA5qNCc="; }; - cargoHash = "sha256-ZsqxlwgXqw9eUEjw1DLBMz05V/y/ZbcrCL6I8TcnnDs="; + cargoHash = "sha256-FXYFQpiK2BGUz9GjsUPS9LWPeezbBQ3A33juoVCl71g="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/nixpkgs/pkgs/applications/misc/pot/Cargo.lock b/nixpkgs/pkgs/applications/misc/pot/Cargo.lock index 5eb18c72f9b9..25cc0ccf41af 100644 --- a/nixpkgs/pkgs/applications/misc/pot/Cargo.lock +++ b/nixpkgs/pkgs/applications/misc/pot/Cargo.lock @@ -4177,21 +4177,6 @@ dependencies = [ ] [[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] name = "rsa" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4256,36 +4241,6 @@ dependencies = [ ] [[package]] -name = "rustls" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" -dependencies = [ - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.4", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "rustversion" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4352,16 +4307,6 @@ dependencies = [ ] [[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "security-framework" version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4785,8 +4730,6 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rustls", - "rustls-pemfile", "serde", "serde_json", "sha2", @@ -4798,7 +4741,6 @@ dependencies = [ "tokio-stream", "tracing", "url", - "webpki-roots", ] [[package]] @@ -5377,7 +5319,7 @@ dependencies = [ [[package]] name = "tauri-plugin-sql" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b20f28d747f6ec3ba5a80bfcd5edc1d573b4c90" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#77b81af36cc6c03b07c59a2988b0f6d20960f1b0" dependencies = [ "futures-core", "log", @@ -5906,12 +5848,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] name = "url" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6233,15 +6169,6 @@ dependencies = [ ] [[package]] -name = "webpki-roots" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" -dependencies = [ - "rustls-webpki", -] - -[[package]] name = "webview2-com" version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/nixpkgs/pkgs/applications/misc/pot/default.nix b/nixpkgs/pkgs/applications/misc/pot/default.nix index a9b829aa2678..bf345bdea486 100644 --- a/nixpkgs/pkgs/applications/misc/pot/default.nix +++ b/nixpkgs/pkgs/applications/misc/pot/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "pot"; - version = "2.6.3"; + version = "2.6.6"; src = fetchFromGitHub { owner = "pot-app"; repo = "pot-desktop"; rev = version; - hash = "sha256-ag54ns4lqIGjjHj6n8mDJTalQfBjqLxqSudjyeRRSs4="; + hash = "sha256-ZpN+SgBq2vA2p4MjrT07j22VB67FdiXIIl9puGiGJA4="; }; sourceRoot = "${src.name}/src-tauri"; @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { outputHashes = { # All other crates in the same workspace reuse this hash. "tauri-plugin-autostart-0.0.0" = "sha256-wgVsF3H9BT8lBew7tQ308eIQ6cLZT93hD/4eYCDEq98="; + "tauri-plugin-sql-0.0.0" = "sha256-e9iwcHwW8MaRzkaAbewrq6b9+n3ZofMTBnvA23ZF2ro="; }; }; diff --git a/nixpkgs/pkgs/applications/misc/privacyidea/default.nix b/nixpkgs/pkgs/applications/misc/privacyidea/default.nix index fab133ab3593..9cdf4da33ef2 100644 --- a/nixpkgs/pkgs/applications/misc/privacyidea/default.nix +++ b/nixpkgs/pkgs/applications/misc/privacyidea/default.nix @@ -257,7 +257,7 @@ python3'.pkgs.buildPythonPackage rec { description = "Multi factor authentication system (2FA, MFA, OTP Server)"; license = licenses.agpl3Plus; homepage = "http://www.privacyidea.org"; - maintainers = with maintainers; [ globin ma27 ]; + maintainers = with maintainers; [ ma27 ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/qlcplus/default.nix b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix index e27f2a0bdcae..5ddb8170fcef 100644 --- a/nixpkgs/pkgs/applications/misc/qlcplus/default.nix +++ b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix @@ -45,7 +45,7 @@ mkDerivation rec { meta = with lib; { description = "A free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc"; - maintainers = [ maintainers.globin ]; + maintainers = [ ]; license = licenses.asl20; platforms = platforms.all; homepage = "https://www.qlcplus.org/"; diff --git a/nixpkgs/pkgs/applications/misc/redshift/default.nix b/nixpkgs/pkgs/applications/misc/redshift/default.nix index 70d30ea054e6..a8730bc6a014 100644 --- a/nixpkgs/pkgs/applications/misc/redshift/default.nix +++ b/nixpkgs/pkgs/applications/misc/redshift/default.nix @@ -117,7 +117,7 @@ rec { license = licenses.gpl3Plus; homepage = "http://jonls.dk/redshift"; platforms = platforms.unix; - maintainers = with maintainers; [ globin yana ]; + maintainers = with maintainers; [ yana ]; }; }; diff --git a/nixpkgs/pkgs/applications/misc/tellico/default.nix b/nixpkgs/pkgs/applications/misc/tellico/default.nix index 6e9d2e6cc1bb..23f736e9f038 100644 --- a/nixpkgs/pkgs/applications/misc/tellico/default.nix +++ b/nixpkgs/pkgs/applications/misc/tellico/default.nix @@ -24,14 +24,14 @@ mkDerivation rec { pname = "tellico"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-opg4FbfOM48eqWQUJnMHH7KSo6x4S2DHd7ucPw6iTzg="; + hash = "sha256-48ZFSE+uFEtY3ry3ONT/d+KhfX93eTyW8z+PiXQqEn4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/tumpa/default.nix b/nixpkgs/pkgs/applications/misc/tumpa/default.nix index f7dfdd95d5db..cc73b7fa6901 100644 --- a/nixpkgs/pkgs/applications/misc/tumpa/default.nix +++ b/nixpkgs/pkgs/applications/misc/tumpa/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { owner = "kushaldas"; repo = "tumpa"; rev = "v${version}"; - sha256 = "17nhdildapgic5l05f3q1wf5jvz3qqdjv543c8gij1x9rdm8hgxi"; + hash = "sha256-sT+IasupBxkfYoOULRvG429ZHA94uAJoYfFd1Whs0J4="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/applications/misc/wttrbar/default.nix b/nixpkgs/pkgs/applications/misc/wttrbar/default.nix index 54775719a2e5..7e2f72e31ded 100644 --- a/nixpkgs/pkgs/applications/misc/wttrbar/default.nix +++ b/nixpkgs/pkgs/applications/misc/wttrbar/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "wttrbar"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; rev = version; - hash = "sha256-697LoXu6x8ODQa7tG/NqpSqnLJgM765wBFFnKyul7uI="; + hash = "sha256-Qe1Is13RXUIT5JkfuLK3Lj5gxKxVbfA4FCNgkqSTMNE="; }; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; - cargoHash = "sha256-sxZ4R7QXQSuNFNRuOI/omON6QmQ0DTKQvjHy1BcvXAA="; + cargoHash = "sha256-IK6ciz+XtNsC4QsAop7Pf5qjiTCUQa30xnHWW4PobnA="; meta = { description = "A simple but detailed weather indicator for Waybar using wttr.in"; diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index e3a9a01af6dd..5ac761db99db 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1015 +1,1025 @@ { - version = "118.0.2"; + version = "119.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ach/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ach/firefox-119.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "edaae29cc72b033e7116f56a5c26ec14a87b44d394c5b447000b2cea3f092421"; + sha256 = "b39b5d57d6cffa2a70b5bc0b79437b0b0bae8c6e8c0cb59cad1a06949367b5cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/af/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/af/firefox-119.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "31bbfc2b7c2f3e96ea6607512769a20271c912a3d025c9b875a91333d399c6b8"; + sha256 = "918c39a93f193d796763d366bda8ca821f048c696f25dd4d82ec3a66e630eff6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/an/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/an/firefox-119.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "13835d48854bfed399898fa68c3e8a12ca749d6a079599049f4f24ab1701ecfd"; + sha256 = "fc56648a834e860516c743138ae7dabd79271483150a28aa4af1d64cedb227b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ar/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ar/firefox-119.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "860f800879c39636a53bfd4149d1b2295fa8691b73ef32291bcf60d3f59d4f7b"; + sha256 = "6a4ba37c37eac8807c64aab68a8904b533da34ebe12064a70595a798827dda86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ast/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ast/firefox-119.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "f462a8b29ae601c1dc1aa52072db9114edd77f51f0acd36e83a0f728b2c6c57e"; + sha256 = "bf9eec66de4b202200132c3f31a1532a81753f34ea827485ba6e96ca7ba36ead"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/az/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/az/firefox-119.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "25072dc449a004fe376eadf1bf72ced247d18cb7644f209ce44076567982ba04"; + sha256 = "13ea61d828ca7eecb8960f40d779454b612c711865a3caa47f0f9bcb0c7f70c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/be/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/be/firefox-119.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "23d23aade92122562920a90cbce73afc570dc1f7eb4198d5e6f311d5439edeec"; + sha256 = "1c6c629c02034cd562b440302ed148c4ec080e6c93ca74b7244b47baec96973f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/bg/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/bg/firefox-119.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "05b3cd2074c2496dcaee4744d5dbaf409e8ac15fcea274a7e07647309da7bc10"; + sha256 = "f382168dd2aad7c13ccdedbdc5f43167e6030d8aa8159eb8b5b01c0454c5d367"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/bn/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/bn/firefox-119.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "151f4b9e92583ea048bfecbfec9de77613c87a7b77c56dff45a7188bd89dbb0b"; + sha256 = "c149b1dfa5517489677e8a613e04a15f781866b01bdf3e711d9afa9f65c08499"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/br/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/br/firefox-119.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "1e4784df4de56c0c656e7a523cfaf73ee713658cead7ef5c2965a30b842aa5a9"; + sha256 = "350540c67927823dbf0757dfc2561d9219ee71d576ca3ff2f86ce4e9c831118c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/bs/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/bs/firefox-119.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "baf4579d63d93e5b813210e19763dca574afb35dcca5a53f6b2cf1ad75d7391f"; + sha256 = "59a9dbc269c2ee815b7698eb5a0eacd9b310e604ae0df766503e6914c0bf740e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ca-valencia/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ca-valencia/firefox-119.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "6a0ada9f33f226a0209ea5007e3daf5ea2d050052ff41e91c3d50ff8ca9370c3"; + sha256 = "8b5f0b091b5d8236c68e07ed1d0484994cb5d7082605f79c8ee01b96b1219b56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ca/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ca/firefox-119.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "e2bc65ee5649e3ddec778e0d5b36a0b1cc103ff99841eaad292d0bc6337a1654"; + sha256 = "7c8435210f1dcf5e577c85eb5607b231d36a42233d2a42bf3f58626e9fe313ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/cak/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/cak/firefox-119.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9c6a0b7919bb72ce22549a530c537a07ab0d4b8dda33df0c3ba3c563c451c84b"; + sha256 = "1f88c845c86881eaed91552028206abd62b0d20c87e57c58ada6bd725c6efaee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/cs/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/cs/firefox-119.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "923cc5ebbc0503bfd4059c94febc1f8b8b49d833967fe2f641a985b40b44c590"; + sha256 = "0983f8406f4dd3c15bb9679cc4da17bf0d2e55fc1d2a2108d98c6b1f26823161"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/cy/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/cy/firefox-119.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5a94b219227b5bdf33090de67eb0ec32bd2d749e71e41980126ba3d975f375f2"; + sha256 = "e223b1a0af9265d69fd7cc640959562db028f7be4e57a106a8a58b22198cb36b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/da/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/da/firefox-119.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "11781b484eb02f1566f03db478c9d79a3f1e02947be5964e6272789ecfd8ce28"; + sha256 = "af0c8bf6987638b39156c34359f79cd89371af513510de83068e427cfbd1f76b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/de/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/de/firefox-119.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "691235de2d13d8412b5ea72821cc3172ce86b9c331c3fae4e312f3cab6102ad2"; + sha256 = "5b686480faa5e93b88f18148179f44a068e2152fdec20187fc9e5bf184adee6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/dsb/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/dsb/firefox-119.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "a7ad39655d2165e94e19c79ddab1392e496e64f731b5fc903cfc65738e07e20c"; + sha256 = "e4e69bf057f5de0086958f6023319b922fcb852ba9467dd40ec1c14d6f68efd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/el/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/el/firefox-119.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "62815f5f1e99c9e3676edb1daa01d70cd29eed3781f91e7bdca0b1b65ac61afa"; + sha256 = "57307cc86a5aef496053f116854d46adf65bac39a01f6d56f84d572d1b539ed2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/en-CA/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/en-CA/firefox-119.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "c32053f77daf81dbe9b0cae597c269176bb2ef244647998e9c6fcfb839a6396d"; + sha256 = "b5361c64b7b98c9a6df89d06364e18d8e0b5bf0ec6e20a1363ca841cb6a03df9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/en-GB/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/en-GB/firefox-119.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "f8459059b1fb6371db9905dd8ab281de35cf271ef9d1b8a7a041fc41199a46a1"; + sha256 = "ac25fba40006fe6a92d7c08eff26a595e594728ed913799a31f4bb3ba183257e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/en-US/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/en-US/firefox-119.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "08d98d91fc4d15241061b5345deeb7ce8c6d30032f66388a02089de7d23c92eb"; + sha256 = "3cba47e712cec5de5716666ef640f678d65ffb3c8ed5a67986296dcfa59fbc32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/eo/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/eo/firefox-119.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "87db7fbc63cade709ed478f271923468c722ded1b097583caaabffe5cffd48a0"; + sha256 = "82013838fab41be6cc427e13ce05664d100cf4b36fba2bb1c7e6de4bb5e17427"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/es-AR/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/es-AR/firefox-119.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "b4c4fc27197e1bd55aa6694d53662f2180cd9c994a4acde025056d336866ee8f"; + sha256 = "5d29218c1edb409e16229e5f579b9b212bd13547686f09597fc1721b50385490"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/es-CL/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/es-CL/firefox-119.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "85996f30d7abfe3c1896ffd9674dec86be0655f9cd3360588d36ac36c72cedf4"; + sha256 = "200d3d3e5cca0a1e7be2c4dca8476b8c84500201769791f4de193a9c00dc069c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/es-ES/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/es-ES/firefox-119.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "d2b766cd31a23cee8380ffc55e1c812281f6268416bd3900ac6bf81922a45f8e"; + sha256 = "e158a68eb5da1e503bdf05ee3bb687b0540fef16725293371ccfbdbd085c120a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/es-MX/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/es-MX/firefox-119.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "f2d8c8a9370af90ab11e2028c482e08be954a95862d37a1149e6c42b02d14378"; + sha256 = "2b430ad86706fb2b602dcaceb2d71c8eadb28259e55a95cf6e75eda2cfbbfc76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/et/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/et/firefox-119.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "41373db23f3929fe55dbc9dcc83b6390b99b5d414c0b85da28f7ac90ecd1a510"; + sha256 = "c86da524f593aa1e78322a0f289dc293dfa6ea6cb770ec28eed4dec448476bad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/eu/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/eu/firefox-119.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "1dd9a536f5c8dc22f35e0ff9077ae81dab2ac8b0e25eabeaa2c66dc294500b98"; + sha256 = "3046b38b745175f3a9ba8b5e093ae79c8c238a1df56fadef165e075ffd3b3320"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/fa/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/fa/firefox-119.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "75f5499dc303167f3d3521b4dd741462d8cf7be9c0599fa3ea520d5c50419017"; + sha256 = "404503bd56a6bc2cba8e65cb20018f0e80c5cf290573e0ad3b14dd75bbf9bc39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ff/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ff/firefox-119.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "92b4d4e9d5cd9d1af8d85eb6e79dac180430920ad1898705f694d9454ede6330"; + sha256 = "98c702ef329c24e3c6b7e7ccf7004894f39a646c18b58aafe23c9e90bf96be47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/fi/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/fi/firefox-119.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b55367a8cae3155438e0d9a207b238aa23e0f4923774a8d920e953a458dc4f08"; + sha256 = "562c31519ada2355e4b8739e03aed937356424fa35bf60cc1a55114d208a668a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/fr/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/fr/firefox-119.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "471fad8fa3cba6c88de351d23c06f02455ef1d204f0b7891613277ed64ead64c"; + sha256 = "d7a2df46a6e35c15ad84556e8b8042ca3915faa4875b5c6d2cd0a7edc835072c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/fur/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/fur/firefox-119.0.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "36dc198d6810859005d9e6db9ccf0ff09ee9c16ca629be6b7f8e80ba0ae08529"; + sha256 = "ef596a90fa2acecb0b6a11be98edf355ea929c20276f7b51ca179f8890e9e3dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/fy-NL/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/fy-NL/firefox-119.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "cb238406adcdbe0f41b28d497da49c83ebc3b6182657dec264ed022468095cde"; + sha256 = "dacbf9e586c3bd3bf70d0cfbaea637dfb9e78bf58d44283778c875c2e47e558d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ga-IE/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ga-IE/firefox-119.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "1d6c433d80d58f7e8b5bb8c22cf6875b41908b0a82b87d92d359fe8b93a442f0"; + sha256 = "621d157491c09010f68baa54b893759b85cd350daadda4081574e58be50e946a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/gd/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/gd/firefox-119.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2df1ccb7d1a176092b3b9a58abfa1f4caf58c8d0ba599cd2075a99eae5943509"; + sha256 = "d0433bd49687a042d0a7d3cf79f8f128a330fed546bc9ff78258d4797fc0fe42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/gl/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/gl/firefox-119.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "012c433502c59b993971cc03e3cc68945236241aa2c4a663a1ca1e5646a63522"; + sha256 = "193c4c8bde818a06b0284a836d6be803955727b12043a1ed79c748d79de31825"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/gn/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/gn/firefox-119.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "cb202fe5eabc9ec9dffc2f00f339e8c492ff3c2ddc9f2162ce04fc5527744084"; + sha256 = "079dab78929dec897f912bd2cdde3b13a64e9ef5e21e98c5030cc0482d9574bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/gu-IN/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/gu-IN/firefox-119.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "e09eb574a23e6bb03ae8877108fa631c1fddbe23f28708dedba70c50c71e84a3"; + sha256 = "ee9670c5e502e6c6bef1c1b118e16624cb6df5be68e136961083d3ca7d4e8400"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/he/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/he/firefox-119.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "fd7ca0027cca8232a71cc95508710373a7a57dfee490befa81a6911f40da2d1a"; + sha256 = "24ac7821df7d752ffa8f959dbf4cf85ee3c2189b415b15e6a3fcbdefb9953dd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/hi-IN/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/hi-IN/firefox-119.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "27036573a6fc158626b31769a15273feb99f2d7b4d0642c25238f767c391f7f5"; + sha256 = "46fb02f9332139f1e2966df339c07ec0a91ba42744e4afb5e9a54ed3d7b98f59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/hr/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/hr/firefox-119.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ba72f0a1c4a216aa2d332e7ffb9022c67240a9311893d8d2afa42c12764fd0ee"; + sha256 = "4faa0d060c9ff8754d3ae1dbddade68fc45ec0fa9c736643fdb2bd8b35974e04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/hsb/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/hsb/firefox-119.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "b5f732a1cde793c6e4019eccf20c12d99120ee68d46c3af73578eeae8f13f081"; + sha256 = "cd64231d3afcdec60743153eeb4b1f0bbb56234f6ac77b8e1e694514656a4e02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/hu/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/hu/firefox-119.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0bcbe31ce109772f275dc68c6c8e698672206712eb335b2d12e52980dc3d439a"; + sha256 = "94264673a553ad4def9ea264ca3d97f1208a780ea367e26857dc8d1d8622744a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/hy-AM/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/hy-AM/firefox-119.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ca692088bf041df45344304257f0cb0ac5f994b73a84bbfbef8d1afdf8431aea"; + sha256 = "dfb11193bc4d8ef993bbeab5c66c9b365d860fff3426a6473cc85fe168c17264"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ia/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ia/firefox-119.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "c109de529b4fa66a1a86a6e500ca7552b2db0f7b7a7dcc4c1ae7b09c841d7240"; + sha256 = "73506b0eb9e2b8d7b233b66cac2e71bf570a9ca4bdeaade7e3ac6fdb7326a7d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/id/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/id/firefox-119.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "93eab7182a441fcf215609cf35defc655a6375117b656fc45f1ef05ca80d08bc"; + sha256 = "b819e003fa942117ad01ca57082eedab1150f8bcdc11bb5345083fc170d36928"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/is/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/is/firefox-119.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9ee541eb90fc4166bc425bf3542963b9a0894d4c990e4e445a2f0c228900a347"; + sha256 = "81c44e530d1d7781b3df276a9f384e703c7faa95e119969c28095d42c177b161"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/it/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/it/firefox-119.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "b0a974115b358e60824cf3589d6ae6e44b9769d301235cb782d404acd78606d8"; + sha256 = "ad8b2f146772487809fba1e81d01d66ceadf29d4c41c05c4dac4bd62ee7e674b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ja/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ja/firefox-119.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "f1aaece094f926991747e7a878683d80b957d8d4c4ea138f0a17138bcee4beba"; + sha256 = "a66a5eea3b15d0fe5bcf9276e152f214d5156692d6ce062ce94d90849d209b26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ka/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ka/firefox-119.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "1f2c896fc93fe9d463d95e7b38f2015d5b2fd3bdcc06176a1c6ba6eaefb783b1"; + sha256 = "dd1817b054d70c64f529c0549a6424567a58200a23716488655152ee2d38e2cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/kab/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/kab/firefox-119.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "bc5ea67b452e896feb48fef2ccf940fac72aeb3363aaba33c3533b393c96de7f"; + sha256 = "a6c1eda609f94651bd97cac31c830c8c19b6e3c085b233caa569eedd99999997"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/kk/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/kk/firefox-119.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "d8cf92a1576ef8422c0f11864200d4c4acd05509e7ea7c52903d61d8f502c4ab"; + sha256 = "35afce4fba1c41ac276a03cdf688232df8f3b3177b6797bfe83407111d9c596f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/km/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/km/firefox-119.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "695bdf7b572a5c28eac19955f2170cec1501eb337efc111030ce15a7794b6ece"; + sha256 = "7b40552893a20c3463cdd6ac1f378d44c3c2199141e980261f2fe899d8e9ce92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/kn/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/kn/firefox-119.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "4f7f974b8f3ba3b09714bdaafecc0280384838cff54704eb5ad2bd129d7dc7f4"; + sha256 = "2d7c2003218f0404f2f20896d924cf5df179c6ff2fd61616876e485b4ad9d084"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ko/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ko/firefox-119.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "350445a1a2a7e0daaf39023409558fbde8cee86f35d71d70c557234843efef90"; + sha256 = "46ec2ab8e5898f3c063bfcecbdb16a21e14b150718259c9d6f82e8f0a5147d8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/lij/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/lij/firefox-119.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "9c70ee5cf9a277bda0731ea0c927cdde60b1f9270b1d8f910bb9b89936938652"; + sha256 = "fe103d6b1377898242421518b691916df27ab414ae3b47fa71694e2a673a552a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/lt/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/lt/firefox-119.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "604fb287735aa843d98cb3b6fae2c7f2939ff13d327ffb4f80fdcd82b828f2a3"; + sha256 = "a174153a909957ff3a41ee263ba95f6e30786007c2e74be0ff1c68d1dbc55c7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/lv/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/lv/firefox-119.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3e3d6d64ad4c998cb6a92cf7ac457f0c3712e68e653de0a3ddbdaca15d03167d"; + sha256 = "3ba44426c9654bc44f6e0740c90e5c8d0a9af04a5e0ffe0943bf6e0d2c3d5280"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/mk/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/mk/firefox-119.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "fed28734dd7e3e69d1c42a2ae183e173f54fd5ecfe7e3e9301064d98f6e3eee0"; + sha256 = "870768e901c2f900d25a547d08413a612f01dd2935988a2f59bfda8fa4184544"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/mr/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/mr/firefox-119.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "180527d25dc0746650918ec85ec13a808125ee50e24f48cb0b613372a5ac92e1"; + sha256 = "f2cde4a376169be38d3bb5c7e0585f59383a07eb63a1fa840bcba7c6f452d4d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ms/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ms/firefox-119.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "751c4aad153f6347bcc36c821cd6a8fc83cd30392cd097da364bf4ac484bbe92"; + sha256 = "c680975f06962d5d7e4ece1d6b566a4863ea59b009bdf7ce00f6b548533d63b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/my/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/my/firefox-119.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "0590bea84cb17f09b0ddd7baf17306e32049ca6ccd694143fb2ab481aa05d6d8"; + sha256 = "7dbe7c8066106e80be4acb553d6b6dd3c8ccaeb1d8eadb141a99330d969a7ab1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/nb-NO/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/nb-NO/firefox-119.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "51edca7fb1d6dac258b0f7823acf87297bf5e916c52a2796c00e84889570611e"; + sha256 = "0d8e3c89de78f607f3b3258f9e8633792a8fb781ee4019bc5c4dc61e8bc4a276"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ne-NP/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ne-NP/firefox-119.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "04ca864dde0502fdf4cd2a68d2ac4af1996dff8443f503fbee68d6355fb8ad83"; + sha256 = "fda071dbefc7d999d6e6d46dd9267d4bd08d3a124797183e6a5ebec5e357c411"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/nl/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/nl/firefox-119.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "c8bcd78b5ed3b9e675cda7505134a904142a62e9977abef1284d4bc7d4d2a7c4"; + sha256 = "f7b66affba5582a786086431ad187fdd5818cee274333447d8461d81fa120788"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/nn-NO/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/nn-NO/firefox-119.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "aa712a3ac3148af441dbdf5413b01d750a833125d510cce4fdc2cf4b3d5a9ffd"; + sha256 = "1e8ae2c889461f16d776ef816212f0230cc71046ea2c42fe50f294c17d346069"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/oc/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/oc/firefox-119.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "52da19a46baa9628389ee08ad02d350baa9108989ebab0cc2608a13138c832d1"; + sha256 = "d3e8c4ec7ed58550a42c58c78b930114def4c31e1e9541cd2e1d93d1f8ed6d22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/pa-IN/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/pa-IN/firefox-119.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "7b522cfddeeaec19e8dc5c25c32dfe590743acca8349a9b1a5877d9582a584a4"; + sha256 = "8445047117de8e1a136bf08c3c7b12aed9486d5b2ceb53b515198e5dc9ff6912"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/pl/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/pl/firefox-119.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d27dd66b00740fed51b146b60c940d0500378be008a04331869f6603a5c96744"; + sha256 = "87d29a11b54e21884be4f3bb3005d37cc2441220f9d8bd8fbcac002d60a05aae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/pt-BR/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/pt-BR/firefox-119.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "15c2f48c2b504ebb98863f4dd61e68a8d316a977284b632bfc3a498212b48cfd"; + sha256 = "425f86111d409a3bc2250b68588bb92221d7eab575064488693a8723c78b97d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/pt-PT/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/pt-PT/firefox-119.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "353475f78b33efd4bded36e8e1a6259a8ddeb067dfed9400b560cb8a56118481"; + sha256 = "eeeeb25dd197cd2b194f9378fd0cccc6aee4a22a841e9fe87c34481e61a5bdc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/rm/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/rm/firefox-119.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "9ae918fb2ab4ce322152da4848d865501de297c72b2b90a3b58b98ac44ac3746"; + sha256 = "7842a3cc0cc9c882633377f1e18a8c7339af2912578cf5eadf12ac05cc44cf6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ro/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ro/firefox-119.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "1bfe0a34d5f1a1652fe076aa881da6ce4fc8dc098b2afe71ba7702ce07e87801"; + sha256 = "05f930e45de7537055a76dbe2148a7557907293e9238ddd8b81335ffeca85457"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ru/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ru/firefox-119.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "eab71d99e2548650e05646ad86425f4f74c2597535ea7aa4be7e70c718c64562"; + sha256 = "ef9bf25a5488e03b699add0308bb3b0b101025b533f408dc88b2d37777ee4186"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/sc/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sat/firefox-119.0.tar.bz2"; + locale = "sat"; + arch = "linux-x86_64"; + sha256 = "034813361992a52b30ddebe013c221f06b6628bb78404916bdd6eaa7e0e02c6f"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sc/firefox-119.0.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "cb979ed8cab05be2d34c51b3649666164f0e18d67b923b5acbdb112c9733ae29"; + sha256 = "7795f208a10e91d4ec00b7605bdb55242a085fa11a49b6c210ba87f59d1b1873"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/sco/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sco/firefox-119.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "bb240568809555462268462bd269bcb8483d22a8e394a77938e768727acd0a2c"; + sha256 = "732f8e5fd43e5be9019c3d4f1eaeb14dd05bc167b2a521960e1f984879e996c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/si/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/si/firefox-119.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "0e4caa28640d88eb46ba5df3717afc68055a5c689f6f802f0f2cf1f09a1c4451"; + sha256 = "aaaba267bf52680a719360b58c1d8a9f74e56c88ff1c790a238a7db8e7811fac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/sk/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sk/firefox-119.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "f3ffe13e272fe628fc2e5d6057503f973e128fbced0699d93b74f8a8991c27ac"; + sha256 = "562fed5652761207aa61c6df3b87538bf1b95018097ea7fe2f7b17d803f4207e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/sl/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sl/firefox-119.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "01906a62d986f224a592cf577f3e4bc26f0d63fbcbfc22d6ee3235ca4894a062"; + sha256 = "250383f4681196d5c3357a4ac4a0ba0edd58ea89e529a62e92a103e21761489b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/son/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/son/firefox-119.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "a361fd5d60744e370de1b4f8efd8dfcff34389d114919997514e9810887b8dd0"; + sha256 = "d2f8c73e7030a9ada05d3da1f403bbb05b16a54e7affcad1fce196c739b1c93e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/sq/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sq/firefox-119.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "f9ff65b19262d45f2a3a3b984ec7cf150d7e81edc9d34953b29f4f6fe83c7155"; + sha256 = "20fa7878cef8ccf9b877aee793638a30b81e0c89d609cf72bcc3d185ac8ecfa8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/sr/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sr/firefox-119.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "91e9db5029983cdd5000fd897087d705ce1f634959685f179710c6130d0f7024"; + sha256 = "ac7149159ac83f91790a53926c874ac4dfaf1f411951a3a5eba63a500324b30b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/sv-SE/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/sv-SE/firefox-119.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "682bfa392232ee040536c89105675ae26cd07979a557938031cf96c3921886b4"; + sha256 = "b86cce597d8b3130495d676a28c5440732c0089f040b0f28dd9381dcbe1598ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/szl/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/szl/firefox-119.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "ca82574af46e338968b9c28dd59e05f59c28166befcd21dacb02ec447ebcd714"; + sha256 = "75770fb197dbcbe8aa473ab7e0bcf2474c4f240917f4cb743c3119724770382d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ta/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ta/firefox-119.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "119ebef979adfc0e4e68e567465c80c8f74a9533d48d0dad301931105c364144"; + sha256 = "2395da544f587e2d07578b122e92de14a14c6c4fa90e5e25d951fc8060ef07f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/te/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/te/firefox-119.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "3f9dbcc42a8370d7bcc457160d9fe8eea9a4aada3497d2a679da4fa7e6ffae3d"; + sha256 = "2661e1bff3f097a1d9a903ec6f4778dd1c111e8e81698eeaf9cc26a18c937720"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/tg/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/tg/firefox-119.0.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "d32a057c40df8ade083f16f5606bf16aabf63137cad74653f565d3a54ecf932b"; + sha256 = "7aa7e780ec6b8d4b2026cb5c223988ad5022be484350f320a6780c7788b83e62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/th/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/th/firefox-119.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "32665ef2f383a4ea77c9c360a77385cb3076928f4d24f1f38a9a0607062e1ce1"; + sha256 = "28b55df0316d694acdc5e14e3dc0f4ad75d54246dcc1c5eada5787a3cbae7007"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/tl/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/tl/firefox-119.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "d9746267f427aa75fafac7840ea91d178e800413eec71ae836f62494a7a16600"; + sha256 = "0daeabf81bd3ef1f79f51db76ae70d2ab82c9cedcd7b8e4dcd27668944e4a4e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/tr/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/tr/firefox-119.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "0f3bd7cb21b17ed2539de42cf4ec8b3353809a557ad4160b5bf6dc30e978a1a7"; + sha256 = "fdcf18ed645299e11365d713d22fc554da4ff4be8a33233262c166ac1f4519c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/trs/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/trs/firefox-119.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "e3d79184e1e769410123c1f2aa6d3a1fe5a7f6a08981282207b904934a0f0d59"; + sha256 = "18f547adbdb52f61ac3db408ada06ac81b59c0be19b8826eff306779f70df5e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/uk/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/uk/firefox-119.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e4dcb615b767c14d9c8b5e112ff3b2fc9f25aa5d1feccd83c566f435347189bf"; + sha256 = "0003f5e2e6f452b20c67bcf7fdc314bca34363f18e642ae375635102530d5e46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/ur/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/ur/firefox-119.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "a87de384a8fbdcbfc60d4c0ea248f923b2792a853564e4615a235a0562ca51fb"; + sha256 = "82c3ef7c208c7cdb44de5d09456e82bdd71de1321d8398323983d9473cc9e488"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/uz/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/uz/firefox-119.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1cb8f957361a3fbcfd3770c094b5bece5663eea6922a2eb7f459c83111407551"; + sha256 = "43f93fcf41dd41b70dcd75a2eff9f8d9db5b56a62623fe51f2034d461c5be60d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/vi/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/vi/firefox-119.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "40b8e3ccecf7f055a2f2133e6d1fae21f5ab22c505a7eb108e2f374e9f58430e"; + sha256 = "662ed24018c950f0c11adfe857046256b94a312faa9c945d3d2e752f1c8ff6fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/xh/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/xh/firefox-119.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "7bcfb6c7aafeb7202369ea2479272d476b45599a15a70f781c9b5b0547ef0846"; + sha256 = "2b4a67692ed2d88139b82beeb582b054cdbf773c1d67a6a112710da6dd5c2d51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/zh-CN/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/zh-CN/firefox-119.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "7604468ac3d9359a01f8634ba2e74c1dec1d0a3ef17702ea145cc6f07e86ef93"; + sha256 = "e4432e793813e4ee8b07b7fad53fc2c15de1fd9617a33466cc87c2d7ea4c782a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-x86_64/zh-TW/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-x86_64/zh-TW/firefox-119.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c36ed4783efb76c402130c91884451685bbcc7c0fa74b3f561534c7d3ff54849"; + sha256 = "93508a741d87d40b794f0529ccb6abef895cc8063b7c9791e89e41936eaf4e1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ach/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ach/firefox-119.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "0a9075d13f61b1f221af6f5c8fb42769dab38bed01bd89e2baecc7becbc2c1d6"; + sha256 = "f5c1c2ed270695990cdb41ca40370c0b3bca8ac1a0157eaa2e78fb4afe7883d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/af/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/af/firefox-119.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "db2e7e15a47f59ed319e3f187df01cbb79760abfa8f8069062a5a3eaf08b5421"; + sha256 = "a01356f453f0fabe8d02c5e4d810c1c56efe3c0c04af986fe23f53ce338eaf1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/an/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/an/firefox-119.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "3d93e35e9761f2bd4f4e9f2e6c2a390ef761e401616e4c521b218b6e5dc8c6ee"; + sha256 = "089748a093475bff39e28774fca3d2ee325d9fae03b25b42ed7d9094ffaa24ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ar/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ar/firefox-119.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "49f0207c1902c1acfbbd91f7180784146b3cd4b7cb9d1b0e08788e4b83d8357e"; + sha256 = "ecf8e9df1a96f9db677acc2b51435c61101839b5da5ccd06a51787a414406e07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ast/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ast/firefox-119.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "36e4a73db19796c4e210476535ec0d7cd09a5a01c53d48fc04e7b219bed6f60c"; + sha256 = "7f592b92c90c131f0811c6114c43f77a3c39600cec07416bb76ee6caf82b8efe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/az/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/az/firefox-119.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "69ec44fa6a55cdac49e90708e10522e3511cf2a70d55308298833848f54ded36"; + sha256 = "d57c232fe0568b696196f16e211f993027d354fd555998d125d9468f8c77442a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/be/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/be/firefox-119.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "a42294f4bbbb0e150d4177806c545a166ea365b32d5d8fe1ef98efbd01b0aca5"; + sha256 = "e4f83fba365fafdb4b6923bb7e74890b2208278e0bed94504ff4b9edb1ed5fb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/bg/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/bg/firefox-119.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "36020ebd1d73c3067a5720cd9506167ef349414b415d69c3cc0a7bb688a5d40a"; + sha256 = "6ee691106c0db5dc35bb4f14918e4d4cabe67bc4c0b9fcb2048adda902054d68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/bn/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/bn/firefox-119.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "6256d8a4ead9fee6c51ba90600bf2df59bcabb4d88cefda1b76112c7f138deb1"; + sha256 = "965afc86cbf57c043f93326f52c9d53dbf854f1150c5f11d8773b27ee0b736e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/br/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/br/firefox-119.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3256a60a5f535c3c27141ace969bc8d216744a598c261781e8019178b3ed1b20"; + sha256 = "3dc242d4fa2b10f2d0cefb44eaf3f6777a08f9bec38b196cbc27c5ecd0f13724"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/bs/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/bs/firefox-119.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "f1278ed6ca583e238a05720580db0000bccd79f59f7edbaa35675137c6c9eb83"; + sha256 = "5b89b0c80ee34858eecaf569182d39fbbfcbb4378075d9be3af5e20d3eddbadd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ca-valencia/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ca-valencia/firefox-119.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "0dbbee488b4dab03ed06138e26bf3fcabb09717f0d933678a9cb1020bc9aa710"; + sha256 = "a3b0007731d232139441bf087b66d3226484bcf1acb816b1efc578bc9e7bc821"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ca/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ca/firefox-119.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "b2eec6c073460f15f071f2659af6f05feae8f2f8aad143e1259ca3518ef234a3"; + sha256 = "4024e50d07aa8ab332b3e2cf3c55d94d0fb563ef29dc14b11ec42b21e2e8a3dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/cak/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/cak/firefox-119.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "d07291412673b290946747bbc26b3efb886d60999295530ad05898e0379c66ed"; + sha256 = "d306e095f1f1021374024ae564d82c47a16e34cd05c9a51dec71b574838cede8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/cs/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/cs/firefox-119.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "55f3032400ffb32c04255351ddefcae07a992a0b5a7a2a8be296c1430ce4aa96"; + sha256 = "d2184a3457e444f982fe3ae512f8b062a0db9b1e1c852ca59f8595b7c884984d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/cy/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/cy/firefox-119.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "bf3c04553966296d316f593cdb93eb68e7d0961ecf680ce7dfef6bd2b01f8393"; + sha256 = "73b3918642eedbb3b65f53996a43cb244c516e004cbf37534d4c48d8adf48f83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/da/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/da/firefox-119.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "64598899ad5049990f1943db654dbd4fa58d86157884e8ec7168ea06968a5b10"; + sha256 = "9f1a123bf057298f2fc3799942b44b5e5db3211128f76de22d9903e4859401e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/de/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/de/firefox-119.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "a5d26d93fecddb0a0f86ac4c45dc2e92fbd4c997935caee7db614618a63652df"; + sha256 = "b0e68af0cebf4005298545f5e6b0c326fa44ce5a177e5b7bcb60248481cfe96c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/dsb/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/dsb/firefox-119.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "2390a7da3ecfa271344f91b614d2c2687a55147534e958611f006f3391780516"; + sha256 = "d07aa90bec4c9b902785d28724963c6a3ed33edca737ce1a49471ac073b58241"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/el/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/el/firefox-119.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "93ad4d3bd321509a59f40ec8f9c0397c0e46346d7226e979d063224711d9295c"; + sha256 = "c78872d539d91bbba9967da21914e595f5cb70dedf8c60c81f86d856049df4a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/en-CA/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/en-CA/firefox-119.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d5c46df7d6bc538a74beaa400a11954c1e4805b57536ce0701c2136283f385b9"; + sha256 = "7a8d68ebbbe1f6a3e012cbf9087f0e5fd71a27697ba7202d2911d32c2d7f5bf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/en-GB/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/en-GB/firefox-119.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "986fb4de351deb991b9fada275130bf0c428933ff64336c2000129a74a0be226"; + sha256 = "90005f2fcd03cbd2709e80f35e39026467219d96c2febcd6fe2165b44e4af3e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/en-US/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/en-US/firefox-119.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c26325a30d2b64307da11d3a1a78d9f7c41d03a46a22ecea00ed3a58ed43df89"; + sha256 = "7ee426d7b5e818b465f581e2de1eccf9b51a22ccfb11bb2029a7cacd162d1af4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/eo/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/eo/firefox-119.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "c728bccbe38178063da51bcf1be60e6d88521df6cf10c63d4f9ae340251037e6"; + sha256 = "b29ab4e7e52486beaad58f9e3b5d4bc3a2a9c64148393edc78aa2e000ed9dd63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/es-AR/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/es-AR/firefox-119.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "36d69a2e568e6725f9367aea137744dc5ccf0af7bd289ff6db706ce45a0df15a"; + sha256 = "17e1fa5e8625a79e29a1f0a4f5a1165a23ff7229a00d9224d69d3732ad70e873"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/es-CL/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/es-CL/firefox-119.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "611ba71f4398826c9493e40dd13e3b3283a44a3e93d5735b70e2db407206af9a"; + sha256 = "a38a14173f04083183aafe02ca15171e1741cc6d31b091ca8a9292ebc94c6b74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/es-ES/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/es-ES/firefox-119.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8eaa666f90279e963dab4d8642edf76b8923370554c5759ca6e8072726a062c4"; + sha256 = "36a9cd379370724daebff6df4f71ba5ec4c17295d30d8ebf97bb8fa89029c75d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/es-MX/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/es-MX/firefox-119.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6400e1dddc122a1d033ebf4c0fad2551db13262f9858da1cee5a89a96584fca4"; + sha256 = "af5bb98b2a4ae147315a5f63d88e9fa23a93ec9e0bf1c4863f83b636aaee6c85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/et/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/et/firefox-119.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "12ea80cebdb02b88535b9075452e8326cc5cb9e7766031efbccebe4b66920c99"; + sha256 = "b275483c1356b84259016497f421959d335b4788a862a4f4c79a079171917d28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/eu/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/eu/firefox-119.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "fbcc8428ce547e8b36b49cfba3f9c8d5470c906c630cecce24f94629c5ad6de2"; + sha256 = "227747752cd5a0406190986db8e434455b2212f57b09c291682b5ed75bc469ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/fa/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/fa/firefox-119.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "0de1dd537805146200e4f0b27d14a720037f8b8e095c152c4ef2edd3bb4568f5"; + sha256 = "34235d52c8b81a6c784d76a45aaa6743c94f3d941f4dae4d224a8bfc9cb5e27b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ff/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ff/firefox-119.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "7eb77e41602b9a388f43c8f5af46de43799e729ea64c576abb7988fd3578d905"; + sha256 = "8c2e0ff48c32bda68708400d07512fa56774fd16608a4dd682bea7f9e1d6cb91"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/fi/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/fi/firefox-119.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "3f0c0c103d41521b989dfe14ef549c2920ea18a88859796a29aab0fe03ab7cab"; + sha256 = "c3a78941a36573c22474f0be4882e831893380dff9b1d742489cf6889a136cb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/fr/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/fr/firefox-119.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "41de5291d7936bc77daa8af8ba7ae9e55b63d7a2ef4e2590d2e36fcbee080db7"; + sha256 = "21e5ac594c682a210cd14944c9674a35eea5f45c47c1b33c43e79a279eb04a1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/fur/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/fur/firefox-119.0.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "4e43d964879b19e8cf952b1d0022a44ace931d520e9e943fb5ce40c1c71b76ba"; + sha256 = "acfab957500437f62d8a90b40e568a0e616d3ad52f6db984c1624e228dc7a577"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/fy-NL/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/fy-NL/firefox-119.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ed8062d98e87179a560685f35e58d89fce025b358b1141716290781622bd541b"; + sha256 = "c84b7eae53b29265bc37dca53d9f8ed374ac225e488ed923ef125ef41b9ba67b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ga-IE/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ga-IE/firefox-119.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "62ec8fab3a46a234abc90d24d24b33695bd112523b7cbad98416397eedaf70b0"; + sha256 = "6c8cc765c33caecdf8db7fc0bea6094caa7344ab5c5301bec6cf5248b316ee62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/gd/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/gd/firefox-119.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b6df887831d49161abdf3abefbd295c2e25042fc735e1983882fc1a635964321"; + sha256 = "1d9db92cff230170d7271e57d0c76148fe6a8ee20531bda73e8c72f6b7cf2aae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/gl/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/gl/firefox-119.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "68669a7a8e7896f42bdb768a78e80991ce568dc03cb0c7cec422425c77a84bcf"; + sha256 = "344269ae91ff0cdeb4ae9e04cf3628a6f30ce97ff67b64578d79c618d5a5aec4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/gn/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/gn/firefox-119.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "de36f07f0c36dce4b9cf1892dd9d38a09012e3f2fe772ff0280c4ebad8de4f5c"; + sha256 = "96b9f44853921d21c7510ab029cd8c55f7ac628de0802fc3e6dcfd7852857304"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/gu-IN/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/gu-IN/firefox-119.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "8633ab5d773aa7e409279c4a0bf67378a20b3fcd6b0e552743e752de2c6c8ce3"; + sha256 = "9cb60dc534dd3e4928a2bd9ee2f7c19fee613781cfa8fb84c14cc77da6749e4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/he/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/he/firefox-119.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "aba5e41f9afd5321e8e4140757eeaf2d227a4567c989c985c4bfe884ba75bde3"; + sha256 = "3c844f9980014b146fe1583991ee53907944266a86b862351e23b27434b975b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/hi-IN/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/hi-IN/firefox-119.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "cb6d3b6173b985d9a7d215d6c0bf044cc59b733c9bbf20abe5d70e5bbf855f5a"; + sha256 = "b228b0cd269ec09c57c461f4afa57530c0ec61a15bbd46215608feffb631c01a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/hr/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/hr/firefox-119.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "1894c5348d53cb37016140f130f39719aaeb44d87f23e8b51e1e51522aa8e39d"; + sha256 = "a0d088e6802093acaa87d1e254ce5048b55fef39e7c0e838e389f7b4c2629abc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/hsb/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/hsb/firefox-119.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "39835314f56d88c0f14edccdffd49cbdb09e30110a90e82bb58b6175acde9927"; + sha256 = "d7083468a49a9e38a6f1f5b45c6605a0f02843057a74c4f38b03d531c2c79f5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/hu/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/hu/firefox-119.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5477d69e9b42e76cb9c4ff53bf86e347ee5b4b98df0912adde37480b6ac21f09"; + sha256 = "359c893821d78268ef17d84bdca4770af0bffcf1b410e67c3694effe2eeb065d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/hy-AM/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/hy-AM/firefox-119.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "9bbf6bfbe53f0b098b98720029f4cf283bcef537cf308e51cafbc71b1159e60b"; + sha256 = "511e1898738fabac4a24ec52cb7e6bfa07779bb8138624f298d4607eba43df83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ia/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ia/firefox-119.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "e76ec7d30f7eb2be1c5220b975ba5dfe0f50b8c01cca0e7e7c508df45126520f"; + sha256 = "fdee380e522e5339b9fb79534761ef79bcbf633d1ce28bd90f7b99df923bbf59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/id/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/id/firefox-119.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "092ac344c44c0d88e1c65b6819f30875a5618acde6102b7dc8bfe668c802963e"; + sha256 = "049d3e5e015f19217831ca5f73097b4d88217b2acda57d501568704c58744eba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/is/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/is/firefox-119.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "3e8cc9c8b1e9a7d14a356004db5765c7a57aaf5b15979ca57dfa53d5a792287a"; + sha256 = "63b29fcd76565a521ba39d816d86e98fa9c2345d1d9f9ad2e0223b100ab6aaf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/it/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/it/firefox-119.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "e3d3fbac0d5051d37773257625136f539d23d150811c41f5b6b6fa98ec4e0168"; + sha256 = "15003e0970f03c566f7e8ba81ae211106957447d8f779ecb2edd363c0499e0a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ja/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ja/firefox-119.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "7ead75588a0564b9488f653a806077994f201b53a328f07cac4db67233e31bdd"; + sha256 = "3e513ff795ad0fed83b9b83294a31d575853ebe681110db05529b8b39d328c2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ka/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ka/firefox-119.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "de7379ecaac8ad0a5995b4707ee64f05a61f5557960edcc37f9acc3a51303aa0"; + sha256 = "cfbeab366980e0f7b64fed447503c476f227fefd1dfe68e7389421bae51d680d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/kab/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/kab/firefox-119.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a185d80b13a34c71ca70bc69a240e2e5666fc467f03428d9596d3013029b33b9"; + sha256 = "2a9764f29abffc179144dc891de76ae55bc0566a9b989d5f68c4078e73295827"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/kk/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/kk/firefox-119.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6005f58a67abacfbcfc2699c56813807b91edb1dc6ae167c8efc097ea504d292"; + sha256 = "8c0ea00720e05d12dbfd7500f6f1ab34d0fbeec02cd0155d58070b6de810130d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/km/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/km/firefox-119.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "d8b76729b6ebc3ed6832ece6c56244f9951f4c6aac3bc6b6c9597a93656bd488"; + sha256 = "8c1f8839665ec7bd802450c3934bbea394346922cbd1a5162ac8ef31672b6909"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/kn/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/kn/firefox-119.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "7e1f442300e922b627ded2e6d617fb7f8a87e390b4010bfacbc5f125b270e769"; + sha256 = "3f7120ec13df4b13f39562e0ec9da4033f655a2a026e37eb053bff7e7ec71e3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ko/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ko/firefox-119.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "0f64cc9ff2062e9ac8fe5a40231aa295a1160c20cdd31ab6a0a5269a9e4199f3"; + sha256 = "6bb3c61886f6f3ee07fc8e668d54e3cfa2d82487a51ae1e8090c8e07df2ba74f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/lij/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/lij/firefox-119.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "020ee251ebabdf788baffec0126bea8c7170f1e3047eb669ae64993134ac6433"; + sha256 = "22ef5dcf3706cc39bbf29adc00f8d311600dfcf6e6863348507cf658ba9e0d47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/lt/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/lt/firefox-119.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6b88440fffc2f0c53999cc25e87fbc5dbda6ad4733886b9aea66262522be142e"; + sha256 = "de443a2361af84f8f3051c2d00da99dcfdc70669980d59409cc9c8b74772a182"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/lv/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/lv/firefox-119.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "608d6074ec95430dfdfb6818c09f714f3a7df6301d8730c071fb47f0c5e372f3"; + sha256 = "3ecd36232974b705eeefd728d411926c1c92cb0a450e45aec636f884b9a25f9e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/mk/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/mk/firefox-119.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "e77851b573aad33b6004d6757aa74ea16d781c859413e56c71e49d4a30ab04d5"; + sha256 = "9530f8bfa744772847988e945c70fed2f6e79fa3013d59ead836477fded6abf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/mr/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/mr/firefox-119.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "cc337ec0dc81840620930f0bdd3d06ce987c5acdc4471af78392b6146a935e4d"; + sha256 = "b69846b1b93558687b161c6b6a65a36b71b5cb9d483c4bfe83ff3defb4fec739"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ms/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ms/firefox-119.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "69fff136f5616ad6c89ccbef2dcf6dd788f3c0c91a7ab7da8cfa758fadb5f3a2"; + sha256 = "85484d41f6de8cc019194f729682073c40d550ca87d28433b31c5104d35f6746"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/my/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/my/firefox-119.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "5cb7e8a402d4667bff595711df4bd1aea230ffe23d2bd2a421b5304109e681ba"; + sha256 = "1c9071c14396aaf34b2221762aa436103ac0e12a40b42f9908ea887c2760684d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/nb-NO/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/nb-NO/firefox-119.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "8f7e81c9dcb7b2fa89074dee76fad6db0a3bda1dda30b2efe9b21728c4171f61"; + sha256 = "56a04b6bc327fe1b2e28c7da603596c7309b559cd22bdf1d6df6e3c53a6a1c96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ne-NP/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ne-NP/firefox-119.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "c93461d9fee98af8677c3dd313447dfce1cea25d8feeb2fe3bf73ef86df69f45"; + sha256 = "0765df520a6332797b8da6d91cfe43d2d499fd2a9d1d550f1908a234f8f8c0dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/nl/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/nl/firefox-119.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "b2e7eb45e1b883b8a9144a3342308892d2e408c71ccf524b818cf16e00f95f4d"; + sha256 = "f10c04af0177e1e6995b4b370ed000f7ae9db9a539dcca8e098d4263d4d58585"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/nn-NO/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/nn-NO/firefox-119.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "1a768448a8075fff9ce86df5b9e83a1f46f1cd1c82053bb1f74b966394c724cc"; + sha256 = "218e6405bb9a0484f424d88af19475e0838a5f49b793377e6a8886f232fc90e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/oc/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/oc/firefox-119.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "bd30931e94d3f9a354c7fe1ebfea7eb50ad4dcba25866b4c1e8c0c4dfa5faf91"; + sha256 = "2ee964aef5edc66f602537e70d107df09625d5e872cbfb66b2a27021f98c6c64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/pa-IN/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/pa-IN/firefox-119.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d412067a51123b1719211c411e4a2a5cf934d7ca1ea7e30ae8e5c5619b8fc219"; + sha256 = "8b0ba60b30197627022ac2a5cee233a0f58c3b3eb264b9d803196aa6a625636d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/pl/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/pl/firefox-119.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "ecc4f762919c55a62db0a062a37eb1f7aa13e6e6496e6feb37c6bae73055701d"; + sha256 = "97008357b685110881ccb178877b0e82e10e9c6a7a6a102829791c375facab48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/pt-BR/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/pt-BR/firefox-119.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "1edc8b7680643240fe7b7c2a1524ba0772c38fcd002f638db9597138101f9737"; + sha256 = "875ffc30562361411ea0652259193bb815db19e14e85b259595bbfb2ab35aef5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/pt-PT/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/pt-PT/firefox-119.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "224a2ea6dc3f1350f850bfb8f54d1e008406b4675a341707bf603d021df328c6"; + sha256 = "eabef633ed71284df0d339a9fd6d9d142bfd15f71e85958fa2ea6c21d5067088"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/rm/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/rm/firefox-119.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "aad37a82e518b7807e0939aea64371cfc32431d9c6defb3fdf01e1ee35c34857"; + sha256 = "dd30d7b7e8b7fd388856841a5291a96ae70a61abb683a922ae6c34b454effc0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ro/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ro/firefox-119.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "e099ca30cd6bbab9d6f3d0497dfcc1351bf77947138b334e895b2d60f1c248b1"; + sha256 = "9a5fb9896e80bdcc4d5dbf9597121bcb3beb869f060191ee36c51ad1e850e02c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ru/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ru/firefox-119.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "86231533e4bb79750ab0bf0a2db09fea3a036ce476f734d2b98776221646cdbf"; + sha256 = "211e864ca9abb665ab7c1a18e811b746a3bfde9f49fe065651cc2042b6bbf522"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sat/firefox-119.0.tar.bz2"; + locale = "sat"; + arch = "linux-i686"; + sha256 = "8651d750d4446d32664301d6d9e7641a6c98d2795423cb57e4a7644b1a280d0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/sc/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sc/firefox-119.0.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "1e5d6e0818e8ec90c8956bc095e7f41dc350dcdec6a8c64460eddf435d2fcdd6"; + sha256 = "02826300bcb7106dc1cfeaecfdc3bc7ec9539dc8c81eb95b6a950795059e0805"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/sco/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sco/firefox-119.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "e72d33997968984d98773f6b66f95311ed88b5b300b7b43f1ff40581f3d340ec"; + sha256 = "409d8ebbbbee320d2d446c5978fdfbc8cdea259918cebcc08c909c82cb281140"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/si/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/si/firefox-119.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "9c443ebf18ca933f32f913f01aef2238d1a837d04bbd49e03ca518fb9b1a1608"; + sha256 = "9f689881dd71c69b36b48c383cdb1683bd06596b57491526207ad3036d16d52c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/sk/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sk/firefox-119.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "ba4b1e98ad6524176132ccff6beb61b990b6e4ad717af382f492a62e4b3cfec0"; + sha256 = "5ec8fb3d368f3e4e21dc22e9be79f4feb35fa0148012e4064a79b8990cf57bb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/sl/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sl/firefox-119.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "6379ec3854e9e598daec93f08ca1bb5a01a5d1782f4cd1f576fd974b580e96cc"; + sha256 = "2f570f27edd24c3e8d996e342ce74b2ce0ff2c591d5bbc3624077cdc5a57a8fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/son/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/son/firefox-119.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "df181b95e0b2e4353aae777359c0936e33dfe96bb0985a83adccbbf8d33cb642"; + sha256 = "c54398747780e8e8f2390d4b1432be5e2bd8d859c586d754bf53ae3956a5f397"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/sq/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sq/firefox-119.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "1edf2e6880a25b807f35d649ecb1044b796308f3344bbcdfdaf215dab7ecf09b"; + sha256 = "7b322cb127c458cc116de76890c1857ba1be779a75c3109d900e3d59324cb36a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/sr/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sr/firefox-119.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "aac0c85bb49a4c324469f46e82f52f86641f09733867955496be3cc656c1a3ca"; + sha256 = "3a199cc608b12c96658f2fad08714d8c996227a9c2684e4ed65c171699e76722"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/sv-SE/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/sv-SE/firefox-119.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "3a7a8560b03832067efc7a80b0883b16419705a7f40daa17c0868a865b0aedc3"; + sha256 = "7cd8531661e1e3d73e0e4bca9bf017d2842c569941d3d51b4d93e875bbffdd6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/szl/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/szl/firefox-119.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "fe848112295f45db53d8531cf36849b7146bf450b0880a9516c3721394417185"; + sha256 = "c1bb24d2261165def15c66e380dbb6d6ff4c6802f6fb91987e2a25a0542902c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ta/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ta/firefox-119.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "849953dda3c50d0951ee9364fa932ba4ab6c528af08f25ad7908272de50e4072"; + sha256 = "2273897af354a0a3d66608dca218379586976742e2344b0eda49514dba4c3c8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/te/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/te/firefox-119.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "bdc108bdecf2c6e90143593e4dd9769f31e06e4c18b00dcf74953c2a87a23b18"; + sha256 = "2d2945ad65eda81031b27720e3d729453a1548e91b58bf8a378c52ae18a0c1f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/tg/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/tg/firefox-119.0.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "0dea836b74226a462d07ffc6bae37976b5cbf2002c36e02f088f322717b08e9e"; + sha256 = "9ded627e8cfefc2ae50607ffff0eac3c21e3256dc2b086e74bb259318908df48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/th/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/th/firefox-119.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "962a5f4a13888e455c2f7c33c6c7787ac6b1add3d55f8b8208fdef4f151b552c"; + sha256 = "30ca7ae93bcfd8c577db3fb34b029eb7a940486f4672f5dfcc021cd9bda087ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/tl/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/tl/firefox-119.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "883a6069c8edcf048e3496e9bc878d4d5cd33c6dc52f066a1d53e40a1eba4fc3"; + sha256 = "361c229f5374b36741423b416bab348ff44329737c89e077f9f3a6610b450ae9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/tr/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/tr/firefox-119.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "be059c6408be614401cb118c9e5821bf68586e4cc880ace150e4be3bcd4d0827"; + sha256 = "85183fe5a667755a35e34581b4dd47a1cefed6f9db134eb73d530bd09eacf10c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/trs/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/trs/firefox-119.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "f8e4e7409b11080519db94c92b91296f3f391bc35b42e2917548d562580c85c0"; + sha256 = "40248dd2e4642f7100f4713e1d4b79a632c889926b5ab36571cdf753c780186f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/uk/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/uk/firefox-119.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "eed992481cb5939224b2ab1f5f816f8fd2814233a941a58ea27dcb91f569d5b5"; + sha256 = "10d93be092d85ace9549dbab2ee86e9c5b672542c4c85265034c3482d08021c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/ur/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/ur/firefox-119.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "97d06604445cf9e1bbff1acf9b5ad8692cfd92cb30764085761dff86831aa876"; + sha256 = "08e7f68c05759df1abdb7b6196cb10b0798e7af1ff659a17aec259e9a9b6a843"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/uz/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/uz/firefox-119.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "dfc2a5060802e9db7cca77ba610338b505169b31144d2f09e55ec2a89a7763ee"; + sha256 = "bfdc7e8d348cf0306ed591d46b2dd60d83015e9ce6688d35d0f1a59e0904d750"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/vi/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/vi/firefox-119.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "f070ebbbab3addb2e4fcb1a2a8a9868498dec7d2ff04fbcb02a418f85d3e695c"; + sha256 = "b3c54a453345e0331f5d20693eb9b30eec0c8313c5c6d952e8d9369da970d57d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/xh/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/xh/firefox-119.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "366e7a62d0547ea0ef9d5954e751ca2e2b51a7b055e49b4c77e29daf5ad3aecb"; + sha256 = "56a04a202bf58cdebc18f33dd79cb64018b32ae288d64e00e9b30b9b49269181"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/zh-CN/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/zh-CN/firefox-119.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "3e066b02d289734149bb50cffeca2ed1bc4678f45809adfae38a35989b2b267c"; + sha256 = "7f765179cac4472b7c39e5c84d8363051c630ee310f4feb44c6022a68eec7ad3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.2/linux-i686/zh-TW/firefox-118.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0/linux-i686/zh-TW/firefox-119.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e3f088c818d96e0eb96efa24db888d352e296ceb9f08a886a875aa71006c70b8"; + sha256 = "7294e0e6eee46223ba9d9f133eaf8f2245a77ae6cb7795a09664592b473a00ab"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 94f01b8af398..e58ee63d08c6 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "118.0.2"; + version = "119.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "fe9d7951927e44aee98a15840820251b779cc427f27597951497bd01fde3c3f2857942535c64c9d1a64f877c43802771304ed97254bffd9216f554e1af9efbf4"; + sha512 = "4b555c444add36567fd538752b122f227cf78bb70b72c79e6d8ae8d9c2e61c3cdacfae79c37970753b8b5c7716b28c686071eb7b551773c30a76852f3550676c"; }; meta = { @@ -90,11 +90,11 @@ firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.3.1esr"; + version = "115.4.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "65cb6fc46bba03eed742bd67f8e36b63b19f2ad7b85d2f503595704a4e88f554758a1e66ba548c8efe97a76322fb2514db72e6ff4bb2992d1aaa86edc3af85f1"; + sha512 = "3ee680c5c503df7e4913794b7029ccffc10889f8f259f16030b24c1c18c1528439123532374ccb3a7e7a0d5d64068949cb85638a29694a7d99b74dd403ddefdc"; }; meta = { diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 28e97bcaa41e..ed1ec5692a0c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -34,6 +34,7 @@ let , nameSuffix ? "" , icon ? applicationName , wmClass ? applicationName + , nativeMessagingHosts ? [] , extraNativeMessagingHosts ? [] , pkcs11Modules ? [] , useGlvnd ? true @@ -62,18 +63,28 @@ let # PCSC-Lite daemon (services.pcscd) also must be enabled for firefox to access smartcards smartcardSupport = cfg.smartcardSupport or false; - nativeMessagingHosts = - [ ] - ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) - ++ lib.optional (cfg.enableBukubrow or false) bukubrow - ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native - ++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector - ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator - ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration - ++ lib.optional (cfg.enableFXCastBridge or false) fx-cast-bridge - ++ lib.optional (cfg.enableKeePassXC or false) keepassxc - ++ extraNativeMessagingHosts - ; + deprecatedNativeMessagingHost = option: pkg: + if (cfg.${option} or false) + then + lib.warn "The cfg.${option} argument for `firefox.override` is deprecated, please add `pkgs.${pkg.pname}` to `nativeMessagingHosts` instead" + [pkg] + else []; + + allNativeMessagingHosts = builtins.map lib.getBin ( + nativeMessagingHosts + ++ deprecatedNativeMessagingHost "enableBrowserpass" browserpass + ++ deprecatedNativeMessagingHost "enableBukubrow" bukubrow + ++ deprecatedNativeMessagingHost "enableTridactylNative" tridactyl-native + ++ deprecatedNativeMessagingHost "enableGnomeExtensions" gnome-browser-connector + ++ deprecatedNativeMessagingHost "enableUgetIntegrator" uget-integrator + ++ deprecatedNativeMessagingHost "enablePlasmaBrowserIntegration" plasma5Packages.plasma-browser-integration + ++ deprecatedNativeMessagingHost "enableFXCastBridge" fx-cast-bridge + ++ deprecatedNativeMessagingHost "enableKeePassXC" keepassxc + ++ (if extraNativeMessagingHosts != [] + then lib.warn "The extraNativeMessagingHosts argument for the Firefox wrapper is deprecated, please use `nativeMessagingHosts`" extraNativeMessagingHosts + else []) + ); + libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg_5 @@ -338,7 +349,7 @@ let install -D -t $out/share/applications $desktopItem/share/applications/* mkdir -p $out/lib/mozilla/native-messaging-hosts - for ext in ${toString nativeMessagingHosts}; do + for ext in ${toString allNativeMessagingHosts}; do ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/* done diff --git a/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix index 1f898ed87986..054726f65948 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,18 +1,17 @@ { stdenv, lib, fetchurl, fetchzip, python3 , wrapQtAppsHook, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 -, libxslt, gst_all_1 ? null +, libxslt , withPdfReader ? true -, withMediaPlayback ? true -, backend ? "webengine" , pipewireSupport ? stdenv.isLinux , pipewire , qtwayland , qtbase , qtwebengine -, wrapGAppsHook , enableWideVine ? false , widevine-cdm +, enableVulkan ? stdenv.isLinux +, vulkan-loader }: let @@ -26,20 +25,14 @@ let }; pname = "qutebrowser"; - version = "3.0.0"; + version = "3.0.2"; in -assert withMediaPlayback -> gst_all_1 != null; -assert lib.assertMsg (backend != "webkit") '' - Support for the QtWebKit backend has been removed. - Please remove the `backend = "webkit"` option from your qutebrowser override. -''; - python3.pkgs.buildPythonApplication { inherit pname version; src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-Oer0p/DwUfOejUCgSCSkMvLLAjNyJx51qgN7bcQQ2Pw="; + hash = "sha256-pRiT3koSNRmvuDcjuc7SstmPTKUoUnjIHpvdqR7VvFE="; }; # Needs tox @@ -48,13 +41,10 @@ python3.pkgs.buildPythonApplication { buildInputs = [ qtbase glib-networking - ] ++ lib.optionals withMediaPlayback (with gst_all_1; [ - gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly gst-libav - ]); + ]; nativeBuildInputs = [ - wrapQtAppsHook wrapGAppsHook asciidoc + wrapQtAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt python3.pkgs.pygments ]; @@ -74,7 +64,6 @@ python3.pkgs.buildPythonApplication { ./fix-restart.patch ]; - dontWrapGApps = true; dontWrapQtApps = true; postPatch = '' @@ -112,9 +101,16 @@ python3.pkgs.buildPythonApplication { in '' makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" + # Force the app to use QT_PLUGIN_PATH values from wrapper + --unset QT_PLUGIN_PATH "''${qtWrapperArgs[@]}" + # avoid persistant warning on starup + --set QT_STYLE_OVERRIDE Fusion ${lib.optionalString pipewireSupport ''--prefix LD_LIBRARY_PATH : ${libPath}''} + ${lib.optionalString (enableVulkan) '' + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [vulkan-loader]} + --set-default QSG_RHI_BACKEND vulkan + ''} ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''} ) ''; diff --git a/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix b/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix index 269f97ac3948..2e2ca3341d83 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.10.10"; + version = "0.10.13"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-Lu/itKaF7mSG/jwg2sA4wNkbzBWdDY4pfwHB0elI1Bc="; + hash = "sha256-DhMoNI1eRzP9FK752Z8sAcuj5dpu2vRqXRv4tbSYmLE="; }; CGO_ENABLED = 0; diff --git a/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix b/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix index 887d6e6f5c29..8e1c1c14fd16 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.15.10"; + version = "0.15.11"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-iIv4xOqggbMDvscnaaz0QXjeScJ4SzOP0fvfshq+vyE="; + hash = "sha256-czU5o6QS4MsXyyedQ0nzwDiCQacHcDsbm2iDk7nU+Y8="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix index af27ec6c9302..30710a814652 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-mbsmsNwUDjBqEbPuYFWHZPBfqDa92PnpiuD10mLhiEQ="; + hash = "sha256-yACUJY//y1nqu0PfmCuREC8k/koJEB6yPV5IXLnweB0="; }; - vendorHash = "sha256-FUimSBMZI4BDtNKnlzmxe2HiL7MGIUh7SFC2dwWYT3I="; + vendorHash = "sha256-wOf9OWbqjxYJio57lMBdp77RG5hhRrVU75iJiI8g0EM="; subPackages = [ "cmd/clusterctl" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index b70ecd725eab..9e0470c70e82 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.157.0"; + version = "0.158.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-M0XhkmYdmKpaA1gTXGgI7XNqIAuerV2NqfUI7sIgIiw="; + sha256 = "sha256-768rlhkh8scQbzLvWyjyQSba4zCY/ydYreve+HmcFgw="; }; - vendorHash = "sha256-RRnziHhM3pxoi5dZSZI5bkGWIp3Nx0TU3mVsOoU/CCM="; + vendorHash = "sha256-ip01Uj720Sa11ni+8//U1PkHgiY6ttftvMHdxZgfKLk="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix index d958e06b7eca..ccbde5deac97 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "50.4"; + version = "51.0.14"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; - rev = version; - sha256 = "sha256-+9AnzY/vnB1OGzkKmYL0sxWS17NV+MGnHNXGOtt+BKU="; + rev = "v${version}"; + hash = "sha256-aFeegAFGRofGa54roJ3EACvk9179YAwsgO97eeoOd6s="; }; vendorHash = "sha256-Vcn1Ky/J/3QiV6M5fLedDcpkLp5WsVcXRkOEgkKPYEQ="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix b/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix index 0b63cc7b0f5a..b119bfdcde2e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix @@ -28,7 +28,7 @@ let meta = old.meta // { homepage = "https://github.com/NixOS/nixops"; description = "NixOS cloud provisioning and deployment tool"; - maintainers = with lib.maintainers; [ adisbladis aminechikhaoui eelco rob domenkozar ]; + maintainers = with lib.maintainers; [ adisbladis aminechikhaoui roberth ]; platforms = lib.platforms.unix; license = lib.licenses.lgpl3; mainProgram = "nixops"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix b/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix index ac44c8efffdb..95646c800aba 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ocm"; - version = "0.1.69"; + version = "0.1.70"; src = fetchFromGitHub { owner = "openshift-online"; repo = "ocm-cli"; rev = "v${version}"; - sha256 = "sha256-JKR58is8SzNmEQ8x1om1anReLIbNCHJkkzZQ1SiQ5J4="; + sha256 = "sha256-J/CN1cxEcKiEt8WMg79nA4y0gp18vSDEsBqvYuQVaIk="; }; vendorHash = "sha256-3HLTuWf4mK3r92s2mPE2yl/rrPxgcsB9EmrxkiJsMaE="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix index 1d0356e68ebb..73984e863600 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-RoodFtZ4BINyPxxpVkliMD9Sam0eRujvd3gXR2Hxk70="; + hash = "sha256-l0cR5BDUREBOOac/b87re5lzq3maz8Tg3msalXV6zAs="; }; - vendorHash = "sha256-PIuSn4qp6bLPFJwkLEb+pX1ra49IkxXYDRzEFbVqVI0="; + vendorHash = "sha256-/l0crKz1Pks2yiQ+t/rY2ZxB+jYCymSfoILtHYtQ7K8="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix index 126a083b5b34..ea6166475065 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -17,16 +17,16 @@ let tctl-next = buildGoModule rec { pname = "tctl-next"; - version = "0.9.0"; + version = "0.10.6"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-zgi1wNx7fWf/iFGKaVffcXnC90vUz+mBT6HhCGdXMa0="; + hash = "sha256-4kNuudnYBD6rgIkysP7dEjsRu/dFvTm3hkbBYZ6+Zh4="; }; - vendorHash = "sha256-EX1T3AygarJn4Zae2I8CHQrZakmbNF1OwE4YZFF+nKc="; + vendorHash = "sha256-ZECwF/avHKE4L9GHa2w5Lx71wD6UIAaPpRkUtpEVafI="; inherit overrideModAttrs; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index b0c4515b2909..589754a397bc 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -46,11 +46,11 @@ "vendorHash": "sha256-Iuz5yxuxRwzj8BvoEXp8ePzaSA/vb7WbffljO1dBtxU=" }, "alicloud": { - "hash": "sha256-d1KJITBU/jo1SFQ2Oe39yE3EMjioPVCToA1MpvuzFqE=", + "hash": "sha256-ZcING8FOCZE+Wrpr2Gov0WmdjQUZU3K3Moj+0gMVKuQ=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.211.0", + "rev": "v1.211.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -82,11 +82,11 @@ "vendorHash": "sha256-q9PO9tMbaXTs3nBLElwU05GcDZMZqNmLVVGDmiSRSfo=" }, "artifactory": { - "hash": "sha256-dANkX/SnEyQa3VWOVdkEB9z2Eh/m9JYgc9YeracmepI=", + "hash": "sha256-knQZsPb41JJjtSLV51/c33jlXM5Jud0QIaB/78iFQKs=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v9.6.0", + "rev": "v9.7.2", "spdx": "Apache-2.0", "vendorHash": "sha256-H91JHkL32B1arXlqwhhK8M24s3lW3O8gMXd+0waMIKQ=" }, @@ -119,13 +119,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-Wt6rcHCxn1RPIxblL/Y6JWfsmOcloMZ8DMWvoVz/xrI=", + "hash": "sha256-tiSCEHOjhOXW4XcQ3FrkNg6AVtFrDLqVe0fB3o1KAmU=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.14.0", + "rev": "v5.22.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-wF4dsQItVSXpJWBiOmdt/5ZaZeROmIxNW66Ec80PudU=" + "vendorHash": "sha256-pRnQUCuAk02dM5NozNirH7c+meewwf0DMjwZlazD30Q=" }, "azuread": { "hash": "sha256-aTIxJgKk0bRvJyONn7iGLbsEbfe0Vzmtk+bTj3tZFPI=", @@ -137,11 +137,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-l26MIkMpB4/vO6r2u7vyepAGxRw8CNPDhcUD/USWteg=", + "hash": "sha256-jgnWSOwcocdWS531sjOFYiNx43Orx78WfS0glHRznfw=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.71.0", + "rev": "v3.77.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -155,11 +155,11 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-dlU8e7IvZ6Kugcfo0rkq7sNkEZwZ9h6xQr4oGkGUWxo=", + "hash": "sha256-h4CWzwvxRhA0DYjkVC44/hbwQMZ6uWGQqOqaM0mkYt8=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.18", + "rev": "v1.19.19", "spdx": "MPL-2.0", "vendorHash": null }, @@ -191,13 +191,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-Bk+qBPT0AX5gPOs4NIiqEpRSxYfc8KtAclNQ0aGoarw=", + "hash": "sha256-WVDbC8zLKrKi3dvpYmu8n0W/+YJKrpyQhA2ubcu76J8=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.0.3", + "rev": "v1.0.4", "spdx": "MIT", - "vendorHash": "sha256-VAAVq7C1IJl+KJqs2skK7zI0q6PixDVYQXI1+3kJT0M=" + "vendorHash": "sha256-UleQAfbWR4Zv0U+LgDs9JFcqTN5yLwHGw5EUUi8SnUs=" }, "checkly": { "hash": "sha256-AFufcitZh9UwkO1p52PjjZEpYxLLdtLWQlUJm4PJjWI=", @@ -227,13 +227,13 @@ "vendorHash": "sha256-dR/7rtDNj9bIRh6JMwXhWvLiAhXfrGnqS9QvfDH9eGw=" }, "cloudflare": { - "hash": "sha256-U5NRO5QdSPxIj1lmkWhvHJii9IltWYLQyIH6i3FzSN0=", + "hash": "sha256-xnAEEKKHbVeITO1RRCyt2/LEDlqUqCf6jDHShhKLDwU=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.16.0", + "rev": "v4.17.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-+T9kifslEWZMw6VMCEdyq+wLYBWO0Z23qYuHoezdtTc=" + "vendorHash": "sha256-i5pO4dY3dnNy4XlIPk5CMYMqXzKyfwQWjettF5vPXr0=" }, "cloudfoundry": { "hash": "sha256-yEqsdgTSlwppt6ILRZQ6Epyh5WVN6Il3xsBOa/NfIdo=", @@ -291,13 +291,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-tmiX8+PLBUK+0w2QrUsXSKmnxO6DbnrivwYB/skK064=", + "hash": "sha256-Etp25ZcKy+13SbsEtpVnNgF8GpYhO27JwlV8wRkaSOo=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.30.0", + "rev": "v3.31.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Wq2R+Yted1J8KNogGRXSw3P6C6qX/2ShXD7ZzLTpjRE=" + "vendorHash": "sha256-0sfHf+aBV2vVScbyCPFtI6wj5KE6kNoioh4tyHhNOKc=" }, "dexidp": { "hash": "sha256-Sy/xkhuNTocCoD7Nlq+pbvYiat4du4vZtOOZD2Ig3OA=", @@ -381,13 +381,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-WRiOk+Yz83FfQd/IrP33ucSHDz0B1Ay89LqqVG9a+u0=", + "hash": "sha256-cUHVp4oVQ2e1d6kkByI1QsvODZCvkbw0goW3BjRk5Xw=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.17.0", + "rev": "v1.18.0", "spdx": "MIT", - "vendorHash": "sha256-mTOwVTNeuwJaGNCVvt1yrtTY917JAHntOuBewTSISUA=" + "vendorHash": "sha256-woYNslCzOOg9m8/Dfk42ZAWJDi8HZeqyVQw1MuRhoOE=" }, "exoscale": { "hash": "sha256-KtuGrHPSNSyuwAXYpOHiVX2svWj5+6EkXb/wZAnW/6E=", @@ -408,11 +408,11 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-A66R6W2LdlS5FtASdA3jOEoSGvaFRiufsJ8c3vzarKg=", + "hash": "sha256-T3iQ0QIB3lfzcTx1K7WkgUdKsl/hls2+eorPa0O19g8=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.5.0", + "rev": "v5.6.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -472,24 +472,24 @@ "vendorHash": "sha256-tMFNjdXIlyBELrLRKkJySXlQbuHDybVhSTw/J3dXZ7w=" }, "google": { - "hash": "sha256-6BCZcBPf6wPpjIcQ/6WaBf+BcIBHNBdfdCGrWFXxMV0=", + "hash": "sha256-9svwUHvA5fuYjfiFWQLQs1yOejYprsiSF+58nPWN/Vs=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v5.1.0", + "rev": "v5.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-53eUL32N5ZPaKiplltP6upA/v6f7itu0UIuD6QhOJ0g=" + "vendorHash": "sha256-aVJuAYF5S/fkFHRk34HIN9p+P9MgHGh0RpeqC3/gchY=" }, "google-beta": { - "hash": "sha256-6e5SWf6GmCYGbC6fHBT65HxihS0OB2VcqvUW8vTx+MM=", + "hash": "sha256-z8b77hlIcB1Uthkl+aWQH9bkkRb+A9Y/EEUxNTU4wR4=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v5.1.0", + "rev": "v5.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-53eUL32N5ZPaKiplltP6upA/v6f7itu0UIuD6QhOJ0g=" + "vendorHash": "sha256-aVJuAYF5S/fkFHRk34HIN9p+P9MgHGh0RpeqC3/gchY=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -682,13 +682,13 @@ "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA=" }, "launchdarkly": { - "hash": "sha256-yxmiMW8zV9UHhZFfBVUzsvpAt81D2ZFW9jC8PZNGhRk=", + "hash": "sha256-4vluO+efNhlYhnzNjvZD6ol0eIx3DWzQBTevMmRAfxM=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.15.2", + "rev": "v2.16.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-I+9hfKWBbclXXpthQc9LAHhZ7MYr/8I89mLeIVeae+Q=" + "vendorHash": "sha256-f/OJ+DoH/pc+A7bl1OOgsSU1PQC2ZEBuK7sSmcpA3tk=" }, "libvirt": { "hash": "sha256-64wCem/eTCCyZvz96szsWoKrxKezsHQYoYZGKHBF8OY=", @@ -700,13 +700,13 @@ "vendorHash": "sha256-dHzyNvzxNltCAmwYWQHOEKkhgfylUUhOtBPiBqIS1Qg=" }, "linode": { - "hash": "sha256-pTGROrgCa6BL4LQfjeQ/Bh0xu/v4vOWxM9WrH7mtIpg=", + "hash": "sha256-yzEbkK2fOXNkuMYjtsXXRI3tV+OngzVeJoDiu+iTr5w=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.9.1", + "rev": "v2.9.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-trxe9T61TNCONnZ4rVdOvGIR8z9rEx3IcqKMM30XDB8=" + "vendorHash": "sha256-G4A1nCM2R/6yWSUP+OSHrd6k6bz0Cp7wc40IU2AnS5s=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -772,13 +772,13 @@ "vendorHash": "sha256-cufN4QYXE+bqDKLUV+Rdslr5CgbI0DvoFVWVQiBVomw=" }, "mongodbatlas": { - "hash": "sha256-3B2SBgQkoV3OcPc2pe9Q9iXEVeNSOgmG6E7xZnGhKsA=", + "hash": "sha256-aS5TU9xnevgjK9TH0J4nzSr6ct2Cqw2Wa+d+jIjA9Qg=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.12.1", + "rev": "v1.12.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-TcAA68bNzFP+9wdta0z4gvV0sreCKsJ/U15KpuImTgI=" + "vendorHash": "sha256-on7kyb/AGdQK++5AOCEmkrRlbuW09u2653mda9gmvKE=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", @@ -799,13 +799,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-5VsS0QdtC3ZSKjst8HsIiEU67k9Fyn21QnUVbYKRw8A=", + "hash": "sha256-b9wHTSxDT657qTfv73O8A2YnwJPSWYONrElcyYyeH60=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.27.2", + "rev": "v3.27.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-3/BaGU2IdN6WxhJUL3LrzI7PoI63PuzKsGk8mHNb5Xk=" + "vendorHash": "sha256-qZqmw55Fsn3XaDvyorouy391iM6KXQxX5gJGrKR3URU=" }, "nomad": { "hash": "sha256-urxTfyBv/vuX3Xowca625aNEsU4sxkmd24tis2YjR3Y=", @@ -817,13 +817,13 @@ "vendorHash": "sha256-L8BpkzTs5qcr31Nho66xzlNMVg2SqfZbj9pPAZrNuqA=" }, "ns1": { - "hash": "sha256-QYG+tJ7LqVQuvvQm4Uzq/OsNcI17ICXop4jjbBXx/eo=", + "hash": "sha256-UHoOVITbfwZ7tviDuZ1Tp9aVgRpB9ZnCzk5EOZeH/Eo=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.0.9", + "rev": "v2.0.10", "spdx": "MPL-2.0", - "vendorHash": "sha256-0bG7IMitSvYF/P2Mp0FjX+7hDXMFc0Xgcl5tIzv43Pk=" + "vendorHash": "sha256-nkpKq8cAusokeuOk32n8QA9He9zQlaTFzUwLMHKzpqM=" }, "null": { "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", @@ -845,22 +845,22 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-v0+kXkhRGp3FL611HAbhNDS3b+zaOY733kxJajpGMK8=", + "hash": "sha256-gMVGLURSXzT9TXXHJlL3F5WN+XI4o22bkPFh/jPtUrw=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.16.0", + "rev": "v5.17.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-yjT9yspTD8eHcPPALPTSxDLxJ4eoBd8XjJPsL806Wzc=", + "hash": "sha256-0UvJCEHoCsONskvihQidGo834qEZR1hZMczNF+C7fqw=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.4.3", + "rev": "v4.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Wsr+KQ4TZ0pP3ugKNnNqUJt9tEt5mt3qzPEdPSBukKA=" + "vendorHash": "sha256-LwExX17GlyzxMcn95c2T9FawoS03fHH58RmHoPTsjBA=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -890,20 +890,20 @@ "vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI=" }, "opentelekomcloud": { - "hash": "sha256-wBuyooq7qomckoEi4q4yZply4ZR2MiNvhGR4vKRkJsc=", + "hash": "sha256-ozaIQiYpo0M0yuFSk70kw3tPZbEhZjHkq1FzUKOZP4Q=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.35.9", + "rev": "v1.35.10", "spdx": "MPL-2.0", - "vendorHash": "sha256-8+cwt7ONirs7XzXQ5q3Xspz0Uzn1jOVWVYrVZXa9MKM=" + "vendorHash": "sha256-cFZO7GSv2+FpSZcYNRbuRkX3DJ7m0JwW/TCPo41F800=" }, "opsgenie": { - "hash": "sha256-QZspThq58IjyNDSXwyZ1XDeNY6WRxSj5YnZjHKSM0Rc=", + "hash": "sha256-3iPprhDd9nnF9NnaGHp8rQ57rvA1jxZuSjIFsfGtEMU=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.30", + "rev": "v0.6.32", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1016,13 +1016,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-Pl6sPft5dadQ3OdTnIYiZT2btZSaSpfmZR9PuirdZvg=", + "hash": "sha256-Fx77O5FHRZAFGNojWUxPPhlJ+hv2XVvh4RVYnMt1WXQ=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.29.0", + "rev": "v2.30.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-HkSVtqCAqr1IxPbcdp0XreWJ69dNOgzcl0l0INyWNcM=" + "vendorHash": "sha256-4fIFZRAx0Vkl7QK13Vp/QJN+WDtk40RsvGYm6wPnfAI=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1079,13 +1079,13 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-jse640SjSx3hBlRMJaPIHZdMPx6aJv1d5+7eHspEtuI=", + "hash": "sha256-p2VN5M9OCEdA0olIx5HmB3g62sZVnJZEob40p8UgIXs=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.73.0", + "rev": "v0.74.0", "spdx": "MIT", - "vendorHash": "sha256-+XF5E4tzSaRZ3ZcZ9UrZDmGVXm3uIU2xQRpQvLOxOSg=" + "vendorHash": "sha256-lxjAtxY++tITodDbdxZorIzkJXKPHqO/UZqBr5IBNys=" }, "sops": { "hash": "sha256-ZastswL5AVurQY3xn6yx3M1BMvQ9RjfcZdXX0S/oZqw=", @@ -1097,13 +1097,13 @@ "vendorHash": "sha256-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8=" }, "spotinst": { - "hash": "sha256-926quU0wPySj9YeEkbIwtAF3mdGmXDkSRRUrdfBtphw=", + "hash": "sha256-banhAkXLg3iWH7/eiPodOreReqaDskmlCdNIPZYbM3E=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.145.0", + "rev": "v1.147.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-mc8SSRYQoFL3pByyVs5TW2dbZUQ/KQ7TTPF35VLGVq0=" + "vendorHash": "sha256-sr2VAFSc6VfLW0KNGQMxYuAITjFaWOQaJjIlaMYamS0=" }, "stackpath": { "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", @@ -1115,13 +1115,13 @@ "vendorHash": "sha256-OGYiynCwbJU2KisS7Y6xmLuBKOtQvh3MWPrvBk/x95U=" }, "statuscake": { - "hash": "sha256-3tYHifwTFMqSA0RHELVepyflGwXvIKNjnZqkfXJjyFI=", + "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=", "homepage": "https://registry.terraform.io/providers/StatusCakeDev/statuscake", "owner": "StatusCakeDev", "repo": "terraform-provider-statuscake", - "rev": "v2.2.1", + "rev": "v2.2.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-wJNCPM+wkGwDZ76z3v/okVE8Kerthl+lPydPhipL3Z4=" + "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { "hash": "sha256-5/PaEGKG8M/XifRelqV1aL6ARXRVvOYY/uka+grijzg=", @@ -1151,11 +1151,11 @@ "vendorHash": "sha256-0HRhwUGDE4y7UFlXyD0w8zl4NV5436L4SRhrb8vQGyc=" }, "tencentcloud": { - "hash": "sha256-yPY2tCAI9PxpT50YTkMs5yMPdU0PtC5CEd2RzLDVVgE=", + "hash": "sha256-TJKLBMgxQXKhdKG7HCUFLWAtWCoZFla4CvSeN1a2k44=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.36", + "rev": "v1.81.38", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1169,11 +1169,11 @@ "vendorHash": "sha256-PQanCxvb1sT5SSLNH4fKFwF8j5ycU+6Os63GZuyBUSo=" }, "thunder": { - "hash": "sha256-CZjoWme/f1F5JzYlntEKL5ijRF/qR3h4ZTiv9vwzbJI=", + "hash": "sha256-wS50I4iTnHq0rDUoz7tQXpqW84wugQQiw42xhzxFiRw=", "homepage": "https://registry.terraform.io/providers/a10networks/thunder", "owner": "a10networks", "repo": "terraform-provider-thunder", - "rev": "v1.2.2", + "rev": "v1.3.0", "spdx": "BSD-2-Clause", "vendorHash": null }, @@ -1233,14 +1233,14 @@ "vendorHash": "sha256-aMN25qa67m2Z8ZdMqtob0rj70Oy+E8bXEiRVb1HmGOk=" }, "vault": { - "hash": "sha256-IPVD4VVC6jn3BWltqfCk2+GFSkQRNK7jkJ3/QmgBxqg=", + "hash": "sha256-HWEPeIhYCdM6m1hEuX5ozZFl5yRlND0heF+sl+uaNHM=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.20.0", + "rev": "v3.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xd2tsJ5k/8PCSegHqeyJ1ePFBS0ho8SD+4m4QyFMTL0=" + "vendorHash": "sha256-tas0801GM+E1yuMEFoFo8GfizeJaDwKfvK8TsCf/big=" }, "vcd": { "hash": "sha256-ltdkB9PqmuCs5daRjcThVhy1wIoDW21yBiwtRo/pMss=", @@ -1270,11 +1270,11 @@ "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { - "hash": "sha256-AOeqEG2oCewD1yzk8FNI7uPiphtIK3Et7Yu3ulnMvUM=", + "hash": "sha256-AVN2WDVDAc11p0i/d8wb/AvITMStrtsIq+MqXWYdwL8=", "homepage": "https://registry.terraform.io/providers/vmware/vra7", "owner": "vmware", "repo": "terraform-provider-vra7", - "rev": "v3.0.9", + "rev": "v3.0.10", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/nixpkgs/pkgs/applications/networking/cluster/tf-summarize/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tf-summarize/default.nix index 7267e3fc064a..1381ba664222 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tf-summarize/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tf-summarize/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tf-summarize"; - version = "0.3.3"; + version = "0.3.6"; src = fetchFromGitHub { owner = "dineshba"; repo = "tf-summarize"; rev = "v${version}"; - hash = "sha256-1sYWOvSWxoS0R6M1HxJ6yyBSa/LY3b9G8mF3NMofFhM="; + hash = "sha256-8TRX7gAbBlCIOHbwRIVoke2WBSgwLx9121Fg5h0LPF0="; }; vendorHash = "sha256-YdfZt8SHBJHk5VUC8Em97EzX79EV4hxvo0B05npBA2U="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix b/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix index f574daedde03..10f8e7a9f577 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.15.6"; + version = "0.16.4"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-frYE/0PcVNlk+hwSCoPwSbL2se4dEP9g6aLDMGdn6x8="; + hash = "sha256-LL+fikMTg79d9goFEkmxwYvF9E0GrPNTLmFy2tfnQtg="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix index 5bd4b16762e6..f15e6ac474e2 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-NrOdnsdKxobJkMUGxdWQyzqB+2fDCjvTjnIt5S9fL0U="; + sha256 = "sha256-qa/Ic3qi+CAW9h4W2G8x6UdxPC2SkrMLMJEcxN7eDGY="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorHash = "sha256-mPRBmCqyQWCbWArORXL9sF8B4AlXHtA7Zs9NZD0TqoE="; + vendorHash = "sha256-TisGl0kM4vMVh9vk6/mRVOaRm9yoTwKkPedTPqdySDY="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix b/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix index f47bd051c710..a268f262ead0 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "weave-gitops"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MJX9OrfvzGwrJria1Ki6QHprvoDLxBRPCnKRqPdnbUw="; + sha256 = "sha256-W7Q5rsmNEDUGofQumbs9HaByQEb7sj4tOT7ZpIe98E4="; }; ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ]; - vendorHash = "sha256-3woVoEh+bU8QOzOEk7hnxxVe0mlPozqUDuP0Rn/9J6k="; + vendorHash = "sha256-+UxrhtwYP+ctn+y7IxKKLO5RVoiUSl4ky0xprXr98Jc="; subPackages = [ "cmd/gitops" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix b/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix index 3b165ab6fa6d..0d58e54bcb42 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.263"; + version = "1.2.267"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-eWiUn6v7XZZH7rudvCMLa3rUBmMsiSUKcwoDCFxRlFE="; + hash = "sha256-OlTlyo/JbmXyoMBSDnKHvjGN6NMRrk0kQT63R34gtOs="; }; vendorHash = "sha256-0bxM0Y4K6wxg6Ka1A9MusptiSMshTUWJItXoVDpo7lI="; diff --git a/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index 83544b7f9a27..e9b43a6aa1a8 100644 --- a/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.4.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+4TQAtqM1ruhv3W1SBHAd1WVJKa7dvGLHlxVqazc+uk="; + sha256 = "sha256-CyQKQNuCJLtm73ngrGtUmVUfiseXEp2fcKVGvQ1ET5A="; }; - vendorHash = "sha256-3aGdn6Gp+N/a+o9dl4h0oIOnYhtu4oZuBF6X/HKjQOI="; + vendorHash = "sha256-Q8Xw2vuxiYpkY0/gQlUVWO7WQszv2x1cvbV03Wi1GNg="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/networking/errbot/default.nix b/nixpkgs/pkgs/applications/networking/errbot/default.nix index 7085ac5f38ba..9e239627b02c 100644 --- a/nixpkgs/pkgs/applications/networking/errbot/default.nix +++ b/nixpkgs/pkgs/applications/networking/errbot/default.nix @@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/errbotio/errbot/blob/${version}/CHANGES.rst"; description = "Chatbot designed to be simple to extend with plugins written in Python"; homepage = "http://errbot.io/"; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; license = licenses.gpl3Plus; platforms = platforms.linux; # flaky on darwin, "RuntimeError: can't start new thread" diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix index a8d3d2607de4..9b16c05241c8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { in { x86_64-linux = fetchurl { - url = "${base}/v${version}/ArmCord_${builtins.head (lib.splitString "-" version)}_amd64.deb"; + url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; hash = "sha256-6zlYm4xuYpG+Bgsq5S+B/Zt9TRB2GZnueKAg2ywYLE4="; }; aarch64-linux = fetchurl { - url = "${base}/v${version}/ArmCord_${builtins.head (lib.splitString "-" version)}_arm64.deb"; + url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; hash = "sha256-HJu1lRa3zOTohsPMe23puHxg1VMWNR2aOjDQJqc4TqE="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix index 336d045b6c16..ae8bc922bb46 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -1,23 +1,46 @@ -{ lib, buildNpmPackage, fetchFromGitHub, writeText, jq, conf ? { } }: +{ lib +, buildNpmPackage +, fetchFromGitHub +, writeText +, jq +, python3 +, pkg-config +, pixman +, cairo +, pango +, stdenv +, darwin +, conf ? { } +}: let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in buildNpmPackage rec { pname = "cinny"; - version = "2.2.6"; + version = "3.0.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-Da/gbq9piKvkIMiamoafcRrqxF7128GXoswk2C43An8="; + hash = "sha256-BFovEmT4RgdzlSYi1p0324PW7+2rvw3n5+jKWTV2FF4="; }; - npmDepsHash = "sha256-3wgB/dQmLtwxbRsk+OUcyfx98vpCvhvseEOCrJIFohY="; + npmDepsHash = "sha256-E+VBs66chBeiK40DZZ1hWTTISKaBN1RA+Uyr1iHqfus="; nativeBuildInputs = [ jq + python3 + pkg-config + ]; + + buildInputs = [ + pixman + cairo + pango + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreText ]; installPhase = '' @@ -32,7 +55,7 @@ buildNpmPackage rec { meta = with lib; { description = "Yet another Matrix client for the web"; homepage = "https://cinny.in/"; - maintainers = with maintainers; [ abbe ]; + maintainers = with maintainers; [ abbe ashkitten ]; license = licenses.agpl3Only; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix index 0c4bebcab96a..ce304a4fb23a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openasar"; - version = "unstable-2023-07-07"; + version = "unstable-2023-10-24"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "5ac246dc92e9a2a9b314d899df728f37096c482b"; - hash = "sha256-ODeVru4LCSl3rIeJCdezAwqzKP6IRo5WDaaUymqEcBs="; + rev = "eee9bab822e3dbd97a735d0050ddd41ba27917f2"; + hash = "sha256-SSWQSqGgTZjowgrzF6qHZDTw/Y9xFHNTZvetxqZubYI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix index b410cfdea338..8c292d444206 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -62,7 +62,7 @@ buildNpmPackage rec { makeWrapper '${lib.getExe electron_27}' $out/bin/webcord \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \ --suffix PATH : "${binPath}" \ - --add-flags "--ozone-platform-hint=auto" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags $out/lib/node_modules/webcord/ runHook postInstall @@ -88,7 +88,7 @@ buildNpmPackage rec { changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}"; license = lib.licenses.mit; mainProgram = "webcord"; - maintainers = with lib.maintainers; [ huantian ]; + maintainers = with lib.maintainers; [ eclairevoyant huantian ]; platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index bfc5ad79327b..cf6a9ccae535 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -50,7 +50,7 @@ let # find where to edit them. versions.aarch64-darwin = "5.16.2.23409"; versions.x86_64-darwin = "5.16.2.23409"; - versions.x86_64-linux = "5.16.2.8828"; + versions.x86_64-linux = "5.16.5.303"; srcs = { aarch64-darwin = fetchurl { @@ -64,7 +64,7 @@ let }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-eRvgNrMe/NyOnsMJ8L659C3Cl4xZ5Ij1u4qoHehj4y8="; + hash = "sha256-M+76HzqhPVxsP0nZOG4Oe8lnRJ9MJ2mE4+1hGvRkSUg="; }; }; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix index 8136324770e6..23bfb324c1ae 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -36,16 +36,19 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.0.5"; + version = "4.1.0"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-PXLmGwVjHavcKDIxdo+TioVUSyfjH6v+E8V7TfXF47s="; + hash = "sha256-AwSC5bjw9pxr/Upja2+m12tkqeweF58auqNbGrONHhA="; }; + # Why is this needed? https://github.com/weechat/weechat/issues/2031 + patches = lib.optional gettext.gettextNeedsLdflags ./gettext-intl.patch; + outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; cmakeFlags = with lib; [ diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/gettext-intl.patch b/nixpkgs/pkgs/applications/networking/irc/weechat/gettext-intl.patch new file mode 100644 index 000000000000..7b95472c06fa --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/gettext-intl.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake +index 358734688..ffcbf7ef4 100644 +--- a/cmake/FindGettext.cmake ++++ b/cmake/FindGettext.cmake +@@ -42,6 +42,7 @@ find_path(LIBINTL_INCLUDE + ) + + set(CMAKE_REQUIRED_INCLUDES ${LIBINTL_INCLUDE}) ++set(CMAKE_REQUIRED_FLAGS "-lintl") + + check_include_files(libintl.h HAVE_LIBINTL_H) + diff --git a/nixpkgs/pkgs/applications/networking/mullvad/Cargo.lock b/nixpkgs/pkgs/applications/networking/mullvad/Cargo.lock index 87bef3c513fe..49d3e0f812b7 100644 --- a/nixpkgs/pkgs/applications/networking/mullvad/Cargo.lock +++ b/nixpkgs/pkgs/applications/networking/mullvad/Cargo.lock @@ -19,31 +19,30 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ + "crypto-common", "generic-array 0.14.4", ] [[package]] name = "aes" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "ctr", - "opaque-debug 0.3.0", ] [[package]] name = "aes-gcm" -version = "0.9.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" +checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" dependencies = [ "aead", "aes", @@ -63,6 +62,12 @@ dependencies = [ ] [[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] name = "android_log-sys" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -82,14 +87,63 @@ dependencies = [ [[package]] name = "android_system_properties" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ "libc", ] [[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] name = "anyhow" version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -97,9 +151,21 @@ checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "arc-swap" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "async-stream" @@ -119,7 +185,7 @@ checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -130,7 +196,7 @@ checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -223,12 +289,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "blake3" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "digest 0.10.3", +] + +[[package]] name = "block-buffer" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -284,9 +376,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cbindgen" @@ -294,7 +386,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6358dedf60f4d9b8db43ad187391afe959746101346fe51bb978126bec61dfb" dependencies = [ - "clap", + "clap 3.2.25", "heck", "indexmap", "log", @@ -302,7 +394,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn", + "syn 1.0.100", "tempfile", "toml", ] @@ -327,21 +419,20 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ "aead", "chacha20", @@ -352,13 +443,13 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.21" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f725f340c3854e3cb3ab736dc21f0cca183303acea3b3ffec30f141503ac8eb" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", "time 0.1.43", @@ -368,36 +459,74 @@ dependencies = [ [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array 0.14.4", + "crypto-common", + "inout", + "zeroize", ] [[package]] name = "clap" -version = "3.2.23" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags", - "clap_lex", + "clap_lex 0.2.4", "indexmap", - "once_cell", "strsim 0.10.0", "termcolor", "textwrap", ] [[package]] +name = "clap" +version = "4.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex 0.4.1", + "once_cell", + "strsim 0.10.0", +] + +[[package]] name = "clap_complete" -version = "3.0.6" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678db4c39c013cc68b54d372bce2efc58e30a0337c497c9032fd196802df3bc3" +checksum = "1a19591b2ab0e3c04b588a0e04ddde7b9eaa423646d1b4a8092879216bf47473" dependencies = [ - "clap", + "clap 4.2.7", +] + +[[package]] +name = "clap_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.15", ] [[package]] @@ -410,6 +539,12 @@ dependencies = [ ] [[package]] +name = "clap_lex" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" + +[[package]] name = "classic-mceliece-rust" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -421,6 +556,22 @@ dependencies = [ ] [[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] name = "colored" version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -443,9 +594,15 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.7.1" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" + +[[package]] +name = "constant_time_eq" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" +checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" [[package]] name = "convert_case" @@ -465,9 +622,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" @@ -479,10 +636,29 @@ dependencies = [ ] [[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +dependencies = [ + "cfg-if", +] + +[[package]] name = "crypto-bigint" -version = "0.3.2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ "generic-array 0.14.4", "rand_core 0.6.4", @@ -492,19 +668,20 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array 0.14.4", + "rand_core 0.6.4", "typenum", ] [[package]] name = "ctr" -version = "0.8.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ "cipher", ] @@ -533,6 +710,50 @@ dependencies = [ ] [[package]] +name = "cxx" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.15", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] name = "darling" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -553,7 +774,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.9.3", - "syn", + "syn 1.0.100", ] [[package]] @@ -564,7 +785,18 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.100", +] + +[[package]] +name = "dashmap" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8858831f7781322e539ea39e72449c46b059638250c14344fec8d0aa6e539c" +dependencies = [ + "cfg-if", + "num_cpus", + "parking_lot", ] [[package]] @@ -586,11 +818,12 @@ dependencies = [ [[package]] name = "der" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", + "zeroize", ] [[package]] @@ -601,7 +834,7 @@ checksum = "302ccf094df1151173bb6f5a2282fcd2f45accd5eae1bdf82dcbfefbc501ad5c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -614,7 +847,7 @@ dependencies = [ "derive_builder_core", "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -626,7 +859,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -639,7 +872,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", + "syn 1.0.100", ] [[package]] @@ -706,9 +939,9 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.13.4" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ "der", "elliptic-curve", @@ -732,13 +965,14 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "elliptic-curve" -version = "0.11.12" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct", "crypto-bigint", "der", + "digest 0.10.3", "generic-array 0.14.4", "rand_core 0.6.4", "sec1", @@ -761,7 +995,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -803,7 +1037,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.100", "synstructure", ] @@ -819,6 +1053,17 @@ dependencies = [ ] [[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] name = "errno-dragonfly" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -864,6 +1109,18 @@ dependencies = [ ] [[package]] +name = "filetime" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.48.0", +] + +[[package]] name = "fixedbitset" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -877,15 +1134,23 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] [[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] name = "futures" version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -941,7 +1206,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -1017,9 +1282,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.4.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" dependencies = [ "opaque-debug 0.3.0", "polyval", @@ -1033,9 +1298,9 @@ checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" [[package]] name = "h2" -version = "0.3.14" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" dependencies = [ "bytes", "fnv", @@ -1081,6 +1346,12 @@ dependencies = [ ] [[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1158,9 +1429,9 @@ checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" [[package]] name = "httparse" -version = "1.5.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -1176,9 +1447,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.16" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -1189,7 +1460,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 0.4.8", + "itoa 1.0.1", "pin-project-lite", "socket2", "tokio", @@ -1212,15 +1483,26 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.42" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9512e544c25736b82aebbd2bf739a47c8a1c935dfcc3a6adcde10e35cd3cd468" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", - "core-foundation", + "core-foundation-sys", + "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", ] [[package]] @@ -1241,6 +1523,16 @@ dependencies = [ ] [[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] name = "indexmap" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1252,6 +1544,17 @@ dependencies = [ [[package]] name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abf888f9575c290197b2c948dc9e9ff10bd1a39ad1ea8585f734585fa6b9d3f9" @@ -1273,6 +1576,15 @@ dependencies = [ ] [[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array 0.14.4", +] + +[[package]] name = "instant" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1317,9 +1629,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.3.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "ipnetwork" @@ -1341,14 +1653,14 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.2" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "io-lifetimes", - "rustix", - "windows-sys 0.42.0", + "rustix 0.37.3", + "windows-sys 0.48.0", ] [[package]] @@ -1413,7 +1725,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -1443,6 +1755,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" [[package]] +name = "kqueue" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +dependencies = [ + "bitflags", + "libc", +] + +[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1450,9 +1782,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libdbus-sys" @@ -1464,6 +1796,15 @@ dependencies = [ ] [[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + +[[package]] name = "linked-hash-map" version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1476,6 +1817,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] +name = "linux-raw-sys" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" + +[[package]] name = "lock_api" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1557,16 +1904,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6a38fc55c8bbc10058782919516f88826e70320db6d206aebc49611d24216ae" dependencies = [ "digest 0.10.3", - "md5-asm", -] - -[[package]] -name = "md5-asm" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b9a6f25ec11ea27e22d7fc8beafda909da44ece95f63e94f1eeb23d19bb5c7" -dependencies = [ - "cc", ] [[package]] @@ -1585,6 +1922,24 @@ dependencies = [ ] [[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + +[[package]] name = "mime" version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1644,6 +1999,7 @@ dependencies = [ "hyper", "ipnetwork", "log", + "mullvad-fs", "mullvad-types", "once_cell", "regex", @@ -1655,19 +2011,18 @@ dependencies = [ "talpid-types", "tokio", "tokio-rustls", - "uuid", ] [[package]] name = "mullvad-cli" version = "0.0.0" dependencies = [ - "base64", + "anyhow", + "base64 0.13.0", "chrono", - "clap", + "clap 4.2.7", "clap_complete", "env_logger 0.10.0", - "err-derive", "futures", "itertools", "mullvad-management-interface", @@ -1689,7 +2044,7 @@ dependencies = [ "android_logger", "cfg-if", "chrono", - "clap", + "clap 4.2.7", "ctrlc", "dirs-next", "duct", @@ -1702,6 +2057,7 @@ dependencies = [ "log", "log-panics", "mullvad-api", + "mullvad-fs", "mullvad-management-interface", "mullvad-paths", "mullvad-relay-selector", @@ -1709,6 +2065,7 @@ dependencies = [ "mullvad-version", "nix 0.23.1", "objc", + "once_cell", "parking_lot", "rand 0.8.5", "regex", @@ -1739,6 +2096,16 @@ dependencies = [ ] [[package]] +name = "mullvad-fs" +version = "0.0.0" +dependencies = [ + "log", + "talpid-types", + "tokio", + "uuid", +] + +[[package]] name = "mullvad-jni" version = "0.0.0" dependencies = [ @@ -1807,7 +2174,7 @@ dependencies = [ name = "mullvad-problem-report" version = "0.0.0" dependencies = [ - "clap", + "clap 4.2.7", "dirs-next", "duct", "env_logger 0.10.0", @@ -1852,7 +2219,7 @@ dependencies = [ name = "mullvad-setup" version = "0.0.0" dependencies = [ - "clap", + "clap 4.2.7", "env_logger 0.10.0", "err-derive", "lazy_static", @@ -1872,6 +2239,7 @@ name = "mullvad-types" version = "0.0.0" dependencies = [ "chrono", + "clap 4.2.7", "err-derive", "ipnetwork", "jnix", @@ -2010,7 +2378,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "memoffset", + "memoffset 0.6.4", ] [[package]] @@ -2025,13 +2393,48 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.44" +name = "nix" +version = "0.26.1" +source = "git+https://github.com/nix-rust/nix?rev=b13b7d18e0d2f4a8c05e41576c7ebf26d6dbfb28#b13b7d18e0d2f4a8c05e41576c7ebf26d6dbfb28" +dependencies = [ + "bitflags", + "cfg-if", + "libc", + "memoffset 0.8.0", + "pin-utils", + "static_assertions", +] + +[[package]] +name = "nix" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "autocfg", - "num-traits", + "bitflags", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", +] + +[[package]] +name = "notify" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9" +dependencies = [ + "bitflags", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify 0.9.6", + "kqueue", + "libc", + "mio", + "walkdir", + "windows-sys 0.42.0", ] [[package]] @@ -2045,11 +2448,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi 0.2.6", "libc", ] @@ -2073,9 +2476,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.13.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -2112,30 +2515,39 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.0.0" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" + +[[package]] +name = "oslog" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d2043d1f61d77cb2f4b1f7b7b2295f40507f5f8e9d1c8bf10a1ca5f97a3969" +dependencies = [ + "cc", + "dashmap", + "log", +] [[package]] name = "p256" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19736d80675fbe9fe33426268150b951a3fb8f5cfca2a23a17c85ef3adb24e3b" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa", "elliptic-curve", - "sec1", ] [[package]] name = "p384" -version = "0.9.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755d8266e41f57bd8562ed9b6e93cdcf73ead050e1e8c3a27ea3871b6643a20c" +checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa", "elliptic-curve", - "sec1", ] [[package]] @@ -2183,9 +2595,9 @@ checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" @@ -2216,7 +2628,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -2247,7 +2659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52063325d6b0de17051e72275d44f96c5b73a75029fcdd7e05e54a62ff216437" dependencies = [ "derive_builder", - "errno", + "errno 0.2.8", "error-chain", "ioctl-sys", "ipnetwork", @@ -2309,7 +2721,7 @@ checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -2325,6 +2737,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der", + "spki", +] + +[[package]] name = "pkg-config" version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2332,9 +2754,9 @@ checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" [[package]] name = "poly1305" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug 0.3.0", @@ -2343,9 +2765,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" +checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" dependencies = [ "cfg-if", "cpufeatures", @@ -2376,7 +2798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a49e86d2c26a24059894a3afa13fd17d063419b05dfb83f06d9c3566060c3f5a" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.100", ] [[package]] @@ -2388,7 +2810,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.100", "version_check", ] @@ -2405,9 +2827,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -2452,7 +2874,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -2498,14 +2920,14 @@ checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] name = "quote" -version = "1.0.10" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -2654,19 +3076,21 @@ dependencies = [ [[package]] name = "ring-compat" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6242f589b69a0555addb0bb759f81e5cba40485d38b36f780ab3a588b2bdf064" +checksum = "333b9bf6765e0141324d95b5375bb1aa5267865bb4bc0281c22aff22f5d37746" dependencies = [ "aead", - "digest 0.9.0", + "digest 0.10.3", "ecdsa", "ed25519", "generic-array 0.14.4", "opaque-debug 0.3.0", "p256", "p384", + "pkcs8", "ring", + "signature", ] [[package]] @@ -2712,14 +3136,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" dependencies = [ "bitflags", - "errno", + "errno 0.2.8", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.1.4", "windows-sys 0.42.0", ] [[package]] +name = "rustix" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" +dependencies = [ + "bitflags", + "errno 0.3.1", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.6", + "windows-sys 0.45.0", +] + +[[package]] name = "rustls" version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2737,7 +3175,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" dependencies = [ - "base64", + "base64 0.13.0", ] [[package]] @@ -2768,6 +3206,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + +[[package]] name = "sct" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2779,10 +3223,11 @@ dependencies = [ [[package]] name = "sec1" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ + "base16ct", "der", "generic-array 0.14.4", "subtle", @@ -2834,7 +3279,7 @@ checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -2881,16 +3326,6 @@ dependencies = [ "cfg-if", "cpufeatures", "digest 0.10.3", - "sha1-asm", -] - -[[package]] -name = "sha1-asm" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "563d4f7100bc3fce234e5f37bbf63dc2752558964505ba6ac3f7204bdc59eaac" -dependencies = [ - "cc", ] [[package]] @@ -2905,20 +3340,22 @@ dependencies = [ [[package]] name = "shadowsocks" -version = "1.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16fc99441d1a1b91b5f7b5093773d631ad506761a973e0a632f1836d1b05939" +version = "1.15.3" +source = "git+https://github.com/mullvad/shadowsocks-rust?rev=c45980bb22d0d50ac888813c59a1edf0cff14a36#c45980bb22d0d50ac888813c59a1edf0cff14a36" dependencies = [ + "arc-swap", "async-trait", - "base64", + "base64 0.21.0", + "blake3", "byte_string", "bytes", "cfg-if", "futures", "libc", "log", - "nix 0.23.1", + "notify", "once_cell", + "percent-encoding", "pin-project", "sendfd", "serde", @@ -2926,24 +3363,27 @@ dependencies = [ "serde_urlencoded", "shadowsocks-crypto", "socket2", + "spin 0.9.2", "thiserror", "tokio", "tokio-tfo", + "trust-dns-resolver", "url", - "winapi", + "windows-sys 0.45.0", ] [[package]] name = "shadowsocks-crypto" -version = "0.3.6" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd381517e3eb8fec5090696debfdea972d8afe6fc926c26c7bfd5fee9053efbd" +checksum = "dfb488687e398030dd9c9396e119ddbc6952bdeaefe2168943b5b2ddaa54f2e6" dependencies = [ "aes", "aes-gcm", "cfg-if", "chacha20", "chacha20poly1305", + "ctr", "hkdf", "md-5", "rand 0.8.5", @@ -2952,10 +3392,21 @@ dependencies = [ ] [[package]] +name = "shadowsocks-proxy" +version = "0.0.0" +dependencies = [ + "cbindgen", + "libc", + "log", + "oslog", + "shadowsocks-service", + "tokio", +] + +[[package]] name = "shadowsocks-service" -version = "1.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c3eb3ce85fb4c1f7451d2a5704503d3146ed7d626a17a63194092f07be45a4" +version = "1.15.3" +source = "git+https://github.com/mullvad/shadowsocks-rust?rev=c45980bb22d0d50ac888813c59a1edf0cff14a36#c45980bb22d0d50ac888813c59a1edf0cff14a36" dependencies = [ "arc-swap", "async-trait", @@ -2964,16 +3415,18 @@ dependencies = [ "bytes", "cfg-if", "futures", - "idna", + "hyper", + "idna 0.3.0", "ipnet", "iprange", "json5", "libc", "log", "lru_time_cache", - "nix 0.23.1", + "nix 0.26.2", "once_cell", "pin-project", + "rand 0.8.5", "regex", "serde", "shadowsocks", @@ -2981,7 +3434,8 @@ dependencies = [ "spin 0.9.2", "thiserror", "tokio", - "winapi", + "tower", + "windows-sys 0.45.0", ] [[package]] @@ -3011,9 +3465,9 @@ dependencies = [ [[package]] name = "signature" -version = "1.4.0" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ "rand_core 0.6.4", ] @@ -3048,9 +3502,9 @@ checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -3072,6 +3526,22 @@ dependencies = [ ] [[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der", +] + +[[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.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3110,6 +3580,17 @@ dependencies = [ ] [[package]] +name = "syn" +version = "2.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] name = "sync_wrapper" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3123,15 +3604,15 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", "unicode-xid", ] [[package]] name = "system-configuration" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags", "core-foundation", @@ -3161,14 +3642,14 @@ dependencies = [ "err-derive", "futures", "hex", - "inotify", + "inotify 0.10.0", "internet-checksum", "ipnetwork", "jnix", "lazy_static", "libc", "log", - "memoffset", + "memoffset 0.6.4", "mnl", "netlink-packet-route", "netlink-sys", @@ -3186,7 +3667,6 @@ dependencies = [ "regex", "resolv-conf", "rtnetlink", - "shadowsocks-service", "shell-escape", "socket2", "subslice", @@ -3297,6 +3777,7 @@ dependencies = [ name = "talpid-routing" version = "0.0.0" dependencies = [ + "bitflags", "err-derive", "futures", "ipnetwork", @@ -3305,12 +3786,13 @@ dependencies = [ "log", "netlink-packet-route", "netlink-sys", + "nix 0.26.1", "rtnetlink", "socket2", + "system-configuration", "talpid-types", "talpid-windows-net", "tokio", - "tokio-stream", "widestring 1.0.2", "windows-sys 0.45.0", ] @@ -3348,6 +3830,7 @@ name = "talpid-tunnel-config-client" version = "0.0.0" dependencies = [ "classic-mceliece-rust", + "libc", "log", "pqc_kyber", "prost", @@ -3357,6 +3840,7 @@ dependencies = [ "tonic", "tonic-build", "tower", + "windows-sys 0.45.0", "zeroize", ] @@ -3364,7 +3848,7 @@ dependencies = [ name = "talpid-types" version = "0.0.0" dependencies = [ - "base64", + "base64 0.13.0", "err-derive", "ipnetwork", "jnix", @@ -3434,7 +3918,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall", - "rustix", + "rustix 0.36.7", "windows-sys 0.42.0", ] @@ -3470,7 +3954,7 @@ checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -3545,7 +4029,7 @@ checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -3572,9 +4056,9 @@ dependencies = [ [[package]] name = "tokio-tfo" -version = "0.1.9" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4279aec5ded232170bf39130dd0e0deaed2c9f31cd3b5db1f2021056bcf5f94a" +checksum = "35ccf89920b48afc418f18135342355d30ad048f3c95ba54670f50a52371a439" dependencies = [ "cfg-if", "futures", @@ -3584,7 +4068,7 @@ dependencies = [ "pin-project", "socket2", "tokio", - "winapi", + "windows-sys 0.36.1", ] [[package]] @@ -3619,7 +4103,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64", + "base64 0.13.0", "bytes", "futures-core", "futures-util", @@ -3652,7 +4136,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -3727,7 +4211,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -3800,7 +4284,7 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna", + "idna 0.2.3", "ipnet", "lazy_static", "rand 0.8.5", @@ -3836,9 +4320,9 @@ dependencies = [ [[package]] name = "trust-dns-server" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cf9f8a359c9f16fdf760b79cb2be3f261b98db8027f81959c7a4f6645e2c" +checksum = "99022f9befa6daec2a860be68ac28b1f0d9d7ccf441d8c5a695e35a58d88840d" dependencies = [ "async-trait", "bytes", @@ -3932,6 +4416,12 @@ dependencies = [ ] [[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] name = "unicode-xid" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3939,11 +4429,11 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "universal-hash" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" dependencies = [ - "generic-array 0.14.4", + "crypto-common", "subtle", ] @@ -3955,18 +4445,23 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", - "idna", - "matches", + "idna 0.3.0", "percent-encoding", "serde", ] [[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] name = "uuid" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4041,7 +4536,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.100", "wasm-bindgen-shared", ] @@ -4063,7 +4558,7 @@ checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4149,6 +4644,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] name = "windows-service" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4161,17 +4665,30 @@ dependencies = [ [[package]] name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -4180,7 +4697,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] @@ -4189,13 +4715,28 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -4205,42 +4746,114 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] name = "winreg" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4286,6 +4899,6 @@ checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", "synstructure", ] diff --git a/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix b/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix index 754109c5ccf7..71a53aa3344b 100644 --- a/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix +++ b/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix @@ -1,9 +1,7 @@ { lib , stdenv -, writeText , rustPlatform , fetchFromGitHub -, fetchpatch , pkg-config , protobuf , makeWrapper @@ -19,18 +17,20 @@ }: rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2023.3"; + version = "2023.5"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; rev = version; - hash = "sha256-as/d14xVTqJvb+QxzEyZWh1EMRVpE8cDQRbdc4R4pcU="; + hash = "sha256-bu16U9XJiIuYG9Npljos2ytfloSoGIl1ayH43w0aeKY="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { + "nix-0.26.1" = "sha256-b5bLeZVNbJE7aBnyzl0qvo0mXFeXa4hAZiuT1VJiFLk="; + "shadowsocks-1.15.3" = "sha256-P35IQL2sAfrtjwMDn8k/kmkk2IMsvq6zICRRGUGfqJI="; "udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4="; }; }; diff --git a/nixpkgs/pkgs/applications/networking/ndppd/default.nix b/nixpkgs/pkgs/applications/networking/ndppd/default.nix index df3bc9f9f236..290a6519f85a 100644 --- a/nixpkgs/pkgs/applications/networking/ndppd/default.nix +++ b/nixpkgs/pkgs/applications/networking/ndppd/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/DanielAdolfsson/ndppd"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ fadenb globin ]; + maintainers = with maintainers; [ fadenb ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index cad0829b9c2b..a86d80d9ae67 100644 --- a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "rclone"; - version = "1.64.1"; + version = "1.64.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-JaUsclhAZpmVi3K9VdRfAber++ghiEfzmJDmeku9IXA="; + hash = "sha256-gOFOcqCgFAiTc6W3v8Z917hGCzxluswqnuOoUht73GA="; }; vendorHash = "sha256-eYIGVCTvUfGbsIMFthEfD0r6aeA7Ly9xJ8PJ6hR2SjA="; diff --git a/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix b/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix index 6c6dddee1735..7424a3da049a 100644 --- a/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "unstable-2022-12-19"; + version = "unstable-2023-07-11"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "6a122f24deb4f2ff6c6f97b6a803301a7f7b666c"; - sha256 = "sha256-fH4Inqy7DfMJbW1FYWanScLATu8cZA1n+Vas8ee3xwA="; + rev = "3b52ef573129fb799319630bd438717761111f57"; + sha256 = "sha256-TwHWeTVzUo42t1erD7lMT4vdXiV3/9Hy1sPnrvJpQE8="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/networking/trayscale/default.nix b/nixpkgs/pkgs/applications/networking/trayscale/default.nix index 01c79a1153ea..ad4c40cd4ad2 100644 --- a/nixpkgs/pkgs/applications/networking/trayscale/default.nix +++ b/nixpkgs/pkgs/applications/networking/trayscale/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.9.7"; + version = "0.10.4"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-PMcpVBJVJNX+5vICubBUqlyHC0CEZC9EGUfw6O3pCeA="; + hash = "sha256-/31QKCyMeEdpP59B+iXS5hL9W5sWz7R/I2nxBtj+0s4="; }; - vendorHash = "sha256-K1Za2j4kUtsktFi9DjZYXrtfsWF1r6vIbyocLUrj5IU="; + vendorHash = "sha256-xYBiO6Zm32Do19I/cm4T6fubXY++Bhkn+RNAmKzM5cY="; subPackages = [ "cmd/trayscale" ]; diff --git a/nixpkgs/pkgs/applications/office/micropad/default.nix b/nixpkgs/pkgs/applications/office/micropad/default.nix index ae522f53e61d..8a1b435cf2d4 100644 --- a/nixpkgs/pkgs/applications/office/micropad/default.nix +++ b/nixpkgs/pkgs/applications/office/micropad/default.nix @@ -15,25 +15,25 @@ let in mkYarnPackage rec { pname = "micropad"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "MicroPad"; repo = "Micropad-Electron"; rev = "v${version}"; - hash = "sha256-Rr3mOz2OlCq2tibxutR8zBANhswnkz70aP9BBS/pXp0="; + hash = "sha256-VK3sSXYW/Dev7jCdkgrU9PXFbJ6+R2hy6QMRjj6bJ5M="; }; micropad-core = fetchzip { url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz"; - hash = "sha256-7yFTD8bXsxT6kBKxBGGxwzYpa0rZYLYV6KRYtImQ58c="; + hash = "sha256-KfS13p+mjIh7VShVCT6vFuQY0e/EO/sENOx4GPAORHU="; }; packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-PKCi1c8WY1BG/H1kUJ8xSCVoLF/9DEn5Kh29is2BTYY="; + hash = "sha256-8M0VZI5I4fLoLLmXkIVeCqouww+CyiXbd+vJc8+2tIs="; }; nativeBuildInputs = [ copyDesktopItems makeWrapper ] diff --git a/nixpkgs/pkgs/applications/office/micropad/package.json b/nixpkgs/pkgs/applications/office/micropad/package.json index b3492b71e6d2..9c392b08205a 100644 --- a/nixpkgs/pkgs/applications/office/micropad/package.json +++ b/nixpkgs/pkgs/applications/office/micropad/package.json @@ -1,6 +1,6 @@ { "name": "micropad", - "version": "4.3.0", + "version": "4.4.0", "description": "A powerful note-taking app that helps you organise + take notes without restrictions.", "main": "main.js", "scripts": { @@ -27,9 +27,10 @@ "devDependencies": { "@types/mime": "^3.0.1", "@types/node": "^18.7.18", - "electron": "^25.5.0", - "electron-builder": "^24.6.3", - "typescript": "~4.9.5" + "@types/typo-js": "^1.2.1", + "electron": "^27.0.2", + "electron-builder": "^24.6.4", + "typescript": "~5.2.2" }, "dependencies": { "dictionary-en": "^3.0.0", diff --git a/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix b/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix index ee4fe040bfa2..d434e000da5e 100644 --- a/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -1,8 +1,15 @@ -{ buildPythonPackage, lib, fetchFromGitLab +{ buildPythonPackage +, lib +, fetchFromGitLab -, isPy3k, isPyPy +, isPy3k +, isPyPy -, distro, setuptools, psutil +, distro +, setuptools +, psutil +, certifi +, setuptools-scm , pkgs }: @@ -10,6 +17,7 @@ buildPythonPackage rec { pname = "openpaperwork-core"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + format = "pyproject"; sourceRoot = "${src.name}/openpaperwork-core"; @@ -17,23 +25,33 @@ buildPythonPackage rec { disabled = !isPy3k && !isPyPy; patchPhase = '' - echo 'version = "${version}"' > src/openpaperwork_core/_version.py chmod a+w -R .. patchShebangs ../tools ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ distro setuptools psutil + certifi ]; - nativeBuildInputs = [ pkgs.gettext pkgs.which ]; + nativeBuildInputs = [ + pkgs.gettext + pkgs.which + setuptools-scm + ]; preBuild = '' make l10n_compile ''; + preCheck = '' + export HOME=$(mktemp -d) + ''; + meta = { description = "Backend part of Paperwork (Python API, no UI)"; homepage = "https://openpaper.work/"; diff --git a/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index 9566a6010635..cd0290f08746 100644 --- a/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -9,6 +9,7 @@ , pillow , pygobject3 , distro +, setuptools-scm , pkgs }: @@ -16,6 +17,7 @@ buildPythonPackage rec { pname = "openpaperwork-gtk"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + format = "pyproject"; sourceRoot = "${src.name}/openpaperwork-gtk"; @@ -23,12 +25,18 @@ buildPythonPackage rec { disabled = !isPy3k && !isPyPy; patchPhase = '' - echo 'version = "${version}"' > src/openpaperwork_gtk/_version.py chmod a+w -R .. patchShebangs ../tools ''; - nativeBuildInputs = [ pkgs.gettext pkgs.which ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + pkgs.gettext + pkgs.which + setuptools-scm + ]; + preBuild = '' make l10n_compile ''; diff --git a/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix b/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix index cbb57496427c..95608b26e2fe 100644 --- a/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -1,6 +1,5 @@ { buildPythonPackage , lib -, fetchpatch , fetchFromGitLab , pyenchant , scikit-learn @@ -8,7 +7,6 @@ , pycountry , whoosh , termcolor -, levenshtein , pygobject3 , pyocr , natsort @@ -24,34 +22,30 @@ , shared-mime-info , libreoffice , unittestCheckHook +, setuptools-scm }: buildPythonPackage rec { pname = "paperwork-backend"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + format = "pyproject"; sourceRoot = "${src.name}/paperwork-backend"; patches = [ # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 ./flaky_test.patch - (fetchpatch { - url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/0f5cf0fe7ef223000e02c28e4c7576f74a778fe6.patch"; - hash = "sha256-NIK3j2TdydfeK3/udS/Pc+tJa/pPkfAmSPPeaYuaCq4="; - }) ]; patchFlags = [ "-p2" ]; postPatch = '' - substituteInPlace setup.py \ - --replace python-Levenshtein Levenshtein - - echo 'version = "${version}"' > src/paperwork_backend/_version.py chmod a+w -R .. patchShebangs ../tools ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ distro gtk3 @@ -63,7 +57,6 @@ buildPythonPackage rec { pygobject3 pyocr pypillowfight - levenshtein poppler_gi scikit-learn termcolor @@ -74,6 +67,7 @@ buildPythonPackage rec { gettext shared-mime-info which + setuptools-scm ]; preBuild = '' diff --git a/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix b/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix index d4ae3070d9af..a43546ee8e0d 100644 --- a/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -34,6 +34,7 @@ in python3Packages.buildPythonApplication rec { inherit src version; pname = "paperwork"; + format = "pyproject"; sample_docs = sample_documents // { # a trick for the update script @@ -43,21 +44,13 @@ python3Packages.buildPythonApplication rec { sourceRoot = "${src.name}/paperwork-gtk"; - # Patch out a few paths that assume that we're using the FHS: - postPatch = '' - substituteInPlace setup.py \ - --replace python-Levenshtein Levenshtein + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' chmod a+w -R .. patchShebangs ../tools export HOME=$(mktemp -d) - - cat - ../AUTHORS.py > src/paperwork_gtk/_version.py <<EOF - # -*- coding: utf-8 -*- - version = "${version}" - authors_code="" - EOF ''; preBuild = '' @@ -93,6 +86,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gobject-introspection + python3Packages.setuptools-scm (lib.getBin gettext) which gdk-pixbuf # for the setup hook diff --git a/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix b/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix index 56d84e1039c1..7a1d82a5eb31 100644 --- a/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -9,9 +9,11 @@ , openpaperwork-gtk , paperwork-backend , fabulous +, rich , getkey , psutil , shared-mime-info +, setuptools-scm , pkgs }: @@ -19,6 +21,7 @@ buildPythonPackage rec { pname = "paperwork-shell"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + format = "pyproject"; sourceRoot = "${src.name}/paperwork-shell"; @@ -26,10 +29,10 @@ buildPythonPackage rec { disabled = !isPy3k && !isPyPy; patchPhase = '' - echo 'version = "${version}"' > src/paperwork_shell/_version.py chmod a+w -R .. patchShebangs ../tools ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; propagatedBuildInputs = [ openpaperwork-core @@ -37,6 +40,7 @@ buildPythonPackage rec { fabulous getkey psutil + rich ]; nativeCheckInputs = [ @@ -44,7 +48,12 @@ buildPythonPackage rec { openpaperwork-gtk ]; - nativeBuildInputs = [ pkgs.gettext pkgs.which ]; + nativeBuildInputs = [ + pkgs.gettext + pkgs.which + setuptools-scm + ]; + preBuild = '' make l10n_compile ''; diff --git a/nixpkgs/pkgs/applications/office/paperwork/src.nix b/nixpkgs/pkgs/applications/office/paperwork/src.nix index 6323c2c417b8..ad0a071bd4e1 100644 --- a/nixpkgs/pkgs/applications/office/paperwork/src.nix +++ b/nixpkgs/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "/5k+zUtTE+Dr879xbHDCAYrqlEJLsbkcRSG3GbA/PCg="; + sha256 = "sha256-OFVj9INDiOpGd5N3ziMBWt3/IdmpInc+jEAxW3GcvOA="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/nixpkgs/pkgs/applications/office/todoman/default.nix b/nixpkgs/pkgs/applications/office/todoman/default.nix index 813c29e1ef50..56c2219af67d 100644 --- a/nixpkgs/pkgs/applications/office/todoman/default.nix +++ b/nixpkgs/pkgs/applications/office/todoman/default.nix @@ -5,6 +5,7 @@ , installShellFiles , jq , python3 +, fetchpatch }: python3.pkgs.buildPythonApplication rec { @@ -19,6 +20,14 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-dxyI9ypZZBouTUF72wzvi7j+CeoQ9JNSiXrVeV7ForY="; }; + patches = [ + (fetchpatch { + name = "disable-broken-urwid-test.patch"; + url = "https://github.com/pimutils/todoman/commit/7ff0d2e2e69e24df5d66fecc58f8cd0b4e5ced6d.patch"; + hash = "sha256-MMNnnIthNqobexd8GaA6lYxzv5gr1l0e9YK+Ygeje2w="; + }) + ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/zotero/default.nix b/nixpkgs/pkgs/applications/office/zotero/default.nix index 9be6994d6a0d..506b934d77c9 100644 --- a/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -153,5 +153,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ i077 ]; + knownVulnerabilities = [ "CVE-2023-5217" ]; }; } diff --git a/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix index 6ce255675b14..21b80fcf51dd 100644 --- a/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix +++ b/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "QubesOS"; repo = pname; rev = "v${version}"; - sha256 = "sha256:02l1vs5c2jfw22gxvl2fb66m0d99n8ya1i7rphsb5cxsljvxary0"; + hash = "sha256:02l1vs5c2jfw22gxvl2fb66m0d99n8ya1i7rphsb5cxsljvxary0"; }; buildInputs = [ xen ]; diff --git a/nixpkgs/pkgs/applications/radio/cloudlog/default.nix b/nixpkgs/pkgs/applications/radio/cloudlog/default.nix index 87986fdfa8b3..4814672bfa3c 100644 --- a/nixpkgs/pkgs/applications/radio/cloudlog/default.nix +++ b/nixpkgs/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.4.10"; + version = "2.4.11"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-Hj/Qtx9g73H3eKPQgQE+nRqjG344IbxzRX1y/iPgJAc="; + hash = "sha256-w1QCEow0K8uzbHlyASCggw2U+1RXjPbmxd5XRSdp6yE="; }; postPath = '' diff --git a/nixpkgs/pkgs/applications/radio/direwolf/default.nix b/nixpkgs/pkgs/applications/radio/direwolf/default.nix index c93f336b6059..321e78ce9138 100644 --- a/nixpkgs/pkgs/applications/radio/direwolf/default.nix +++ b/nixpkgs/pkgs/applications/radio/direwolf/default.nix @@ -8,6 +8,7 @@ , hamlib , hamlibSupport ? true , perl +, portaudio , python3 , espeak , udev @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { strictDeps = true; buildInputs = lib.optionals stdenv.isLinux [ alsa-lib udev ] + ++ lib.optionals stdenv.isDarwin [ portaudio ] ++ lib.optionals gpsdSupport [ gpsd ] ++ lib.optionals hamlibSupport [ hamlib ] ++ lib.optionals extraScripts [ python3 perl espeak ]; diff --git a/nixpkgs/pkgs/applications/radio/qdmr/default.nix b/nixpkgs/pkgs/applications/radio/qdmr/default.nix index 440c1c955ab0..ed3fa1715f75 100644 --- a/nixpkgs/pkgs/applications/radio/qdmr/default.nix +++ b/nixpkgs/pkgs/applications/radio/qdmr/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "hmatuschek"; repo = "qdmr"; rev = "v${version}"; - sha256 = "sha256-YLGsKGcKIPd0ihd5IzlT71dYkxZfeH7BpnKQMEyY8dI="; + hash = "sha256-YLGsKGcKIPd0ihd5IzlT71dYkxZfeH7BpnKQMEyY8dI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/biology/delly/default.nix b/nixpkgs/pkgs/applications/science/biology/delly/default.nix index 1c39d209c34e..52e2980980af 100644 --- a/nixpkgs/pkgs/applications/science/biology/delly/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/delly/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "delly"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "dellytools"; repo = "delly"; rev = "v${finalAttrs.version}"; - hash = "sha256-oBIY8s/ippf+Xw+3QzMwP0Esc/QpiT6yWeAnqpMix6s="; + hash = "sha256-IxZPbcM52E1bzy6msGmka6Ykgc+OLWTMhWBCn0E4mFI="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/electronics/geda/default.nix b/nixpkgs/pkgs/applications/science/electronics/geda/default.nix index 775bae981339..160928633a3c 100644 --- a/nixpkgs/pkgs/applications/science/electronics/geda/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/geda/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, groff, pkg-config, python2, guile, gtk2, flex, gawk, perl }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, groff, pkg-config, guile, gtk2, flex, gawk, perl }: stdenv.mkDerivation rec { pname = "geda"; @@ -9,12 +9,20 @@ stdenv.mkDerivation rec { hash = "sha256-6GKrJBUoU4+jvuJzkmH1aAERArYMXjmi8DWGY8BCyKQ="; }; + patches = [ + (fetchpatch { + name = "geda-1.10.2-drop-xorn.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch?id=5589cc7bc6c4f18f75c40725a550b8d76e7f5ca1"; + hash = "sha256-jPQaHjEDwCEfZqDGku+xyIMl5WlWlVcpPv1W6Xf8Grs="; + }) + ]; + configureFlags = [ "--disable-update-xdg-database" "--without-libfam" ]; - nativeBuildInputs = [ groff pkg-config python2 ]; + nativeBuildInputs = [ autoreconfHook groff pkg-config ]; buildInputs = [ guile gtk2 flex gawk perl ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix index 90601651e510..86d6716eaeb7 100644 --- a/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "5.012"; + version = "5.016"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Y6GkIgkauayJmGhOQg2kWjbcxYVIob6InMopv555Lb8="; + hash = "sha256-MVQbAZXSIdzX7+yKbSrFLLd0j6dfLSXpES3uu6bcPt8="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix b/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix index 456b939c60ad..826181139c19 100644 --- a/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "xschem"; - version = "3.1.0"; + version = "3.4.4"; src = fetchFromGitHub { owner = "StefanSchippers"; repo = "xschem"; rev = version; - sha256 = "sha256-SHpESg5mn9lSDOURQusQUsug8Jqin/W5rqkVgmseSgA="; + sha256 = "sha256-1jP1SJeq23XNkOQgcl2X+rBrlka4a04irmfhoKRM1j4="; }; nativeBuildInputs = [ bison flex pkg-config ]; diff --git a/nixpkgs/pkgs/applications/science/logic/proverif/default.nix b/nixpkgs/pkgs/applications/science/logic/proverif/default.nix index 57220aa523cf..5cd0e5ff9e39 100644 --- a/nixpkgs/pkgs/applications/science/logic/proverif/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/proverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "proverif"; - version = "2.04"; + version = "2.05"; src = fetchurl { url = "https://bblanche.gitlabpages.inria.fr/proverif/proverif${version}.tar.gz"; - sha256 = "sha256:0xgwnp59779xc40sb7ck8rmfn620pilxyq79l3bymj9m7z0mwvm9"; + hash = "sha256-SHH1PDKrSgRmmgYMSIa6XZCASWlj+5gKmmLSxCnOq8Q="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/applications/science/math/calc/default.nix b/nixpkgs/pkgs/applications/science/math/calc/default.nix index 4cfc4fb182b8..86ec445d9b3e 100644 --- a/nixpkgs/pkgs/applications/science/math/calc/default.nix +++ b/nixpkgs/pkgs/applications/science/math/calc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' - substituteInPlace Makefile \ + substituteInPlace Makefile.target \ --replace '-install_name ''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' \ --replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' ''; diff --git a/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix b/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix index c475dbd5ef2b..d30d560f47fd 100644 --- a/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix +++ b/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs:{ pname = "wxmaxima"; - version = "23.02.1"; + version = "23.10.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${finalAttrs.version}"; - sha256 = "sha256-Lrj/oJNmKlCkNbnCGY2TewCospwajKdWgmKkreHzEIU="; + sha256 = "sha256-3zQzpw0KWNAAvML55O2FMlid9j0GtP8OWy1eqifzVwI="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/version-management/commitizen/default.nix b/nixpkgs/pkgs/applications/version-management/commitizen/default.nix index 178f6281c147..5d8df1bec774 100644 --- a/nixpkgs/pkgs/applications/version-management/commitizen/default.nix +++ b/nixpkgs/pkgs/applications/version-management/commitizen/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { pname = "commitizen"; - version = "3.10.0"; + version = "3.12.0"; format = "pyproject"; disabled = python3.pythonOlder "3.8"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { owner = "commitizen-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-faHZBH/JrCDRQqZT9v6hsj4C9/PbLQxIr+6hNFzsEcg="; + hash = "sha256-Gzx2DdCX8GyxYEi8OH2a21V6JkA50qA+39IInEjLReI="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/applications/version-management/diff-so-fancy/default.nix b/nixpkgs/pkgs/applications/version-management/diff-so-fancy/default.nix index 7b4144ff981e..2cdae3989795 100644 --- a/nixpkgs/pkgs/applications/version-management/diff-so-fancy/default.nix +++ b/nixpkgs/pkgs/applications/version-management/diff-so-fancy/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { diff-so-fancy builds on the good-lookin' output of git contrib's diff-highlight to upgrade your diffs' appearances. ''; - maintainers = with maintainers; [ fpletz globin ma27 ]; + maintainers = with maintainers; [ fpletz ma27 ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-mit/default.nix b/nixpkgs/pkgs/applications/version-management/git-mit/default.nix index bc51f3175e0c..b198fb1dd474 100644 --- a/nixpkgs/pkgs/applications/version-management/git-mit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.163"; + version = "5.12.166"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-Vntwh3YVi6W5eoO0lgMkwMu6EhNhtZDSrkoIze8gBDs="; + hash = "sha256-9+Ya0vQVDP8LNlHogRko3wOahOXwGVSS2gVZHZMMFLo="; }; - cargoHash = "sha256-l+fABvV3nBTUqd6oA6/b7mHIi9LObrsL7beEEveKxgU="; + cargoHash = "sha256-nYy3oB+0uZk1ArfImtfxkoxDPgg55wpOuOtrg+sYzfs="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index 0cbbe9d469ef..9082bffce0f9 100644 --- a/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -10,24 +10,24 @@ with lib; let pname = "gitkraken"; - version = "9.5.1"; + version = "9.9.2"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-irKs0yvz2TrKvF34DMOBdmJvH+Lox/ZVbPSaHAl6Vyo="; + sha256 = "sha256-UfzHkgqxEaSsoiDwFLsyIBW2min9AvSBrLPJ2MlKh3U="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-3g49FBbolEhBgSPanLnrWhfxHR5jg4C1p+70rIrQ2GM="; + sha256 = "sha256-ble0n+giM8xmuSewBVdj+RuT2093rW0taNzsyQLO92I="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - sha256 = "sha256-8ateh2LswWMOboPASWcYTy6OfK30h7wABIgoZXJ7GTM="; + sha256 = "sha256-QYhYzjqbCO0/pRDK7c5jYifj+/UY7SLpRqQUQ3LBFkE="; }; }; @@ -139,9 +139,15 @@ let nativeBuildInputs = [ unzip ]; installPhase = '' + runHook preInstall + mkdir -p $out/Applications/GitKraken.app cp -R . $out/Applications/GitKraken.app + + runHook postInstall ''; + + dontFixup = true; }; in if stdenv.isDarwin diff --git a/nixpkgs/pkgs/applications/version-management/glab/default.nix b/nixpkgs/pkgs/applications/version-management/glab/default.nix index 833bd1523d1d..723f4c59e3fc 100644 --- a/nixpkgs/pkgs/applications/version-management/glab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.33.0"; + version = "1.34.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-sBovwqL+3UmOdGf5pnAVzAiAbu69PJi7YhfcJqdejTY="; + hash = "sha256-YMiT1eJyBwKKFxonQCAu7st+JoU/YLpxKCcMfs/sZ1U="; }; - vendorHash = "sha256-HiU6Kx/du8QLNKUDsSMm349msxSxyNRppxadtIpglBg="; + vendorHash = "sha256-o/B5enbrmv/+zJYBQkxbdUaiieaFyOJDc8Fm6tV//uM="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/sendtokodi/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/sendtokodi/default.nix new file mode 100644 index 000000000000..f6946842ded4 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/kodi/addons/sendtokodi/default.nix @@ -0,0 +1,40 @@ +{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, kodi, inputstreamhelper }: + +buildKodiAddon rec { + pname = "sendtokodi"; + namespace = "plugin.video.sendtokodi"; + version = "0.9.557"; + + src = fetchFromGitHub { + owner = "firsttris"; + repo = "plugin.video.sendtokodi"; + rev = "v${version}"; + hash = "sha256-Ga+9Q7x8+sEmQmteHbSyCahZ/T/l28BAEM84w7bf7z8="; + }; + + patches = [ + ./use-packaged-deps.patch + ]; + + propagatedBuildInputs = [ + inputstreamhelper + ]; + + postPatch = '' + # Remove vendored youtube-dl and yt-dlp libraries. + rm -r lib/ + ''; + + passthru = { + # Instead of the vendored libraries, we propagate youtube-dl and yt-dlp via + # the Python path. + pythonPath = with kodi.pythonPackages; makePythonPath [ youtube-dl yt-dlp ]; + }; + + meta = with lib; { + homepage = "https://github.com/firsttris/plugin.video.sendtokodi"; + description = "Plays various stream sites on Kodi using youtube-dl"; + license = licenses.mit; + maintainers = teams.kodi.members ++ [ maintainers.pks ]; + }; +} diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-deps.patch b/nixpkgs/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-deps.patch new file mode 100644 index 000000000000..abfea58a7ceb --- /dev/null +++ b/nixpkgs/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-deps.patch @@ -0,0 +1,16 @@ +diff --git a/service.py b/service.py +index 1d7b6e4..9782993 100644 +--- a/service.py ++++ b/service.py +@@ -241,9 +241,9 @@ def playlistIndex(url, playlist): + + # Use the chosen resolver while forcing to use youtube_dl on legacy python 2 systems (dlp is python 3.6+) + if xbmcplugin.getSetting(int(sys.argv[1]),"resolver") == "0" or sys.version_info[0] == 2: +- from lib.youtube_dl import YoutubeDL ++ from youtube_dl import YoutubeDL + else: +- from lib.yt_dlp import YoutubeDL ++ from yt_dlp import YoutubeDL + + # patch broken strptime (see above) + patch_strptime() diff --git a/nixpkgs/pkgs/applications/video/mediathekview/default.nix b/nixpkgs/pkgs/applications/video/mediathekview/default.nix index 36d941ec94f4..6db16f1aec06 100644 --- a/nixpkgs/pkgs/applications/video/mediathekview/default.nix +++ b/nixpkgs/pkgs/applications/video/mediathekview/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://mediathekview.de/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; + mainProgram = "mediathek"; maintainers = with maintainers; [ moredread ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix b/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix index 60b392a6aa27..291db71dc75f 100644 --- a/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix +++ b/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "mpv-thumbnail-script"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "marzzzello"; repo = "mpv_thumbnail_script"; rev = version; - sha256 = "sha256-6J1eeuSYyUJmWLIl9WsQ4NzQOBJNO3Cnl5jcPEal4vM="; + sha256 = "sha256-J24Rou7BTE7zoiPlBkWuO9dtYJiuzkuwB4FROuzXzag="; }; nativeBuildInputs = [ python3 ]; diff --git a/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/nixpkgs/pkgs/applications/video/obs-studio/default.nix index 8b3866d624bf..fee8325bf6d5 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -118,12 +118,12 @@ stdenv.mkDerivation rec { postUnpack = '' mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/ for i in ${libcef}/share/cef/*; do - cp -r $i cef/Release/ - cp -r $i cef/Resources/ + ln -s $i cef/Release/ + ln -s $i cef/Resources/ done - cp -r ${libcef}/lib/libcef.so cef/Release/ - cp -r ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ - cp -r ${libcef}/include cef/ + ln -s ${libcef}/lib/libcef.so cef/Release/ + ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ + ln -s ${libcef}/include cef/ ''; cmakeFlags = [ @@ -145,6 +145,9 @@ stdenv.mkDerivation rec { blackmagic-desktop-video ]; in '' + # Remove libcef before patchelf, otherwise it will fail + rm $out/lib/obs-plugins/libcef.so + qtWrapperArgs+=( --prefix LD_LIBRARY_PATH : "$out/lib:${lib.makeLibraryPath wrapperLibraries}" ''${gappsWrapperArgs[@]} @@ -154,6 +157,9 @@ stdenv.mkDerivation rec { postFixup = lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/lib/lib*.so addOpenGLRunpath $out/lib/obs-plugins/*.so + + # Link libcef again after patchelfing other libs + ln -s ${libcef}/lib/libcef.so $out/lib/obs-plugins/libcef.so ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/video/w_scan2/default.nix b/nixpkgs/pkgs/applications/video/w_scan2/default.nix index 56000407fce6..26202ee18bc2 100644 --- a/nixpkgs/pkgs/applications/video/w_scan2/default.nix +++ b/nixpkgs/pkgs/applications/video/w_scan2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "stefantalpalaru"; repo = "w_scan2"; rev = version; - sha256 = "sha256-fDFAJ4EMwu4X1Go3jkRjwA66xDY4tJ5wCKlEdZUT4qQ="; + hash = "sha256-fDFAJ4EMwu4X1Go3jkRjwA66xDY4tJ5wCKlEdZUT4qQ="; }; meta = { diff --git a/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/nixpkgs/pkgs/applications/virtualization/crun/default.nix index e33b860ddc9a..74fa6e225638 100644 --- a/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.9.2"; + version = "1.10"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-C2VPEtHJyO7azDmvH74AoCnNaCeJ7XOLlIIe3nay4Po="; + hash = "sha256-deva/IPyjcGGAnUIofev3RV2ia7uI+OgSiUz/GtHhxE="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix b/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix index 9a63309b9c76..8c2fec16186c 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with lib; { description = "The Docker toolset to pack, ship, store, and deliver content"; license = licenses.asl20; - maintainers = [ maintainers.globin ]; + maintainers = []; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/youki/default.nix b/nixpkgs/pkgs/applications/virtualization/youki/default.nix index 808f91351506..a179b4568a7f 100644 --- a/nixpkgs/pkgs/applications/virtualization/youki/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/youki/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "youki"; - version = "0.1.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Nz3paJiR5Jtv8gLBq6mBUyLDfIFJCpnc/RMsDLT09Vg="; + sha256 = "sha256-XoHGRCGLEG/a6gb+3ejYoeOuIml64U/p6CcxsFLoTWY="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p" "youki" ]; cargoTestFlags = [ "-p" "youki" ]; - cargoHash = "sha256-luzKyN09lauflAict9zqVdGPbDLFAfe5P8121a5YBsA="; + cargoHash = "sha256-L5IhOPo8BDQAvaSs3IJzJHN0TbgmUcEyv60IDLN4kn0="; meta = with lib; { description = "A container runtime written in Rust"; diff --git a/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix b/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix index bac7b9f4cf50..2afb89ad6216 100644 --- a/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/cardboard/default.nix @@ -27,44 +27,49 @@ }: let - # cereal.wrap - cereal-wrap = fetchurl { - name = "cereal-1.3.0.tar.gz"; - url = "https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz"; - hash = "sha256-Mp6j4xMLAmwDpKzFDhaOfa/05uZhvGp9/sDXe1cIUdU="; - }; - cereal-wrapdb = fetchurl { - name = "cereal-1.3.0-1-wrap.zip"; - url = "https://wrapdb.mesonbuild.com/v1/projects/cereal/1.3.0/1/get_zip"; - hash = "sha256-QYck5UT7fPLqtLDb1iOSX4Hnnns48Jj23Ae/LCfLSKY="; - }; + allSources = { + # cereal.wrap + cereal-wrap = fetchurl { + name = "cereal-1.3.0.tar.gz"; + url = "https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz"; + hash = "sha256-Mp6j4xMLAmwDpKzFDhaOfa/05uZhvGp9/sDXe1cIUdU="; + }; + cereal-wrapdb = fetchurl { + name = "cereal-1.3.0-1-wrap.zip"; + url = "https://wrapdb.mesonbuild.com/v1/projects/cereal/1.3.0/1/get_zip"; + hash = "sha256-QYck5UT7fPLqtLDb1iOSX4Hnnns48Jj23Ae/LCfLSKY="; + }; - # expected.wrap - expected-wrap = fetchgit { - name = "expected"; - url = "https://gitlab.com/cardboardwm/expected"; - rev = "0ee13cb2b058809aa9708c45ca18d494e72a759e"; - sha256 = "sha256-gYr4/pjuLlr3k6Jcrg2/SzJLtbgyA+ZN2oMHkHXANDo="; - }; + # expected.wrap + expected-wrap = fetchgit { + name = "expected"; + url = "https://gitlab.com/cardboardwm/expected"; + rev = "0ee13cb2b058809aa9708c45ca18d494e72a759e"; + sha256 = "sha256-gYr4/pjuLlr3k6Jcrg2/SzJLtbgyA+ZN2oMHkHXANDo="; + }; - # wlroots.wrap - wlroots-wrap = fetchgit { - name = "wlroots"; - url = "https://github.com/swaywm/wlroots"; - rev = "0.12.0"; - sha256 = "sha256-1rE3D+kQprjcjobc95/mQkUa5y1noY0MdoYJ/SpFQwY="; + # wlroots.wrap + wlroots-wrap = fetchgit { + name = "wlroots"; + url = "https://github.com/swaywm/wlroots"; + rev = "0.12.0"; + sha256 = "sha256-1rE3D+kQprjcjobc95/mQkUa5y1noY0MdoYJ/SpFQwY="; + }; + + # the source itself + cardboard = fetchFromGitLab { + owner = "cardboardwm"; + repo = "cardboard"; + rev = "b54758d85164fb19468f5ca52588ebea576cd027"; + hash = "sha256-Kn5NyQSDyX7/nn2bKZPnsuepkoppi5XIkdu7IDy5r4w="; + }; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cardboard"; - version = "unstable=2021-05-10"; + version = "unstable-2021-05-10"; - src = fetchFromGitLab { - owner = "cardboardwm"; - repo = "cardboard"; - rev = "b54758d85164fb19468f5ca52588ebea576cd027"; - hash = "sha256-Kn5NyQSDyX7/nn2bKZPnsuepkoppi5XIkdu7IDy5r4w="; - }; + src = allSources.cardboard; nativeBuildInputs = [ meson @@ -95,23 +100,25 @@ stdenv.mkDerivation rec { postPatch = '' pushd subprojects - tar xvf ${cereal-wrap} - unzip ${cereal-wrapdb} - cp -r ${expected-wrap} ${expected-wrap.name} - cp -r ${wlroots-wrap} ${wlroots-wrap.name} + tar xvf ${allSources.cereal-wrap} + unzip ${allSources.cereal-wrapdb} + cp -r ${allSources.expected-wrap} ${allSources.expected-wrap.name} + cp -r ${allSources.wlroots-wrap} ${allSources.wlroots-wrap.name} popd - sed '1i#include <functional>' -i cardboard/ViewAnimation.h # gcc12 + # gcc12 + sed '1i#include <functional>' -i cardboard/ViewAnimation.h ''; # "Inherited" from Nixpkgs expression for wlroots mesonFlags = [ - "-Dman=true" - "-Dwlroots:logind-provider=systemd" - "-Dwlroots:libseat=disabled" + (lib.mesonBool "man" true) + (lib.mesonOption "wlroots:logind-provider" "systemd") + (lib.mesonEnable "wlroots:libseat" false) ]; - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ]; # gcc12 + # gcc12 + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ]; meta = { homepage = "https://gitlab.com/cardboardwm/cardboard"; @@ -119,9 +126,5 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; - knownVulnerabilities = [ - "CVE-2020-11104 (inherited from cereal 1.3.0)" - "CVE-2020-11105 (inherited from cereal 1.3.0)" - ]; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/cwm/default.nix b/nixpkgs/pkgs/applications/window-managers/cwm/default.nix index 94b75af3ea5c..ac5353daeb23 100644 --- a/nixpkgs/pkgs/applications/window-managers/cwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/cwm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "leahneukirchen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L3u4mH2UH2pTHhSPVr5dUi94b9DheslkIWL6EgQ05yA="; + hash = "sha256-L3u4mH2UH2pTHhSPVr5dUi94b9DheslkIWL6EgQ05yA="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index 14a38ec9effc..47ec249ea11e 100644 --- a/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -40,13 +40,13 @@ assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renam assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-a0nqm82brOC0QroGOXxcIKxOMAfl9I6pfFOYjCeRzO0="; + hash = "sha256-8n67P8wvtFgjOufTj4y1sRpBcbMrlhSlH7d8dOhUKns="; }; patches = [ @@ -57,9 +57,15 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Fix hardcoded paths to /usr installation sed -i "s#/usr#$out#" src/render/OpenGL.cpp - substituteInPlace meson.build \ - --replace "@GIT_COMMIT_HASH@" '${finalAttrs.src.rev}' \ - --replace "@GIT_DIRTY@" "" + + # Generate version.h + cp src/version.h.in src/version.h + substituteInPlace src/version.h \ + --replace "@HASH@" '${finalAttrs.src.rev}' \ + --replace "@BRANCH@" "" \ + --replace "@MESSAGE@" "" \ + --replace "@TAG@" "" \ + --replace "@DIRTY@" "" ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index 4188a13c34da..c102b6dfb416 100644 --- a/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -42,8 +42,8 @@ wlroots.overrideAttrs domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; - rev = "98a745d926d8048bc30aef11b421df207a01c279"; - hash = "sha256-LEIUGXvKR5DYFQUTavC3yifcObvG4XZUUHfxXmu8nEM="; + rev = "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc"; + hash = "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM="; }; pname = diff --git a/nixpkgs/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/nixpkgs/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 37c4bb03002e..9960824e642e 100644 --- a/nixpkgs/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (self: { pname = "xdg-desktop-portal-hyprland"; - version = "1.1.0"; + version = "1.2.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; rev = "v${self.version}"; - hash = "sha256-K1cqx+NP4lxPwRVPLEeSUfagaMI3m5hdYvQe7sZr7BU="; + hash = "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/window-managers/i3/default.nix b/nixpkgs/pkgs/applications/window-managers/i3/default.nix index b9079c882814..ca77fa763942 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tiling window manager"; homepage = "https://i3wm.org"; - maintainers = with maintainers; [ modulistic fpletz globin ]; + maintainers = with maintainers; [ modulistic fpletz ]; license = licenses.bsd3; platforms = platforms.all; diff --git a/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index a6802f4ab544..b5e03164ac26 100644 --- a/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -83,7 +83,7 @@ let etcProfile = writeText "profile" '' export PS1='${name}-chrootenv:\u@\h:\w\$ ' export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' - export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" export TZDIR='/etc/zoneinfo' diff --git a/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index eef67154ef94..8ac11436c5f7 100644 --- a/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -110,7 +110,20 @@ let gccForLibs_solib = getLib gccForLibs + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"; - # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu + # The following two functions, `isGccArchSupported` and + # `isGccTuneSupported`, only handle those situations where a flag + # (`-march` or `-mtune`) is accepted by one compiler but rejected + # by another, and both compilers are relevant to nixpkgs. We are + # not trying to maintain a complete list of all flags accepted by + # all versions of all compilers ever in nixpkgs. + # + # The two main cases of interest are: + # + # - One compiler is gcc and the other is clang + # - One compiler is pkgs.gcc and the other is bootstrap-files.gcc + # -- older compilers (for example bootstrap's GCC 5) fail with + # -march=too-modern-cpu + isGccArchSupported = arch: if targetPlatform.isPower then false else # powerpc does not allow -march= if isGNU then @@ -159,6 +172,51 @@ let else false; + isGccTuneSupported = tune: + # for x86 -mtune= takes the same values as -march, plus two more: + if targetPlatform.isx86 then + { + generic = true; + intel = true; + }.${tune} or (isGccArchSupported tune) + # on arm64, the -mtune= values are specific processors + else if targetPlatform.isAarch64 then + (if isGNU then + { + cortex-a53 = versionAtLeast ccVersion "4.8"; # gcc 8c075f + cortex-a72 = versionAtLeast ccVersion "5.1"; # gcc d8f70d + "cortex-a72.cortex-a53" = versionAtLeast ccVersion "5.1"; # gcc d8f70d + }.${tune} or false + else if isClang then + { + cortex-a53 = versionAtLeast ccVersion "3.9"; # llvm dfc5d1 + }.${tune} or false + else false) + else if targetPlatform.isPower then + # powerpc does not support -march + true + else if targetPlatform.isMips then + # for mips -mtune= takes the same values as -march + isGccArchSupported tune + else + false; + + # Clang does not support as many `-mtune=` values as gcc does; + # this function will return the best possible approximation of the + # provided `-mtune=` value, or `null` if none exists. + # + # Note: this function can make use of ccVersion; for example, `if + # versionOlder ccVersion "12" then ...` + findBestTuneApproximation = tune: + let guess = if isClang + then { + # clang does not tune for big.LITTLE chips + "cortex-a72.cortex-a53" = "cortex-a72"; + }.${tune} or tune + else tune; + in if isGccTuneSupported guess + then guess + else null; darwinPlatformForCC = optionalString stdenv.targetPlatform.isDarwin ( if (targetPlatform.darwinPlatform == "macos" && isGNU) then "macosx" @@ -559,10 +617,12 @@ stdenv.mkDerivation { + optionalString (targetPlatform ? gcc.thumb) '' echo "-m${if targetPlatform.gcc.thumb then "thumb" else "arm"}" >> $out/nix-support/cc-cflags-before '' - + optionalString (targetPlatform ? gcc.tune && - isGccArchSupported targetPlatform.gcc.tune) '' - echo "-mtune=${targetPlatform.gcc.tune}" >> $out/nix-support/cc-cflags-before - '' + + (let tune = if targetPlatform ? gcc.tune + then findBestTuneApproximation targetPlatform.gcc.tune + else null; + in optionalString (tune != null) '' + echo "-mtune=${tune}" >> $out/nix-support/cc-cflags-before + '') # TODO: categorize these and figure out a better place for them + optionalString targetPlatform.isWindows '' diff --git a/nixpkgs/pkgs/build-support/php/build-composer-project.nix b/nixpkgs/pkgs/build-support/php/build-composer-project.nix index d614ca01eb71..778aa35fa6a5 100644 --- a/nixpkgs/pkgs/build-support/php/build-composer-project.nix +++ b/nixpkgs/pkgs/build-support/php/build-composer-project.nix @@ -13,6 +13,7 @@ let composerNoDev = previousAttrs.composerNoDev or true; composerNoPlugins = previousAttrs.composerNoPlugins or true; composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ composer @@ -69,6 +70,7 @@ let composerNoDev = previousAttrs.composerNoDev or true; composerNoPlugins = previousAttrs.composerNoPlugins or true; composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; }; COMPOSER_CACHE_DIR="/dev/null"; diff --git a/nixpkgs/pkgs/build-support/php/build-composer-repository.nix b/nixpkgs/pkgs/build-support/php/build-composer-repository.nix index 9487b61e16cb..5b31f86e61cf 100644 --- a/nixpkgs/pkgs/build-support/php/build-composer-repository.nix +++ b/nixpkgs/pkgs/build-support/php/build-composer-repository.nix @@ -32,6 +32,7 @@ let composerNoDev = previousAttrs.composerNoDev or true; composerNoPlugins = previousAttrs.composerNoPlugins or true; composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; name = "${previousAttrs.pname}-${previousAttrs.version}-composer-repository"; diff --git a/nixpkgs/pkgs/build-support/php/hooks/composer-install-hook.sh b/nixpkgs/pkgs/build-support/php/hooks/composer-install-hook.sh index ab7756aef4f1..6fe1c4e5f7dd 100644 --- a/nixpkgs/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/nixpkgs/pkgs/build-support/php/hooks/composer-install-hook.sh @@ -35,14 +35,16 @@ composerInstallConfigureHook() { cp composer.lock $out/ echo - echo 'No composer.lock file found, consider adding one to your repository to ensure reproducible builds.' - echo "In the meantime, a composer.lock file has been generated for you in $out/composer.lock" + echo -e "\e[31mERROR: No composer.lock found\e[0m" echo - echo 'To fix the issue:' - echo "1. Copy the composer.lock file from $out/composer.lock to the project's source:" - echo " cp $out/composer.lock <path>" - echo '2. Add the composerLock attribute, pointing to the copied composer.lock file:' - echo ' composerLock = ./composer.lock;' + echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m' + echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m" + echo + echo -e '\e[31mTo fix the issue:\e[0m' + echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m" + echo -e "\e[31m cp $out/composer.lock <path>\e[0m" + echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m' + echo -e '\e[31m composerLock = ./composer.lock;\e[0m' echo exit 1 @@ -51,15 +53,15 @@ composerInstallConfigureHook() { echo "Validating consistency between composer.lock and ${composerRepository}/composer.lock" if ! @cmp@ -s "composer.lock" "${composerRepository}/composer.lock"; then echo - echo "ERROR: vendorHash is out of date" + echo -e "\e[31mERROR: vendorHash is out of date\e[0m" echo - echo "composer.lock is not the same in $composerRepository" + echo -e "\e[31mcomposer.lock is not the same in $composerRepository\e[0m" echo - echo "To fix the issue:" - echo '1. Set vendorHash to an empty string: `vendorHash = "";`' - echo '2. Build the derivation and wait for it to fail with a hash mismatch' - echo '3. Copy the "got: sha256-..." value back into the vendorHash field' - echo ' You should have: vendorHash = "sha256-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX=";' + echo -e "\e[31mTo fix the issue:\e[0m" + echo -e '\e[31m1. Set vendorHash to an empty string: `vendorHash = "";`\e[0m' + echo -e '\e[31m2. Build the derivation and wait for it to fail with a hash mismatch\e[0m' + echo -e '\e[31m3. Copy the "got: sha256-..." value back into the vendorHash field\e[0m' + echo -e '\e[31m You should have: vendorHash = "sha256-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX=";\e[0m' echo exit 1 @@ -105,7 +107,26 @@ composerInstallBuildHook() { composerInstallCheckHook() { echo "Executing composerInstallCheckHook" - composer validate --no-ansi --no-interaction + if ! composer validate --strict --no-ansi --no-interaction --quiet; then + if [ ! -z "${composerStrictValidation-}" ]; then + echo + echo -e "\e[31mERROR: composer files validation failed\e[0m" + echo + echo -e '\e[31mThe validation of the composer.json and composer.lock failed.\e[0m' + echo -e '\e[31mMake sure that the file composer.lock is consistent with composer.json.\e[0m' + echo + exit 1 + else + echo + echo -e "\e[33mWARNING: composer files validation failed\e[0m" + echo + echo -e '\e[33mThe validation of the composer.json and composer.lock failed.\e[0m' + echo -e '\e[33mMake sure that the file composer.lock is consistent with composer.json.\e[0m' + echo + echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m' + echo + fi + fi echo "Finished composerInstallCheckHook" } diff --git a/nixpkgs/pkgs/build-support/php/hooks/composer-repository-hook.sh b/nixpkgs/pkgs/build-support/php/hooks/composer-repository-hook.sh index 2c35b11b73b4..03783d9d639c 100644 --- a/nixpkgs/pkgs/build-support/php/hooks/composer-repository-hook.sh +++ b/nixpkgs/pkgs/build-support/php/hooks/composer-repository-hook.sh @@ -3,6 +3,7 @@ declare version declare composerNoDev declare composerNoPlugins declare composerNoScripts +declare composerStrictValidation preConfigureHooks+=(composerRepositoryConfigureHook) preBuildHooks+=(composerRepositoryBuildHook) @@ -31,14 +32,16 @@ composerRepositoryConfigureHook() { cp composer.lock $out/ echo - echo 'No composer.lock file found, consider adding one to your repository to ensure reproducible builds.' - echo "In the meantime, a composer.lock file has been generated for you in $out/composer.lock" + echo -e "\e[31mERROR: No composer.lock found\e[0m" echo - echo 'To fix the issue:' - echo "1. Copy the composer.lock file from $out/composer.lock to the project's source:" - echo " cp $out/composer.lock <path>" - echo '2. Add the composerLock attribute, pointing to the copied composer.lock file:' - echo ' composerLock = ./composer.lock;' + echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m' + echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m" + echo + echo -e '\e[31mTo fix the issue:\e[0m' + echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m" + echo -e "\e[31m cp $out/composer.lock <path>\e[0m" + echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m' + echo -e '\e[31m composerLock = ./composer.lock;\e[0m' echo exit 1 @@ -63,7 +66,26 @@ composerRepositoryBuildHook() { composerRepositoryCheckHook() { echo "Executing composerRepositoryCheckHook" - composer validate --no-ansi --no-interaction + if ! composer validate --strict --no-ansi --no-interaction --quiet; then + if [ ! -z "${composerStrictValidation-}" ]; then + echo + echo -e "\e[31mERROR: composer files validation failed\e[0m" + echo + echo -e '\e[31mThe validation of the composer.json and composer.lock failed.\e[0m' + echo -e '\e[31mMake sure that the file composer.lock is consistent with composer.json.\e[0m' + echo + exit 1 + else + echo + echo -e "\e[33mWARNING: composer files validation failed\e[0m" + echo + echo -e '\e[33mThe validation of the composer.json and composer.lock failed.\e[0m' + echo -e '\e[33mMake sure that the file composer.lock is consistent with composer.json.\e[0m' + echo + echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m' + echo + fi + fi echo "Finished composerRepositoryCheckHook" } diff --git a/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix index 4e3e2045e8ec..d977fb9f7c27 100644 --- a/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix @@ -366,6 +366,10 @@ crate_: lib.makeOverridable meta = { mainProgram = crateName; + badPlatforms = [ + # Rust is currently unable to target the n32 ABI + lib.systems.inspect.patterns.isMips64n32 + ]; }; } // extraDerivationAttrs ) diff --git a/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix b/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix index ea15421b29fa..8b87bcbee3af 100644 --- a/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix +++ b/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix @@ -163,6 +163,10 @@ let "x86_64-redox" "wasm32-wasi" ]; + badPlatforms = [ + # Rust is currently unable to target the n32 ABI + lib.systems.inspect.patterns.isMips64n32 + ]; } // meta; }) // { overrideRustAttrs = f: buildRustPackage (args // (f args)); diff --git a/nixpkgs/pkgs/build-support/writers/data.nix b/nixpkgs/pkgs/build-support/writers/data.nix index 48f9bc547ed3..45ed5360eaeb 100644 --- a/nixpkgs/pkgs/build-support/writers/data.nix +++ b/nixpkgs/pkgs/build-support/writers/data.nix @@ -1,4 +1,4 @@ -{ lib, runCommand, dasel }: +{ lib, pkgs, formats, runCommand, dasel }: let daselBin = lib.getExe dasel; @@ -23,7 +23,7 @@ rec { # writeJSON = makeDataWriter { input = builtins.toJSON; output = "cp $inputPath $out"; }; # myConfig = writeJSON "config.json" { hello = "world"; } # - makeDataWriter = { input ? lib.id, output ? "cp $inputPath $out" }: nameOrPath: data: + makeDataWriter = lib.warn "pkgs.writers.makeDataWriter is deprecated. Use pkgs.writeTextFile." ({ input ? lib.id, output ? "cp $inputPath $out" }: nameOrPath: data: assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); let name = last (builtins.split "/" nameOrPath); @@ -40,41 +40,25 @@ rec { mkdir -p $out/$(dirname "${nameOrPath}") mv tmp $out/${nameOrPath} ''} - ''; + ''); - # Writes the content to text. - # - # Example: - # writeText "filename.txt" "file content" - writeText = makeDataWriter { - input = toString; - output = "cp $inputPath $out"; - }; + inherit (pkgs) writeText; # Writes the content to a JSON file. # # Example: # writeJSON "data.json" { hello = "world"; } - writeJSON = makeDataWriter { - input = builtins.toJSON; - output = "${daselBin} -f $inputPath -r json -w json > $out"; - }; + writeJSON = (pkgs.formats.json {}).generate; # Writes the content to a TOML file. # # Example: # writeTOML "data.toml" { hello = "world"; } - writeTOML = makeDataWriter { - input = builtins.toJSON; - output = "${daselBin} -f $inputPath -r json -w toml > $out"; - }; + writeTOML = (pkgs.formats.toml {}).generate; # Writes the content to a YAML file. # # Example: # writeYAML "data.yaml" { hello = "world"; } - writeYAML = makeDataWriter { - input = builtins.toJSON; - output = "${daselBin} -f $inputPath -r json -w yaml > $out"; - }; + writeYAML = (pkgs.formats.yaml {}).generate; } diff --git a/nixpkgs/pkgs/build-support/writers/test.nix b/nixpkgs/pkgs/build-support/writers/test.nix index 2411f8c03a70..005daf0be5b4 100644 --- a/nixpkgs/pkgs/build-support/writers/test.nix +++ b/nixpkgs/pkgs/build-support/writers/test.nix @@ -7,6 +7,7 @@ , python3Packages , pypy3Packages , runCommand +, testers , writers , writeText }: @@ -36,14 +37,7 @@ let let expectedFile = writeText "${file.name}-expected" expected; in - runCommand "run-${file.name}" {} '' - if ! diff -u ${file} ${expectedFile}; then - echo 'test ${file.name} failed' - exit 1 - fi - - touch $out - ''; + testers.testEqualContents { expected = expectedFile; actual = file; assertion = "${file.name} matches"; }; in lib.recurseIntoAttrs { bin = lib.recurseIntoAttrs { @@ -261,7 +255,9 @@ lib.recurseIntoAttrs { toml = expectDataEqual { file = writeTOML "data.toml" { hello = "world"; }; - expected = "hello = 'world'\n"; + expected = '' + hello = "world" + ''; }; yaml = expectDataEqual { diff --git a/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch b/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch index 364f7653efa3..364f7653efa3 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch +++ b/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch diff --git a/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch b/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch index 234e510d3d17..234e510d3d17 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch +++ b/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch diff --git a/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix b/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix index f6afcd7d884f..4816ac1bdc73 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -11,7 +11,7 @@ , bashInteractive , nix-update-script , testers -, ssm-agent +, amazon-ssm-agent , overrideEtc ? true }: @@ -40,13 +40,13 @@ let in buildGoModule rec { pname = "amazon-ssm-agent"; - version = "3.2.1630.0"; + version = "3.2.1705.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ssm-agent"; rev = "refs/tags/${version}"; - hash = "sha256-0tN0rBfz2VZ4UkYLFDGg9218O9vyyRT2Lrppu9TETao="; + hash = "sha256-4KhDD5G/fS1rHitQdbYqIz6RSQ3PTMZsUENC202a/Do="; }; vendorHash = null; @@ -138,7 +138,7 @@ buildGoModule rec { passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { - package = ssm-agent; + package = amazon-ssm-agent; command = "amazon-ssm-agent --version"; }; }; diff --git a/nixpkgs/pkgs/by-name/as/ast-grep/package.nix b/nixpkgs/pkgs/by-name/as/ast-grep/package.nix index 3ac77c214afc..68e9ebd5f4d0 100644 --- a/nixpkgs/pkgs/by-name/as/ast-grep/package.nix +++ b/nixpkgs/pkgs/by-name/as/ast-grep/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-rWfuPk8PWxOmy/WDXGnqBCuGPEI7tBwuOc0IP2FhAq8="; + hash = "sha256-oFe3AbMpBVBAm/W4IowXAKcEN7CDrrAXhx4dzMXppUM="; }; - cargoHash = "sha256-M3eNvY8UwsnV9mvkGD//u1zTiJzV1ce7ODyQjnDSZTo="; + cargoHash = "sha256-f4tcJqT3l9G6FimBb0D4PATgQYUkSG5uIQ9BbsbgC/U="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/nixpkgs/pkgs/by-name/br/bruno/package.nix b/nixpkgs/pkgs/by-name/br/bruno/package.nix index 4dfa1375ef7a..b058449ea224 100644 --- a/nixpkgs/pkgs/by-name/br/bruno/package.nix +++ b/nixpkgs/pkgs/by-name/br/bruno/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "bruno"; - version = "0.17.0"; + version = "0.27.0"; src = fetchurl { url = "https://github.com/usebruno/bruno/releases/download/v${version}/bruno_${version}_amd64_linux.deb"; - hash = "sha256-4FF9SEgWuIPQSarOBTaEvgdgRTkR1caRYr/bjfFmTLE="; + hash = "sha256-57Cbp/+3rNq/bhUItPuN6ZIjSd8IzmJsn9FNm89khiE="; }; nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/by-name/ca/cargo-xwin/package.nix b/nixpkgs/pkgs/by-name/ca/cargo-xwin/package.nix new file mode 100644 index 000000000000..36d60fb509de --- /dev/null +++ b/nixpkgs/pkgs/by-name/ca/cargo-xwin/package.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-xwin"; + version = "0.14.8"; + + src = fetchFromGitHub { + owner = "rust-cross"; + repo = "cargo-xwin"; + rev = "v${version}"; + hash = "sha256-VhpqmGhGBqB20ZteIwbd0GCIUltBGfBw7XF9lH7witA="; + }; + + cargoHash = "sha256-e5QyaiQKlIzBwJE781BrhdVINacw0iniPywIsoMlCGg="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Cross compile Cargo project to Windows MSVC target with ease"; + homepage = "https://github.com/rust-cross/cargo-xwin"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ shivaraj-bh ]; + }; +} diff --git a/nixpkgs/pkgs/by-name/ci/cidr-merger/package.nix b/nixpkgs/pkgs/by-name/ci/cidr-merger/package.nix new file mode 100644 index 000000000000..3d0612071609 --- /dev/null +++ b/nixpkgs/pkgs/by-name/ci/cidr-merger/package.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "cidr-merger"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "zhanhb"; + repo = "cidr-merger"; + rev = "v${version}"; + sha256 = "sha256-Kb+89VP7JhBrTE4MM3H/dqoIBgDLnVhKqkgHdymYCgk="; + }; + + vendorHash = "sha256-cPri384AX/FdfNtzt3xj4bF+/izSa4sZuAohK0R/7H4="; + + meta = with lib; { + description = "A simple command line tool to merge ip/ip cidr/ip range, supports IPv4/IPv6"; + homepage = "https://github.com/zhanhb/cidr-merger"; + license = licenses.mit; + maintainers = with maintainers; [ cyounkins ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/7.nix b/nixpkgs/pkgs/by-name/ci/ciscoPacketTracer7/package.nix index 620e7420439b..620e7420439b 100644 --- a/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/7.nix +++ b/nixpkgs/pkgs/by-name/ci/ciscoPacketTracer7/package.nix diff --git a/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/8.nix b/nixpkgs/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index 5784c156e956..5784c156e956 100644 --- a/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/8.nix +++ b/nixpkgs/pkgs/by-name/ci/ciscoPacketTracer8/package.nix diff --git a/nixpkgs/pkgs/servers/monitoring/cockpit/default.nix b/nixpkgs/pkgs/by-name/co/cockpit/package.nix index f73f391f71b9..48bcff3f32a9 100644 --- a/nixpkgs/pkgs/servers/monitoring/cockpit/default.nix +++ b/nixpkgs/pkgs/by-name/co/cockpit/package.nix @@ -1,7 +1,5 @@ { lib , stdenv -, fetchzip -, fetchurl , fetchFromGitHub , autoreconfHook , bashInteractive @@ -14,7 +12,6 @@ , gettext , git , glib -, glibc , glib-networking , gnused , gnutls @@ -26,6 +23,7 @@ , makeWrapper , nodejs , nixosTests +, nix-update-script , openssh , openssl , pam @@ -47,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "287"; + version = "303"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - sha256 = "sha256-tIZOI3jiMRaGHMXS1mA1Tom9ij3L/VuxDUJdnEc7SSc="; + hash = "sha256-1VPnmb4VDSwzdXtk2YZVHH4qFJSe2OPzsmzVD/NkbYg="; fetchSubmodules = true; }; @@ -108,6 +106,7 @@ stdenv.mkDerivation rec { --replace 'devel@lists.cockpit-project.org' 'https://github.com/NixOS/nixpkgs/issues/new?assignees=&labels=0.kind%3A+bug&template=bug_report.md&title=cockpit%25' patchShebangs \ + build.js \ test/common/pixel-tests \ test/common/run-tests \ test/common/tap-cdp \ @@ -126,9 +125,6 @@ stdenv.mkDerivation rec { cp node_modules/.package-lock.json package-lock.json - substituteInPlace src/systemd_ctypes/libsystemd.py \ - --replace libsystemd.so.0 ${systemd}/lib/libsystemd.so.0 - for f in pkg/**/*.js pkg/**/*.jsx test/**/* src/**/*; do # some files substituteInPlace report as missing and it's safe to ignore them substituteInPlace "$(realpath "$f")" \ @@ -150,6 +146,7 @@ stdenv.mkDerivation rec { "--disable-pcp" # TODO: figure out how to package its dependency "--with-default-session-path=/run/wrappers/bin:/run/current-system/sw/bin" "--with-admin-group=root" # TODO: really? Maybe "wheel"? + "--enable-old-bridge=yes" ]; enableParallelBuilding = true; @@ -213,12 +210,12 @@ stdenv.mkDerivation rec { make check -j$NIX_BUILD_CORES || true test/static-code npm run eslint - npm run stylelint + npm run stylelint || true ''; passthru = { tests = { inherit (nixosTests) cockpit; }; - updateScript = ./update.sh; + updateScript = nix-update-script {}; }; meta = with lib; { diff --git a/nixpkgs/pkgs/by-name/cy/cyme/package.nix b/nixpkgs/pkgs/by-name/cy/cyme/package.nix new file mode 100644 index 000000000000..3e32c22d2e41 --- /dev/null +++ b/nixpkgs/pkgs/by-name/cy/cyme/package.nix @@ -0,0 +1,53 @@ +{ + lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, stdenv +, darwin +, libusb1 +, udev +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "cyme"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "tuna-f1sh"; + repo = "cyme"; + rev = "v${version}"; + hash = "sha256-UXh97pHJ9wa/xSslHLB7WVDwLKJYvLPgmPX8RvKrsTI="; + }; + + cargoHash = "sha256-hSd53K50Y4K/fYGfsT2fHUaipVSpeYN6/EOFlv4ocuE="; + + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + darwin.DarwinTools + ]; + + buildInputs = [ + libusb1 + ] ++ lib.optionals stdenv.isLinux [ + udev + ]; + + checkFlags = lib.optionals stdenv.isDarwin [ + # system_profiler is not available in the sandbox + "--skip=test_run" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://github.com/tuna-f1sh/cyme"; + description = "A modern cross-platform lsusb"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ h7x4 ]; + platforms = platforms.linux ++ platforms.darwin ++ platforms.windows; + mainProgram = "cyme"; + }; +} diff --git a/nixpkgs/pkgs/by-name/de/decker/package.nix b/nixpkgs/pkgs/by-name/de/decker/package.nix new file mode 100644 index 000000000000..84c08eaaa38d --- /dev/null +++ b/nixpkgs/pkgs/by-name/de/decker/package.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, SDL2_image +, unixtools +, multimarkdown +}: + +stdenv.mkDerivation rec { + pname = "decker"; + version = "1.31"; + + src = fetchFromGitHub { + owner = "JohnEarnest"; + repo = "Decker"; + rev = "v${version}"; + hash = "sha256-9utCIf7LO/ms46QqagkcXZ3BuvRuLa6nE78MgkbaEjA="; + }; + + buildInputs = [ + SDL2 + SDL2_image + multimarkdown + unixtools.xxd + ]; + + doCheck = true; + + postPatch = '' + patchShebangs ./scripts + ''; + + buildPhase = '' + runHook preBuild + make lilt + make decker + make docs + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm0755 ./c/build/lilt -t $out/bin + install -Dm0755 ./c/build/decker -t $out/bin + install -Dm0644 ./syntax/vim/ftdetect/lil.vim -t $out/share/vim-plugins/decker/ftdetect + install -Dm0644 ./syntax/vim/syntax/lil.vim -t $out/share/vim-plugins/decker/syntax + + # Fixing the permissions of the installed files on the documentation. + chmod a-x ./docs/images/* \ + ./docs/*.md \ + ./examples/decks/*.deck \ + ./examples/lilt/*.lil + + # This example has a shebang so we'll leave it as an executable. + chmod a+x ./examples/lilt/podcasts.lil + + mkdir -p $out/share/doc/decker + cp -r ./docs/*.html ./docs/images ./examples $out/share/doc/decker + + runHook postInstall + ''; + + checkPhase = '' + runHook preCheck + make test + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://beyondloom.com/decker"; + description = "Multimedia platform for creating and sharing interactive documents"; + license = licenses.mit; + mainProgram = "decker"; + platforms = platforms.all; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/diesel-cli-ext/default.nix b/nixpkgs/pkgs/by-name/di/diesel-cli-ext/package.nix index 3e784090398b..7b118b3ce7e0 100644 --- a/nixpkgs/pkgs/development/tools/diesel-cli-ext/default.nix +++ b/nixpkgs/pkgs/by-name/di/diesel-cli-ext/package.nix @@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec { description = "Provides different tools for projects using the diesel_cli"; homepage = "https://crates.io/crates/diesel_cli_ext"; license = with licenses; [ asl20 mit ]; + mainProgram = "diesel_ext"; maintainers = with maintainers; [ siph ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/doggo/default.nix b/nixpkgs/pkgs/by-name/do/doggo/package.nix index ebebb1fcca05..cdd19bc37b90 100644 --- a/nixpkgs/pkgs/tools/networking/doggo/default.nix +++ b/nixpkgs/pkgs/by-name/do/doggo/package.nix @@ -1,31 +1,21 @@ -{ lib -, buildGoModule +{ buildGoModule , fetchFromGitHub , installShellFiles -, fetchpatch +, lib }: buildGoModule rec { pname = "doggo"; - version = "0.5.5"; + version = "0.5.7"; src = fetchFromGitHub { owner = "mr-karan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qc6RYz2bVaY/IBGIXUYO6wyh7iUDAJ1ASCK0dFwZo6s="; + hash = "sha256-hzl7BE3vsE2G9O2nwN/gkqQTJ+9aDfNIjmpmgN1AYq8="; }; - patches = [ - # go 1.20 support - # https://github.com/mr-karan/doggo/pull/66 - (fetchpatch { - url = "https://github.com/mr-karan/doggo/commit/7db5c2144fa4a3f18afe1c724b9367b03f84aed7.patch"; - hash = "sha256-cx8s23e02zIvJOtuqTz8XC9ApYODh96Ubl1KhsFUZ9g="; - }) - ]; - - vendorHash = "sha256-GVLfPK1DFVSfNSdIxYSaspHFphd8ft2HUK0SMeWiVUg="; + vendorHash = "sha256-uonybBLABPj9CPtc+y82ajvQI7kubK+lKi4eLcZIUqA="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/doggo" ]; diff --git a/nixpkgs/pkgs/by-name/fa/fantomas/package.nix b/nixpkgs/pkgs/by-name/fa/fantomas/package.nix new file mode 100644 index 000000000000..c698e6edef6c --- /dev/null +++ b/nixpkgs/pkgs/by-name/fa/fantomas/package.nix @@ -0,0 +1,17 @@ +{ buildDotnetGlobalTool, lib }: + +buildDotnetGlobalTool { + pname = "fantomas"; + version = "6.2.2"; + + nugetSha256 = "sha256-r5F44iwAV3QSeh3TyGTVhrN2oL4A68eD5dKiz/VnwdI="; + + meta = with lib; { + description = "F# source code formatter"; + homepage = "https://github.com/fsprojects/fantomas"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ mikaelfangel ]; + mainProgram = "fantomas"; + }; +} diff --git a/nixpkgs/pkgs/by-name/gr/grun/package.nix b/nixpkgs/pkgs/by-name/gr/grun/package.nix new file mode 100644 index 000000000000..aef41add611d --- /dev/null +++ b/nixpkgs/pkgs/by-name/gr/grun/package.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, gtk2 +, pkg-config +, autoreconfHook +}: + +stdenv.mkDerivation { + pname = "grun"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "lrgc"; + repo = "grun"; + rev = "release_0_9_3"; + hash = "sha256-VbvX0wrgMIPmPnu3aQdtQ6H0X3umi8aJ42QvmmeMrJ0="; + }; + + buildInputs = [ + gtk2 + ]; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = { + description = "An application launcher written in C and using GTK for the interface"; + homepage = "https://github.com/lrgc/grun"; + platforms = lib.platforms.linux; + license = with lib.licenses; [ gpl2Only ]; + maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; + }; +} + diff --git a/nixpkgs/pkgs/by-name/la/lanraragi/expose-password-hashing.patch b/nixpkgs/pkgs/by-name/la/lanraragi/expose-password-hashing.patch new file mode 100644 index 000000000000..1f6941f55ff4 --- /dev/null +++ b/nixpkgs/pkgs/by-name/la/lanraragi/expose-password-hashing.patch @@ -0,0 +1,36 @@ +diff --git a/lib/LANraragi/Controller/Config.pm b/lib/LANraragi/Controller/Config.pm +index 2cd2c999..0bd8ab6e 100644 +--- a/lib/LANraragi/Controller/Config.pm ++++ b/lib/LANraragi/Controller/Config.pm +@@ -50,6 +50,15 @@ sub index { + ); + } + ++sub make_password_hash { ++ my $ppr = Authen::Passphrase::BlowfishCrypt->new( ++ cost => 8, ++ salt_random => 1, ++ passphrase => shift, ++ ); ++ return $ppr->as_rfc2307; ++} ++ + # Save the given parameters to the Redis config + sub save_config { + +@@ -95,14 +104,7 @@ sub save_config { + my $password = $self->req->param('newpassword'); + + if ( $password ne "" ) { +- my $ppr = Authen::Passphrase::BlowfishCrypt->new( +- cost => 8, +- salt_random => 1, +- passphrase => $password, +- ); +- +- my $pass_hashed = $ppr->as_rfc2307; +- $confhash{password} = $pass_hashed; ++ $confhash{password} = make_password_hash($password); + } + } + diff --git a/nixpkgs/pkgs/by-name/la/lanraragi/fix-minion-redis-password.patch b/nixpkgs/pkgs/by-name/la/lanraragi/fix-minion-redis-password.patch new file mode 100644 index 000000000000..eb6b88f68f7f --- /dev/null +++ b/nixpkgs/pkgs/by-name/la/lanraragi/fix-minion-redis-password.patch @@ -0,0 +1,34 @@ +diff --git a/lib/LANraragi.pm b/lib/LANraragi.pm +index e6b833c4..d677030b 100644 +--- a/lib/LANraragi.pm ++++ b/lib/LANraragi.pm +@@ -144,8 +144,13 @@ sub startup { + shutdown_from_pid( get_temp . "/minion.pid" ); + + my $miniondb = $self->LRR_CONF->get_redisad . "/" . $self->LRR_CONF->get_miniondb; ++ my $redispassword = $self->LRR_CONF->get_redispassword; ++ ++ # If the password is non-empty, add the required delimiters ++ if ($redispassword) { $redispassword = "x:" . $redispassword . "@"; } ++ + say "Minion will use the Redis database at $miniondb"; +- $self->plugin( 'Minion' => { Redis => "redis://$miniondb" } ); ++ $self->plugin( 'Minion' => { Redis => "redis://$redispassword$miniondb" } ); + $self->LRR_LOGGER->info("Successfully connected to Minion database."); + $self->minion->missing_after(5); # Clean up older workers after 5 seconds of unavailability + +diff --git a/lib/LANraragi/Model/Config.pm b/lib/LANraragi/Model/Config.pm +index f52056d4..63e1f5d3 100644 +--- a/lib/LANraragi/Model/Config.pm ++++ b/lib/LANraragi/Model/Config.pm +@@ -42,8 +42,8 @@ sub get_minion { + my $miniondb = get_redisad . "/" . get_miniondb; + my $password = get_redispassword; + +- # If the password is non-empty, add the required @ +- if ($password) { $password = $password . "@"; } ++ # If the password is non-empty, add the required delimiters ++ if ($password) { $password = "x:" . $password . "@"; } + + return Minion->new( Redis => "redis://$password$miniondb" ); + } diff --git a/nixpkgs/pkgs/by-name/la/lanraragi/fix-paths.patch b/nixpkgs/pkgs/by-name/la/lanraragi/fix-paths.patch new file mode 100644 index 000000000000..f545bd4759f7 --- /dev/null +++ b/nixpkgs/pkgs/by-name/la/lanraragi/fix-paths.patch @@ -0,0 +1,100 @@ +diff --git a/lib/LANraragi.pm b/lib/LANraragi.pm +index e6b833c4..4b90e4c5 100644 +--- a/lib/LANraragi.pm ++++ b/lib/LANraragi.pm +@@ -21,6 +21,8 @@ use LANraragi::Utils::Minion; + use LANraragi::Model::Search; + use LANraragi::Model::Config; + ++use FindBin; ++ + # This method will run once at server start + sub startup { + my $self = shift; +@@ -30,7 +32,7 @@ sub startup { + say "キタ━━━━━━(゚∀゚)━━━━━━!!!!!"; + + # Load package.json to get version/vername/description +- my $packagejson = decode_json( Mojo::File->new('package.json')->slurp ); ++ my $packagejson = decode_json( Mojo::File->new("$FindBin::Bin/../package.json")->slurp ); + + my $version = $packagejson->{version}; + my $vername = $packagejson->{version_name}; +diff --git a/lib/LANraragi/Model/Archive.pm b/lib/LANraragi/Model/Archive.pm +index 73e824dd..8bcea29c 100644 +--- a/lib/LANraragi/Model/Archive.pm ++++ b/lib/LANraragi/Model/Archive.pm +@@ -13,6 +13,7 @@ use Time::HiRes qw(usleep); + use File::Basename; + use File::Copy "cp"; + use File::Path qw(make_path); ++use FindBin; + + use LANraragi::Utils::Generic qw(remove_spaces remove_newlines render_api_response); + use LANraragi::Utils::TempFolder qw(get_temp); +@@ -126,7 +127,7 @@ sub serve_thumbnail { + } else { + + # If the thumbnail doesn't exist, serve the default thumbnail. +- $self->render_file( filepath => "./public/img/noThumb.png" ); ++ $self->render_file( filepath => "$FindBin::Bin/../public/img/noThumb.png" ); + } + return; + +diff --git a/lib/LANraragi/Utils/Generic.pm b/lib/LANraragi/Utils/Generic.pm +index 14736893..4352f023 100644 +--- a/lib/LANraragi/Utils/Generic.pm ++++ b/lib/LANraragi/Utils/Generic.pm +@@ -17,6 +17,8 @@ use Sys::CpuAffinity; + use LANraragi::Utils::TempFolder qw(get_temp); + use LANraragi::Utils::Logging qw(get_logger); + ++use FindBin; ++ + # Generic Utility Functions. + use Exporter 'import'; + our @EXPORT_OK = +@@ -161,7 +163,7 @@ sub start_shinobu { + my $mojo = shift; + + my $proc = Proc::Simple->new(); +- $proc->start( $^X, "./lib/Shinobu.pm" ); ++ $proc->start( $^X, "$FindBin::Bin/../lib/Shinobu.pm" ); + $proc->kill_on_destroy(0); + + $mojo->LRR_LOGGER->debug( "Shinobu Worker new PID is " . $proc->pid ); +@@ -201,7 +203,7 @@ sub get_css_list { + + #Get all the available CSS sheets. + my @css; +- opendir( my $dir, "./public/themes" ) or die $!; ++ opendir( my $dir, "$FindBin::Bin/../public/themes" ) or die $!; + while ( my $file = readdir($dir) ) { + if ( $file =~ /.+\.css/ ) { push( @css, $file ); } + } +diff --git a/lib/LANraragi/Utils/Logging.pm b/lib/LANraragi/Utils/Logging.pm +index ee29c507..6bdfc1bd 100644 +--- a/lib/LANraragi/Utils/Logging.pm ++++ b/lib/LANraragi/Utils/Logging.pm +@@ -18,7 +18,7 @@ our @EXPORT_OK = qw(get_logger get_plugin_logger get_logdir get_lines_from_file) + # Get the Log folder. + sub get_logdir { + +- my $log_folder = "$FindBin::Bin/../log"; ++ my $log_folder = "./log"; + + # Folder location can be overriden by LRR_LOG_DIRECTORY + if ( $ENV{LRR_LOG_DIRECTORY} ) { +diff --git a/lib/LANraragi/Utils/TempFolder.pm b/lib/LANraragi/Utils/TempFolder.pm +index 792b1c1b..f0eb341b 100644 +--- a/lib/LANraragi/Utils/TempFolder.pm ++++ b/lib/LANraragi/Utils/TempFolder.pm +@@ -20,7 +20,7 @@ our @EXPORT_OK = qw(get_temp get_tempsize clean_temp_full clean_temp_partial); + #Get the current tempfolder. + #This can be called from any process safely as it uses FindBin. + sub get_temp { +- my $temp_folder = "$FindBin::Bin/../public/temp"; ++ my $temp_folder = "./public/temp"; + + # Folder location can be overriden by LRR_TEMP_DIRECTORY + if ( $ENV{LRR_TEMP_DIRECTORY} ) { diff --git a/nixpkgs/pkgs/by-name/la/lanraragi/install.patch b/nixpkgs/pkgs/by-name/la/lanraragi/install.patch new file mode 100644 index 000000000000..9d260f5a494f --- /dev/null +++ b/nixpkgs/pkgs/by-name/la/lanraragi/install.patch @@ -0,0 +1,63 @@ +diff --git a/tools/cpanfile b/tools/cpanfile +index 359c61fe..ca3b7ec7 100755 +--- a/tools/cpanfile ++++ b/tools/cpanfile +@@ -20,7 +20,7 @@ requires 'Sort::Naturally', 1.03; + requires 'Authen::Passphrase', 0.008; + requires 'File::ReadBackwards', 1.05; + requires 'URI::Escape', 1.74; +-requires 'URI', 5.09; ++requires 'URI', 5.05; + + # Used by Installer + requires 'IPC::Cmd', 1.02; +diff --git a/tools/install.pl b/tools/install.pl +index 0cbb847d..1bd61fa0 100755 +--- a/tools/install.pl ++++ b/tools/install.pl +@@ -91,32 +91,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) { + $cpanopt = " -l " . $ENV{HOMEBREW_FORMULA_PREFIX} . "/libexec"; + } + +-#Load IPC::Cmd +-install_package( "IPC::Cmd", $cpanopt ); +-install_package( "Config::AutoConf", $cpanopt ); +-IPC::Cmd->import('can_run'); +-require Config::AutoConf; +- +-say("\r\nWill now check if all LRR software dependencies are met. \r\n"); +- +-#Check for Redis +-say("Checking for Redis..."); +-can_run('redis-server') +- or die 'NOT FOUND! Please install a Redis server before proceeding.'; +-say("OK!"); +- +-#Check for GhostScript +-say("Checking for GhostScript..."); +-can_run('gs') +- or warn 'NOT FOUND! PDF support will not work properly. Please install the "gs" tool.'; +-say("OK!"); +- +-#Check for libarchive +-say("Checking for libarchive..."); +-Config::AutoConf->new()->check_header("archive.h") +- or die 'NOT FOUND! Please install libarchive and ensure its headers are present.'; +-say("OK!"); +- + #Check for PerlMagick + say("Checking for ImageMagick/PerlMagick..."); + my $imgk; +@@ -154,12 +128,6 @@ if ( $back || $full ) { + #Clientside Dependencies with Provisioning + if ( $front || $full ) { + +- say("\r\nObtaining remote Web dependencies...\r\n"); +- +- if ( system("npm install") != 0 ) { +- die "Something went wrong while obtaining node modules - Bailing out."; +- } +- + say("\r\nProvisioning...\r\n"); + + #Load File::Copy diff --git a/nixpkgs/pkgs/by-name/la/lanraragi/package.nix b/nixpkgs/pkgs/by-name/la/lanraragi/package.nix new file mode 100644 index 000000000000..74ec38eeae23 --- /dev/null +++ b/nixpkgs/pkgs/by-name/la/lanraragi/package.nix @@ -0,0 +1,130 @@ +{ lib +, stdenv +, buildNpmPackage +, fetchFromGitHub +, fetchpatch +, makeBinaryWrapper +, perl +, ghostscript +, nixosTests +}: + +let + perlEnv = perl.withPackages (_: cpanDeps); + + cpanDeps = with perl.pkgs; [ + ImageMagick + locallib + Redis + Encode + ArchiveLibarchiveExtract + ArchiveLibarchivePeek + NetDNSNative + SortNaturally + AuthenPassphrase + FileReadBackwards + URI + LogfileRotate + Mojolicious + MojoliciousPluginTemplateToolkit + MojoliciousPluginRenderFile + MojoliciousPluginStatus + IOSocketSSL + CpanelJSONXS + Minion + MinionBackendRedis + ProcSimple + ParallelLoops + SysCpuAffinity + FileChangeNotify + ModulePluggable + TimeLocal + ] ++ lib.optional stdenv.isLinux LinuxInotify2; +in +buildNpmPackage rec { + pname = "lanraragi"; + version = "0.8.90"; + + src = fetchFromGitHub { + owner = "Difegue"; + repo = "LANraragi"; + rev = "v.${version}"; + hash = "sha256-ljnREUGCKvUJvcQ+aJ6XqiMTkVmfjt/0oC47w3PCj/k="; + }; + + patches = [ + (fetchpatch { + name = "add-package-lock-json.patch"; # Can be removed when updating to 0.9.0 + url = "https://github.com/Difegue/LANraragi/commit/c5cd8641795bf7e40deef4ae955ea848dde44050.patch"; + hash = "sha256-XKxRzeugkIe6N4XRN6+O1wEZpxo6OzU0OaG0ywKFv38="; + }) + ./install.patch + ./fix-paths.patch + ./expose-password-hashing.patch + ./fix-minion-redis-password.patch # Should be upstreamed + ]; + + npmFlags = [ "--legacy-peer-deps" ]; + + npmDepsHash = "sha256-UQsChPU5b4+r5Kv6P/3rJCGUzssiUNSKo3w4axNyJew="; + + nativeBuildInputs = [ + perl + makeBinaryWrapper + perl.pkgs.Appcpanminus + ] ++ cpanDeps; + + nativeCheckInputs = with perl.pkgs; [ + TestMockObject + TestTrap + TestDeep + ]; + + buildPhase = '' + runHook preBuild + + perl ./tools/install.pl install-full + rm -r node_modules public/js/vendor/*.map public/css/vendor/*.map + + runHook postBuild + ''; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + rm tests/plugins.t # Uses network + prove -r -l -v tests + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/lanraragi + cp -r lib public script templates package.json $out/share/lanraragi + + makeWrapper ${perlEnv}/bin/perl $out/bin/lanraragi \ + --prefix PATH : ${lib.makeBinPath [ ghostscript ]} \ + --add-flags "$out/share/lanraragi/script/launcher.pl -f $out/share/lanraragi/script/lanraragi" + + runHook postInstall + ''; + + passthru = { + inherit perlEnv; + tests = { inherit (nixosTests) lanraragi; }; + }; + + meta = { + changelog = "https://github.com/Difegue/LANraragi/releases/tag/${src.rev}"; + description = "Web application for archival and reading of manga/doujinshi"; + homepage = "https://github.com/Difegue/LANraragi"; + license = lib.licenses.mit; + mainProgram = "lanraragi"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/by-name/my/mystmd/package.nix b/nixpkgs/pkgs/by-name/my/mystmd/package.nix new file mode 100644 index 000000000000..5bf90c7d90cd --- /dev/null +++ b/nixpkgs/pkgs/by-name/my/mystmd/package.nix @@ -0,0 +1,34 @@ +{ lib, buildNpmPackage, fetchFromGitHub }: + +buildNpmPackage rec { + pname = "mystmd"; + version = "1.1.22"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = "mystmd"; + rev = "mystmd@${version}"; + hash = "sha256-jx/UCC/Cl5kqAbMzeikTmrx9xWS02OCp3rn0pvtIAPY="; + }; + + npmDepsHash = "sha256-1qQ19iB7N+KvO1uUdEMU1iN91FMQs4wzfTCdv6wfn30="; + + dontNpmInstall = true; + + installPhase = '' + runHook preInstall + + install -D packages/mystmd/dist/myst.cjs $out/bin/myst + + runHook postInstall + ''; + + meta = with lib; { + description = "Command line tools for working with MyST Markdown"; + homepage = "https://github.com/executablebooks/mystmd"; + changelog = "https://github.com/executablebooks/mystmd/blob/${src.rev}/packages/myst-cli/CHANGELOG.md"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + mainProgram = "myst"; + }; +} diff --git a/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix b/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix index b7b99c4a58eb..e0dd291ef76b 100644 --- a/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix +++ b/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.301"; + version = "0.0.302"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-e2le7yIzgb3dReniU7grR814xDWhGgckuyzx4omeRYI="; + hash = "sha256-I4ZkPdxidT2670NU5o1QTaee4fuDJNEirg7peuHqaJQ="; }; vendorHash = "sha256-jYkEXoCxqlxLF7oRc7H+/pMwkphOEwt2qUFkg+JOKVA="; diff --git a/nixpkgs/pkgs/by-name/on/onedrivegui/package.nix b/nixpkgs/pkgs/by-name/on/onedrivegui/package.nix new file mode 100644 index 000000000000..6ffd81584f3e --- /dev/null +++ b/nixpkgs/pkgs/by-name/on/onedrivegui/package.nix @@ -0,0 +1,87 @@ +{ lib +, python3Packages +, fetchFromGitHub +, writeText +, copyDesktopItems +, makeDesktopItem +, makeWrapper +, onedrive +}: + +let + version = "1.0.3"; + + setupPy = writeText "setup.py" '' + from setuptools import setup + setup( + name='onedrivegui', + version='${version}', + scripts=[ + 'src/OneDriveGUI.py', + ], + ) + ''; + +in +python3Packages.buildPythonApplication rec { + pname = "onedrivegui"; + inherit version; + + src = fetchFromGitHub { + owner = "bpozdena"; + repo = "OneDriveGUI"; + rev = "v${version}"; + hash = "sha256-HutziAzhIDYP8upNPieL2GNrxPBHUCVs09FFxdSqeBs="; + }; + + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + + propagatedBuildInputs = with python3Packages; [ pyside6 requests ]; + + # wrap manually to avoid having a bash script in $out/bin with a .py extension + dontWrapPythonPrograms = true; + + doCheck = false; # No tests defined + pythonImportsCheck = [ "OneDriveGUI" ]; + + desktopItems = [ + (makeDesktopItem { + name = "OneDriveGUI"; + exec = "onedrivegui"; + desktopName = "OneDriveGUI"; + comment = "OneDrive GUI Client"; + type = "Application"; + icon = "OneDriveGUI"; + terminal = false; + categories = [ "Utility" ]; + }) + ]; + + postPatch = '' + # Patch OneDriveGUI.py so DIR_PATH points to shared files location + sed -i src/OneDriveGUI.py -e "s@^DIR_PATH =.*@DIR_PATH = '$out/share/OneDriveGUI'@" + cp ${setupPy} ${setupPy.name} + ''; + + postInstall = '' + mkdir -p $out/share/OneDriveGUI + # we do not need the `ui` directory - only resources + cp -r src/resources $out/share/OneDriveGUI + install -Dm444 -t $/out/share/icons/hicolor/48x48/apps src/resources/images/OneDriveGUI.png + # we put our own executable wrapper in place instead + rm -r $out/bin/* + + makeWrapper ${python3Packages.python.interpreter} $out/bin/onedrivegui \ + --prefix PATH : ${lib.makeBinPath [ onedrive ]} \ + --prefix PYTHONPATH : ${python3Packages.makePythonPath (propagatedBuildInputs ++ [(placeholder "out")])} \ + --add-flags $out/lib/${python3Packages.python.libPrefix}/site-packages/OneDriveGUI.py + ''; + + meta = with lib; { + homepage = "https://github.com/bpozdena/OneDriveGUI"; + description = "A simple GUI for Linux OneDrive Client, with multi-account support"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jgarcia ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/by-name/pa/paper-age/package.nix b/nixpkgs/pkgs/by-name/pa/paper-age/package.nix index d4bf9c731fa8..d15954fd6b2b 100644 --- a/nixpkgs/pkgs/by-name/pa/paper-age/package.nix +++ b/nixpkgs/pkgs/by-name/pa/paper-age/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "paper-age"; - version = "1.1.4"; + version = "1.2.0"; src = fetchFromGitHub { owner = "matiaskorhonen"; repo = "paper-age"; rev = "v${version}"; - hash = "sha256-/8t+4iO+rYlc2WjjECq5mk8t0af/whmzatU63r9sO98="; + hash = "sha256-7dd1R41CDgkpFI8fUWCJfgz3lr22IjWQYW6vRYEFidc="; }; - cargoHash = "sha256-lLY3PINWGpdnNojIPT+snvLJTH4UEM7JWXdqrOLxibY="; + cargoHash = "sha256-IJDV0dmOsA9gbVKGfPsN3TKJbox3JTNxldArQK6GPt8="; meta = with lib; { description = "Easy and secure paper backups of secrets"; diff --git a/nixpkgs/pkgs/by-name/pg/pgmoneta/package.nix b/nixpkgs/pkgs/by-name/pg/pgmoneta/package.nix index bbfbb1a64476..dee9c6610b14 100644 --- a/nixpkgs/pkgs/by-name/pg/pgmoneta/package.nix +++ b/nixpkgs/pkgs/by-name/pg/pgmoneta/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "pgmoneta"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; rev = version; - hash = "sha256-Acg60QFMmRTubYWkPxbHTciVOYoIWc3GZGQVauewZik="; + hash = "sha256-F3bQ3UytEunXf0w2Eo1vx3u0Q40usYhbCmCVuL9X9lI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/by-name/ri/river-bnf/package.nix b/nixpkgs/pkgs/by-name/ri/river-bnf/package.nix new file mode 100644 index 000000000000..f869a6e2ff0c --- /dev/null +++ b/nixpkgs/pkgs/by-name/ri/river-bnf/package.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromSourcehut +, wayland +, wayland-scanner +, unstableGitUpdater +}: + +stdenv.mkDerivation rec { + pname = "river-bnf"; + version = "unstable-2023-10-10"; + + src = fetchFromSourcehut { + owner = "~leon_plickat"; + repo = pname; + rev = "bb8ded380ed5d539777533065b4fd33646ad5603"; + hash = "sha256-rm9Nt3WLgq9QOXzrkYBGp45EALNYFTQGInxfYIN0XcU="; + }; + + nativeBuildInputs = [ + wayland-scanner + ]; + + buildInputs = [ + wayland.dev + ]; + + postPatch = '' + substituteInPlace Makefile --replace '/usr/local' $out + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Switch back'n'forth between river tags"; + homepage = "https://git.sr.ht/~leon_plickat/river-bnf"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ adamcstephens ]; + mainProgram = "river-bnf"; + platforms = lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/by-name/sc/scalingo/package.nix b/nixpkgs/pkgs/by-name/sc/scalingo/package.nix new file mode 100644 index 000000000000..3b5682846987 --- /dev/null +++ b/nixpkgs/pkgs/by-name/sc/scalingo/package.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "scalingo"; + version = "1.29.1"; + + src = fetchFromGitHub { + owner = pname; + repo = "cli"; + rev = version; + hash = "sha256-xBf+LIwlpauJd/0xJIQdfEa0rxph3BJPuMY4+0s+Bb4="; + }; + + vendorHash = null; + + preCheck = '' + export HOME=$TMPDIR + ''; + + postInstall = '' + rm $out/bin/dists + ''; + + meta = with lib; { + description = "Command line client for the Scalingo PaaS"; + homepage = "https://doc.scalingo.com/platform/cli/start"; + changelog = "https://github.com/Scalingo/cli/blob/master/CHANGELOG.md"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ cimm ]; + platforms = with lib.platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/tools/security/steamguard-cli/default.nix b/nixpkgs/pkgs/by-name/st/steamguard-cli/package.nix index 643a5ad07ef9..d93cfa4b281c 100644 --- a/nixpkgs/pkgs/tools/security/steamguard-cli/default.nix +++ b/nixpkgs/pkgs/by-name/st/steamguard-cli/package.nix @@ -1,20 +1,29 @@ -{ lib +{ installShellFiles +, lib , rustPlatform , fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "steamguard-cli"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "dyc3"; repo = pname; rev = "v${version}"; - hash = "sha256-p3v7XiOXWH6F1oIiARr0K3sYOXCcNS97+THIG7k72wk="; + hash = "sha256-qfyo63u6gBkGNxVBmFsz9YXs6duRU/VnFly40C13vI8="; }; - cargoHash = "sha256-qQA7UdtFqGPyCRHdV+FfbQFiPaOeW4rT4dYC3BeHDw0="; + cargoHash = "sha256-B8/WCSHC905wDxYGLYVMT0QxgMiGR0/VMVzOlyTKPss="; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd steamguard \ + --bash <($out/bin/steamguard completion --shell bash) \ + --fish <($out/bin/steamguard completion --shell fish) \ + --zsh <($out/bin/steamguard completion --shell zsh) \ + ''; meta = with lib; { changelog = "https://github.com/dyc3/steamguard-cli/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/by-name/su/supersonic/package.nix b/nixpkgs/pkgs/by-name/su/supersonic/package.nix index 9b0fe4fd0634..db635f073a63 100644 --- a/nixpkgs/pkgs/by-name/su/supersonic/package.nix +++ b/nixpkgs/pkgs/by-name/su/supersonic/package.nix @@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-4SLAUqLMoUxTSi4I/QeHqudO62Gmhpm1XbCGf+3rPlc="; + hash = "sha256-elDVkhRW1mTez56OKQJJ0m0VxP8/Bq+HcXf5iokeY5I="; }; - vendorHash = "sha256-6Yp5OoybFpoBuIKodbwnyX3crLCl8hJ2r4plzo0plsY="; + vendorHash = "sha256-z1sDlyc7HW+tYfG0Z4EjUCEM3Su4JjmWIKxU2MV6GOA="; nativeBuildInputs = [ copyDesktopItems @@ -62,6 +62,7 @@ buildGoModule rec { darwin.apple_sdk_11_0.frameworks.Kernel darwin.apple_sdk_11_0.frameworks.OpenGL darwin.apple_sdk_11_0.frameworks.UserNotifications + darwin.apple_sdk_11_0.frameworks.MediaPlayer ]; postInstall = '' diff --git a/nixpkgs/pkgs/by-name/sy/systemctl-tui/package.nix b/nixpkgs/pkgs/by-name/sy/systemctl-tui/package.nix new file mode 100644 index 000000000000..5da79686b5f8 --- /dev/null +++ b/nixpkgs/pkgs/by-name/sy/systemctl-tui/package.nix @@ -0,0 +1,30 @@ +{ lib +, rustPlatform +, fetchCrate +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "systemctl-tui"; + version = "0.2.2"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-q/LzehMspiqxQOgALh1smhmL1803xr4GzIw9t+jE6NM="; + }; + + cargoHash = "sha256-GNuWag8Y1aSkBMzXcHpwfVU80zmhusLIOrKtZSe/jI0="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + ]; + + meta = with lib; { + description = "A simple TUI for interacting with systemd services and their logs"; + homepage = "https://crates.io/crates/systemctl-tui"; + license = licenses.mit; + maintainers = with maintainers; [ siph ]; + mainProgram = "systemctl-tui"; + }; +} diff --git a/nixpkgs/pkgs/by-name/te/textsnatcher/package.nix b/nixpkgs/pkgs/by-name/te/textsnatcher/package.nix new file mode 100644 index 000000000000..21b75c31a37f --- /dev/null +++ b/nixpkgs/pkgs/by-name/te/textsnatcher/package.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, vala +, wrapGAppsHook +, pkg-config +, pantheon +, libhandy +, libportal +, glib +, gtk3 +, desktop-file-utils +, scrot +, tesseract +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "textsnatcher"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "RajSolai"; + repo = "TextSnatcher"; + rev = "v${finalAttrs.version}"; + hash = "sha256-phqtPjwKB5BoCpL+cMeHvRLL76ZxQ5T74cpAsgN+/JM="; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + desktop-file-utils + wrapGAppsHook + ]; + + buildInputs = [ + pantheon.granite + libhandy + libportal + gtk3 + glib + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ scrot tesseract ]} + ) + ''; + + meta = with lib; { + description = "Copy Text from Images with ease, Perform OCR operations in seconds"; + homepage = "https://textsnatcher.rf.gd/"; + changelog = "https://github.com/RajSolai/TextSnatcher/releases/tag/v${finalAttrs.version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ galaxy ]; + mainProgram = "com.github.rajsolai.textsnatcher"; + platforms = platforms.linux; + }; +}) diff --git a/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix b/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix index 0ba415d1bb96..6c8b7055fc68 100644 --- a/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix +++ b/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "trunk-ng"; - version = "0.17.8"; + version = "0.17.10"; src = fetchFromGitHub { owner = "ctron"; repo = "trunk"; rev = "v${version}"; - hash = "sha256-ycZIqDBZccPapOK0ZI9Cvq94tRxChrsWX1rhyWh0S2c="; + hash = "sha256-F2g/GMxnS5r44i3NIJGOic9f+H5+JbFi3dqMqI6h6JQ="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoHash = "sha256-URHArTog34JcuxXHzTQBjQOFMffarNb51d9sUOfjm6c="; + cargoHash = "sha256-37nCqRTgbsg2cXu4xwYC/qfodPIxx97Qns8FQe9NroQ="; meta = with lib; { homepage = "https://github.com/ctron/trunk"; diff --git a/nixpkgs/pkgs/by-name/ui/uiua/package.nix b/nixpkgs/pkgs/by-name/ui/uiua/package.nix index bb40115a53fd..9ddfd1d8cf13 100644 --- a/nixpkgs/pkgs/by-name/ui/uiua/package.nix +++ b/nixpkgs/pkgs/by-name/ui/uiua/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "uiua"; - version = "0.0.20"; + version = "0.0.23"; src = fetchFromGitHub { owner = "uiua-lang"; repo = "uiua"; - rev = "refs/tags/${version}"; - hash = "sha256-fFsMN+4ORB//Ch+wrRRMeZKXvW8ta5m66Vy3I3uyHO8="; + rev = version; + hash = "sha256-+Q/dn0pGZ3R+UlAt9stQZU1n+WITujJzTxY5dpXc+Bc="; }; - cargoHash = "sha256-old+U0sJWnp8wTiZBjcQ7+mv+6N15cpyyTDEjTUnghk="; + cargoHash = "sha256-R4jQ9Or9vh3dtqJH7nPvYM4o1h277sFUf+nC1VQl1Uk="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook @@ -41,13 +41,14 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional audioSupport "audio"; - passthru.tests.run = runCommand "uiua-test-run" {nativeBuildInputs = [uiua];} '' + passthru.tests.run = runCommand "uiua-test-run" { nativeBuildInputs = [ uiua ]; } '' uiua init; diff -U3 --color=auto <(uiua run main.ua) <(echo '"Hello, World!"') touch $out; ''; - meta = with lib; { + meta = { + changelog = "https://github.com/uiua-lang/uiua/releases/tag/${src.rev}"; description = "A stack-oriented array programming language with a focus on simplicity, beauty, and tacit code"; longDescription = '' Uiua combines the stack-oriented and array-oriented paradigms in a single @@ -55,8 +56,8 @@ rustPlatform.buildRustPackage rec { high information density and little syntactic noise. ''; homepage = "https://www.uiua.org/"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "uiua"; - maintainers = with maintainers; [ cafkafk tomasajt ]; + maintainers = with lib.maintainers; [ cafkafk tomasajt ]; }; } diff --git a/nixpkgs/pkgs/by-name/ve/vesktop/package.nix b/nixpkgs/pkgs/by-name/ve/vesktop/package.nix index d25167ebe308..d528fec7563a 100644 --- a/nixpkgs/pkgs/by-name/ve/vesktop/package.nix +++ b/nixpkgs/pkgs/by-name/ve/vesktop/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , stdenvNoCC +, gcc13Stdenv , fetchFromGitHub , substituteAll , makeWrapper @@ -9,6 +10,7 @@ , vencord , electron , pipewire +, libpulseaudio , libicns , jq , moreutils @@ -16,13 +18,13 @@ }: stdenv.mkDerivation rec { pname = "vesktop"; - version = "0.3.3"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${version}"; - sha256 = "sha256-Njs3tACxUyRolYUtS/q2lITIQnUBFXVXWZEfQ66HpPM="; + hash = "sha256-jSGad3qMhAdiGdwomQO6BIyHIbKrGLRGniGrJN97gN8="; }; pnpm-deps = stdenvNoCC.mkDerivation { @@ -51,7 +53,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-vInaSLGahRUgvwAeUcI+oV84L+tgNRCmfFpE0aUD4X4="; + outputHash = "sha256-lTeL+8QujWzx4ys2T+G55NUP51c8i5lB1vAkUtzkJlA="; }; nativeBuildInputs = [ @@ -92,7 +94,12 @@ stdenv.mkDerivation rec { # yes, upstream really packages it as "vesktop" but uses "vencorddesktop" file names installPhase = let - libPath = lib.makeLibraryPath [ pipewire ]; + # this is mainly required for venmic + libPath = lib.makeLibraryPath [ + libpulseaudio + pipewire + gcc13Stdenv.cc.cc.lib + ]; in '' runHook preInstall @@ -132,7 +139,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Vencord/Vesktop"; license = licenses.gpl3Only; maintainers = with maintainers; [ getchoo Scrumplex vgskye ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "vencorddesktop"; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/nixpkgs/pkgs/by-name/wa/waybar-mpris/package.nix b/nixpkgs/pkgs/by-name/wa/waybar-mpris/package.nix new file mode 100644 index 000000000000..253829d9abec --- /dev/null +++ b/nixpkgs/pkgs/by-name/wa/waybar-mpris/package.nix @@ -0,0 +1,33 @@ +{ lib +, fetchgit +, buildGoModule +, installShellFiles +}: + +buildGoModule { + pname = "waybar-mpris"; + version = "unstable-2022-01-27"; + + src = fetchgit { + url = "https://git.hrfee.pw/hrfee/waybar-mpris"; + rev = "485ec0ec0af80a0d63c10e94aebfc59b16aab46b"; + hash = "sha256-BjLxWnDNsR2ZnNklNiKzi1DeoPpaZsRdKbVSwNwYhJ4="; + }; + + vendorHash = "sha256-85jFSAOfNMihv710LtfETmkKRqcdRuFCHVuPkW94X/Y="; + + nativeBuildInputs = [ installShellFiles ]; + + CGO_LDFLAGS = "-s -w"; + + GOFLAGS = "-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"; + + meta = with lib; { + description = "A waybar component/utility for displaying and controlling MPRIS2 compliant media players individually"; + homepage = "https://git.hrfee.pw/hrfee/waybar-mpris"; + license = licenses.mit; + mainProgram = "waybar-mpris"; + maintainers = with maintainers; [ khaneliman ]; + }; +} + diff --git a/nixpkgs/pkgs/data/fonts/whatsapp-emoji/default.nix b/nixpkgs/pkgs/by-name/wh/whatsapp-emoji-font/package.nix index 5e34282891b9..5e34282891b9 100644 --- a/nixpkgs/pkgs/data/fonts/whatsapp-emoji/default.nix +++ b/nixpkgs/pkgs/by-name/wh/whatsapp-emoji-font/package.nix diff --git a/nixpkgs/pkgs/by-name/wh/whistle/package.nix b/nixpkgs/pkgs/by-name/wh/whistle/package.nix new file mode 100644 index 000000000000..0e097ed347d3 --- /dev/null +++ b/nixpkgs/pkgs/by-name/wh/whistle/package.nix @@ -0,0 +1,26 @@ +{ lib, buildNpmPackage, fetchFromGitHub }: + +buildNpmPackage rec { + pname = "whistle"; + version = "2.9.58"; + + src = fetchFromGitHub { + owner = "avwo"; + repo = "whistle"; + rev = "v${version}"; + hash = "sha256-/dt4xwUZrvymCpc3xRyWM2Wsh7zk7ndepgOWJwJ2Das="; + }; + + npmDepsHash = "sha256-9GBhC2PQyaqi64ncIuMZSf9CLB8l+cywT7QTzW9WiTs="; + + dontNpmBuild = true; + + meta = with lib; { + description = "HTTP, HTTP2, HTTPS, Websocket debugging proxy"; + homepage = "https://github.com/avwo/whistle"; + changelog = "https://github.com/avwo/whistle/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + mainProgram = "whistle"; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index fa1787d8f7fc..5d2be4826f43 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "27.2.0"; + version = "27.3.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 28e0f75124e5..5d687585141d 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "27.2.1"; + version = "27.3.1"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-+d6pONsAoA0iI7VCuDHBGGjZPaxgLToouQpFTaX6edY="; + hash = "sha256-7ndJDdgDn5tnnUeB4etQ8bBZnH7NuiYoNQ9CrF2HtwQ="; }; - npmDepsHash = "sha256-c/QvrDjjoq2o1le++e7D0Lb18wyZc/q6ct++rkgYtzg="; + npmDepsHash = "sha256-MNlT8VJTIvoZDAAdEs0Fa8gqO7dWhRR9I4Kw4qlW5Ig="; nativeBuildInputs = [ remarshal diff --git a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 0094fc3e6fe1..4035a0961a26 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1jn883s4vvpfih31yxap2hg6xya9jfjnqa8f7iqkqyxxqrnx7zzm"; - iosevka-aile = "1p2s5nslifmdbjbqqlk02kl0rvpmr5pkq71hr9xim2dqb11kmcdl"; - iosevka-curly = "0rs7jmgpl1ki7b9i3l78fn63xbgd02wraixqb1yjc3lmxi9jbhxn"; - iosevka-curly-slab = "09rf82w41fbw7pm1ak9vv1i9450h2ia7x434gn9czx01wnb3s2zb"; - iosevka-etoile = "1621a74z378rz4l1gn9dr7fqqvnd1g7ipr5bw13qhwl5ljf170xs"; - iosevka-slab = "06x3hbi05bzlaci7hr3wk8j92zn97i41bw8xjnj8sh63mla36w9p"; - iosevka-ss01 = "1plp7lk9yzizfz9c5k4m51ynvp0zkz7r7vgx416rkwb3yh23fjpv"; - iosevka-ss02 = "0zpl9a8nccnrywaxj61glj4x7ai1fas9x463xqpy38w686n0jjyn"; - iosevka-ss03 = "1xrxvsj2ja9miwvgq7p6kxysn8858gk8qh2pp1bw1n67vppvhkp9"; - iosevka-ss04 = "1y0ac2dq8xmrbw84nar2jsxbyf9nck8fxh3dbl8vhvpnbwan150w"; - iosevka-ss05 = "1z722m5chr8jq24i7czph1qgkasah7y7i4wv2wv0n2j89mc2fbc2"; - iosevka-ss06 = "1fzsj9389cah6zp23vlr375j107jxfabqxaa7iv1hjbw3fa2vmdk"; - iosevka-ss07 = "18psmz6kfhdmpac408w1fsqfarahn60bypm8ci8y3gd8bk8js13c"; - iosevka-ss08 = "0hjlrly98hd4w5l6cm361h4cyvkdrlf3bp1g6f438aip0bj2y94w"; - iosevka-ss09 = "13jdlmamfbxnkqii6bkh0xm71fgqdvgnqs88dnq8pjyqhbl32sca"; - iosevka-ss10 = "15ak510q6di9hsy2p8k7gkp5d1kzgrmk2m55zh90w5irbr5fmbjp"; - iosevka-ss11 = "0x42pjik0iy2v11iq8i83wa88f6b6qymc3v2sih28rjhijxl7lsm"; - iosevka-ss12 = "15s7imcm4w61555crah1pxzc9yn3zffkj13zk8zidgk6v7jzb6rs"; - iosevka-ss13 = "1q3d3fyjsk6iwq1w6dv9rc7ivk021i3v2px574dfbqlswvb2sg86"; - iosevka-ss14 = "0r1fkrcqcccx4zz9qgzgq9si8xcbn7y1f2821cjs6cbfaxmrkwmc"; - iosevka-ss15 = "0vgwgkfnch5rn7kc9rblg1km4pzqwsglb31zqnx3rxhszm66j9q6"; - iosevka-ss16 = "009whnydn5rb6dj06scnc3722y8sddsv4jl42r70x2zzra14qdgk"; - iosevka-ss17 = "01j1gqrmlx3b6rlv6sg3kv9j39s2dwqvj35h4v0v7min2vn1hydj"; - iosevka-ss18 = "1pbwqgrkv560237marp5msq1y93llxvjrpixka15a79a7lmpd36i"; - sgr-iosevka = "0p31qdby1znrsz4hplrq81ngv1l2pxbn9x26hcpjxrbgv2mmvhfq"; - sgr-iosevka-aile = "00zapw8mk0z40jw69ynvdzhpd67rvi9lp509hf3vb7x3cq1ka1wz"; - sgr-iosevka-curly = "1rgxkc2ps8pmp3mgi2b51lv4j5cc5q7m6iizw8gbfl36qmzlfdlh"; - sgr-iosevka-curly-slab = "1fdxr0mkb40fa0605i8b8h51pg8p3cskjsggil9gp1376wzhr42q"; - sgr-iosevka-etoile = "1r91042avgn0f0p2rf09pam4wfjndkj7wml9vs082kc40aqgh9m5"; - sgr-iosevka-fixed = "13b5nkyxpm9izj0dmwc97lqbfvbxqyjg3677hpi6ywl3c6m1h542"; - sgr-iosevka-fixed-curly = "06r0lzcrhf9897yi9h6xh5n1mfb8j4v21nz81igs616w7gjlz0dk"; - sgr-iosevka-fixed-curly-slab = "1l9qaialwq2xygznylbwkizbqwghzl4625d845f8kwyl9krd92na"; - sgr-iosevka-fixed-slab = "199s1cdn22rjirrh1f9xhqbh77namriw077g11hykr4ibwy6sc6n"; - sgr-iosevka-fixed-ss01 = "1y51qk0pfq9r8hpcgmcykrvddl8rw5rjfysrbsjvf6zi59z5rk02"; - sgr-iosevka-fixed-ss02 = "12x3qrw6baxfwbj2wgawf9qpbk8nv7ccd9grqgw7b4qmy5j31n39"; - sgr-iosevka-fixed-ss03 = "1sf8xybh8l76dbm8vgk0y4lgdm5lb5pb4kgnipygqj9z0kasj07d"; - sgr-iosevka-fixed-ss04 = "0pbpqnv6kdnnl4yix3ysfrnxg3ainsl9m0pnkb1i21q5sav20ph5"; - sgr-iosevka-fixed-ss05 = "1vgfiqxwfg3m68dlk4s1x5ms293nbwgdq34y80hysp8pfzl7d07z"; - sgr-iosevka-fixed-ss06 = "17f3rxsh2nla6a8fhim88vxqj1kzafvcfbara1iwzsw3fw9gz2ai"; - sgr-iosevka-fixed-ss07 = "1j3r197jx51b7l5cpm2g5b7mzq53wp05f8ra3cz04r69qc0dj8i5"; - sgr-iosevka-fixed-ss08 = "1gj784bi4wy0282xbq3f24sqlm7b2s1gz2f8sna4bd5bgci8avb7"; - sgr-iosevka-fixed-ss09 = "0hhqvghq0mxbjzfhfcjgij94b40129vhg6x4slgk579kdfmr21y4"; - sgr-iosevka-fixed-ss10 = "044dam3cg2s29j0zbq03ypyyskws31dfvyyp01smds7njf8f2w39"; - sgr-iosevka-fixed-ss11 = "1xxmcai145rfjhlx4n5hcs7kdz298pxn9b3if85cpmdd9qhdmy48"; - sgr-iosevka-fixed-ss12 = "13rbsql91z2ndbx121j1yb3m10a2fwil0jilhfjj17rn0kh0a5qi"; - sgr-iosevka-fixed-ss13 = "19y6x2jln772afqy7y2k97kzpin73y5wq72fh7c9n9cmh1n24628"; - sgr-iosevka-fixed-ss14 = "0ndm0yk95a10qv95c9d5qhjx4vzc28wkahlxjadndxh82hn8zlqm"; - sgr-iosevka-fixed-ss15 = "107lwn4d01hry6jyk2blxdy7gx80ka6wrgxs80l5czx4jsk6kr66"; - sgr-iosevka-fixed-ss16 = "0ka5rp7svqp5hs2zdf0bq5lfhgfmqij93f53q1a0snispx1qnsn6"; - sgr-iosevka-fixed-ss17 = "18kvws3r66b1lqqpyphpf1nk6qdv6pv9c36zf0kpi7hpfcp1dvaa"; - sgr-iosevka-fixed-ss18 = "1s9gzh2ghs66rjjz7317x163072gy2fxbqmvhghngd7bpvbajdd6"; - sgr-iosevka-slab = "0b78y7pikcrlilzn2xlvg5f7liqp0zvzcknx9l47nh32sqn11f5j"; - sgr-iosevka-ss01 = "1nrj6dl3znakj3h0fvd37k71gcp2l0yfgqggdn6ms4cyyrq16z38"; - sgr-iosevka-ss02 = "0mhn1jx2ibllp8h05lm9ms8wh960yyncblx4pkj95sswm5kdv8vv"; - sgr-iosevka-ss03 = "0xxanqcpqh5fvhfad6cyk89yr2nza9lpig6dralizi8b1vxl7bnl"; - sgr-iosevka-ss04 = "1566hvq2lwnh6p7v55j8khi56y61cg88g7vnb306a0rakg5jv17y"; - sgr-iosevka-ss05 = "111pwbwp8fkiph6mrzblbx1nzdnzv9d6aphmkxlmrf1cs19jv71k"; - sgr-iosevka-ss06 = "0p57cqqfhyhri2r1ss8pcd2hdn4pvp0dwr8ls1iws5gaj2s5zbjx"; - sgr-iosevka-ss07 = "0clchkildx4vmk4xpd3xjx0xbihfkn61pcha00md4qf471ysnpmp"; - sgr-iosevka-ss08 = "17ici8in0sh2zy1ya9319k9qqjzg5nl7ky6mbb2skpgmh85figfp"; - sgr-iosevka-ss09 = "0fcwxcvzpc9l5dvmkqxf1g32xr4fk5rr389d6s3qbkdxdlc2vx63"; - sgr-iosevka-ss10 = "1d59vw8caj9nlpmfijwpgkbb6kxphgdrw2hd5ldcvxs0ny0r8fcd"; - sgr-iosevka-ss11 = "0d60zpdq7n73cn0lgnwhddxzw3x0i2cpqwpc1k78s8r8h36qmd05"; - sgr-iosevka-ss12 = "15sc20f2kf6i0wlcfy60ss2j6dyg6figd18g22zmm7msz2lda1b0"; - sgr-iosevka-ss13 = "0qi8ala5dm3r9gljwf5i84624h6arasd9mhww8nk3822cx8c8jd0"; - sgr-iosevka-ss14 = "0i9p2rz8ppwl6x9d2j4gry7l386nbv4g2jrrna6bwgk4nh12izg0"; - sgr-iosevka-ss15 = "0d4s197v96ka5c4b63kisiy8j694vskspc5vry4bgj4pbl7vl6lg"; - sgr-iosevka-ss16 = "1a02r483ihfnlzx0kir6p84q6bscrs798i5qaw7qiz3zi8kxdrgb"; - sgr-iosevka-ss17 = "1hi7dikls7x5zn79waki77bcp4w5hzx12mqmh0zx77aah3ghcax1"; - sgr-iosevka-ss18 = "1mkjyn5mjnlwrxfhxr1f3ja2fd6lbv54fxx0xy9zm1banz0pp3y1"; - sgr-iosevka-term = "0cmycg6vygxi3c1pdqddmh8mqpcrnkmn9y5c8xjzd1lygm41668q"; - sgr-iosevka-term-curly = "1q7r3qclmkniin8hx8digwk1rfgfcm4jz6mvjay5sfi5wa6g9fd0"; - sgr-iosevka-term-curly-slab = "07bf92s5zf9vny3560dr8zwxdg1jpdvz5ksmqcm74ib1024yk17r"; - sgr-iosevka-term-slab = "1am42m5jggfy0fv3580rsksklaiq8827da1s20ngiyxfzcgbgwf3"; - sgr-iosevka-term-ss01 = "09igqk8b4hmgmh1q1idvcjpz0vj15yzrsmcqhyrs1ygxyl2d6g5v"; - sgr-iosevka-term-ss02 = "143czw61bilpim4lqqzp9d2gz4igijyl2p87iy3f5pvh75qzk8fx"; - sgr-iosevka-term-ss03 = "02s7dsjxsm6dgp2rcz6n9dyi6priz9k5q5wd1rajfs6rgb01j1h7"; - sgr-iosevka-term-ss04 = "10paacm4gb0823pqacj1ps8s79k6zbayrqqqnhvklkqki2iiay4g"; - sgr-iosevka-term-ss05 = "0nn49fgxciwpfddcksb5krhvyqbr2zfx2zq1m5nswb70nzwwk8sj"; - sgr-iosevka-term-ss06 = "1r6xlbf9si5ycg96av2pjjak82qgj1sqdq634wkl41x4mj39zkjl"; - sgr-iosevka-term-ss07 = "1sfjv2ggqrgxjqykgycia62xa2g523yf61gix9dp79gyg6ga25nr"; - sgr-iosevka-term-ss08 = "0rk66nzjc4d7bjx9sfgnlzsx52mdrdmgl4xri6jd0ad3543j43bh"; - sgr-iosevka-term-ss09 = "0y12s0ynb5fda8kprwlbw6a9kkb7fwjfna2axgz5rxlz0ja14gs1"; - sgr-iosevka-term-ss10 = "0hy31v083cd9lcb7xfvh6lj4nvzlqkbm8lni092sp21iv43xpp4f"; - sgr-iosevka-term-ss11 = "0wb1c4l8327vsnkpj34grplw1v1mlr3wdavi7i0z5383qx4l3cn0"; - sgr-iosevka-term-ss12 = "0x8zgm1yl37ij1hq6bcdf0whfbyv4gdkqk94yi3xm74a744pzsvx"; - sgr-iosevka-term-ss13 = "1ia9q4gn9a6mr0n4vb6d8mnnp9s6l5v5y4fgi6ip0g49n0n8fw4r"; - sgr-iosevka-term-ss14 = "0ipfjn23jaz6xjb0v2pbirrvi18czir6nijh79kxrrs1k83mc4yq"; - sgr-iosevka-term-ss15 = "0pdlsd8qsp80y5rgp3vrhl1wjbj4b3bgqyavz1ayqccg939dvzqv"; - sgr-iosevka-term-ss16 = "0bz3i0cnijq84skhsjgy0p6p6ww364gnkrny1hgcw7w21d69n2x5"; - sgr-iosevka-term-ss17 = "1sfpaqviv1gqz4c29kmrm1v3zbr3615w90w96s5yxh2lr6zqxi7v"; - sgr-iosevka-term-ss18 = "02f7i400qk9pbyid4dr6p690sqphz52pvgprqp54q1lw07jksqa6"; + iosevka = "0l14c39r68x14maw9hyiqd0lqz7q2pq4drw68i0j4jwa58l0r2x1"; + iosevka-aile = "1pl59kga3ab2jm3y4lh0lqp9nqjggykqrpnh27s99abkf5cvgkzr"; + iosevka-curly = "1nv3r2c2zj9y3zgaa2r8s0w4l28a3pzkyvcm1br650mb4l469j6c"; + iosevka-curly-slab = "1ik3affc11w0q3xjrm9pdpzp6hdq9623f1nhsbc4ih5980mvki0j"; + iosevka-etoile = "16fsysywpf7zdkl0sszi5im42idlmxl273ml0zs9dajd5zdwhm08"; + iosevka-slab = "1xksbmzzfp6mnd90nfnqyg02ps36makrcr311l1xcl9v4drcnsiq"; + iosevka-ss01 = "1pzl1adnbi4m2bi4p754k82viqksxjd39q5sqljjrs60p5mwxbw6"; + iosevka-ss02 = "0r1vrg6b6c4ixw0fzi4g3q7c1hah2szw2rv5gkqmdg0kiw6sddl1"; + iosevka-ss03 = "0rg6hb0xjzmf8s410x7v5m1pv246p1xfxfggw4lhs19h6f7jcy0v"; + iosevka-ss04 = "1690xgfyk6gqxwx70dsvq5ba7vf5906pf1qrrd916fkg2a28fxxp"; + iosevka-ss05 = "1zbiq0hczg2dhld82nyw7x6rkh6y812cvawqqpjmhzxjhd2wn6hv"; + iosevka-ss06 = "0290w7812pqlix1zmpanksbinzkzv6gw0y5k5dvaf4jrg5c3163m"; + iosevka-ss07 = "0z7irkdcwwxpj52a6j1b4s1xz9nlib6jm66fxva7pqd9dhsjp1ph"; + iosevka-ss08 = "1jd12mjcnjs6md3lj182ph9zlb66cmmm2cz49fwdxpx54laawn3i"; + iosevka-ss09 = "0zggxrk2a315rzz684c06pk0vmp9cw5bcn9zkh61hcn0mii10xdv"; + iosevka-ss10 = "14mshgnpq5sn4z81a8cwsq6hjarlrmwfqyhkyzcmqymi6gyljs6k"; + iosevka-ss11 = "14p8fbvd4b4vddnmydyn0v5iffkq1s15pdxpmmwl2aplxnrgshiy"; + iosevka-ss12 = "1r2p1f0mdkx7sqkv29gdpq78c905gcc7kfbr8l907awhv80fzsgg"; + iosevka-ss13 = "0ara2w4zav48rk019hnhr3fq8kqzzvlgshq18cq5gralbcgjw883"; + iosevka-ss14 = "1yqmm13bafrz7siq7q95921ipn3p6ms3dmsxn5zbcmm3pdxxyq1c"; + iosevka-ss15 = "1y84vzqpwa060q3qrxc77kk3hnrgyjqwwxq4s9fq8hww9d01jb5d"; + iosevka-ss16 = "0cszx4s3bi9j5l46sh33dkn9cqn9s7v6rk23d4srlfg19bfs19ga"; + iosevka-ss17 = "0ld6pr8rx1ldszgdd2ixmfj341ry9ajfcpk6k1f9jmfilp4cjnzr"; + iosevka-ss18 = "19787429v0am3qsjyxlgqwbkn50s54w26481h46ybn7nrskgxl7a"; + sgr-iosevka = "1i5zg7wwyczf2ljxjvwk4n75j1nvn6wavc3w1zycfcgim458x8s6"; + sgr-iosevka-aile = "0m0imj778l6zb4y5kb882z4f6abw6q1ww0d8fn4vyqk2csm3kx9v"; + sgr-iosevka-curly = "071jpj9cj56hszqjy5cmj40gq6n47fp117ckypi0npk6cvrvrl7a"; + sgr-iosevka-curly-slab = "1f33iy0nrkm76alyzs7bjdfvc7c4j7cqrzrk769y40wx68l5sbji"; + sgr-iosevka-etoile = "19rgrrk4p9k94s887vv2kqb7zj1wjh5kjncalzbisjpv8ns6l3qq"; + sgr-iosevka-fixed = "03ccy1f8hswslr7n9dhj9l3zvfkahqi742giim34f360f5chpmdi"; + sgr-iosevka-fixed-curly = "14czka86s0yj1h0mq4ajn5yx1lnb9l3hp9yw8h558dy8hf6xk9pi"; + sgr-iosevka-fixed-curly-slab = "1i0hjw0121l83znyfq3zl0z1pl4p57yf2qqrp35qqp0vpsxnjlcy"; + sgr-iosevka-fixed-slab = "1cz1lj2qa8yiwbxpk3c6hdkgg44q9019yai3iz0c17gw8vwj6xxh"; + sgr-iosevka-fixed-ss01 = "1966jyi9j01s094kz1k67ds4k4z1sfahwfxsasi59bc4r5srq3p7"; + sgr-iosevka-fixed-ss02 = "1l08id1p2z2m8vrprlrg0rphspbz17lnc1l483wadffbfrlqrhpr"; + sgr-iosevka-fixed-ss03 = "0g98s0w2lvskq9fyh47b8rx7rha24k4vzza9svl25kx55ixznzjm"; + sgr-iosevka-fixed-ss04 = "0wjq34b6xv17ma75lysmwfqxyp57zr0h9hrxyl9c6sgdmlvf7jqx"; + sgr-iosevka-fixed-ss05 = "080i32z64y9dm19fagc5jh3gkynbim0w03i42bc19im07ryyq79h"; + sgr-iosevka-fixed-ss06 = "17ggkvz3y17zqkn1m864vgqbc5zvn63gsh39n4w1p9wi9v360984"; + sgr-iosevka-fixed-ss07 = "1nazbkhr46larr0hgxwx2h5zvi9yr3qlg2npnmpprwqrhvlvlpah"; + sgr-iosevka-fixed-ss08 = "08i420lx329py3slc99r73hysdnjbc12nm15fs17f505c2zj7war"; + sgr-iosevka-fixed-ss09 = "0zc9wmxjrpzss7cdczg6af6sckdr22k0q9gj90hggyyjlc08cvz0"; + sgr-iosevka-fixed-ss10 = "15qzf9zir1rqfpfspkgy9azf6m73lgpl79xhidf47hkvcw9zxjr7"; + sgr-iosevka-fixed-ss11 = "1z6kji0h5vb3my47h2ccdl2vafh58pyqwp83yy3xgsvsj2qd0835"; + sgr-iosevka-fixed-ss12 = "0wyk8kyllm35wlsqkxgh3sxvn3f52w7kicq64hdax8k8piaj584x"; + sgr-iosevka-fixed-ss13 = "052jrfqwi4qbs9k9mqmdk2s82qb8q6175ajy3f6186grnzd73nnq"; + sgr-iosevka-fixed-ss14 = "0wba9g5q8h5n5c50rncbbkbkc06xs9zxydxz1b0a6dl37drgmvkf"; + sgr-iosevka-fixed-ss15 = "1kds5pl4vxcniksfp4mslpfr0ba30m754w7vxvzvqamgazmyf0pp"; + sgr-iosevka-fixed-ss16 = "12hb9laxbhkbgf2rnbzq7zwwl7bg3n3n2yyjlr3vlsik5kd7aznz"; + sgr-iosevka-fixed-ss17 = "18rvf78xif6p06nzha9nvp725f6mr79f1rk0a6n7ifh1ygdy4lvx"; + sgr-iosevka-fixed-ss18 = "019gzj9s3wh3i9bxalazx9x8nfljf191idh6ygxpqjz4z3yzxh9n"; + sgr-iosevka-slab = "0l9bcvrfbxp0pi3hj3zlirq800h63dyqf8dy307r7xg8m3l48xgr"; + sgr-iosevka-ss01 = "1rb49rx12vgdjvkbyyg63pmxbwqd4v5cfvn5q3k2q4w5m3yhsbm9"; + sgr-iosevka-ss02 = "07xz0iayqk2hqalmrj8c7kp8b80d6qgazrxwvs22y8nymignzq2s"; + sgr-iosevka-ss03 = "0skq1kqmkwhs9d1p0lpksxqdgvpjz2krlfqa7idq1sdykpwsvmhi"; + sgr-iosevka-ss04 = "0cgjh4c3vmmcgb43g0l2dmwcwnwwwqkrr80b9rsbrx43v6lkavda"; + sgr-iosevka-ss05 = "16y8rm0byaf2xqh31h4vfan6il2m98a225nv3vsb7f42ga185vw0"; + sgr-iosevka-ss06 = "0v9nd1h0gzgwa5sw9lrxvd5g77y9wn3fqsw86ivpsqn1vmgpqrzq"; + sgr-iosevka-ss07 = "1h49qx02kn683ax3vh090r7fwlq7ya802zywcws2b9h2hs6p799x"; + sgr-iosevka-ss08 = "1zk08x7chnj1ach4ghh26kr9kndzlgzzsrrw9aa3f0s7qk1lx2yg"; + sgr-iosevka-ss09 = "12mrzd7viia71r9ixw1bzsqfaycxpl8zf20qv83ndbjsgzxh9ary"; + sgr-iosevka-ss10 = "1cq8ii94jdskd0p5g2iigprbzzs3qnjxj7m2rkhl8mricwxdxxs4"; + sgr-iosevka-ss11 = "1wmzaqcy0xy831010fsdhlm3aly2j01j7z10ka83ga3h8ymg1wla"; + sgr-iosevka-ss12 = "00xfyvf50ykippnr1cfxy17s0k0gqkgx61vf7x9dmsgl2y6qigpl"; + sgr-iosevka-ss13 = "0ynmx67c96qslzggjign8g3q7k11ny0mdrdwa7zwi2p0mm61n2jd"; + sgr-iosevka-ss14 = "19s3a6csc4wq4cjjc2qll8fv00hmzsp5z7hwaq09wls8swz5kmmq"; + sgr-iosevka-ss15 = "0d8ljkjcf0y263lwpnlh07305k6xlznk9gysk63dhcyxv0ajhrq1"; + sgr-iosevka-ss16 = "12jbanrv31zxkh5a3a4w2wv0gqvj03mcs7v0zpnylp8jgfmpf8qa"; + sgr-iosevka-ss17 = "1p088x66grn9bs4k1y6mxb0ka4y4vm74v6nbm74qsarjbyc0kx0a"; + sgr-iosevka-ss18 = "0ff8lnhhgknj2sq40fkx7pqmiklnjl9ryjrnjcjviwzvs2dgzbmh"; + sgr-iosevka-term = "0ny2p3hmzwbmzwxr8k1hbv0r3fqwngnz6kind1p3yddrqz8l5rrz"; + sgr-iosevka-term-curly = "0qdys5q9fw273q58yvs71kqhal2mrh1400kf33mjp80pm1dy0j5j"; + sgr-iosevka-term-curly-slab = "1bfn60arcb78lllf1lpdi2gscazvy3k9irp3ik0x12qdf9jgzgw0"; + sgr-iosevka-term-slab = "1grdywa132zl3m5vf7w47lq7wgk6p5n8nab6rgg7pim839f1cn9q"; + sgr-iosevka-term-ss01 = "14an4f8gm741zz22g854zxbfys2z33sf20kjrlzdp239376k72b7"; + sgr-iosevka-term-ss02 = "0lqzcn4ykvkvylnlp4c1cfcl72hy3i18q15zng79d8v439w7cbds"; + sgr-iosevka-term-ss03 = "0kmfmdv5rvfgm8p85dcqb28fsmkwsrgpjkjh1n787nvd2vs96l23"; + sgr-iosevka-term-ss04 = "0p6hspr95p8hxas05rgp2dq00425i7nnz3nbyfrv4mnjzj66ir60"; + sgr-iosevka-term-ss05 = "0izgz7rgjivzzvqywj3d2gma2sh83nhvc4scb7x3cbwwkzg9m5jx"; + sgr-iosevka-term-ss06 = "0syp2mqnqq2gs4zsa3vvx0yz7pa23s995jc8sjrh01la6kpdk332"; + sgr-iosevka-term-ss07 = "0dzfrw30aych0a0ic643w11ww42rncgyzvm5fkgqnkj1zjsdpgsw"; + sgr-iosevka-term-ss08 = "0d9b2rwcdpwbdlsyjcd3qd0pip9km4hg9ihjymsi3xj7bihd0wp5"; + sgr-iosevka-term-ss09 = "06bbj7c99wpjfh7ib7990nayxvbwy69ijlrjbi2mj45pm5i5lswq"; + sgr-iosevka-term-ss10 = "1i6cfzgbnga999851k7gg6b5awq1i9253fz8sngsb6b34c45zw5c"; + sgr-iosevka-term-ss11 = "1jb4lg0cjwv8xvhc5j9qp921zawgp2say6dnj6zncv0ys0rs6qwm"; + sgr-iosevka-term-ss12 = "01w3vj7pw0714r6xp4rq5rlirch9h2d22mk76hsnqb0igzhlkvhy"; + sgr-iosevka-term-ss13 = "0ywjr4j31v31z1cvvz7jvn7mcj2zhdpgljmvsfvix1j26cy5lr95"; + sgr-iosevka-term-ss14 = "1cxsxriayzvrxzr3i6k6dwq08ywl9dk78iz4jqgy5jvrh942km0w"; + sgr-iosevka-term-ss15 = "0j6rvsww2783hrdca3hfvv02s2whswwld7icf0bijdb3p799qi6w"; + sgr-iosevka-term-ss16 = "0hgi40g030s1ylnp1whxz47wg2lzzqwhblx894dzz7rpnwbgff38"; + sgr-iosevka-term-ss17 = "0hbdhc3z75n814r2xffnw6lnkwc31p0fmrvsan3z0db35c5kz54i"; + sgr-iosevka-term-ss18 = "18c3i4l4j9wi7rx191hzmhlc8zblyqpx7bhq9g2lxs9asp8svqsa"; } diff --git a/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix b/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix index 33ed947ae690..8147db6e1086 100644 --- a/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix +++ b/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "unifont_upper"; - version = "15.1.02"; + version = "15.1.03"; src = fetchurl { url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf"; - hash = "sha256-OTIwWA2p+7ldqEB5O6J18zU5RVoswC0t1G72fFeCKpU="; + hash = "sha256-IZM+21ipmDHoiHYfKQdoguLWN9KC9FlHsNbqOcXDBFQ="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix b/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix index 27811203c86e..79dcc88a6f5d 100644 --- a/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix +++ b/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "adw-gtk3"; - version = "4.9"; + version = "5.1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ni1u6696jrwjYZ4gppF9yD1RAum0+D7WxQgu09cxVGg="; + sha256 = "sha256-vRB6+C27M4u7v10c6dqGsKpxHMGfpCSiScZ+8qlJRr0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/themes/nordic/default.nix b/nixpkgs/pkgs/data/themes/nordic/default.nix index c8e956c3f83d..a64b870d12b9 100644 --- a/nixpkgs/pkgs/data/themes/nordic/default.nix +++ b/nixpkgs/pkgs/data/themes/nordic/default.nix @@ -2,76 +2,78 @@ , stdenv , fetchFromGitHub , gtk-engine-murrine +, breeze-icons +, plasma-framework +, plasma-workspace , jdupes -, libsForQt5 }: stdenv.mkDerivation rec { pname = "nordic"; - version = "unstable-2023-05-12"; + version = "unstable-2023-10-17"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "399246cdcbdb1a714c5bb294857cd5a6494b6006"; - sha256 = "sha256-0yZ4QYcdcGHEw6tdcXAKZ4e+mhNNmvihBxp2sLgTuu8="; + rev = "e97d2bcf4494f8ab502e33d13c74b396469a42f4"; + hash = "sha256-7WfCE3eoJ7maAYqgQNb0mlw8u3zc6NAwTJN+PVojDcE="; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "3599ddb6f8b7de936cf106bddd4f929ddfe88b1c"; - sha256 = "sha256-ft5UbBnjP0xNFFVwk5Elvrpcj273OupjM+MGJVlvJZQ="; + rev = "73ed3490c13b2df6c3d27d6b3bcba0c087297f4a"; + hash = "sha256-fRmGiqtjfGFIfr5hRBS3ZPFYEpQx391WoxphB5gRTJo="; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "b03b66d5badadc2e5ff27b8745a2308b8fafaa61"; - sha256 = "sha256-6dORsGfYi7q8z7JWA3Y9oqVs9bhT/gbdSrcgJcebGP8="; + rev = "4b1fc2942bad203a0aa035cbb688b28005bb1011"; + hash = "sha256-VU5Bo39l8xdR6QmbTR0Qic6XkSfDFrhyjoHaMm9SBYM="; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "e19b75f56e5c328352c183fc960a0be54e99836e"; - sha256 = "sha256-deKHT0dE5tsUo7+vkzxQ/eRon7COrOAWolw17VtKhiE="; + rev = "6d57a16eef66c25f0212b7d2f02e208f2afdf4f9"; + hash = "sha256-Sq5ZXOh+HA+udQHL2wUw5azgKwAVVvHGNb3SiuOn0nQ="; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "b134b4a1299b3c4a2d9543707ec2b5a0fc97987c"; - sha256 = "sha256-XSDwc0/59sUHkS0holvujmr/p6vX79648l9cxJqunuM="; + rev = "566e38c40bca86df93d0e9226c33d5d525d34454"; + hash = "sha256-Wl/m2O0tVCFgZhPC/gcNgKr0JqQbiyQBpGEcp8g6kvY="; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "a4efbc09470b36f4cf6af60b5fdfeb8e09282fb3"; - sha256 = "sha256-Qgrl6p0AhbhK0+aM8hu85Kz/Lz/b2Nn8uWS+WpTGjU4="; + rev = "b43efee28129634fdefe70f2a03c401efc7dc22f"; + hash = "sha256-rLOWkfTMFEnVU2tuw5M2fvbNMPfxIu+gzi+3gnBEhx4="; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "0d44fb16d0f07ef8615fd7740317a518d2b9411f"; - sha256 = "sha256-388251/Tg4jyn7c8zkrUxVFooN9O67xk2NTSeYa0VvI="; + rev = "2192acfce55fbb9a2982886abe25e623d0e7ff66"; + hash = "sha256-B/sAy4I+9gX9dHXUldcN5t0vlOL2Jnoan/hRV+tNnSo="; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "0eea9185946fee20b6d7472548226a3652dea7ae"; - sha256 = "sha256-8JFrmGKn8cl1x3TeDPee1zbMmtypJ9kALv/PRqRHGAU="; + rev = "a24b42411d8ea0dc63bf0778e443be251858e586"; + hash = "sha256-02z4eMFtok1+SeW+ai7vZCXZb6ZhU4l4ch1Zc/GyhYM="; name = "Nordic-Polar-standard-buttons"; }) ]; @@ -80,47 +82,57 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ jdupes ]; - buildInputs = with libsForQt5; [ + propagatedUserEnvPkgs = [ + gtk-engine-murrine + breeze-icons plasma-framework - qtgraphicaleffects plasma-workspace - breeze-icons ]; dontWrapQtApps = true; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - installPhase = '' runHook preInstall + # install theme files mkdir -p $out/share/themes cp -a Nordic* $out/share/themes + + # remove uneeded files rm -r $out/share/themes/*/.gitignore rm -r $out/share/themes/*/Art + rm -r $out/share/themes/*/FUNDING.yml rm -r $out/share/themes/*/LICENSE rm -r $out/share/themes/*/README.md rm -r $out/share/themes/*/{package.json,package-lock.json,Gulpfile.js} rm -r $out/share/themes/*/src rm -r $out/share/themes/*/cinnamon/*.scss - rm -r $out/share/themes/*/gnome-shell/{extensions,*.scss} + rm -r $out/share/themes/*/gnome-shell/{earlier-versions,extensions,*.scss} rm -r $out/share/themes/*/gtk-2.0/{assets.svg,assets.txt,links.fish,render-assets.sh} rm -r $out/share/themes/*/gtk-3.0/{apps,widgets,*.scss} + rm -r $out/share/themes/*/gtk-4.0/{apps,widgets,*.scss} rm -r $out/share/themes/*/xfwm4/{assets,render_assets.fish} + # move wallpapers to appropriate directory + mkdir -p $out/share/wallpapers/Nordic + mv -v $out/share/themes/Nordic/extras/wallpapers/* $out/share/wallpapers/Nordic/ + rmdir $out/share/themes/Nordic/extras{/wallpapers,} + # move kde related contents to appropriate directories - mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,sddm/themes/Nordic} + mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,sddm/themes,icons} mv -v $out/share/themes/Nordic/kde/aurorae/* $out/share/aurorae/themes/ mv -v $out/share/themes/Nordic/kde/colorschemes/* $out/share/color-schemes/ mv -v $out/share/themes/Nordic/kde/konsole $out/share/ mv -v $out/share/themes/Nordic/kde/kvantum/* $out/share/Kvantum/ mv -v $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/ - mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/Nordic/ + mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/ + mv -v $out/share/themes/Nordic/kde/folders/* $out/share/icons/ + mv -v $out/share/themes/Nordic/kde/cursors/*-cursors $out/share/icons/ rm -rf $out/share/themes/Nordic/kde - # Replace duplicate files with hardlinks to the first file in each - # set of duplicates, reducing the installed size in about 65% - jdupes -L -r $out/share + # Replace duplicate files with symbolic links to the first file in + # each set of duplicates, reducing the installed size in about 53% + jdupes --quiet --link-soft --recurse $out/share runHook postInstall ''; diff --git a/nixpkgs/pkgs/data/themes/whitesur/default.nix b/nixpkgs/pkgs/data/themes/whitesur/default.nix index 518bf72d5bdd..fb9a63b21f1a 100644 --- a/nixpkgs/pkgs/data/themes/whitesur/default.nix +++ b/nixpkgs/pkgs/data/themes/whitesur/default.nix @@ -33,13 +33,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2023-06-30"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-ctEaS+zWkmiVoq0WVA3ecHc2rm8LFQC/kqi/KEXAyXw="; + sha256 = "sha256-H8QdKCX6C36J7AfFd0VV9Rnm8LGXSfkxj5Yp2p+PduE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix b/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix index e49b717cb231..0573c36924fb 100644 --- a/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix @@ -43,6 +43,6 @@ mkDerivation rec { description = "A lightweight Qt-based terminal emulator"; license = licenses.gpl2Plus; platforms = with platforms; unix; - maintainers = with maintainers; [ globin ] ++ teams.lxqt.members; + maintainers = with maintainers; teams.lxqt.members; }; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/nixpkgs/pkgs/desktops/plasma-5/fetch.sh index 65f33dbda842..533240fc8f02 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/fetch.sh +++ b/nixpkgs/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.8/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.9/ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/nixpkgs/pkgs/desktops/plasma-5/srcs.nix index c26af1cfacc8..2906a5c839f3 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/srcs.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/srcs.nix @@ -4,475 +4,475 @@ { aura-browser = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/aura-browser-5.27.8.tar.xz"; - sha256 = "0963d09whxld1l6fmi3z5qdkdvhl49khak3zjrq3cgs9sifvx08h"; - name = "aura-browser-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/aura-browser-5.27.9.tar.xz"; + sha256 = "1962h3m52yzvj60r9y6cwfzqz4sgg0867n420w27r40cz23nr0fy"; + name = "aura-browser-5.27.9.tar.xz"; }; }; bluedevil = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/bluedevil-5.27.8.tar.xz"; - sha256 = "09bq19xh5cms6zkp8rkf954mz6bf6k6cv345z28ai9a7l386y2rv"; - name = "bluedevil-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/bluedevil-5.27.9.tar.xz"; + sha256 = "0vjbcaalsmkbx1bccflpvjpdmw8gcym28qqybp0h2z983mj6i0b6"; + name = "bluedevil-5.27.9.tar.xz"; }; }; breeze = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/breeze-5.27.8.tar.xz"; - sha256 = "0i1ywyq848g51glw8qkk2v5syp05c5d0dhyv1s6g393lrd9q596d"; - name = "breeze-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/breeze-5.27.9.tar.xz"; + sha256 = "0ks6y9qhwkqbbfivnbw46vk41kapaxgdzmhnbzzywpwpbqlidias"; + name = "breeze-5.27.9.tar.xz"; }; }; breeze-grub = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/breeze-grub-5.27.8.tar.xz"; - sha256 = "08jws31cci1qyxsy5als31rrcld2j87bqq5ir9v1cch7j8vq1cz0"; - name = "breeze-grub-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/breeze-grub-5.27.9.tar.xz"; + sha256 = "1bbmwj5b0xzqrb3w318l805an6rnvbnrd03ad05qnf84fg24cvn9"; + name = "breeze-grub-5.27.9.tar.xz"; }; }; breeze-gtk = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/breeze-gtk-5.27.8.tar.xz"; - sha256 = "1kpaxw7c41159bkxbv8kcjzrhdyizrllfvilrsiszr6vfcmla3s0"; - name = "breeze-gtk-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/breeze-gtk-5.27.9.tar.xz"; + sha256 = "03h1kbrh1rp7h4pslghpb9fjnyg0gg8khkds0la4bvjy85a3jsx8"; + name = "breeze-gtk-5.27.9.tar.xz"; }; }; breeze-plymouth = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/breeze-plymouth-5.27.8.tar.xz"; - sha256 = "0p1vmmlvdg29whvsmvwgxpj4slr11z2wacnnbvq91y98q9jb1p8f"; - name = "breeze-plymouth-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/breeze-plymouth-5.27.9.tar.xz"; + sha256 = "1wqnfzwjgwma2cxvnawwicj3z8kxwh0yjvrh3x5kzc586q0zj01r"; + name = "breeze-plymouth-5.27.9.tar.xz"; }; }; discover = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/discover-5.27.8.tar.xz"; - sha256 = "1lqg0bcqmcvvhdlxgll8psppxyq0m7r4w5awfjjcpgajmsxzrigi"; - name = "discover-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/discover-5.27.9.tar.xz"; + sha256 = "1m97zn2q22842dhamavpa6q49bm0vxl3kq1qgr3nhbmskk1swfg7"; + name = "discover-5.27.9.tar.xz"; }; }; drkonqi = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/drkonqi-5.27.8.tar.xz"; - sha256 = "0b6vs4acsakhxkz44yjyhzdqba7yzm0nbabsnp8wqkp1dm8cr3wb"; - name = "drkonqi-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/drkonqi-5.27.9.tar.xz"; + sha256 = "04nx1wkgz5cdc615611jn1672mnrsl2z3a8xznrqr6cbfpw9ghsm"; + name = "drkonqi-5.27.9.tar.xz"; }; }; flatpak-kcm = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/flatpak-kcm-5.27.8.tar.xz"; - sha256 = "0mgdmbb0zkvzs3kwvgwk6sn5vj80m3wnccm53x9j5j02a40631nw"; - name = "flatpak-kcm-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/flatpak-kcm-5.27.9.tar.xz"; + sha256 = "0zcadkabnp37ab0p5adih9kh81iapn5hzc0j07rx81kk40j9p58s"; + name = "flatpak-kcm-5.27.9.tar.xz"; }; }; kactivitymanagerd = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kactivitymanagerd-5.27.8.tar.xz"; - sha256 = "1n9jx3nxpdklm9cl82kz4racxq1f51gqfidp0mdxx7w3wzhnqjyl"; - name = "kactivitymanagerd-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kactivitymanagerd-5.27.9.tar.xz"; + sha256 = "1gn9a2rkyqljm9ry54kwfca7crmad71fr7fkan9l5cjsjrqqk3sn"; + name = "kactivitymanagerd-5.27.9.tar.xz"; }; }; kde-cli-tools = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kde-cli-tools-5.27.8.tar.xz"; - sha256 = "18v72ja1wdyql8a8r8bjzmgz5x7pqg2s2akv156py1x9gfah5fm2"; - name = "kde-cli-tools-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kde-cli-tools-5.27.9.tar.xz"; + sha256 = "01kx8xg6mlkl3n710vas536vwrni023h1655bs0ixzp12ngsdw86"; + name = "kde-cli-tools-5.27.9.tar.xz"; }; }; kde-gtk-config = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kde-gtk-config-5.27.8.tar.xz"; - sha256 = "1lyrlqm34rll830ykak83c2r22v4blbgchnr6grchaz3hd1njz4p"; - name = "kde-gtk-config-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kde-gtk-config-5.27.9.tar.xz"; + sha256 = "04lrc6anqljfyqhw9mwanxhjbbknfd1hkk2baxlhi49f9rzdhjw0"; + name = "kde-gtk-config-5.27.9.tar.xz"; }; }; kdecoration = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kdecoration-5.27.8.tar.xz"; - sha256 = "12f8n0y3syj9yim7vjzrawyw9471yzqrb2irsdm5jjpsqqzkxbfy"; - name = "kdecoration-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kdecoration-5.27.9.tar.xz"; + sha256 = "0zjk51pww3z6vsgdm5dxya2b3ngrdpxbmizdcin40zj37mkpz7bm"; + name = "kdecoration-5.27.9.tar.xz"; }; }; kdeplasma-addons = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kdeplasma-addons-5.27.8.tar.xz"; - sha256 = "0ik59yfbal16k06jl89r1bl8n342rysw4p02y089jbg1n658cdbb"; - name = "kdeplasma-addons-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kdeplasma-addons-5.27.9.tar.xz"; + sha256 = "0ysg5rzr0zywxx9wyg82x3l0skg7ld0wn270i4rryia8agdx49ps"; + name = "kdeplasma-addons-5.27.9.tar.xz"; }; }; kgamma5 = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kgamma5-5.27.8.tar.xz"; - sha256 = "05ily30mh3wr17ax58ahkwkaa2fa0nkp8mi73s2w7y6g38khqgs8"; - name = "kgamma5-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kgamma5-5.27.9.tar.xz"; + sha256 = "1ks4f1v2cm770j0q2fpd432kpmsg6daa29hjvcbdczfg8gxrnjn8"; + name = "kgamma5-5.27.9.tar.xz"; }; }; khotkeys = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/khotkeys-5.27.8.tar.xz"; - sha256 = "07m1ca39lxgiq29ls9n3bmrdycr18znwbcy4lq14i4g18f027qlc"; - name = "khotkeys-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/khotkeys-5.27.9.tar.xz"; + sha256 = "1s6whyqbz331j8nyz0f5k54ww22awcyq0gqpg2sfjwm5rclms6kn"; + name = "khotkeys-5.27.9.tar.xz"; }; }; kinfocenter = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kinfocenter-5.27.8.tar.xz"; - sha256 = "1k6rm87i4hls6b3x9prl2aqx3lpikisf3w3p35r6kcxsd2gn4vxg"; - name = "kinfocenter-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kinfocenter-5.27.9.tar.xz"; + sha256 = "0qp89b2js74qnfcc3b79ywi8g329scc0xypz9kjlzcncp6q79gq3"; + name = "kinfocenter-5.27.9.tar.xz"; }; }; kmenuedit = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kmenuedit-5.27.8.tar.xz"; - sha256 = "17zk2jb3jbvw396r83481zj9md3k8hy90al3yz9i41ihyj9hl25f"; - name = "kmenuedit-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kmenuedit-5.27.9.tar.xz"; + sha256 = "1ngbf7jrgsp5qnk38zw22vm07lpr2hizi5l5n6jy4754d756ndn8"; + name = "kmenuedit-5.27.9.tar.xz"; }; }; kpipewire = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kpipewire-5.27.8.tar.xz"; - sha256 = "1027a23m7kxmw6gxs93wssgc22pg91jhnmbxm1mghd2695nlrrjs"; - name = "kpipewire-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kpipewire-5.27.9.tar.xz"; + sha256 = "086h2mfb8isravj9wypvislwwg2yf72rkzly4zsnx3r0dh8lyyqv"; + name = "kpipewire-5.27.9.tar.xz"; }; }; kscreen = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kscreen-5.27.8.tar.xz"; - sha256 = "06q4iyn7mg0mmcardafzx6vzd1i3cm2kxdc22daw4mm0kqwjpjql"; - name = "kscreen-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kscreen-5.27.9.tar.xz"; + sha256 = "0nz1lm2i4h2w9m6pdw2diqii11sx38lwz2yrk4mzxsq229c97rij"; + name = "kscreen-5.27.9.tar.xz"; }; }; kscreenlocker = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kscreenlocker-5.27.8.tar.xz"; - sha256 = "05px5ksppa6ladldwmksyhyyxbwwlzsy7dxwicvcbd7c521r6gws"; - name = "kscreenlocker-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kscreenlocker-5.27.9.tar.xz"; + sha256 = "0kc7j69rbf66ji8s250iza4aq1cvpfgz43r59vrzr1in1a6a9077"; + name = "kscreenlocker-5.27.9.tar.xz"; }; }; ksshaskpass = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/ksshaskpass-5.27.8.tar.xz"; - sha256 = "1bcrhmnkivig68lavk50qfhal4v7bycqh2npa7dnca4lanx1ki37"; - name = "ksshaskpass-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/ksshaskpass-5.27.9.tar.xz"; + sha256 = "0wwarxw8xrmwmyfscvy9dr5r2g8zmdk0qjipydg3i8dcpxqd1n67"; + name = "ksshaskpass-5.27.9.tar.xz"; }; }; ksystemstats = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/ksystemstats-5.27.8.tar.xz"; - sha256 = "0nli13g5mzm3lj4hba9vz90ikn6j2644pbdp8qmrmfzs991ma5if"; - name = "ksystemstats-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/ksystemstats-5.27.9.tar.xz"; + sha256 = "0lbr84jv70qqayq6a8nvmcbd582696zpcrf108kzpxzd0smbbnij"; + name = "ksystemstats-5.27.9.tar.xz"; }; }; kwallet-pam = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kwallet-pam-5.27.8.tar.xz"; - sha256 = "0mgv2blyzq36r0y47nvj7n9wi2k7jf855karxh77rbra8arglxxs"; - name = "kwallet-pam-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kwallet-pam-5.27.9.tar.xz"; + sha256 = "1kjjrd84fxnpm9jv7n9ndbnfch2x904l2xxi0g85fv4ipfm0z6bn"; + name = "kwallet-pam-5.27.9.tar.xz"; }; }; kwayland-integration = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kwayland-integration-5.27.8.tar.xz"; - sha256 = "11bkd11m6srnmwy8vz11228mb1rfhfni9s0arwrzqq8xgjivfzbs"; - name = "kwayland-integration-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kwayland-integration-5.27.9.tar.xz"; + sha256 = "1rg2vyry9lv9d1bkhwnlhxx8pjridbqhs1758kgls5dk9q4g05wn"; + name = "kwayland-integration-5.27.9.tar.xz"; }; }; kwin = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kwin-5.27.8.tar.xz"; - sha256 = "1s9j0wkwsqvqnld8ndgldhg6ifnpml73cswbx4yay1c8cilcs9p7"; - name = "kwin-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kwin-5.27.9.tar.xz"; + sha256 = "1fvqamjhl5vij7kqd7sk0xcpv12rv965a1qk9pbnd2gqlqgnjkyr"; + name = "kwin-5.27.9.tar.xz"; }; }; kwrited = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kwrited-5.27.8.tar.xz"; - sha256 = "0y45kh4zdsh2jb8r51kpdacayyf6nba0xnhgks9bk70i6g9vj5s9"; - name = "kwrited-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kwrited-5.27.9.tar.xz"; + sha256 = "1x2mci8bnwpfcccc9ps7aaqpmg7yzc37hdr13vaqy71i8qkf7a76"; + name = "kwrited-5.27.9.tar.xz"; }; }; layer-shell-qt = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/layer-shell-qt-5.27.8.tar.xz"; - sha256 = "1aw8qs85k714nccb9gnslk3af1gj52b8x2ll9jgvbfhh2yx2lbvp"; - name = "layer-shell-qt-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/layer-shell-qt-5.27.9.tar.xz"; + sha256 = "0vw8cvp27is951dlzfzwkrx7l6480wdxsdfp16ihsa34yzcpw837"; + name = "layer-shell-qt-5.27.9.tar.xz"; }; }; libkscreen = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/libkscreen-5.27.8.tar.xz"; - sha256 = "0843db3f6b11nfr41bjf22jc74ff36x727sy548a75z2ipajymll"; - name = "libkscreen-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/libkscreen-5.27.9.tar.xz"; + sha256 = "0awvqchf48027f1zfl4n0llavl6nfnp30jvg7sx9anvzx6jb4ggs"; + name = "libkscreen-5.27.9.tar.xz"; }; }; libksysguard = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/libksysguard-5.27.8.tar.xz"; - sha256 = "0zgx8miggiasfk519sqccd54mxa237is06v6nhpixv8a7ccc0950"; - name = "libksysguard-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/libksysguard-5.27.9.tar.xz"; + sha256 = "0xi1fb1irp9nxnnqgqwhdza5rf6bw2hpqlz5l0mwipd0xdgarx3h"; + name = "libksysguard-5.27.9.tar.xz"; }; }; milou = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/milou-5.27.8.tar.xz"; - sha256 = "1rq8kkk609n0ccm0hrhp06lz82rny42dy3iz085048iasfl7d72d"; - name = "milou-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/milou-5.27.9.tar.xz"; + sha256 = "1y2si9gpmj363asvqd2iil14fwzmdd66f1fpsig05w1680dc35p8"; + name = "milou-5.27.9.tar.xz"; }; }; oxygen = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/oxygen-5.27.8.tar.xz"; - sha256 = "12y4hfygd7v004cs1ydx01mbypljpvwjwdcww08570dz9zc8aasz"; - name = "oxygen-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/oxygen-5.27.9.tar.xz"; + sha256 = "0wx96v6v65yjal1x2c25adp3hnfrmsd2r1m5fzicfcbdk33yn834"; + name = "oxygen-5.27.9.tar.xz"; }; }; oxygen-sounds = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/oxygen-sounds-5.27.8.tar.xz"; - sha256 = "01d4lnfyrpyz7fxj5damdjlwdlfm7lywz82mk1xgs6g0f7lxg5yn"; - name = "oxygen-sounds-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/oxygen-sounds-5.27.9.tar.xz"; + sha256 = "0n9plr4xs6wl4v4qm71mxbvgl22cz5c5523bjv5mv5jgvp5wpzg1"; + name = "oxygen-sounds-5.27.9.tar.xz"; }; }; plank-player = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plank-player-5.27.8.tar.xz"; - sha256 = "1bgdmiy6bzy08xjj2vd546p632dghpd1q5xlbbjhs6ck4a60q64k"; - name = "plank-player-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plank-player-5.27.9.tar.xz"; + sha256 = "0vfmab3fab7izz43j6hssly001sp773swc53xf6z4dx0j210zb3d"; + name = "plank-player-5.27.9.tar.xz"; }; }; plasma-bigscreen = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-bigscreen-5.27.8.tar.xz"; - sha256 = "0bigadshjprfsd7wlyn8apmb50ncwr74kb13hbnhh5kqadzv8kfl"; - name = "plasma-bigscreen-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-bigscreen-5.27.9.tar.xz"; + sha256 = "14dq3smb8rnpazr8mjs034gg9fidzj08nyggkqqwjiq774khv4wb"; + name = "plasma-bigscreen-5.27.9.tar.xz"; }; }; plasma-browser-integration = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-browser-integration-5.27.8.tar.xz"; - sha256 = "1rwmnkkwf52i9c5dj11mr4ny3gylw6mb2g5iwzp7kqyaknnyqjlw"; - name = "plasma-browser-integration-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-browser-integration-5.27.9.tar.xz"; + sha256 = "1d9f6fppaqxiwxixxngsvpawx2zbdnj9mwl47x107axnc7gn6355"; + name = "plasma-browser-integration-5.27.9.tar.xz"; }; }; plasma-desktop = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-desktop-5.27.8.tar.xz"; - sha256 = "1bmw7v8c8a4h63hjfg3ddg1r3ff6s0pri6fmml9430ynk850lrnz"; - name = "plasma-desktop-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-desktop-5.27.9.tar.xz"; + sha256 = "1rgjq7sla2x0icphaph2682k67n89znlyhp9nw95p8czpyqgbmkd"; + name = "plasma-desktop-5.27.9.tar.xz"; }; }; plasma-disks = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-disks-5.27.8.tar.xz"; - sha256 = "0yg2b8nqcws7sw25pxf4iwhr9qdg983x69arfls85xyjkkchnz4q"; - name = "plasma-disks-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-disks-5.27.9.tar.xz"; + sha256 = "0ikz5wv5429bc5i1ms8bdgmkm6x0f3jhs79ry8x2xq9q8f9cdraw"; + name = "plasma-disks-5.27.9.tar.xz"; }; }; plasma-firewall = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-firewall-5.27.8.tar.xz"; - sha256 = "05w9716bs2fh126v85n6vy5ydglh0xbsasdzzq10mdbkmswjrfbf"; - name = "plasma-firewall-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-firewall-5.27.9.tar.xz"; + sha256 = "0mkkz6n7yi382lm5hsgn5pwi8dxz4csmry5jvrscmhg9azcwghpr"; + name = "plasma-firewall-5.27.9.tar.xz"; }; }; plasma-integration = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-integration-5.27.8.tar.xz"; - sha256 = "14f732s64mchqfspd5f29x0h03lysk57vvciribzndj5bgkzn77v"; - name = "plasma-integration-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-integration-5.27.9.tar.xz"; + sha256 = "1csx7sr9ilr2q5mm6qar945srqm6qak95g9x02g70pyl6d58fajq"; + name = "plasma-integration-5.27.9.tar.xz"; }; }; plasma-mobile = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-mobile-5.27.8.tar.xz"; - sha256 = "0xzsil3jprpld5hq7b1al4pkbcckdx1iywq9kf4r0hvw70v9r7hn"; - name = "plasma-mobile-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-mobile-5.27.9.tar.xz"; + sha256 = "095fjn91zcipkh2blwjs70ff39yfrmh73ny2h6f2djkhgnr1xng0"; + name = "plasma-mobile-5.27.9.tar.xz"; }; }; plasma-nano = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-nano-5.27.8.tar.xz"; - sha256 = "1556i16x3cjs42jb1wkyi0y43p1cgmf5hq6hs8kxmdsnky0mbwn2"; - name = "plasma-nano-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-nano-5.27.9.tar.xz"; + sha256 = "1g3dyqwx05506mgq3v7n9n1j5dlnhf7lbb8kbk7whk8lfjc468n6"; + name = "plasma-nano-5.27.9.tar.xz"; }; }; plasma-nm = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-nm-5.27.8.tar.xz"; - sha256 = "0rischaaq8hbvrkdhhyasss5fq39q2i8n86qhq6alj4s571r6m57"; - name = "plasma-nm-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-nm-5.27.9.tar.xz"; + sha256 = "0k2qxyf09k3nk2n2dyg7a1xwx45r7m72nz0azvidlpy0v1j64g1a"; + name = "plasma-nm-5.27.9.tar.xz"; }; }; plasma-pa = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-pa-5.27.8.tar.xz"; - sha256 = "02yp7vyzjghhxpzsl8ahza09c2cb2l64jwax2r67kfhsvcr428v9"; - name = "plasma-pa-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-pa-5.27.9.tar.xz"; + sha256 = "07am1kk6sj9kr5vl2333lnlh3xjd8f7wkww7ra6vjif21wy7gm94"; + name = "plasma-pa-5.27.9.tar.xz"; }; }; plasma-remotecontrollers = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-remotecontrollers-5.27.8.tar.xz"; - sha256 = "1xzs4gjfwfbva12j11fh626w1a8wi2aifc30dnga5c9yghfg75m2"; - name = "plasma-remotecontrollers-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-remotecontrollers-5.27.9.tar.xz"; + sha256 = "10zk35yrzpzkjw6a1g7mlr6w0nsi33h1hzrwqsvsqyac5j0yi25y"; + name = "plasma-remotecontrollers-5.27.9.tar.xz"; }; }; plasma-sdk = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-sdk-5.27.8.tar.xz"; - sha256 = "1fwhfks4a0x4h55g08d5mfdncm2r8c1x35xkbsa7xzm5wdf1v5lz"; - name = "plasma-sdk-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-sdk-5.27.9.tar.xz"; + sha256 = "10rshr3d618gis6spi93zj5q012jhi9mm3ixgbvbxvhlzp8k0b3x"; + name = "plasma-sdk-5.27.9.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-systemmonitor-5.27.8.tar.xz"; - sha256 = "09qc6l6d17w61bdjn03a45dqp2sw8s8bp5bjh8cq61zrc7yfpimx"; - name = "plasma-systemmonitor-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-systemmonitor-5.27.9.tar.xz"; + sha256 = "1c9lyzfx21033335160j3cndkv19icm1lf9nnn88f7gz0zhkz73c"; + name = "plasma-systemmonitor-5.27.9.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-thunderbolt-5.27.8.tar.xz"; - sha256 = "05c7k0p6jb1s1bv4i5cilcid68s4pd5h4qp22hajmv14xk6a8pdk"; - name = "plasma-thunderbolt-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-thunderbolt-5.27.9.tar.xz"; + sha256 = "0rbmj0b0ckyaz5sqrrzxp4n049asb5hxyap0lslhg9js2vjdk239"; + name = "plasma-thunderbolt-5.27.9.tar.xz"; }; }; plasma-vault = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-vault-5.27.8.tar.xz"; - sha256 = "1r6yv9xp0cc0ly04wcnlkwf711jrpb3v5ix8w7rwvki9cnlah1w9"; - name = "plasma-vault-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-vault-5.27.9.tar.xz"; + sha256 = "1p6wdvqprr3bfia0lchvmk8c5ii3c629c9c8qy2r4c0xy3l0f42i"; + name = "plasma-vault-5.27.9.tar.xz"; }; }; plasma-welcome = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-welcome-5.27.8.tar.xz"; - sha256 = "1laqdh014hmsivnncn5j1annmk6p82dadda3hnr94996fanphpqv"; - name = "plasma-welcome-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-welcome-5.27.9.tar.xz"; + sha256 = "1la7sb1ar06x79p80fh1qa09r3qd1gk53f3acr5az5k7gmjhpi1n"; + name = "plasma-welcome-5.27.9.tar.xz"; }; }; plasma-workspace = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-workspace-5.27.8.tar.xz"; - sha256 = "1w0fnv9n8jcv34nw28v9hc08zb6lnwlwjql5041h13pja6cd4rd5"; - name = "plasma-workspace-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-workspace-5.27.9.tar.xz"; + sha256 = "0b2xw5izw5pjlyw2mppmxplibdm4vm2kj18rz1narksg7rwnwfmw"; + name = "plasma-workspace-5.27.9.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-workspace-wallpapers-5.27.8.tar.xz"; - sha256 = "1qkzrgx90r79l2xvwwasiyby58ag00f3bimfgfwm2lk8qa4zm5mg"; - name = "plasma-workspace-wallpapers-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-workspace-wallpapers-5.27.9.tar.xz"; + sha256 = "1gkk4ihpqbyfq394n1dhfkwrdfhnrvkgqbfp7xba82iygcx3zcwf"; + name = "plasma-workspace-wallpapers-5.27.9.tar.xz"; }; }; plymouth-kcm = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plymouth-kcm-5.27.8.tar.xz"; - sha256 = "1spv976q95zip2cs9lwb7hlmcn2cr6gna0cky0lvagpi02kznpqj"; - name = "plymouth-kcm-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plymouth-kcm-5.27.9.tar.xz"; + sha256 = "15cximix1cajylbb0c14q2rz1573kiby7c4h9iysap3ask7g633b"; + name = "plymouth-kcm-5.27.9.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.27.8"; + version = "1-5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/polkit-kde-agent-1-5.27.8.tar.xz"; - sha256 = "13fgz47q1khra7vwl5wkm99bk279gmgivykg3jm9qy57rhakg5sq"; - name = "polkit-kde-agent-1-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/polkit-kde-agent-1-5.27.9.tar.xz"; + sha256 = "14h883ghn22xpjwbdld168m59zdmd6i5a7p6gszv2c6y3lpw3f03"; + name = "polkit-kde-agent-1-5.27.9.tar.xz"; }; }; powerdevil = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/powerdevil-5.27.8.tar.xz"; - sha256 = "0jvp6sm6jrxk4j3h30076rv2jp21vpn17sins92phcms1i0yjry5"; - name = "powerdevil-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/powerdevil-5.27.9.tar.xz"; + sha256 = "1x78cjlkiz6jl79jhcd3l04glpxzsqbb6rhw1f5az7i3ywc2qh7f"; + name = "powerdevil-5.27.9.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/qqc2-breeze-style-5.27.8.tar.xz"; - sha256 = "1h7i3myr56by8j12rc09665qdxn2jhh4jxq25fg27g704ci3b55v"; - name = "qqc2-breeze-style-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/qqc2-breeze-style-5.27.9.tar.xz"; + sha256 = "1allsvr51si8v5b4xvzhpms3i4446vr9a9cfwhg72ll8ssfa46ld"; + name = "qqc2-breeze-style-5.27.9.tar.xz"; }; }; sddm-kcm = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/sddm-kcm-5.27.8.tar.xz"; - sha256 = "1fgflgnirwa9i03fvrsq4dm6g9ikdwm1qqfha2xgk9ji2987rsj6"; - name = "sddm-kcm-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/sddm-kcm-5.27.9.tar.xz"; + sha256 = "0s5swqzmvb3hxsn66r99r70ha2gx9913c5vlffv1mawf5p2pzvk1"; + name = "sddm-kcm-5.27.9.tar.xz"; }; }; systemsettings = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/systemsettings-5.27.8.tar.xz"; - sha256 = "1f9zfjw6wcq1rvzvsldg49n0axbi40fnf2qic4lj1yrdb9qi351y"; - name = "systemsettings-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/systemsettings-5.27.9.tar.xz"; + sha256 = "0q9qy7i1ndf0pw2irf15l9mvc451s0gwz7hx0wjf5kjppwx2z9ab"; + name = "systemsettings-5.27.9.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/xdg-desktop-portal-kde-5.27.8.tar.xz"; - sha256 = "0lrz4xfc7d6fv6dl4zxafkd5r2089f2rypkw90zsfqv39hjdy7vy"; - name = "xdg-desktop-portal-kde-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/xdg-desktop-portal-kde-5.27.9.tar.xz"; + sha256 = "1i2xqks1lx68rf79j67mzibsya43288sf0sl6azhwc14cw15xcdb"; + name = "xdg-desktop-portal-kde-5.27.9.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index 54f51ee2518c..b3f1537a8ac8 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -17,10 +17,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.9.2"; + version = "0.9.3"; odd-unstable = false; - sha256 = "sha256-BHhz5LURXLeILxQ+iNQ+50yHd/oIF7twHAqxiBQ2hFE="; + sha256 = "sha256-kgTKJAUB/w/6vtNm2Ewb2v62t0kFK+T8e5Q3/nKwrMg="; buildInputs = [ dbus diff --git a/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix b/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix index 393c55177464..9475ed35f889 100644 --- a/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix @@ -4,12 +4,12 @@ let pname = "elixir-ls"; - version = "0.17.1"; + version = "0.17.3"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-xC6JfhqUNnTqKh1jEm3WshFB69ne97lZGVqlEUbDkk4="; + hash = "sha256-E+tlnkwJiyG8x29um/G7OqIDCJ/laDMTm3z7VvdWy6s="; fetchSubmodules = true; }; in @@ -21,7 +21,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-3CHvQHqUJPI2PZQ1QIajqnWs0WM4ObizqzutAYHFiF8="; + hash = "sha256-ltSYZYsXWiq5ASvRmR7ETgK9e8bj4f9bhZAZEIceLkw="; }; # elixir-ls is an umbrella app diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix b/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix index 270384565a4f..89737e94f489 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix @@ -69,9 +69,18 @@ in addToNativeBuildInputs (lib.optionals (stdenv.system == "x86_64-darwin") [ pkgs.memorymappingHook ]) (addPkgConfig old); sdl-base = addToBuildInputs pkgs.SDL; - sdl2 = addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2; - sdl2-image = addToBuildInputs pkgs.SDL2_image; - sdl2-ttf = addToBuildInputs pkgs.SDL2_ttf; + sdl2 = old: + ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2 old) // + # needed for sdl2-config to be in PATH + (addToNativeBuildInputs pkgs.SDL2 old)); + sdl2-image = old: + ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2_image old) // + # needed for sdl2-config to be in PATH + (addToNativeBuildInputs pkgs.SDL2 old)); + sdl2-ttf = old: + ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2_ttf old) // + # needed for sdl2-config to be in PATH + (addToNativeBuildInputs pkgs.SDL2 old)); soil = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy; sqlite3 = addToBuildInputs pkgs.sqlite; stemmer = old: diff --git a/nixpkgs/pkgs/development/compilers/dart/default.nix b/nixpkgs/pkgs/development/compilers/dart/default.nix index b0893562c2dd..ee10acbdeb7c 100644 --- a/nixpkgs/pkgs/development/compilers/dart/default.nix +++ b/nixpkgs/pkgs/development/compilers/dart/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - homepage = "https://www.dartlang.org/"; + homepage = "https://dart.dev"; maintainers = with maintainers; [ grburst ]; description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps"; longDescription = '' diff --git a/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix b/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix index 47b64fe47401..f525bcc7ab31 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix @@ -177,6 +177,7 @@ in ++ lib.optionals supportsLinuxDesktop [ glib wrapGAppsHook ]; passthru = flutter.passthru // { + inherit (flutter) version; unwrapped = flutter; inherit engineArtifacts; }; diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix b/nixpkgs/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix index fc88e61c6560..239d60268007 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix @@ -42,11 +42,12 @@ in # # No rule to make target '../../../gcc-xx.x.x/libgcc/config/loongarch/crti.S', needed by 'crti.o'. Stop. # - # For LoongArch64, a hacky workaround is to simply touch them, + # For LoongArch64 and S390, a hacky workaround is to simply touch them, # as the platform forces .init_array support. # # https://www.openwall.com/lists/musl/2022/11/09/3 # - + lib.optionalString stdenv.targetPlatform.isLoongArch64 '' - touch libgcc/config/loongarch/crt{i,n}.S + # 'parsed.cpu.family' won't be correct for every platform. ++ lib.optionalString (stdenv.targetPlatform.isLoongArch64 || stdenv.targetPlatform.isS390) '' + touch libgcc/config/${stdenv.targetPlatform.parsed.cpu.family}/crt{i,n}.S '' diff --git a/nixpkgs/pkgs/development/compilers/julia/README.md b/nixpkgs/pkgs/development/compilers/julia/README.md index d37c01bc8ce6..e9843fa3c9e7 100644 --- a/nixpkgs/pkgs/development/compilers/julia/README.md +++ b/nixpkgs/pkgs/development/compilers/julia/README.md @@ -20,5 +20,5 @@ minimal set of broken or incompatible tests you think you have a good reason to disable, is your best bet at arriving at a solid derivation. [readme]: https://github.com/JuliaLang/julia/blob/master/README.md -[build]: https://github.com/JuliaLang/julia/blob/master/doc/build/build.md +[build]: https://github.com/JuliaLang/julia/tree/master/doc/src/devdocs/build [release_process]: https://julialang.org/blog/2019/08/release-process diff --git a/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 0cf5020962cf..3a649bde95dd 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -263,7 +263,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ globin havvy ] ++ teams.rust.members; + maintainers = with maintainers; [ havvy ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; platforms = [ # Platforms with host tools from diff --git a/nixpkgs/pkgs/development/coq-modules/corn/default.nix b/nixpkgs/pkgs/development/coq-modules/corn/default.nix index 7a745a3df34a..a33fd8b87e27 100644 --- a/nixpkgs/pkgs/development/coq-modules/corn/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/corn/default.nix @@ -5,6 +5,7 @@ mkCoqDerivation rec { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.6"; out = "8.8.1"; } + { case = (range "8.14" "8.18"); out = "8.18.0"; } { case = (range "8.11" "8.17"); out = "8.16.0"; } { case = (range "8.7" "8.15"); out = "8.13.0"; } ] null; @@ -13,6 +14,7 @@ mkCoqDerivation rec { "8.12.0".sha256 = "0b92vhyzn1j6cs84z2182fn82hxxj0bqq7hk6cs4awwb3vc7dkhi"; "8.13.0".sha256 = "1wzr7mdsnf1rq7q0dvmv55vxzysy85b00ahwbs868bl7m8fk8x5b"; "8.16.0".sha256 = "sha256-ZE/EEIndxHfo/9Me5NX4ZfcH0ZAQ4sRfZY7LRZfLXBQ="; + "8.18.0".sha256 = "sha256-ow3mfarZ1PvBGf5WLnI8LdF3E+8A6fN7cOcXHrZJLo0="; }; preConfigure = "patchShebangs ./configure.sh"; diff --git a/nixpkgs/pkgs/development/coq-modules/extructures/default.nix b/nixpkgs/pkgs/development/coq-modules/extructures/default.nix index 7240ffdf0dba..bce21f0e6c62 100644 --- a/nixpkgs/pkgs/development/coq-modules/extructures/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/extructures/default.nix @@ -9,6 +9,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ + { cases = [(range "8.17" "8.18") (isGe "2.0.0") ]; out = "0.4.0"; } { cases = [(range "8.11" "8.18") (isGe "1.12.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } @@ -16,6 +17,7 @@ releaseRev = v: "v${v}"; + release."0.4.0".sha256 = "sha256-hItFO2XY2LTPSofPTKt3AfOEfiLliaYdzUXgDv4ea9Y="; release."0.3.1".sha256 = "sha256-KcuG/11Yq5ACem4FyVnQqHKvy3tNK7hd0ir2SJzzMN0="; release."0.3.0".sha256 = "sha256:14rm0726f1732ldds495qavg26gsn30w6dfdn36xb12g5kzavp38"; release."0.2.2".sha256 = "sha256:1clzza73gccy6p6l95n6gs0adkqd3h4wgl4qg5l0qm4q140grvm7"; diff --git a/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix b/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix index 6ae6956110a5..69d65d4b5587 100644 --- a/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix @@ -5,6 +5,7 @@ mkCoqDerivation { pname = "math-classes"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.12" "8.18"; out = "8.18.0"; } { case = range "8.12" "8.17"; out = "8.17.0"; } { case = range "8.6" "8.16"; out = "8.15.0"; } ] null; @@ -12,6 +13,7 @@ mkCoqDerivation { release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby"; release."8.15.0".sha256 = "10w1hm537k6jx8a8vghq1yx12rsa0sjk2ipv3scgir71ln30hllw"; release."8.17.0".sha256 = "sha256-WklL8pgYTd0l4TGt7h7tWj1qcFcXvoPn25+XKF1pIKA="; + release."8.18.0".sha256 = "sha256-0WwPss8+Vr37zX616xeuS4TvtImtSbToFQkQostIjO8="; propagatedBuildInputs = [ bignums ]; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix index 6adcb3af7d54..ae1dcd57c3dd 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix @@ -20,6 +20,7 @@ let withDoc = single && (args.withDoc or false); defaultVersion = with versions; lib.switch coq.coq-version [ { case = isGe "8.15"; out = "1.17.0"; } + { case = range "8.16" "8.18"; out = "2.1.0"; } { case = range "8.16" "8.18"; out = "2.0.0"; } { case = range "8.13" "8.18"; out = "1.16.0"; } { case = range "8.14" "8.16"; out = "1.15.0"; } @@ -34,6 +35,7 @@ let { case = range "8.5" "8.7"; out = "1.6.4"; } ] null; release = { + "2.1.0".sha256 = "sha256-XDLx0BIkVRkSJ4sGCIE51j3rtkSGemNTs/cdVmTvxqo="; "2.0.0".sha256 = "sha256-dpOmrHYUXBBS9kmmz7puzufxlbNpIZofpcTvJFLG5DI="; "1.17.0".sha256 = "sha256-bUfoSTMiW/GzC1jKFay6DRqGzKPuLOSUsO6/wPSFwNg="; "1.16.0".sha256 = "sha256-gXTKhRgSGeRBUnwdDezMsMKbOvxdffT+kViZ9e1gEz0="; diff --git a/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix index 2b4fd46ea275..ac5d373955f5 100644 --- a/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { hash = "sha256-vbm31EsOJiMeTs2tu5KPXckxPcAQbi3/PGJ5EHCC5VQ="; }; + strictDeps = true; nativeBuildInputs = [ - autoreconfHook pkg-config texinfo + autoreconfHook guile libgcrypt pkg-config texinfo ]; buildInputs = [ guile diff --git a/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix index 84d53b66e19b..6afddd8d362e 100644 --- a/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix +++ b/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { sha256 = "x6apF9fmwzrkyzAexKjClOTFrbE31+fVhSLyFZkKRYU="; }; + strictDeps = true; nativeBuildInputs = [ - autoreconfHook pkg-config texinfo + autoreconfHook guile pkg-config texinfo ]; buildInputs = [ guile diff --git a/nixpkgs/pkgs/development/guile-modules/guile-gnutls/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-gnutls/default.nix index 91ffe90b0435..ae666077bf8f 100644 --- a/nixpkgs/pkgs/development/guile-modules/guile-gnutls/default.nix +++ b/nixpkgs/pkgs/development/guile-modules/guile-gnutls/default.nix @@ -17,7 +17,12 @@ stdenv.mkDerivation rec { hash = "sha256-W0y5JgMgduw0a7XAvA0CMflo/g9WWRPMFpNLt5Ovsjk="; }; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + + nativeBuildInputs = [ + guile + pkg-config + ]; buildInputs = [ gnutls diff --git a/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix index 81febc3171b7..cb34e22e6237 100644 --- a/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix +++ b/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-OLoEjtKdEvBbMsWy+3pReVxEi0HkA6Kxty/wA1gX84g="; }; + strictDeps = true; nativeBuildInputs = [ - pkg-config texinfo + guile pkg-config texinfo ]; buildInputs = [ guile diff --git a/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix index 75e45b00d4e7..8c38432e3e23 100644 --- a/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix +++ b/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix @@ -16,8 +16,10 @@ stdenv.mkDerivation rec { hash = "sha256-5O87hF8SGILHwM8E+BocuP02DG9ktWuGjeVUYhT5BN4="; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook + guile pkg-config ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/guile-modules/guile-sqlite3/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-sqlite3/default.nix index 430249f2c935..4b309f7fbe5d 100644 --- a/nixpkgs/pkgs/development/guile-modules/guile-sqlite3/default.nix +++ b/nixpkgs/pkgs/development/guile-modules/guile-sqlite3/default.nix @@ -20,8 +20,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-C1a6lMK4O49043coh8EQkTWALrPolitig3eYf+l+HmM="; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook + guile pkg-config texinfo ]; diff --git a/nixpkgs/pkgs/development/interpreters/babashka/clojure-tools.nix b/nixpkgs/pkgs/development/interpreters/babashka/clojure-tools.nix index b95a40e12a17..732b3631583b 100644 --- a/nixpkgs/pkgs/development/interpreters/babashka/clojure-tools.nix +++ b/nixpkgs/pkgs/development/interpreters/babashka/clojure-tools.nix @@ -6,10 +6,10 @@ }: clojure.overrideAttrs (previousAttrs: { pname = "babashka-clojure-tools"; - version = "1.11.1.1403"; + version = "1.11.1.1413"; src = fetchurl { url = previousAttrs.src.url; - hash = "sha256-bVNHEEzpPanPF8pfDP51d13bxv9gZGzqczNmFQOk6zI="; + hash = "sha256-k8Olo63KUcWFgGNBmr9myD2/JOoV4f2S95v35mI4H+A="; }; }) diff --git a/nixpkgs/pkgs/development/interpreters/babashka/default.nix b/nixpkgs/pkgs/development/interpreters/babashka/default.nix index 3b1874a605de..ef9636e12dec 100644 --- a/nixpkgs/pkgs/development/interpreters/babashka/default.nix +++ b/nixpkgs/pkgs/development/interpreters/babashka/default.nix @@ -9,11 +9,11 @@ let babashka-unwrapped = buildGraalvmNativeImage rec { pname = "babashka-unwrapped"; - version = "1.3.184"; + version = "1.3.185"; src = fetchurl { url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar"; - sha256 = "sha256-O3pLELYmuuB+Bf1vHTWQ+u7Ymi3qYiMRpCwvEq+GeBQ="; + sha256 = "sha256-nTW7LpvWoF8hBWtpWOc8VtVvx3v1ISJGvxnnYIvprQk="; }; graalvmDrv = graalvmCEPackages.graalvm-ce; diff --git a/nixpkgs/pkgs/development/interpreters/clisp/default.nix b/nixpkgs/pkgs/development/interpreters/clisp/default.nix index 14b436375420..127541c727ec 100644 --- a/nixpkgs/pkgs/development/interpreters/clisp/default.nix +++ b/nixpkgs/pkgs/development/interpreters/clisp/default.nix @@ -113,6 +113,8 @@ stdenv.mkDerivation { cd builddir ''; + doCheck = true; + postInstall = lib.optionalString (withModules != []) (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' diff --git a/nixpkgs/pkgs/development/interpreters/evcxr/default.nix b/nixpkgs/pkgs/development/interpreters/evcxr/default.nix index 21fba0864ad5..7b1a9b8b0835 100644 --- a/nixpkgs/pkgs/development/interpreters/evcxr/default.nix +++ b/nixpkgs/pkgs/development/interpreters/evcxr/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-IQM/uKDxt18rVOd6MOKhQZC26vjxVe+3Yn479ITFDFs="; + sha256 = "sha256-TQG0YNwD3WU50fftFv5nGUK9ucxDXYnbQVv8Dewhwm8="; }; - cargoHash = "sha256-6kyxAHxphZjwfHo7OHrATSKFzrpXIRHVTjynDawlWew="; + cargoHash = "sha256-F2CduT0/vjoVHua5WshYxsxf4P0QBa+BjFVp7iTsFkU="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; diff --git a/nixpkgs/pkgs/development/interpreters/luau/default.nix b/nixpkgs/pkgs/development/interpreters/luau/default.nix index 93aece038980..16a5f4a855b2 100644 --- a/nixpkgs/pkgs/development/interpreters/luau/default.nix +++ b/nixpkgs/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.598"; + version = "0.600"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-B3ggPrhvq1kYmclmuomi6PhXIwN8GKBzbKRLIjH0pac="; + hash = "sha256-fu4ALQ6mpxSQAWdz6zzcHRC4Z5ykVB0G7e2QzpHt8K8="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index f9202514f800..e2e75a80cebe 100644 --- a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "13.0.0"; + version = "14.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-D8Osn/vlPr9eg5F8O0K/eC/M0prHQM7U96k8Cx9D1/4="; + hash = "sha256-9Bpq96k/AOuKPXHeVv3zCqinGUu3rBqKsIryV/RUVlE="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-nFKk6T3S86lPxn/JCEid2Xd9c5zQPOMFcKTi6eM89uE="; + cargoHash = "sha256-q/PTPiaggqYQwZZ9QyFi9ctgqYsFSy/ITHfOBgSHG+U="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/audio/zix/default.nix b/nixpkgs/pkgs/development/libraries/audio/zix/default.nix index 44b8812b29e4..7d1bac57472c 100644 --- a/nixpkgs/pkgs/development/libraries/audio/zix/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/zix/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "zix"; - version = "unstable-2023-02-13"; + version = "0.4.2"; src = fetchFromGitLab { owner = "drobilla"; repo = pname; - rev = "262d4a1522c38be0588746e874159da5c7bb457d"; - hash = "sha256-3vuefgnirM4ksK3j9sjBHgOmx0JpL+6tCPb69/7jI00="; + rev = "v${version}"; + hash = "sha256-nMm3Mdqc4ncCae8SoyGxZYURzmXLNcp1GjsSExfB6x4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/avro-c/default.nix b/nixpkgs/pkgs/development/libraries/avro-c/default.nix index 9f5a68187c02..944182e14124 100644 --- a/nixpkgs/pkgs/development/libraries/avro-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/avro-c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "avro-c"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "sha256-nx+ZqXsmcS0tQ/5+ck8Z19vdXO81R4uuRqGSDfIEV/U="; + sha256 = "sha256-chfKrPt9XzRhF2ZHOmbC4nm8e/rxuimMfwSzsvulc2U="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index f3b138d27487..e473fa97a0ea 100644 --- a/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.2.98"; + version = "5.2.109"; nativeBuildInputs = [ cmake @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-j1vVd9UcwmP3tGGN6NApiMyOql8vYljTqj3CKor1Ckk="; + hash = "sha256-OwwSGzMFwR2ajUUgAy7ea/Q2pWxn3DO72W7ukcjBJnU="; }; # Do not build static libraries diff --git a/nixpkgs/pkgs/development/libraries/elpa/default.nix b/nixpkgs/pkgs/development/libraries/elpa/default.nix index 810e04d3a377..0967ba113f8d 100644 --- a/nixpkgs/pkgs/development/libraries/elpa/default.nix +++ b/nixpkgs/pkgs/development/libraries/elpa/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = !enableCuda; nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; preCheck = '' diff --git a/nixpkgs/pkgs/development/libraries/glibc/default.nix b/nixpkgs/pkgs/development/libraries/glibc/default.nix index 1c822bf1ed01..11676560e80b 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/default.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/default.nix @@ -3,7 +3,7 @@ , profilingLibraries ? false , withGd ? false , withLibcrypt? false -, buildPackages +, pkgsBuildBuild , libgcc }: @@ -95,17 +95,26 @@ in "user-defined-trusted-dirs=${libgcc}/lib" ]; - postInstall = previousAttrs.postInstall + (if stdenv.hostPlatform == stdenv.buildPlatform then '' + postInstall = previousAttrs.postInstall + (if stdenv.buildPlatform.canExecute stdenv.hostPlatform then '' echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED make -j''${NIX_BUILD_CORES:-1} localedata/install-locales - '' else lib.optionalString stdenv.buildPlatform.isLinux '' + '' else lib.optionalString stdenv.buildPlatform.isLinux # This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html # Instead of using their patch to build a build-native localedef, - # we simply use the one from buildPackages + # we simply use the one from pkgsBuildBuild. + # + # Note that we can't use pkgsBuildHost (aka buildPackages) here, because + # that will cause an eval-time infinite recursion: "buildPackages.glibc + # depended on buildPackages.libgcc, which, since it's GCC, depends on the + # target's bintools, which depend on the target's glibc, which, again, + # depends on buildPackages.glibc, causing an infinute recursion when + # evaluating buildPackages.glibc when glibc hasn't come from stdenv + # (e.g. on musl)." https://github.com/NixOS/nixpkgs/pull/259964 + '' pushd ../glibc-2*/localedata export I18NPATH=$PWD GCONV_PATH=$PWD/../iconvdata - mkdir -p $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale - ${lib.getBin buildPackages.glibc}/bin/localedef \ + mkdir -p $NIX_BUILD_TOP/${pkgsBuildBuild.glibc}/lib/locale + ${lib.getBin pkgsBuildBuild.glibc}/bin/localedef \ --alias-file=../intl/locale.alias \ -i locales/C \ -f charmaps/UTF-8 \ @@ -115,7 +124,7 @@ in else "--big-endian"} \ C.UTF-8 - cp -r $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale $out/lib + cp -r $NIX_BUILD_TOP/${pkgsBuildBuild.glibc}/lib/locale $out/lib popd '') + '' diff --git a/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix index 539cfc37051b..b2afb21b6214 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix @@ -66,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.isDarwin [ ./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch ./patches/2.0-darwin-x11.patch + # Fixes an incompatible function pointer conversion and implicit int errors with clang 16. + ./patches/2.0-clang.patch ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gtk/patches/2.0-clang.patch b/nixpkgs/pkgs/development/libraries/gtk/patches/2.0-clang.patch new file mode 100644 index 000000000000..1e2e73b9833d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gtk/patches/2.0-clang.patch @@ -0,0 +1,49 @@ +diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c +index 4317523fb8..3c09cd3ae8 100644 +--- a/gtk/gtkscale.c ++++ b/gtk/gtkscale.c +@@ -1471,7 +1471,7 @@ gtk_scale_add_mark (GtkScale *scale, + mark->position = position; + + priv->marks = g_slist_insert_sorted_with_data (priv->marks, mark, +- (GCompareFunc) compare_marks, ++ (GCompareDataFunc) compare_marks, + GINT_TO_POINTER ( + gtk_range_get_inverted (GTK_RANGE (scale)) + )); +diff --git a/tests/testmenubars.c b/tests/testmenubars.c +index 416a939861..c65e82be26 100644 +--- a/tests/testmenubars.c ++++ b/tests/testmenubars.c +@@ -21,7 +21,7 @@ + #include <gtk/gtk.h> + + static GtkWidget * +-create_menu (depth) ++create_menu (int depth, gboolean _unused) + { + GtkWidget *menu; + GtkWidget *menuitem; +@@ -35,19 +35,19 @@ create_menu (depth) + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), +- create_menu (depth - 1)); ++ create_menu (depth - 1, _unused)); + + menuitem = gtk_menu_item_new_with_mnemonic ("Two"); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), +- create_menu (depth - 1)); ++ create_menu (depth - 1, _unused)); + + menuitem = gtk_menu_item_new_with_mnemonic ("Three"); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), +- create_menu (depth - 1)); ++ create_menu (depth - 1, _unused)); + + return menu; + } diff --git a/nixpkgs/pkgs/development/libraries/kweathercore/default.nix b/nixpkgs/pkgs/development/libraries/kweathercore/default.nix index e0e804c11018..943dee42c0e9 100644 --- a/nixpkgs/pkgs/development/libraries/kweathercore/default.nix +++ b/nixpkgs/pkgs/development/libraries/kweathercore/default.nix @@ -9,14 +9,14 @@ mkDerivation rec { pname = "kweathercore"; - version = "0.6"; + version = "0.7"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LIgUSXKHcRqcBwGTRxU5Z4eHuWmPLerorlrnI6Cf9k4="; + sha256 = "sha256-CnnoPkgz97SfDG13zfyIWweVnp2oxAChTPKFxJC+L8A="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libcdada/default.nix b/nixpkgs/pkgs/development/libraries/libcdada/default.nix index 6fb8caa4746a..e78d845cf5be 100644 --- a/nixpkgs/pkgs/development/libraries/libcdada/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcdada/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "msune"; repo = "libcdada"; rev = "v${version}"; - sha256 = "sha256-vUasCukDRZYB67eu87ckEZG9i6rsNf0aKY2kZsVezRE="; + hash = "sha256-vUasCukDRZYB67eu87ckEZG9i6rsNf0aKY2kZsVezRE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libchamplain/default.nix b/nixpkgs/pkgs/development/libraries/libchamplain/default.nix index ab8f187bf9ee..065d412c91e1 100644 --- a/nixpkgs/pkgs/development/libraries/libchamplain/default.nix +++ b/nixpkgs/pkgs/development/libraries/libchamplain/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { ''; maintainers = teams.gnome.members ++ teams.pantheon.members; - platforms = platforms.gnu ++ platforms.linux; # arbitrary choice + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libhv/default.nix b/nixpkgs/pkgs/development/libraries/libhv/default.nix index b118890949fe..5975502f315b 100644 --- a/nixpkgs/pkgs/development/libraries/libhv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libhv"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "ithewei"; repo = "libhv"; rev = "v${finalAttrs.version}"; - hash = "sha256-hzqU06Gc/vNqRKe3DTdP4AihJqeuNpt2mn4GlLuGU6U="; + hash = "sha256-tVuQwj2HvAhp51urGCuNPjBEIaTu9yR031Ih/5or9Pk="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libvarlink/default.nix b/nixpkgs/pkgs/development/libraries/libvarlink/default.nix index 9e4b96a9d798..941ee900edb2 100644 --- a/nixpkgs/pkgs/development/libraries/libvarlink/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvarlink/default.nix @@ -19,18 +19,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-oUy9HhybNMjRBWoqqal1Mw8cC5RddgN4izxAl0cgnKE="; }; - nativeBuildInputs = [ meson ninja ]; + nativeBuildInputs = [ meson ninja python3 ]; postPatch = '' - substituteInPlace varlink-wrapper.py \ - --replace "/usr/bin/env python3" "${python3}/bin/python3" - # test-object: ../lib/test-object.c:129: main: Assertion `setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0' failed. # PR that added it https://github.com/varlink/libvarlink/pull/27 substituteInPlace lib/test-object.c \ --replace 'assert(setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0);' "" - patchShebangs lib/test-symbols.sh + patchShebangs lib/test-symbols.sh varlink-wrapper.py ''; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/libyang/default.nix b/nixpkgs/pkgs/development/libraries/libyang/default.nix index 88fdfcca03ca..d220bcee1e6e 100644 --- a/nixpkgs/pkgs/development/libraries/libyang/default.nix +++ b/nixpkgs/pkgs/development/libraries/libyang/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "2.1.111"; + version = "2.1.128"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - sha256 = "sha256-CJAIlEPbrjc2juYiPOQuQ0y7ggOxb/fHb7Yoo6/dYQc="; + sha256 = "sha256-qwEHGUizjsWQZSwQkh7Clevd1OQfj1mse7Q8YiRCMyQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/lzlib/default.nix b/nixpkgs/pkgs/development/libraries/lzlib/default.nix index 4e28fc3a5b0d..b8c86221b489 100644 --- a/nixpkgs/pkgs/development/libraries/lzlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/lzlib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace '-Wl,--soname=' '-Wl,-install_name,$(out)/lib/' ''; - makeFlags = [ "CC:=$(CC)" ]; + makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ]; doCheck = true; configureFlags = [ "--enable-shared" ]; diff --git a/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/nixpkgs/pkgs/development/libraries/openmpi/default.nix index d843e1e462f7..1c4955e2c51a 100644 --- a/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin -, libpsm2, libfabric, pmix, ucx +, libpsm2, libfabric, pmix, ucx, ucc , config # Enable CUDA support , cudaSupport ? config.cudaSupport, cudatoolkit @@ -25,11 +25,11 @@ let }; in stdenv.mkDerivation rec { pname = "openmpi"; - version = "4.1.5"; + version = "4.1.6"; src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-pkCYa8JXOJ3TeYhv2uYmTIz6VryYtxzjrj372M5h2+M="; + sha256 = "sha256-90CZRIVRbetjtTEa8SLCZRefUyig2FelZ7hdsAsR5BU="; }; postPatch = '' @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "man" ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ] + ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ucc ] ++ lib.optionals cudaSupport [ cudatoolkit ] ++ [ libevent hwloc ] ++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core diff --git a/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix b/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix deleted file mode 100644 index c45a8e03fd16..000000000000 --- a/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{lib, stdenv, fetchurl, libxpdf, libxml2}: - -stdenv.mkDerivation { - name = "pdf2xml"; - - src = fetchurl { - url = "http://tarballs.nixos.org/pdf2xml.tar.gz"; - sha256 = "04rl7ppxqgnvxvvws669cxp478lnrdmiqj0g3m4p69bawfjc4z3w"; - }; - sourceRoot = "pdf2xml/pdf2xml"; - - buildInputs = [libxml2 libxpdf]; - - patches = [./pdf2xml.patch]; - - hardeningDisable = [ "format" ]; - - preBuild = '' - cp Makefile.linux Makefile - - sed -i 's|/usr/include/libxml2|${libxml2.dev}/include/libxml2|' Makefile - sed -i 's|-lxml2|-lxml2 -L${libxml2.out}/lib|' Makefile - sed -i 's|XPDF = xpdf_3.01|XPDF = ${libxpdf}/lib|' Makefile - - mkdir exe - - buildFlags+=" CXX=$CXX" - ''; - - installPhase = '' - mkdir -p $out/bin - cp exe/* $out/bin - ''; - - meta = with lib; { - description = "PDF to XML converter"; - homepage = "https://sourceforge.net/projects/pdf2xml/"; - platforms = platforms.unix; - license = licenses.gpl2; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/pdf2xml/pdf2xml.patch b/nixpkgs/pkgs/development/libraries/pdf2xml/pdf2xml.patch deleted file mode 100644 index 596a3aea6749..000000000000 --- a/nixpkgs/pkgs/development/libraries/pdf2xml/pdf2xml.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -rc pdf2xml/pdf2xml/Makefile.linux pdf2xml-new/pdf2xml/Makefile.linux -*** pdf2xml/Makefile.linux 2008-02-07 17:43:10.000000000 +0100 ---- pdf2xml-new/Makefile.linux 2010-08-25 15:41:23.000000000 +0200 -*************** -*** 30,36 **** - - - # Executable name -! PDFTOXMLEXE=pdftoxml.exe - - # Main target - all: pdftoxmlEXE ---- 30,36 ---- - - - # Executable name -! PDFTOXMLEXE=pdftoxml - - # Main target - all: pdftoxmlEXE -diff -rc pdf2xml/pdf2xml/src/pdftoxml.cc pdf2xml-new/pdf2xml/src/pdftoxml.cc -*** pdf2xml/src/pdftoxml.cc 2010-04-26 10:58:01.000000000 +0200 ---- pdf2xml-new/src/pdftoxml.cc 2010-08-25 15:36:15.000000000 +0200 -*************** -*** 11,21 **** - // - //=========================================================================== - - #include <aconf.h> -- #include <stdio.h> - #include <stdlib.h> - #include <stddef.h> -! #include <string.h> - #include "parseargs.h" - #include "GString.h" - #include "gmem.h" ---- 11,21 ---- - // - //=========================================================================== - -+ #include <string.h> - #include <aconf.h> - #include <stdlib.h> - #include <stddef.h> -! #include <cstdio> - #include "parseargs.h" - #include "GString.h" - #include "gmem.h" diff --git a/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix b/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix index fd1c1ae34b4c..af05a28b5b1c 100644 --- a/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix +++ b/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix @@ -17,8 +17,8 @@ let src = fetchFromGitHub { owner = "rhasspy"; repo = "espeak-ng"; - rev = "61504f6b76bf9ebbb39b07d21cff2a02b87c99ff"; - hash = "sha256-RBHL11L5uazAFsPFwul2QIyJREXk9Uz8HTZx9JqmyIQ="; + rev = "0f65aa301e0d6bae5e172cc74197d32a6182200f"; + hash = "sha256-2V0D3QO+v9OqffpNmwJQd3NIBd/IFeLkjaJ3Y0HHw7E="; }; patches = [ @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "piper-phonemize"; - version = "1.1.0"; + version = "2023.9.27-2"; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper-phonemize"; - rev = "refs/tags/v${version}"; - hash = "sha256-cMer7CSLOXv3jc9huVA3Oy5cjXjOX9XuEXpIWau1BNQ="; + rev = "refs/tags/${version}"; + hash = "sha256-Rwl8D5ZX9sGdxEch+l7pXdbf4nPCuSfGrK5x/EQ+O60="; }; nativeBuildInputs = [ @@ -42,6 +42,11 @@ stdenv.mkDerivation rec { pkg-config ]; + cmakeFlags = [ + "-DONNXRUNTIME_DIR=${onnxruntime.dev}" + "-DESPEAK_NG_DIR=${espeak-ng'}" + ]; + buildInputs = [ espeak-ng' onnxruntime diff --git a/nixpkgs/pkgs/development/libraries/pmix/default.nix b/nixpkgs/pkgs/development/libraries/pmix/default.nix index 3f1b2e2cf368..f5fb65f7989b 100644 --- a/nixpkgs/pkgs/development/libraries/pmix/default.nix +++ b/nixpkgs/pkgs/development/libraries/pmix/default.nix @@ -1,16 +1,17 @@ { lib, stdenv, fetchFromGitHub, perl, autoconf, automake -, libtool, flex, libevent, hwloc, munge, zlib, pandoc +, libtool, python3, flex, libevent, hwloc, munge, zlib, pandoc, gitMinimal } : stdenv.mkDerivation rec { pname = "pmix"; - version = "3.2.4"; + version = "5.0.1"; src = fetchFromGitHub { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - sha256 = "sha256-79zTZm549VRsqeziCuBT6l4jTJ6D/gZaMAvgHZm7jn4="; + hash = "sha256-ZuuzQ8j5zqQ/9mBFEODAaoX9/doWB9Nt9Sl75JkJyqU="; + fetchSubmodules = true; }; postPatch = '' @@ -18,14 +19,25 @@ stdenv.mkDerivation rec { patchShebangs ./config ''; - nativeBuildInputs = [ pandoc perl autoconf automake libtool flex ]; + nativeBuildInputs = [ + pandoc + perl + autoconf + automake + libtool + flex + gitMinimal + python3 + ]; buildInputs = [ libevent hwloc munge zlib ]; configureFlags = [ "--with-libevent=${lib.getDev libevent}" + "--with-libevent-libdir=${lib.getLib libevent}/lib" "--with-munge=${munge}" "--with-hwloc=${lib.getDev hwloc}" + "--with-hwloc-libdir=${lib.getLib hwloc}/lib" ]; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/randomx/default.nix b/nixpkgs/pkgs/development/libraries/randomx/default.nix index b5da1ad6e198..4e85b3688ab7 100644 --- a/nixpkgs/pkgs/development/libraries/randomx/default.nix +++ b/nixpkgs/pkgs/development/libraries/randomx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "randomX"; - version = "1.1.10"; + version = "1.2.1"; nativeBuildInputs = [ cmake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tevador"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZPphhZFzQL72xcEp9kNfZITY4oqK930ve/bbljTYNBs="; + sha256 = "sha256-dfImzwbEfJQcaPZCoWypHiI6dishVRdqS/r+n3tfjvM="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix index 8bf30f970056..3a72cfaaa6a3 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix @@ -1,4 +1,5 @@ { buildPythonPackage +, fetchpatch , meson , ninja , pkg-config @@ -42,8 +43,17 @@ buildPythonPackage { propagatedBuildInputs = [ tblite simple-dftd3 cffi numpy ]; - # Add multicharge to the meson deps; otherwise we get missing mod_multicharge errors - patches = [ ./0001-fix-multicharge-dep-needed-for-static-compilation.patch ]; + + patches = [ + # Add multicharge to the meson deps; otherwise we get missing mod_multicharge errors + ./0001-fix-multicharge-dep-needed-for-static-compilation.patch + + # Toml-f 0.4.0 compatibility https://github.com/tblite/tblite/pull/108 + (fetchpatch { + url = "https://github.com/tblite/tblite/commit/e4255519b58a5198a5fa8f3073bef1c78a4bbdbe.diff"; + hash = "sha256-BMwYsdWfK+vG3BFgzusLYfwo0WXrYSPxJoEJIyOvbPg="; + }) + ]; format = "other"; pythonImportsCheck = [ "tblite" "tblite.interface" ]; diff --git a/nixpkgs/pkgs/development/libraries/simpleitk/default.nix b/nixpkgs/pkgs/development/libraries/simpleitk/default.nix index 411622c26a44..8ef0e5e39a55 100644 --- a/nixpkgs/pkgs/development/libraries/simpleitk/default.nix +++ b/nixpkgs/pkgs/development/libraries/simpleitk/default.nix @@ -1,27 +1,47 @@ -{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, swig4 +, lua +, elastix +, itk +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "simpleitk"; version = "2.3.0"; src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-SJSFJEFu1qKowX5/98MslN7GFDS8aF5+EKkQ2983Azg="; }; - nativeBuildInputs = [ cmake swig4 ]; - buildInputs = [ lua itk ]; + nativeBuildInputs = [ + cmake + swig4 + ]; + buildInputs = [ + elastix + lua + itk + ]; # 2.0.0: linker error building examples - cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_SHARED_LIBS=OFF" + "-DSimpleITK_USE_ELASTIX=ON" + ]; meta = with lib; { homepage = "https://www.simpleitk.org"; description = "Simplified interface to ITK"; + changelog = "https://github.com/SimpleITK/SimpleITK/releases/tag/v${finalAttrs.version}"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.linux; license = licenses.asl20; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/spdk/default.nix b/nixpkgs/pkgs/development/libraries/spdk/default.nix index bcf6b804ed62..c7b83db53489 100644 --- a/nixpkgs/pkgs/development/libraries/spdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdk/default.nix @@ -1,5 +1,4 @@ { lib, stdenv -, fetchpatch , fetchFromGitHub , ncurses , python3 @@ -10,65 +9,70 @@ , libuuid , numactl , openssl -, fetchurl +, pkg-config +, zlib +, libpcap +, libnl +, libelf +, jansson +, ensureNewerSourcesForZipFilesHook }: -let - # The old version has some CVEs howver they should not affect SPDK's usage of the framework: https://github.com/NixOS/nixpkgs/pull/171648#issuecomment-1121964568 - dpdk' = dpdk.overrideAttrs (old: rec { - name = "dpdk-21.11"; - src = fetchurl { - url = "https://fast.dpdk.org/rel/${name}.tar.xz"; - sha256 = "sha256-Mkbj7WjuKzaaXYviwGzxCKZp4Vf01Bxby7sha/Wr06E="; - }; - }); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "spdk"; - version = "21.10"; + + version = "23.09"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "sha256-pFynTbbSF1g58VD9bOhe3c4oCozeqE+35kECTQwDBDM="; + sha256 = "sha256-P10NDa+MIEY8B3bu34Dq2keyuv2a24XV5Wf+Ah701b8="; + fetchSubmodules = true; }; - patches = [ - # Backport of upstream patch for ncurses-6.3 support. - # Will be in next release after 21.10. - ./ncurses-6.3.patch - - # DPDK 21.11 compatibility. - (fetchpatch { - url = "https://github.com/spdk/spdk/commit/f72cab94dd35d7b45ec5a4f35967adf3184ca616.patch"; - sha256 = "sha256-sSetvyNjlM/hSOUsUO3/dmPzAliVcteNDvy34yM5d4A="; - }) - ]; - nativeBuildInputs = [ python3 + python3.pkgs.setuptools + pkg-config + ensureNewerSourcesForZipFilesHook ]; buildInputs = [ - cunit dpdk' libaio libbsd libuuid numactl openssl ncurses + cunit + dpdk + jansson + libaio + libbsd + libelf + libuuid + libpcap + libnl + numactl + openssl + ncurses + zlib + ]; + + patches = [ + # https://review.spdk.io/gerrit/c/spdk/spdk/+/20394 + ./setuptools.patch ]; postPatch = '' patchShebangs . - - # glibc-2.36 adds arc4random, so we don't need the custom implementation - # here anymore. Fixed upstream in https://github.com/spdk/spdk/commit/43a3984c6c8fde7201d6c8dfe1b680cb88237269, - # but the patch doesn't apply here. - sed -i -e '1i #define HAVE_ARC4RANDOM 1' lib/iscsi/iscsi.c ''; enableParallelBuilding = true; - configureFlags = [ "--with-dpdk=${dpdk'}" ]; + configureFlags = [ + "--with-dpdk=${dpdk}" + "--pydir=${placeholder "out"}/${python3.sitePackages}" + ]; env.NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. # otherwise does not find strncpy when compiling - NIX_LDFLAGS = "-lbsd"; + env.NIX_LDFLAGS = "-lbsd"; meta = with lib; { description = "Set of libraries for fast user-mode storage"; diff --git a/nixpkgs/pkgs/development/libraries/spdk/ncurses-6.3.patch b/nixpkgs/pkgs/development/libraries/spdk/ncurses-6.3.patch deleted file mode 100644 index 174c9b6435ef..000000000000 --- a/nixpkgs/pkgs/development/libraries/spdk/ncurses-6.3.patch +++ /dev/null @@ -1,48 +0,0 @@ -Backport of upstream https://review.spdk.io/gerrit/c/spdk/spdk/+/10300 ---- a/app/spdk_top/spdk_top.c -+++ b/app/spdk_top/spdk_top.c -@@ -1012 +1012 @@ print_max_len(WINDOW *win, int row, uint16_t col, uint16_t max_len, enum str_ali -- mvwprintw(win, row, col, tmp_str); -+ mvwprintw(win, row, col, "%s", tmp_str); -@@ -1944 +1944 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%" PRIu64, -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%d", -@@ -1949 +1949 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time); -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time); -@@ -1951 +1951 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time); -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time); -@@ -1954 +1954 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time); -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time); -@@ -1956 +1956 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time); -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time); -@@ -2111 +2111 @@ show_core(uint8_t current_page) -- mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, idle_time); -+ mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, "%s", idle_time); -@@ -2118 +2118 @@ show_core(uint8_t current_page) -- mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, busy_time); -+ mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, "%s", busy_time); -@@ -2124 +2124 @@ show_core(uint8_t current_page) -- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name); -+ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name); -@@ -2137 +2137 @@ show_core(uint8_t current_page) -- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name); -+ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name); -@@ -2214 +2214 @@ show_poller(uint8_t current_page) -- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL, -+ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL, "%s", -@@ -2216 +2216 @@ show_poller(uint8_t current_page) -- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, poller->thread_name); -+ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, "%s", poller->thread_name); -@@ -2231 +2231 @@ show_poller(uint8_t current_page) -- mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, poller_period); -+ mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, "%s", poller_period); -@@ -2264 +2264 @@ print_bottom_error_message(char *msg) -- mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, msg); -+ mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, "%s", msg); -@@ -2434 +2434 @@ show_stats(pthread_t *data_thread) -- mvprintw(g_max_row - 1, 1, current_page_str); -+ mvprintw(g_max_row - 1, 1, "%s", current_page_str); diff --git a/nixpkgs/pkgs/development/libraries/spdk/setuptools.patch b/nixpkgs/pkgs/development/libraries/spdk/setuptools.patch new file mode 100644 index 000000000000..b3e7644c0076 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/spdk/setuptools.patch @@ -0,0 +1,25 @@ +From 3a72290ba7e2d71ca887225fc0eb8792ca863be2 Mon Sep 17 00:00:00 2001 +From: Jörg Thalheim <joerg@thalheim.io> +Date: Tue, 24 Oct 2023 14:30:53 +0200 +Subject: [PATCH] python: drop deprecated distutils + +This is scheduled for removal in python 3.12: https://docs.python.org/3/whatsnew/3.12.html + +Change-Id: I728dc0cf4ed20f22016d3d58cca8aee3af2bcd8b +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + +diff --git a/python/setup.py b/python/setup.py +index 47e2104..ae4dff7 100755 +--- a/python/setup.py ++++ b/python/setup.py +@@ -2,8 +2,7 @@ + # SPDX-License-Identifier: BSD-3-Clause + # Copyright (C) 2023 Intel Corporation. All rights reserved. + +-from distutils.core import setup +-from setuptools import find_packages ++from setuptools import setup, find_packages + from spdk import __version__ + + diff --git a/nixpkgs/pkgs/development/libraries/utf8proc/default.nix b/nixpkgs/pkgs/development/libraries/utf8proc/default.nix index f9a6bdd7002b..7bdb9747472b 100644 --- a/nixpkgs/pkgs/development/libraries/utf8proc/default.nix +++ b/nixpkgs/pkgs/development/libraries/utf8proc/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/lSD78kj133rpcSAOh8T8XFW/Z0c3JKkGQM5Z6DcMtU="; + sha256 = "sha256-Sgh8vTbclUV+lFZdR29PtNUy8F+9L/OAXk647B+l2mg="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/waffle/default.nix b/nixpkgs/pkgs/development/libraries/waffle/default.nix index e2a90d2e284d..b24c8262794f 100644 --- a/nixpkgs/pkgs/development/libraries/waffle/default.nix +++ b/nixpkgs/pkgs/development/libraries/waffle/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "waffle"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "waffle"; rev = "v${version}"; - sha256 = "sha256-dwDNMLgZrILb559yGs4sNA7D+nD60972+JOy0PKfL0w="; + sha256 = "sha256-GVULv/TkCS9CgSFWlskIamw5Z402n684G6jeTLMCPNc="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix b/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix index bde2dfefee74..8940ec270f93 100644 --- a/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix +++ b/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix @@ -13,13 +13,13 @@ clangStdenv.mkDerivation rec { pname = "xeus-zmq"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "jupyter-xeus"; repo = "xeus-zmq"; rev = "${version}"; - hash = "sha256-j23NPgqwjQ7x4QriCb+N7CtBWhph+pCmBC0AULEDL1U="; + hash = "sha256-sfGXo6CPJu5TJrkecLLoaQxrGaJbeQG+QiCkltAwuI8="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/xeus/default.nix b/nixpkgs/pkgs/development/libraries/xeus/default.nix index d060986515fa..172fd0e73578 100644 --- a/nixpkgs/pkgs/development/libraries/xeus/default.nix +++ b/nixpkgs/pkgs/development/libraries/xeus/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xeus"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "jupyter-xeus"; repo = pname; rev = version; - sha256 = "sha256-bSZ5ImgFztiNYGrn513LLm4OtO1hYGak3xAsBN224g8="; + sha256 = "sha256-kGIVcsgLG6weNfBwgEVTMa8NA9MXSztzi9ML5/gDqAQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/zchunk/default.nix b/nixpkgs/pkgs/development/libraries/zchunk/default.nix index 4af4ba65a395..2d83211ac0d6 100644 --- a/nixpkgs/pkgs/development/libraries/zchunk/default.nix +++ b/nixpkgs/pkgs/development/libraries/zchunk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-mZc8DC26c4hZzHsozhBmuvaIjL3ifQ7GYYGDEsBBPKc="; + hash = "sha256-wmbnkxJHFyqntULxzXF16lt+TfwywLdZamQXvcfSFVM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index f344bd948515..1f4baeaa6185 100644 --- a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -478,30 +478,6 @@ buildLuarocksPackage { }; }) {}; -ferris-nvim = callPackage({ fetchzip, buildLuarocksPackage, lua, luaOlder }: -buildLuarocksPackage { - pname = "ferris.nvim"; - version = "2.0.0-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/ferris.nvim-2.0.0-1.rockspec"; - sha256 = "00d3x2hbs8625ky50r2w08c6idcx3bkrk0rks5qd8yh7v61nj53h"; - }).outPath; - src = fetchzip { - url = "https://github.com/mrcjkb/ferris.nvim/archive/2.0.0.zip"; - sha256 = "1fb18k0ylb06h4ifs9k6lfc42y74xpavzwkqy55lfdkmlbc7jmhy"; - }; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://github.com/mrcjkb/ferris.nvim"; - description = "Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim"; - maintainers = with lib.maintainers; [ mrcjkb ]; - license.fullName = "GPL-2.0"; - }; -}) {}; - fifo = callPackage({ fetchzip, lua, buildLuarocksPackage }: buildLuarocksPackage { pname = "fifo"; @@ -2814,6 +2790,30 @@ buildLuarocksPackage { }; }) {}; +rustaceanvim = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchzip }: +buildLuarocksPackage { + pname = "rustaceanvim"; + version = "3.0.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/rustaceanvim-3.0.0-1.rockspec"; + sha256 = "1v1k08spq3zalgya6q3qny6zpwhn0nb5nl5dn0rkcvnc4imvnyfy"; + }).outPath; + src = fetchzip { + url = "https://github.com/mrcjkb/rustaceanvim/archive/3.0.0.zip"; + sha256 = "1prpklbijr7p890nflr9jixf955dlp3ph9zl2rq3xxyl20ncyqbk"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/mrcjkb/rustaceanvim"; + description = "Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim"; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "GPL-2.0"; + }; +}) {}; + say = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: buildLuarocksPackage { pname = "say"; diff --git a/nixpkgs/pkgs/development/misc/breakpad/default.nix b/nixpkgs/pkgs/development/misc/breakpad/default.nix index 045e2e8f9a6e..29c1b8b642a4 100644 --- a/nixpkgs/pkgs/development/misc/breakpad/default.nix +++ b/nixpkgs/pkgs/development/misc/breakpad/default.nix @@ -1,30 +1,27 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchgit, zlib }: let lss = fetchgit { url = "https://chromium.googlesource.com/linux-syscall-support"; - rev = "d9ad2969b369a9f1c455fef92d04c7628f7f9eb8"; - sha256 = "952dv+ZE1ge/WF5RyHmEqht+AofoRHKAeFmGasVF9BA="; + rev = "v2022.10.12"; + hash = "sha256-rF10v5oH4u9i9vnmFCVVl2Ew3h+QTiOsW64HeB0nRQU="; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation (finalAttrs: { pname = "breakpad"; - version = "unstable-3b3469e"; + version = "2023.01.27"; src = fetchgit { url = "https://chromium.googlesource.com/breakpad/breakpad"; - rev = "3b3469e9ed0de3d02e4450b9b95014a4266cf2ff"; - sha256 = "bRGOBrGPK+Zxp+KK+E5MFkYlDUNVhVeInVSwq+eCAF0="; + rev = "v${finalAttrs.version}"; + hash = "sha256-8msKz0K10r13TwM3oS6GCIlMdf8k8HBKfKJkPmrUrIs="; }; + buildInputs = [ zlib ]; + postUnpack = '' ln -s ${lss} $sourceRoot/src/third_party/lss ''; - postPatch = '' - substituteInPlace src/client/linux/handler/exception_handler.cc \ - --replace "max(16384" "max(static_cast<long>(16384)" - ''; - meta = with lib; { description = "An open-source multi-platform crash reporting system"; homepage = "https://chromium.googlesource.com/breakpad"; @@ -32,4 +29,4 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ berberman ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/ocaml-modules/brr/default.nix b/nixpkgs/pkgs/development/ocaml-modules/brr/default.nix index 709a9b092926..816a52bbab9f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/brr/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/brr/default.nix @@ -2,18 +2,17 @@ , ocaml, findlib, ocamlbuild, topkg , js_of_ocaml-compiler , js_of_ocaml-toplevel -, note }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-brr"; - version = "0.0.4"; + version = "0.0.6"; src = fetchurl { url = "https://erratique.ch/software/brr/releases/brr-${version}.tbz"; - hash = "sha256-v+Ik1tdRBVnNDqhmNoJuLelL3k5OhxIsUorGdTb9sbw="; + hash = "sha256-paYZlzujXsG1S+s/4/kAPBlDuV1Ljorw7okAu4qaAV0="; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; - propagatedBuildInputs = [ js_of_ocaml-compiler js_of_ocaml-toplevel note ]; + propagatedBuildInputs = [ js_of_ocaml-compiler js_of_ocaml-toplevel ]; inherit (topkg) buildPhase installPhase; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix b/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix index 727d407ac542..7ba02d68ff5f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix @@ -8,14 +8,13 @@ buildDunePackage rec { pname = "carton"; - version = "0.6.0"; + version = "0.7.0"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz"; - hash = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; + hash = "sha256-vWkBJdP4ZpRCEwzrFMzsdHay4VyiXix/+1qzk+7yDvk="; }; patches = [ diff --git a/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix index b19e01ceb345..c9e25045426c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchurl , buildDunePackage +, bos , bwd , cmdliner , containers @@ -16,22 +17,21 @@ , yuujinchou , ounit2 , qcheck +, qcheck-core }: let bantorra = buildDunePackage rec { pname = "bantorra"; - version = "unstable-2022-04-20"; + version = "unstable-2022-05-08"; src = fetchFromGitHub { owner = "RedPRL"; repo = "bantorra"; - rev = "1e78633d9a2ef7104552a24585bb8bea36d4117b"; - sha256 = "sha256:15v1cggm7awp11iwl3lzpaar91jzivhdxggp5mr48gd28kfipzk2"; + rev = "d05c34295727dd06d0ac4416dc2e258732e8593d"; + hash = "sha256-s6lUTs3VRl6YhLAn3PO4aniANhFp8ytoTsFAgcOlee4="; }; - duneVersion = "3"; - - propagatedBuildInputs = [ ezjsonm findlib ]; + propagatedBuildInputs = [ bos ezjsonm findlib ]; meta = { description = "Extensible Library Management and Path Resolution"; @@ -41,19 +41,18 @@ let }; kado = buildDunePackage rec { pname = "kado"; - version = "unstable-2022-04-30"; + version = "unstable-2023-10-03"; src = fetchFromGitHub { owner = "RedPRL"; repo = "kado"; - rev = "8dce50e7d759d482b82565090e550d3860d64729"; - sha256 = "sha256:1xb754fha4s0bgjfqjxzqljvalmkfdwdn5y4ycsp51wiah235bsy"; + rev = "6b2e9ba2095e294e6e0fc6febc280d80c5799c2b"; + hash = "sha256-fP6Ade3mJeyOMjuDIvrW88m6E3jfb2z3L8ufgloz4Tc="; }; - duneVersion = "3"; - propagatedBuildInputs = [ bwd ]; doCheck = true; + checkInputs = [ qcheck-core ]; meta = { description = "Cofibrations in Cartecian Cubical Type Theory"; @@ -65,16 +64,15 @@ in buildDunePackage { pname = "cooltt"; - version = "unstable-2022-04-28"; + version = "unstable-2023-10-03"; - minimalOCamlVersion = "4.13"; - duneVersion = "3"; + minimalOCamlVersion = "5.0"; src = fetchFromGitHub { owner = "RedPRL"; repo = "cooltt"; - rev = "88511e10cb9e17286f585882dee334f3d8ace47c"; - sha256 = "sha256:1n9bh86r2n9s3mm7ayfzwjbnjqcphpsf8yqnf4whd3yi930sqisw"; + rev = "a5eaf4db195b5166a7102d47d42724f59cf3de19"; + hash = "sha256-48bEf59rtPRrCRjab7+GxppjfR2c87HjQ+uKY2Bag0I="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix b/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix index e12454759a35..18d307655584 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix @@ -4,9 +4,9 @@ buildDunePackage { pname = "hacl-star"; - inherit (hacl-star-raw) version src meta doCheck minimalOCamlVersion; + inherit (hacl-star-raw) version src meta doCheck; - duneVersion = "3"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ hacl-star-raw diff --git a/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix b/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix index de20299cd4a1..00b524606fcf 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -12,11 +12,11 @@ }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-hacl-star-raw"; - version = "0.7.0"; + version = "0.7.1"; src = fetchzip { url = "https://github.com/cryspen/hacl-packages/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz"; - sha256 = "sha256-jJtxVYhQgP8ItfLhQ2wcF8RKNRnYhB2j0nR7/YH1NfY="; + hash = "sha256-TcAEaJou4BOVXSz5DYewzKfvIpjXmhLAlgF0hlq3ToQ="; stripRoot = false; }; @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { ./aligned-alloc.patch ]; - minimalOCamlVersion = "4.08"; - # strictoverflow is disabled because it breaks aarch64-darwin hardeningDisable = [ "strictoverflow" ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix index f9612c0c011d..ccd2d4eab299 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -3,6 +3,7 @@ , fetchpatch , fzf , lib +, ocaml , openssl , zstd }: @@ -264,6 +265,7 @@ with self; buildInputs = [ jst-config ]; propagatedBuildInputs = [ base base_bigstring base_quickcheck ppx_jane time_now ]; doCheck = false; # circular dependency with core_kernel + meta.broken = lib.versionAtLeast ocaml.version "5.1"; }; core_bench = janePackage { diff --git a/nixpkgs/pkgs/development/ocaml-modules/note/default.nix b/nixpkgs/pkgs/development/ocaml-modules/note/default.nix index 5bb0da7dd106..9640a33569c4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/note/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/note/default.nix @@ -1,18 +1,20 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, brr }: lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") "note is not available for OCaml ${ocaml.version}" stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-note"; - version = "0.0.2"; + version = "0.0.3"; src = fetchurl { url = "https://erratique.ch/software/note/releases/note-${version}.tbz"; - hash = "sha256-b35XcaDUXQLqwkNfsJKX5A1q1pAhw/mgdwyOdacZiiY="; + hash = "sha256-ZZOvCnyz7UWzFtGFI1uC0ZApzyylgZYM/HYIXGVXY2k="; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; + propagatedBuildInputs = [ brr ]; + meta = { homepage = "https://erratique.ch/software/note"; description = "An OCaml module for functional reactive programming"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix index f66abd2bdcf1..0e2dbda80d49 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix @@ -13,20 +13,20 @@ , z3 , linksem , num +, yojson }: buildDunePackage rec { pname = "sail"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { owner = "rems-project"; repo = "sail"; rev = version; - hash = "sha256-eNdFOSzkniNvSCZeORRJ/IYAu+9P4HSouwmhd4BQLPk="; + hash = "sha256-HY/rgWi0S7ZiAWZF0fVIRK6fpoJ7Xp5EQcxoPRCPJ5Y="; }; - duneVersion = "3"; minimalOCamlVersion = "4.08"; nativeBuildInputs = [ @@ -43,6 +43,7 @@ buildDunePackage rec { linenoise pprint linksem + yojson ]; preBuild = '' diff --git a/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix b/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix index ca7b893ebc8e..38a920ae865c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "yojson"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; - sha256 = "sha256-n8sf8ttYqyWfkih5awraR5Tq6XF3sYMzcTgMTk+QsV0="; + hash = "sha256-1YGDIHsZjcBlhmI5Bm4HTDT54TnA2cQXWjiAl5DogXM="; }; nativeBuildInputs = [ cppo ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix b/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix index 5f0c0965b27b..48c1fb471fad 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix @@ -4,8 +4,8 @@ }: let params = if lib.versionAtLeast ocaml.version "5.0" then { - version = "4.0.0"; - hash = "sha256-yNLN5bBe4aft9Rl5VHmlOYTlnCdR2NgDWsc3uJHaZy4="; + version = "5.1.0"; + hash = "sha256-J3qkytgJkk2gT83KJ47nNM4cXqVHbx4iTPK+fLwR7Wk="; propagatedBuildInputs = [ algaeff bwd ]; } else { version = "2.0.0"; @@ -18,7 +18,6 @@ buildDunePackage rec { inherit (params) version; minimalOCamlVersion = "4.12"; - duneVersion = "3"; src = fetchFromGitHub { owner = "RedPRL"; diff --git a/nixpkgs/pkgs/development/perl-modules/Alien-FFI-dont-download.patch b/nixpkgs/pkgs/development/perl-modules/Alien-FFI-dont-download.patch new file mode 100644 index 000000000000..ba79c8c0eb28 --- /dev/null +++ b/nixpkgs/pkgs/development/perl-modules/Alien-FFI-dont-download.patch @@ -0,0 +1,29 @@ +diff --git a/alienfile b/alienfile +index 18d6b42..5ccf296 100644 +--- a/alienfile ++++ b/alienfile +@@ -11,12 +11,6 @@ plugin 'PkgConfig' => 'libffi'; + + share { + +- plugin 'Download::GitHub' => ( +- github_user => 'libffi', +- github_repo => 'libffi', +- asset => 1, +- ); +- + plugin 'Build::Autoconf' => (); + + my $configure = '--disable-shared --enable-static --disable-builddir'; +diff --git a/t/00_diag.t b/t/00_diag.t +index 51dd784..2bc314c 100644 +--- a/t/00_diag.t ++++ b/t/00_diag.t +@@ -13,7 +13,6 @@ $modules{$_} = $_ for qw( + Alien::Base + Alien::Build + Alien::Build::MM +- Alien::Build::Plugin::Download::GitHub + Alien::Build::Plugin::Probe::Vcpkg + Capture::Tiny + ExtUtils::MakeMaker diff --git a/nixpkgs/pkgs/development/perl-modules/ArchiveLibarchive-set-findlib-path.patch b/nixpkgs/pkgs/development/perl-modules/ArchiveLibarchive-set-findlib-path.patch new file mode 100644 index 000000000000..47bc8ee9dc56 --- /dev/null +++ b/nixpkgs/pkgs/development/perl-modules/ArchiveLibarchive-set-findlib-path.patch @@ -0,0 +1,25 @@ +diff --git a/lib/Archive/Libarchive/Lib.pm b/lib/Archive/Libarchive/Lib.pm +index 3fcbcf4..214df7a 100644 +--- a/lib/Archive/Libarchive/Lib.pm ++++ b/lib/Archive/Libarchive/Lib.pm +@@ -3,7 +3,7 @@ package Archive::Libarchive::Lib; + use strict; + use warnings; + use 5.020; +-use FFI::CheckLib 0.30 qw( find_lib_or_die ); ++use FFI::CheckLib qw( find_lib_or_die ); + use Encode qw( decode ); + use experimental qw( signatures ); + +index 3fcbcf4..718caed 100644 +--- a/lib/Archive/Libarchive/Lib.pm ++++ b/lib/Archive/Libarchive/Lib.pm +@@ -23,7 +23,7 @@ L<Archive::Libarchive>. + + sub lib + { +- $ENV{ARCHIVE_LIBARCHIVE_LIB_DLL} // find_lib_or_die( lib => 'archive', symbol => ['archive_read_free','archive_write_free','archive_free'], alien => ['Alien::Libarchive3'] ); ++ $ENV{ARCHIVE_LIBARCHIVE_LIB_DLL} // find_lib_or_die( lib => 'archive', symbol => ['archive_read_free','archive_write_free','archive_free'], libpath => '@@libarchive@@' ); + } + + sub ffi diff --git a/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix b/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix index 346a3cb36951..f3ceeca611e2 100644 --- a/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix +++ b/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix @@ -1,7 +1,7 @@ { lib, buildPecl, fetchFromGitHub }: let - version = "1.0.0RC3"; + version = "1.0.0"; in buildPecl { inherit version; pname = "opentelemetry"; @@ -10,7 +10,7 @@ in buildPecl { owner = "open-telemetry"; repo = "opentelemetry-php-instrumentation"; rev = version; - hash = "sha256-0jHXl+Amjv0vLSuSWhkGAU25pkRXbJgdx02N6o2dUyw="; + hash = "sha256-uCsm2vsxXfbEH9spCgWHhmqzyRH9k8kqIAIdQk5CNYg="; }; sourceRoot = "source/ext"; diff --git a/nixpkgs/pkgs/development/python-modules/accuweather/default.nix b/nixpkgs/pkgs/development/python-modules/accuweather/default.nix index cff7fd06c8ef..7e83d5a6b9a6 100644 --- a/nixpkgs/pkgs/development/python-modules/accuweather/default.nix +++ b/nixpkgs/pkgs/development/python-modules/accuweather/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "accuweather"; - version = "1.0.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CWPhdu0lttYhAS6hzyKPL3vtNRVqbDexxY6nvMya3jA="; + hash = "sha256-elpVclH/sVQHEp3kTiwbDproJcB85F7m5sEjXwSEtNk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix b/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix index 5c32d588428f..78b2cba4d482 100644 --- a/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adguardhome"; - version = "0.6.1"; + version = "0.6.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-ZeajC8FM7Py+DWknVjnwiM4jaCCcnxfC+kTbHEEmyms="; + hash = "sha256-hCiyylnc1WsKz8zQxJhXe4v+SJxKFkwzpmPYnltnc8g="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix b/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix index 2108555b0d33..11ba9a203237 100644 --- a/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.2.7"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-v6cK4j16BhTqjdc5J9XQWGFCa1r9f0/dto9teVTNn0c="; + hash = "sha256-tsx98DG/TvTrVwUy9fscErf+3zUC5XVs50lHKW/9pdQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioapns/default.nix b/nixpkgs/pkgs/development/python-modules/aioapns/default.nix index 2b48f96ae2b5..4b6c4faa123a 100644 --- a/nixpkgs/pkgs/development/python-modules/aioapns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioapns/default.nix @@ -1,23 +1,23 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, setuptools , h2 -, lib , pyjwt , pyopenssl , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aioapns"; - version = "3.0"; - format = "pyproject"; + version = "3.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MiFjd9HYaTugjP66O24Tgk92bC91GQHggvy1sdQIu+0="; + hash = "sha256-BUSRIDAxeVKlZteYgGZZkMcUn6hAo1fWCbuZcHZXUhU="; }; nativeBuildInputs = [ @@ -33,11 +33,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "aioapns" ]; + pythonImportsCheck = [ + "aioapns" + ]; meta = with lib; { - description = "An efficient APNs Client Library for Python/asyncio"; + description = "An efficient APNs Client Library"; homepage = "https://github.com/Fatal1ty/aioapns"; + changelog = "https://github.com/Fatal1ty/aioapns/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index c77a4dfadda5..2a52a28d007d 100644 --- a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "18.0.7"; + version = "18.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Jgu9NEFY74Z0mZ2Cz4uaHG0gfywa2nF/H8G1j9YAyrw="; + hash = "sha256-aKE2/xVkO2uYg9BuDT9/ZxcKB9rARCipPn7B/eeth9M="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix b/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix index cc786f115d66..a1dd1b3fa5c7 100644 --- a/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.4.8"; + version = "0.4.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-siV2cr8YuU4kWRNHGlV29RjeHxCk6mcbK7J15LZguls="; + hash = "sha256-ELB0VeowRbd8yZ0m28KeRY3IcCEL+wmOxiqaZhYXHdk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiosmtplib/default.nix b/nixpkgs/pkgs/development/python-modules/aiosmtplib/default.nix index aadee81a829e..7eefe5fa155f 100644 --- a/nixpkgs/pkgs/development/python-modules/aiosmtplib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiosmtplib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiosmtplib"; - version = "2.0.2"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "cole"; repo = pname; rev = "v${version}"; - hash = "sha256-Wo9WH3fwGN1upLAyj6aThxpQE7hortISjaCATTPee40="; + hash = "sha256-A9pvHj2riIHCd1F+ve6aLdbtl3tPPDovV1AZeWNeOEo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiostream/default.nix b/nixpkgs/pkgs/development/python-modules/aiostream/default.nix index 0e8e7927ddca..43f3ae89f138 100644 --- a/nixpkgs/pkgs/development/python-modules/aiostream/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiostream/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiostream"; - version = "0.5.1"; + version = "0.5.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YdVvUP1b/NfXpbJ83ktjtXaVLHS6CQUGCw+EVygB4fU="; + hash = "sha256-g2W2TtCh2ANPjeTdASVgEu+qKfz/Ugh1rDWJcFvOJpI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aiowithings/default.nix b/nixpkgs/pkgs/development/python-modules/aiowithings/default.nix index bc6e69534342..19d9997ed8d7 100644 --- a/nixpkgs/pkgs/development/python-modules/aiowithings/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiowithings/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiowithings"; - version = "0.4.4"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-withings"; rev = "refs/tags/v${version}"; - hash = "sha256-YmTYwj3Udo1Pev25LLvY7757BR0h44aefqIe8b8FlTc="; + hash = "sha256-3necwO/EpjWD1fAItqsZJKgv0CIBklxcM1jNRPxhSVY="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/autoit-ripper/default.nix b/nixpkgs/pkgs/development/python-modules/autoit-ripper/default.nix index b1145ff332a3..ed0c716bbc95 100644 --- a/nixpkgs/pkgs/development/python-modules/autoit-ripper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autoit-ripper/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "autoit-ripper"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fluG/2XlUh3kPtYtSotrP02c7kdmem92Hy1R93SaTzk="; + hash = "sha256-a30SDJdKoljWjV0O1sZ35NnQPFcJ0XOPcmTanozWpHY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix b/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix index 16bae9a42597..b55977ffdb61 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix @@ -1,25 +1,24 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder +, fetchPypi , cmake , ninja -, numpy , pybind11 , scikit-build-core -, typing-extensions +, numpy }: buildPythonPackage rec { pname = "awkward-cpp"; - version = "23"; - format = "pyproject"; + version = "24"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-c+Rg8+CMIvuDaeuME6ERyfMqeaLMfQHklnXdXQiSNt4="; + hash = "sha256-KJE/zw9+5NaZNXQsED+kIu1R+Ng7ZOywy+mebmY/SwY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/nixpkgs/pkgs/development/python-modules/awkward/default.nix index f8fd32caa696..48218451a5ab 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -1,30 +1,36 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder -, awkward-cpp -, cupy +, fetchPypi , hatch-fancy-pypi-readme , hatchling +, awkward-cpp , importlib-metadata -, numba , numpy , packaging -, setuptools , typing-extensions +, fsspec +, jax +, jaxlib +, numba +, setuptools +, numexpr +, pandas +, pyarrow +, pytest-xdist , pytestCheckHook }: buildPythonPackage rec { pname = "awkward"; - version = "2.4.2"; - format = "pyproject"; + version = "2.4.6"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-soMmJ2JXhoR7rmCjtb+5388WfwnDrEbILyMvJqdymro="; + hash = "sha256-MRnrPChX3a26JELh4oH5nefwoQurpvpprZXeNnz1Cwo="; }; nativeBuildInputs = [ @@ -34,6 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ awkward-cpp + importlib-metadata numpy packaging ] ++ lib.optionals (pythonOlder "3.11") [ @@ -44,19 +51,25 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; + pythonImportsCheck = [ "awkward" ]; + nativeCheckInputs = [ - cupy - pytestCheckHook + fsspec + jax + jaxlib numba setuptools + numexpr + pandas + pyarrow + pytest-xdist + pytestCheckHook ]; + # The following tests have been disabled because they need to be run on a GPU platform. disabledTestPaths = [ "tests-cuda" - ]; - - pythonImportsCheck = [ - "awkward" + "tests-cuda-kernels" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix b/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix index 7dc2a217987f..a4d3fb4c838d 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "2.8.2"; + version = "2.9.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "venth"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hMM7Z0s9t5vetgskiy7nb1W/kKCKHe0Q3kT2ngUVADA="; + hash = "sha256-IZeEb87NX3fyw1hENF1LldbgbaXXPG3u2AiCeci6MIw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix b/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix index 619e181e8d56..f40eb9b0b44f 100644 --- a/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix @@ -6,16 +6,16 @@ , pytestCheckHook , python-dateutil , python-slugify -, pythonAtLeast , pythonOlder , requests +, setuptools , sortedcontainers }: buildPythonPackage rec { pname = "blinkpy"; version = "0.22.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -26,6 +26,10 @@ buildPythonPackage rec { hash = "sha256-r8kf5L6bvtivqd9dSi8om1wIi8IHmipKFckNMPT515I="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aiohttp @@ -49,16 +53,10 @@ buildPythonPackage rec { "blinkpy.sync_module" ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - "test_download_video_exit" - "test_parse_camera_not_in_list" - "test_parse_downloaded_items" - ]; - meta = with lib; { description = "Python library for the Blink Camera system"; homepage = "https://github.com/fronzbot/blinkpy"; - changelog = "https://github.com/fronzbot/blinkpy/releases/tag/v${version}"; + changelog = "https://github.com/fronzbot/blinkpy/blob/${src.rev}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix b/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix deleted file mode 100644 index 2c24fe51debf..000000000000 --- a/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib, stdenv, python, makeWrapper, unzip -, pipInstallHook -, setuptoolsBuildHook -, wheel, pip, setuptools -}: - -stdenv.mkDerivation rec { - pname = "pip"; - inherit (pip) version; - name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; - - srcs = [ wheel.src pip.src setuptools.src ]; - sourceRoot = "."; - - dontUseSetuptoolsBuild = true; - dontUsePipInstall = true; - - # Should be propagatedNativeBuildInputs - propagatedBuildInputs = [ - # Override to remove dependencies to prevent infinite recursion. - (pipInstallHook.override{pip=null;}) - (setuptoolsBuildHook.override{setuptools=null; wheel=null;}) - ]; - - postPatch = '' - mkdir -p $out/bin - '' + (pip.postPatch or ""); # `pip` does not necessarily have a `postPatch` field. - - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ python ]; - - dontBuild = true; - - installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) '' - export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 - '' + '' - # Give folders a known name - mv pip* pip - mv setuptools* setuptools - mv wheel* wheel - # Set up PYTHONPATH: - # - pip and setuptools need to be in PYTHONPATH to install setuptools, wheel, and pip. - # - $out is where we are installing to and takes precedence, and is where wheel will end so we can install pip. - export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$PYTHONPATH" - - echo "Building setuptools wheel..." - pushd setuptools - rm pyproject.toml - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . - popd - - echo "Building wheel wheel..." - pushd wheel - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . - popd - - echo "Building pip wheel..." - pushd pip - rm pyproject.toml - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . - popd - ''; - - meta = { - description = "Version of pip used for bootstrapping"; - license = lib.unique (pip.meta.license ++ setuptools.meta.license ++ wheel.meta.license); - homepage = pip.meta.homepage; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix b/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix index dd9d94715ecf..4e4d10bd2731 100644 --- a/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix +++ b/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "casa-formats-io"; - version = "0.2.1"; + version = "0.2.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-8iZ+wcSfh5ACTb3/iQAf2qQpwZ6wExWwcdJoLmCEjB0="; + hash = "sha256-EOX+tal9nrON2K7mHVYSTTxja6mu2k3Bag8bhL3JHJs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/catppuccin/default.nix b/nixpkgs/pkgs/development/python-modules/catppuccin/default.nix index c938b389c28a..3c86e97f49f9 100644 --- a/nixpkgs/pkgs/development/python-modules/catppuccin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/catppuccin/default.nix @@ -1,27 +1,47 @@ { lib , buildPythonPackage -, fetchPypi -, python +, fetchFromGitHub +, poetry-core +, poetry-dynamic-versioning , pygments +, rich +, pytestCheckHook }: buildPythonPackage rec { pname = "catppuccin"; version = "1.3.2"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-iRQF9U6QvbyOSdp0OALc/Efl4IL1w17WGOZRbhzlqGA="; + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "python"; + rev = "v${version}"; + hash = "sha256-spPZdQ+x3isyeBXZ/J2QE6zNhyHRfyRQGiHreuXzzik="; }; - propagatedBuildInputs = [ pygments ]; + nativeBuildInputs = [ + poetry-core + poetry-dynamic-versioning + ]; + + passthru.optional-dependencies = { + pygments = [ pygments ]; + rich = [ rich ]; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + "tests/test_flavour.py" # would download a json to check correctness of flavours + ]; pythonImportsCheck = [ "catppuccin" ]; - meta = with lib; { + meta = { description = "Soothing pastel theme for Python"; homepage = "https://github.com/catppuccin/python"; - maintainers = with maintainers; [ fufexan ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ fufexan tomasajt ]; + license = lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 8b5ff73d1faa..5237fe31f370 100644 --- a/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -4,7 +4,7 @@ , pythonOlder # build-system -, cython +, cython_3 , poetry-core , setuptools @@ -17,12 +17,12 @@ let pname = "chacha20poly1305-reuseable"; - version = "0.4.2"; + version = "0.10.2"; in buildPythonPackage { inherit pname version; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -30,11 +30,11 @@ buildPythonPackage { owner = "bdraco"; repo = pname; rev = "v${version}"; - hash = "sha256-RBXEumw5A/XzB/LazUcvq8JM/Ahvcy9lCTYKpGcY7go="; + hash = "sha256-jLaYdVNgjpy/fjjt9om72jirgMaM61T/OZu/iHZ/W4k="; }; nativeBuildInputs = [ - cython + cython_3 poetry-core setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/coffea/default.nix b/nixpkgs/pkgs/development/python-modules/coffea/default.nix index dbc75a3bb12f..47f98327cb37 100644 --- a/nixpkgs/pkgs/development/python-modules/coffea/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coffea/default.nix @@ -31,20 +31,20 @@ buildPythonPackage rec { pname = "coffea"; - version = "2023.7.0.rc0"; + version = "2023.10.0.rc1"; pyproject = true; src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-WIJw5NLVN6TrG/0mySqtlqvoNVinmpcWZchSqiNjQ9Q="; + hash = "sha256-1mfTuZDfkD0NjcmSoXN3BLC5o+dWvw+r65ukZTZf8j4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "numba>=0.57.0" "numba" \ - --replace "numpy>=1.22.0,<1.25" "numpy" + --replace "numba>=0.58.0" "numba" \ + --replace "numpy>=1.22.0,<1.26" "numpy" ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/colorlover/default.nix b/nixpkgs/pkgs/development/python-modules/colorlover/default.nix index 70dd66e8f813..d255ff0992f5 100644 --- a/nixpkgs/pkgs/development/python-modules/colorlover/default.nix +++ b/nixpkgs/pkgs/development/python-modules/colorlover/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/jackparmer/colorlover"; description = "Color scales in Python for humans"; license = licenses.mit; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix b/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix index 45be07ce4dce..1f63ed419734 100644 --- a/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , cmake , numpy @@ -10,8 +9,9 @@ , wheel , pybind11 , pydantic -, pytestCheckHook , rich +, awkward +, pytestCheckHook , scipy , zlib }: @@ -19,27 +19,13 @@ buildPythonPackage rec { pname = "correctionlib"; version = "2.3.3"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-4WXY7XfZVYaJD63y7fPB6tCsc+wGAsgnFlgtFbX5IK0="; }; - patches = [ - (fetchpatch { - name = "ci-maintenance.patch"; - url = "https://github.com/cms-nanoAOD/correctionlib/commit/924031637b040f6e8e4930c46a9f7560c59db23d.patch"; - hash = "sha256-jq3ojMsO2Ex9om8tVpEY9uwwelXPzgQ+KCPN0bgda8w="; - includes = [ "pyproject.toml" ]; - }) - (fetchpatch { - name = "clean-up-build-dependencies.patch"; - url = "https://github.com/cms-nanoAOD/correctionlib/commit/c4fd64ca0e5ce806890e8f0ae8e792dcc4537d38.patch"; - hash = "sha256-8ID2jEnmfYmPxWMtRviBc3t1W4p3Y+lAzijFtYBEtyk="; - }) - ]; - nativeBuildInputs = [ cmake numpy @@ -64,6 +50,7 @@ buildPythonPackage rec { env.SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeCheckInputs = [ + awkward pytestCheckHook scipy ]; diff --git a/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix b/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix index 53d0d78cc09d..cc9f4ac69b4e 100644 --- a/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Productivity Tools for Plotly + Pandas"; homepage = "https://github.com/santosjorge/cufflinks"; license = licenses.mit; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix b/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix index a913f577b77b..bcc274b7771c 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , dask , fetchFromGitHub -, fetchpatch , hatch-vcs , hatchling , pyarrow @@ -14,26 +13,18 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2023.9.1"; - format = "pyproject"; + version = "2023.10.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dask-contrib"; - repo = pname; + repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-eGdOFI2KCpheMQcUH1jokyBO96dqyUlcl98jcgdRkYA="; + hash = "sha256-ov5vE9O+dq0ByfSMluQl7NN0vZAcvvBX27iwoYSruSs="; }; - patches = [ - (fetchpatch { - name = "dask-awkward-pyarrow13-test-fixes.patch"; - url = "https://github.com/dask-contrib/dask-awkward/commit/abe7f4504b4f926232e4d0dfa5c601d265773d85.patch"; - hash = "sha256-IYlKTV6YasuKIJutB4cCmHeglGWUwBcvFgx1MZw4hjU="; - }) - ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; pythonRelaxDeps = [ @@ -64,6 +55,7 @@ buildPythonPackage rec { # Tests require network access "test_remote_double" "test_remote_single" + "test_from_text" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix b/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix index 1d144b3db5f0..98e955894f2c 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dask-gateway-server"; - version = "2022.10.0"; + version = "2023.9.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-gateway"; rev = version; - hash = "sha256-8yyako49F3rK8oZFmpYOiLVg9K3YF76/XerapQx3uhc="; + hash = "sha256-hwNLcuFN6ItH5KhC2gDUsaZT7qTC48fPR/Qx6u8B1+M="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/nixpkgs/pkgs/development/python-modules/dask/default.nix b/nixpkgs/pkgs/development/python-modules/dask/default.nix index 341a133c987c..706dd76a1da3 100644 --- a/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -38,16 +38,16 @@ buildPythonPackage rec { pname = "dask"; - version = "2023.9.2"; - format = "pyproject"; + version = "2023.10.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-NJLZyxVS5L25wC79mZ6kRjxxd5dYcjWiC3x3A5Topm8="; + hash = "sha256-u7KuZT0uH833zqLNBfqRLU7EcMrUmXgszevYA3Z7G1Y="; }; nativeBuildInputs = [ @@ -143,6 +143,9 @@ buildPythonPackage rec { # FileNotFoundError: [Errno 2] No such file or directory: '/build/tmp301jryv_/createme/0.part' "test_to_csv_nodir" "test_to_json_results" + # FutureWarning: Those tests should be working fine when pandas will have been upgraded to 2.1.1 + "test_apply" + "test_apply_infer_columns" ]; __darwinAllowLocalNetworking = true; diff --git a/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/nixpkgs/pkgs/development/python-modules/distributed/default.nix index fc52b3b9fc5b..55d5dabdd009 100644 --- a/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -19,22 +19,21 @@ , tornado , urllib3 , versioneer -, wheel , zict }: buildPythonPackage rec { pname = "distributed"; - version = "2023.8.1"; - format = "pyproject"; + version = "2023.10.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "dask"; - repo = pname; + repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-HJyqDi5MqxEjAWWv8ZqNGAzeFn5rZGPwiDz5KaCm6Xk="; + hash = "sha256-V0L1qY9xtJgKxNEZ69z8CQuXsUs30cqu6xFrsjKWkbY="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix b/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix index 4bd5d486d4a9..116e3085d908 100644 --- a/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , django , django-allauth , djangorestframework @@ -21,6 +22,14 @@ buildPythonPackage rec { hash = "sha256-PTFUZ54vKlufKCQyJb+QB/+hI15r+Z0auTjnc38yMLg="; }; + patches = [ + (fetchpatch { + # https://github.com/iMerica/dj-rest-auth/pull/561 + url = "https://github.com/iMerica/dj-rest-auth/commit/be0cf53d94582183320b0994082f0a312c1066d9.patch"; + hash = "sha256-BhZ7BWW8m609cVn1WCyPfpZq/706YVZAesrkcMKTD3A="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "coveralls>=1.11.1" "" \ diff --git a/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix b/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix index c68c554b9b9e..f5942b9b9bf4 100644 --- a/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { description = "Django library for Mailman UIs"; homepage = "https://gitlab.com/mailman/django-mailman3"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ globin qyliss ]; + maintainers = with maintainers; [ qyliss ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/django-markup/default.nix b/nixpkgs/pkgs/development/python-modules/django-markup/default.nix index e373fa30a526..ed33d0937236 100644 --- a/nixpkgs/pkgs/development/python-modules/django-markup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-markup/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , django # optionals @@ -19,14 +20,16 @@ buildPythonPackage rec { pname = "django-markup"; - version = "1.7.2"; - format = "setuptools"; + version = "1.8.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bartTC"; repo = "django-markup"; rev = "refs/tags/v${version}"; - hash = "sha256-NvGlvrXOwDrwHhbFHrWf7Kz9sEzTTyq84/Z6jjRNy8Q="; + hash = "sha256-Hhcp4wVJEcYV1lEZ2jWf7nOlt5m4lVAfC6VmKIdxf4c="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix b/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix index 1995574762dd..9db6be33ed0d 100644 --- a/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "django-mysql"; - version = "4.11.0"; - format = "pyproject"; + version = "4.12.0"; + pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; repo = "django-mysql"; rev = "refs/tags/${version}"; - hash = "sha256-4PxJH5P/a4oNigbTjrZa3q+FeDQTdkvCKonUUl4I8m0="; + hash = "sha256-AieI6zUPFXQsrvoms5bu/Bb3J+DvfLA4rCCsjhYBEZQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django/5.nix b/nixpkgs/pkgs/development/python-modules/django/5.nix new file mode 100644 index 000000000000..f17a961db655 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django/5.nix @@ -0,0 +1,144 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, substituteAll + +# build +, setuptools + +# patched in +, geos +, gdal +, withGdal ? false + +# propagates +, asgiref +, sqlparse + +# extras +, argon2-cffi +, bcrypt + +# tests +, aiosmtpd +, docutils +, geoip2 +, jinja2 +, numpy +, pillow +, pylibmc +, pymemcache +, python +, pywatchman +, pyyaml +, pytz +, redis +, selenium +, tblib +, tzdata +}: + +buildPythonPackage rec { + pname = "Django"; + version = "5.0a1"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-OlIFL7xeAfIgLAIKgkGqQNwDCxbI+0ncSAzEarhzUVg="; + }; + + patches = [ + (substituteAll { + src = ./django_5_set_zoneinfo_dir.patch; + zoneinfo = tzdata + "/share/zoneinfo"; + }) + # prevent tests from messing with our pythonpath + ./django_5_tests_pythonpath.patch + # disable test that excpects timezone issues + ./django_5_disable_failing_tests.patch + ] ++ lib.optionals withGdal [ + (substituteAll { + src = ./django_5_set_geos_gdal_lib.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }) + ]; + + postPatch = '' + substituteInPlace tests/utils_tests/test_autoreload.py \ + --replace "/usr/bin/python" "${python.interpreter}" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + asgiref + sqlparse + ]; + + passthru.optional-dependencies = { + argon2 = [ + argon2-cffi + ]; + bcrypt = [ + bcrypt + ]; + }; + + nativeCheckInputs = [ + # tests/requirements/py3.txt + aiosmtpd + docutils + geoip2 + jinja2 + numpy + pillow + pylibmc + pymemcache + pywatchman + pyyaml + pytz + redis + selenium + tblib + tzdata + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + + doCheck = !stdenv.isDarwin; + + preCheck = '' + # make sure the installed library gets imported + rm -rf django + + # provide timezone data, works only on linux + export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo + ''; + + checkPhase = '' + runHook preCheck + + pushd tests + ${python.interpreter} runtests.py --settings=test_sqlite + popd + + runHook postCheck + ''; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + changelog = "https://docs.djangoproject.com/en/${lib.versions.majorMinor version}/releases/${version}/"; + description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design."; + homepage = "https://www.djangoproject.com"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/django/django_5_disable_failing_tests.patch b/nixpkgs/pkgs/development/python-modules/django/django_5_disable_failing_tests.patch new file mode 100644 index 000000000000..dd4b3f6ac72a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django/django_5_disable_failing_tests.patch @@ -0,0 +1,21 @@ +diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py +index b204487..243f060 100644 +--- a/tests/settings_tests/tests.py ++++ b/tests/settings_tests/tests.py +@@ -2,7 +2,7 @@ import os + import sys + import unittest + from types import ModuleType, SimpleNamespace +-from unittest import mock ++from unittest import mock, skip + + from django.conf import ENVIRONMENT_VARIABLE, LazySettings, Settings, settings + from django.core.exceptions import ImproperlyConfigured +@@ -335,6 +335,7 @@ class SettingsTests(SimpleTestCase): + getattr(s, "foo") + + @requires_tz_support ++ @skip("Assertion fails, exception does not get raised") + @mock.patch("django.conf.global_settings.TIME_ZONE", "test") + def test_incorrect_timezone(self): + with self.assertRaisesMessage(ValueError, "Incorrect timezone setting: test"): diff --git a/nixpkgs/pkgs/development/python-modules/django/django_5_set_geos_gdal_lib.patch b/nixpkgs/pkgs/development/python-modules/django/django_5_set_geos_gdal_lib.patch new file mode 100644 index 000000000000..c1fdcdc4e92e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django/django_5_set_geos_gdal_lib.patch @@ -0,0 +1,26 @@ +diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py +index 30cba0f..5afc031 100644 +--- a/django/contrib/gis/gdal/libgdal.py ++++ b/django/contrib/gis/gdal/libgdal.py +@@ -15,7 +15,7 @@ try: + + lib_path = settings.GDAL_LIBRARY_PATH + except (AttributeError, ImportError, ImproperlyConfigured, OSError): +- lib_path = None ++ lib_path = "@gdal@/lib/libgdal@extension@" + + if lib_path: + lib_names = None +diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py +index 1121b4f..f14ea2f 100644 +--- a/django/contrib/gis/geos/libgeos.py ++++ b/django/contrib/gis/geos/libgeos.py +@@ -25,7 +25,7 @@ def load_geos(): + + lib_path = settings.GEOS_LIBRARY_PATH + except (AttributeError, ImportError, ImproperlyConfigured, OSError): +- lib_path = None ++ lib_path = "@geos@/lib/libgeos_c@extension@" + + # Setting the appropriate names for the GEOS-C library. + if lib_path: diff --git a/nixpkgs/pkgs/development/python-modules/django/django_5_set_zoneinfo_dir.patch b/nixpkgs/pkgs/development/python-modules/django/django_5_set_zoneinfo_dir.patch new file mode 100644 index 000000000000..166cc56281cf --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django/django_5_set_zoneinfo_dir.patch @@ -0,0 +1,13 @@ +diff --git a/django/conf/__init__.py b/django/conf/__init__.py +index 22f1eab..3a752d1 100644 +--- a/django/conf/__init__.py ++++ b/django/conf/__init__.py +@@ -208,7 +208,7 @@ class Settings: + if hasattr(time, "tzset") and self.TIME_ZONE: + # When we can, attempt to validate the timezone. If we can't find + # this file, no check happens and it's harmless. +- zoneinfo_root = Path("/usr/share/zoneinfo") ++ zoneinfo_root = Path("@zoneinfo@") + zone_info_file = zoneinfo_root.joinpath(*self.TIME_ZONE.split("/")) + if zoneinfo_root.exists() and not zone_info_file.exists(): + raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE) diff --git a/nixpkgs/pkgs/development/python-modules/django/django_5_tests_pythonpath.patch b/nixpkgs/pkgs/development/python-modules/django/django_5_tests_pythonpath.patch new file mode 100644 index 000000000000..8355d267a73f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/django/django_5_tests_pythonpath.patch @@ -0,0 +1,12 @@ +diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py +index 7f39d7f..b5b0ae7 100644 +--- a/tests/admin_scripts/tests.py ++++ b/tests/admin_scripts/tests.py +@@ -126,6 +126,7 @@ class AdminScriptTestCase(SimpleTestCase): + del test_environ["DJANGO_SETTINGS_MODULE"] + python_path = [base_dir, django_dir, tests_dir] + python_path.extend(ext_backend_base_dirs) ++ python_path.extend(sys.path) + test_environ["PYTHONPATH"] = os.pathsep.join(python_path) + test_environ["PYTHONWARNINGS"] = "" + diff --git a/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix b/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix index 9e476ad5c188..253604370cbc 100644 --- a/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , dj-rest-auth , django , django-allauth @@ -37,6 +38,14 @@ buildPythonPackage rec { hash = "sha256-sK+upLh0mi8eHKh1Wt9FoLRjqlHitTSX0Zl54S4Ce6E="; }; + patches = [ + (fetchpatch { + # https://github.com/tfranzel/drf-spectacular/pull/1090 + url = "https://github.com/tfranzel/drf-spectacular/commit/8db4c2458f8403c53db0db352dd94057d285814b.patch"; + hash = "sha256-Ue5y7IB4ie+9CEineMBgMMCLGiF4zqmn60TJvKsV1h0="; + }) + ]; + propagatedBuildInputs = [ django djangorestframework diff --git a/nixpkgs/pkgs/development/python-modules/duecredit/default.nix b/nixpkgs/pkgs/development/python-modules/duecredit/default.nix index 28b21cabc1ca..053fd6504e41 100644 --- a/nixpkgs/pkgs/development/python-modules/duecredit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/duecredit/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, pytest +, pythonOlder +, setuptools , pytestCheckHook , vcrpy , citeproc-py @@ -13,16 +13,20 @@ buildPythonPackage rec { pname = "duecredit"; version = "0.9.2"; - disabled = isPy27; + pyproject = true; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; hash = "sha256-Dg/Yfp5GzmyUMI6feAwgP+g22JYoQE+L9a+Wp0V77Rw="; }; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ citeproc-py requests six ]; - nativeCheckInputs = [ pytest pytestCheckHook vcrpy ]; + nativeCheckInputs = [ pytestCheckHook vcrpy ]; + disabledTests = [ "test_import_doi" ]; # tries to access network preCheck = '' export HOME=$(mktemp -d) @@ -33,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/duecredit/duecredit"; description = "Simple framework to embed references in code"; + changelog = "https://github.com/duecredit/duecredit/releases/tag/${version}"; license = licenses.bsd2; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix index 72c9915cc879..81d4719db1df 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.18.1"; + version = "2.18.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JL72tenKmsWanHl6+olpx7SkFLmFoTyctl+2TnnKcAI="; + hash = "sha256-gfb4FtuaOEtzOwNcBPa/KM6dMI8ckf91ch1TZOxFHck="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/nixpkgs/pkgs/development/python-modules/fiona/default.nix index 1fe53065d9ee..8513c723bf00 100644 --- a/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -2,8 +2,9 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, cython +, cython_3 , gdal +, oldest-supported-numpy , setuptools , wheel , attrs @@ -20,8 +21,8 @@ buildPythonPackage rec { pname = "fiona"; - version = "1.9.4.post1"; - format = "pyproject"; + version = "1.9.5"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -29,21 +30,13 @@ buildPythonPackage rec { owner = "Toblerity"; repo = "Fiona"; rev = "refs/tags/${version}"; - hash = "sha256-CeGdWAmWteVtL0BoBQ1sB/+1AWkmxogtK99bL5Fpdbw="; + hash = "sha256-fq/BuyzuK4iOxdpE4h+KRH0CxOEk/wdmbb9KgCfJ1cw="; }; - postPatch = '' - # Remove after https://github.com/Toblerity/Fiona/pull/1225 is released - sed -i '/"oldest-supported-numpy"/d' pyproject.toml - - # Remove after https://github.com/Toblerity/Fiona/pull/1281 is released, - # after which cython also needs to be updated to cython_3 - sed -i 's/Cython~=/Cython>=/' pyproject.toml - ''; - nativeBuildInputs = [ - cython + cython_3 gdal # for gdal-config + oldest-supported-numpy setuptools wheel ]; diff --git a/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix b/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix index e30abdb7cb44..fd915fdc18f3 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { description = "Flask plugin to rewrite file paths to add version info"; homepage = "https://github.com/pilt/flask-versioned"; license = licenses.bsd3; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/gios/default.nix b/nixpkgs/pkgs/development/python-modules/gios/default.nix index 675ea286c26b..0112418b00b8 100644 --- a/nixpkgs/pkgs/development/python-modules/gios/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gios/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gios"; - version = "3.1.0"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7lOY8J42mRmIA18tQrmY3gNEQf6YqzbeULecrGhNwFc="; + hash = "sha256-mgfeaYC9Uq23fDzVwHMryYrmDO2b/rSwrvAp/T4HaIE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 53b865bd75ad..60988de324ad 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.21.0"; + version = "2.21.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zhw5u7bysha6VqzjsIcmDpd43Rmt6e+jcAre6SWACa0="; + hash = "sha256-STU3XqrxhlblPiYxdwudV56Ay07Bs9Rt0jNG94mqAWo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix index d7c11e3cad3b..ac134f2472ca 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.11.2"; + version = "1.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pn2ofYfcHBxAw7IK5lKqf1AGj8e+DU8W++9XVFPZ5Ws="; + hash = "sha256-ud0MLfv5Oy3AV6RdAkyMbCxM2+55txtfoekTB1eznFE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix b/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix index 2131255d5a85..69c9180ce423 100644 --- a/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.2.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-zlLfA8wlXCsBXvzTHNW8y30/DvWMgf7DnpShsvjZXZ4="; + hash = "sha256-WiDoeScro7TcW5nQBmLpVQriL6IzR9CAVqBj36nqivk="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/nixpkgs/pkgs/development/python-modules/griffe/default.nix index 17144972839c..91b83b0f4eaa 100644 --- a/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.36.7"; + version = "0.36.8"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sxj/avPVmS2qHD+s5nsTWpnXjAMQ1RuBA9Z52Rx/X8k="; + hash = "sha256-2lpmEfHUsnqoEXXyVZqly5ADxaqk+n5GsFTemAuwokU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix b/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix index 4b5498396dd7..47096022d1f4 100644 --- a/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "23.9.0"; + version = "23.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-W49jmFwLrCu8NhQ65ll3iu+QbnHBA5sCeUgSLYLrui0="; + hash = "sha256-+D9gl2Q1NybL8Na9qDZpDZOBStzJcfE6IUKFwjzr1J0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hcloud/default.nix b/nixpkgs/pkgs/development/python-modules/hcloud/default.nix index 5da7e3018f12..336f8ed962c3 100644 --- a/nixpkgs/pkgs/development/python-modules/hcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.30.0"; + version = "1.31.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TZlz+jk3+wcMkGk6FM70BdqBrLZe+DINwjHHbFNZ/Zo="; + hash = "sha256-hF+gptNLAeLtpZGrwOezwFeihDt1smCp4QkK5lENMHo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/homematicip/default.nix b/nixpkgs/pkgs/development/python-modules/homematicip/default.nix index 2cdb4b76df25..f0260f04d3c8 100644 --- a/nixpkgs/pkgs/development/python-modules/homematicip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/homematicip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.15"; + version = "1.0.16"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "hahn-th"; repo = "homematicip-rest-api"; rev = "refs/tags/${version}"; - hash = "sha256-wetkcHtm5O6mxhyU3/E4yrv6UGHAdKUlae2wJdCXtJI="; + hash = "sha256-rvjdhsvGYllVeenVkU/ikwil4OVHPRIaXs+85q0pM/w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/huey/default.nix b/nixpkgs/pkgs/development/python-modules/huey/default.nix index 2ef88e7bf486..0b0b02b09714 100644 --- a/nixpkgs/pkgs/development/python-modules/huey/default.nix +++ b/nixpkgs/pkgs/development/python-modules/huey/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "A little task queue for python"; homepage = "https://github.com/coleifer/huey"; license = licenses.mit; - maintainers = [ maintainers.globin ]; + maintainers = []; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jc/default.nix b/nixpkgs/pkgs/development/python-modules/jc/default.nix index cd6f4060fc96..50c8c520fb08 100644 --- a/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.23.4"; + version = "1.23.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-d0KONiYS/5JXrl5izFSTYeABEhCW+W9cKpMgk9o9LB4="; + hash = "sha256-lIIUJL9NOtDpPQeuFi9xvFG0fPzYYEBv40s7Q+JSmN8="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/nixpkgs/pkgs/development/python-modules/jira/default.nix b/nixpkgs/pkgs/development/python-modules/jira/default.nix index a25690408dca..fa7e2b18e6f4 100644 --- a/nixpkgs/pkgs/development/python-modules/jira/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jira/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { homepage = "https://github.com/pycontribs/jira"; changelog = "https://github.com/pycontribs/jira/releases/tag/${version}"; license = licenses.bsd2; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix index d6bdedc992ae..06f5cc6bbd9a 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix @@ -15,6 +15,8 @@ , jsonschema , jupyter-telemetry , jupyterlab +, jupyter-core +, jupyter-server , mock , nbclassic , nodePackages @@ -138,6 +140,8 @@ buildPythonPackage rec { sqlalchemy tornado traitlets + jupyter-core + jupyter-server ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index a99d4d468c95..763e44fb142f 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -69,5 +69,6 @@ buildPythonPackage rec { license = licenses.bsd3; homepage = "https://jupyter.org/"; maintainers = lib.teams.jupyter.members; + mainProgram = "jupyter-lab"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/kivy/default.nix b/nixpkgs/pkgs/development/python-modules/kivy/default.nix index d3276c622b86..dd04b97010dd 100644 --- a/nixpkgs/pkgs/development/python-modules/kivy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kivy/default.nix @@ -3,7 +3,7 @@ , pkg-config, cython, docutils , kivy-garden , mesa, mtdev, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer -, ApplicationServices, AVFoundation, libcxx +, Accelerate, ApplicationServices, AVFoundation, libcxx , withGstreamer ? true , gst_all_1 , pillow, requests, pygments @@ -20,6 +20,15 @@ buildPythonPackage rec { hash = "sha256-k9LIiLtlHY6H1xfVylI/Xbm7R6pCpC5UHe8GWnCwEGA="; }; + patches = [ + # Fixes incompatible function pointer conversion errors with clang 16. + # https://github.com/kivy/kivy/pull/8415 + (fetchpatch { + url = "https://github.com/kivy/kivy/commit/a0ec8ff79fcbc1b82391132a89c8fc21ef1c5c55.patch"; + hash = "sha256-2Kpkx75uWPiEiEqkOxBKl3HENKUGVHbQV4haeI5Gl3A="; + }) + ]; + nativeBuildInputs = [ pkg-config cython @@ -35,6 +44,7 @@ buildPythonPackage rec { mesa mtdev ] ++ lib.optionals stdenv.isDarwin [ + Accelerate ApplicationServices AVFoundation libcxx diff --git a/nixpkgs/pkgs/development/python-modules/libknot/default.nix b/nixpkgs/pkgs/development/python-modules/libknot/default.nix new file mode 100644 index 000000000000..1913d0765133 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/libknot/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# build-system +, hatchling + +# native dependencies +, knot-dns +}: + +buildPythonPackage rec { + pname = "libknot"; + version = "3.3.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-uttdIl2ONoR9ba6gJXmJkU++UQldcezwTUG+X5mCcbE="; + }; + + postPatch = '' + substituteInPlace libknot/__init__.py \ + --replace "libknot%s.dylib" "${lib.getLib knot-dns}/lib/libknot%s.dylib" \ + --replace "libknot.so%s" "${lib.getLib knot-dns}/lib/libknot.so%s" + ''; + + nativeBuildInputs = [ + hatchling + ]; + + pythonImportsCheck = [ + "libknot" + ]; + + meta = with lib; { + description = "Python bindings for libknot"; + homepage = "https://gitlab.nic.cz/knot/knot-dns/-/tree/master/python/libknot"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hexa ]; + mainProgram = "libknot"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix b/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix index 6c52490dc0ef..bb584d6797f6 100644 --- a/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { description = "REST client for driving Mailman 3"; homepage = "https://www.gnu.org/software/mailman/"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ globin qyliss ]; + maintainers = with maintainers; [ qyliss ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/python-modules/mat2/default.nix b/nixpkgs/pkgs/development/python-modules/mat2/default.nix index 97b9090cc250..1646d3ac7246 100644 --- a/nixpkgs/pkgs/development/python-modules/mat2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mat2/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, unittestCheckHook +, pytestCheckHook , pythonOlder , fetchFromGitLab , substituteAll @@ -88,9 +88,12 @@ buildPythonPackage rec { install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus" ''; - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; - unittestFlagsArray = [ "-v" ]; + disabledTests = [ + # Frequently fails when exiftool is updated and adds support for new metadata. + "test_all_parametred" + ]; meta = with lib; { description = "A handy tool to trash your metadata"; diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix index 5ad4ef448454..631f881908c3 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix @@ -1,5 +1,4 @@ { lib -, callPackage , buildPythonPackage , fetchFromGitHub , mkdocs @@ -32,6 +31,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # Some tests fail with an assertion error failure + doCheck = false; + pythonImportsCheck = [ "mkdocs" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix b/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix index 61cf2978a8e5..53fffeaadcba 100644 --- a/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix @@ -3,23 +3,22 @@ , build , buildPythonPackage , fetchFromGitHub +, hatchling +, hatch-vcs , magicgui , napari # reverse dependency, for tests -, psygnal , pydantic , pythonOlder , pytomlpp , pyyaml , rich -, setuptools-scm , typer }: buildPythonPackage rec { pname = "napari-npe2"; version = "0.7.2"; - - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -30,12 +29,11 @@ buildPythonPackage rec { hash = "sha256-PjoLocNTkcAnBNRbPi+MZqZtQ2bjWPIUVz0+k8nIn2A="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ - # npe2 *can* build without it, - # but then setuptools refuses to acknowledge it when building napari - setuptools-scm + hatchling + hatch-vcs ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nats-py/default.nix b/nixpkgs/pkgs/development/python-modules/nats-py/default.nix index b1de4350f500..7df0e1a6f0e0 100644 --- a/nixpkgs/pkgs/development/python-modules/nats-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nats-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.4.0"; + version = "2.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; rev = "refs/tags/v${version}"; - hash = "sha256-6t4BTUWjzTbegPvySv9Y6pQrRDwparuYb6rC+HOXWLo="; + hash = "sha256-BTGq1m1kkWk2CxDYh+jZZIf89ZoQjSTcvloBg9vq4p8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 58f65b6e3d46..d3d3a7add2c7 100644 --- a/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6pLdaBeyTIrsAzkr83Iywta+K4Vx3nt0QyL8opHNwV8="; + hash = "sha256-K8EiDb6B18No9RNbw2a7U+FJQaXrrcFf0hgt40r6Igo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nilearn/default.nix b/nixpkgs/pkgs/development/python-modules/nilearn/default.nix index 921af46b15d5..f8273e30ae7b 100644 --- a/nixpkgs/pkgs/development/python-modules/nilearn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nilearn/default.nix @@ -1,15 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, lxml, matplotlib -, nibabel, numpy, pandas, scikit-learn, scipy, joblib, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestCheckHook +, hatch-vcs +, lxml +, matplotlib +, nibabel +, numpy +, pandas +, scikit-learn +, scipy +, joblib +, requests +}: buildPythonPackage rec { pname = "nilearn"; version = "0.10.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-koo2Tn7XfRXQK38icZfqfHj0Ty/ngP61VdbXz5Iy+EY="; }; + nativeBuildInputs = [ hatch-vcs ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "test_clean_confounds" ]; # https://github.com/nilearn/nilearn/issues/2608 # do subset of tests which don't fetch resources @@ -30,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://nilearn.github.io"; description = "A module for statistical learning on neuroimaging data"; + changelog = "https://github.com/nilearn/nilearn/releases/tag/${version}"; license = licenses.bsd3; }; } diff --git a/nixpkgs/pkgs/development/python-modules/nptyping/default.nix b/nixpkgs/pkgs/development/python-modules/nptyping/default.nix index ac823c2e45ad..883eb00384d9 100644 --- a/nixpkgs/pkgs/development/python-modules/nptyping/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nptyping/default.nix @@ -8,7 +8,6 @@ , numpy , pandas , feedparser -, typeguard }: buildPythonPackage rec { @@ -35,7 +34,6 @@ buildPythonPackage rec { invoke pandas pytestCheckHook - typeguard ]; disabledTests = [ @@ -49,6 +47,8 @@ buildPythonPackage rec { # can't find mypy stubs for pandas: "tests/test_mypy.py" "tests/pandas_/test_mypy_dataframe.py" + # typeguard release broke nptyping compatibility: + "tests/test_typeguard.py" # tries to build wheel of package, broken/unnecessary under Nix: "tests/test_wheel.py" ]; diff --git a/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix b/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix index dce4276d57cd..b2a8329538eb 100644 --- a/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "16.1.0"; + version = "16.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7JkV4idZ/euYGGPTg6I+pw2nNOuttmGJMlz3NvJO9Rw="; + hash = "sha256-Obv4MJvO7li+KqI2l6KxfxjpbZVD5KFJwjn/u+UtaQQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix b/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix index 9c5381171e2f..814c90a698dc 100644 --- a/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.1.32"; + version = "0.1.33"; src = fetchPypi { inherit pname version; - hash = "sha256-UE5LHsG7BrJqC0rNRtUUqmXSPsYRVqodiU5DsB/6ECo="; + hash = "sha256-w3krij7+CtJl1XoJz3RRAAp2aKqMCQg/PBh5erf/Phs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/orange3/default.nix b/nixpkgs/pkgs/development/python-modules/orange3/default.nix index fa1204ffa733..c8939f01e939 100644 --- a/nixpkgs/pkgs/development/python-modules/orange3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/orange3/default.nix @@ -44,8 +44,7 @@ let self = buildPythonPackage rec { pname = "orange3"; - version = "3.36.0"; - format = "pyproject"; + version = "3.36.1"; disabled = pythonOlder "3.7"; @@ -53,7 +52,7 @@ let owner = "biolab"; repo = "orange3"; rev = "refs/tags/${version}"; - hash = "sha256-0HIhBdufc46cTOSXa0koelTfZd5sY7QantmwGWggoCU="; + hash = "sha256-O5ZN5O1vMkqiv83Q5UoaDefGnqVnDLPmYLLG20cdajk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pathy/default.nix b/nixpkgs/pkgs/development/python-modules/pathy/default.nix index 5ec592d53a44..c5fc0852b868 100644 --- a/nixpkgs/pkgs/development/python-modules/pathy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathy/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pathy"; - version = "0.10.2"; + version = "0.10.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ecVyq3/thNxGg3NG7a5YVlmS0Ed6eJzUaRpB2Oq5kX0="; + hash = "sha256-tFGF0G+bGMbTNG06q4gauWh0VT9mHuiMzS5gJG4QPCI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/paypalrestsdk/default.nix b/nixpkgs/pkgs/development/python-modules/paypalrestsdk/default.nix index 26c44f0b070b..0562be6ee739 100644 --- a/nixpkgs/pkgs/development/python-modules/paypalrestsdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/paypalrestsdk/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "paypalrestsdk"; - version = "1.13.1"; + version = "1.13.2"; src = fetchPypi { inherit pname version; - sha256 = "238713208031e8981bf70b3350b3d7f85ed64d34e0f21e4c1184444a546fee7f"; + sha256 = "sha256-kZUfNtsw1oW5ceFASYSRo1bPHfjv9xZWYDrKTtcs81o="; }; propagatedBuildInputs = [ requests six pyopenssl ]; diff --git a/nixpkgs/pkgs/development/python-modules/pdfplumber/default.nix b/nixpkgs/pkgs/development/python-modules/pdfplumber/default.nix index 37809324e275..0408b74ead49 100644 --- a/nixpkgs/pkgs/development/python-modules/pdfplumber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdfplumber/default.nix @@ -62,6 +62,13 @@ buildPythonPackage rec { "test__repr_png_" ]; + disabledTestPaths = [ + # Tests requires pypdfium2 + "tests/test_display.py" + # Tests require Ghostscript + "tests/test_repair.py" + ]; + meta = with lib; { description = "Plumb a PDF for detailed information about each char, rectangle, line, et cetera — and easily extract text and tables"; homepage = "https://github.com/jsvine/pdfplumber"; diff --git a/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index 33e65661f92e..9fe9539bf810 100644 --- a/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.5.5"; + version = "19.5.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AgJT/VfNHcSuJhypBwqJkgXuvYDBlZ7eQp4nGva4z6U="; + hash = "sha256-izw41TUmqKOy34/RMHjBROQr88SChheKJVpPMaOubnE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index a003c2bf464f..1359096853ce 100644 --- a/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-z5pBkB5J8FnuebMW4bPpk0cT2nd5bH/4PBR12g0lEQw="; + hash = "sha256-b1ONVJzwvpuLKAtv2Rk3uUNt85mMChfGrlM+CpPACUw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pipx/default.nix b/nixpkgs/pkgs/development/python-modules/pipx/default.nix index 5ee12b7a223d..ef4e789249ce 100644 --- a/nixpkgs/pkgs/development/python-modules/pipx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pipx/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-lm/Q+8nNubhaUR1pUbSIoD4DEUEkK+pQvvUdWNquW4Q="; + hash = "sha256-eNZJXznKgamGR9yrswrrLEqUTxFhLGxWTkYbi13bebY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix b/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix index 428511bdca3a..f1d152decc1f 100644 --- a/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pmdarima"; - version = "2.0.3"; + version = "2.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alkaline-ml"; repo = "pmdarima"; - rev = "v${version}"; - hash = "sha256-uX4iZZ2deYqVWnqVZT6J0Djf2pXo7ug4MsOsPkKjvSU="; + rev = "refs/tags/v${version}"; + hash = "sha256-LHwPgQRB/vP3hBM8nqafoCrN3ZSRIMWLzqTqDOETOEc="; }; nativeBuildInputs = [ cython ]; diff --git a/nixpkgs/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix b/nixpkgs/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix index fbf7599b313c..0b2a85f7e949 100644 --- a/nixpkgs/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "LDAP Proxy to intercept LDAP binds and authenticate against privacyIDEA"; homepage = "https://github.com/privacyidea/privacyidea-ldap-proxy"; license = licenses.agpl3Only; - maintainers = [ maintainers.globin ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/psycopg/default.nix b/nixpkgs/pkgs/development/python-modules/psycopg/default.nix index 38554ad8e97a..65156543e87d 100644 --- a/nixpkgs/pkgs/development/python-modules/psycopg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/psycopg/default.nix @@ -35,13 +35,13 @@ let pname = "psycopg"; - version = "3.1.11"; + version = "3.1.12"; src = fetchFromGitHub { owner = "psycopg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cQTGaiVgdgaq1fmDdtqvc+uCp66S+s0GsTcFTARR+SI="; + hash = "sha256-2fd21aSCjwSwk8G0uS3cPGzLZfPVoJl2V5dG+akfCrE="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix b/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix index 1b0745990ec5..12e67d554eb4 100644 --- a/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20231020"; + version = "0.10.0.20231026"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5Woh5xWIVvVvgmp4xtpU51rXSCZDH0ljPpLpkvFmO+8="; + hash = "sha256-q2rUBjbue3I3VnRLTF7UscBs51bGxUGjMYwAkgX5UMs="; }; passthru.optional-dependencies = { diff --git a/nixpkgs/pkgs/development/python-modules/pulumi/default.nix b/nixpkgs/pkgs/development/python-modules/pulumi/default.nix index bc0507055f02..b6f1ed005540 100644 --- a/nixpkgs/pkgs/development/python-modules/pulumi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pulumi/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchFromGitHub , protobuf , dill , grpcio @@ -46,7 +45,7 @@ buildPythonPackage rec { cp ../../README.md . substituteInPlace setup.py \ --replace "3.0.0" "${version}" \ - --replace "grpcio==1.51.3" "grpcio" \ + --replace "grpcio~=1.59" "grpcio" \ --replace "semver~=2.13" "semver" ''; diff --git a/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/nixpkgs/pkgs/development/python-modules/pybids/default.nix index f801b878ae75..ec62c32a1079 100644 --- a/nixpkgs/pkgs/development/python-modules/pybids/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybids/default.nix @@ -46,8 +46,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "bids" ]; - # looks for missing data: - disabledTests = [ "test_config_filename" ]; + disabledTests = [ + # looks for missing data: + "test_config_filename" + # regression associated with formulaic >= 0.6.0 + # (see https://github.com/bids-standard/pybids/issues/1000) + "test_split" + ]; meta = with lib; { description = "Python tools for querying and manipulating BIDS datasets"; diff --git a/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix b/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix index bcfe550d3f87..81364bd203ae 100644 --- a/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pydevccu"; - version = "0.1.6"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-r6QjtKEnMmWRfDAnxP5zMChCVwyi9Z2lFrYu7hPrTUg="; + hash = "sha256-wzltcerAGh/QfHGg+M7Hlw4SfDEg23K2plSyrmz/m7E="; }; # Module has no tests diff --git a/nixpkgs/pkgs/development/python-modules/pyeconet/default.nix b/nixpkgs/pkgs/development/python-modules/pyeconet/default.nix index f8fb18f1468e..bc2125b8c6ec 100644 --- a/nixpkgs/pkgs/development/python-modules/pyeconet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyeconet/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyeconet"; - version = "0.1.20"; + version = "0.1.21"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "w1ll1am23"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x94V6qdDHgeeFLAuciC7mHMWbC0d3AtS0aQNaZOCajI="; + hash = "sha256-G+J61L9i5JIgPC4oZQavafjD81kue02r+GRdIazrzOw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix b/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix index d18160d897d3..b968f025d5c8 100644 --- a/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.13.1"; + version = "1.14.0"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-8wGGx7ERYm+lKvLW/NUcJeBTqEXPM0jJNOOlkj/UzYk="; + hash = "sha256-Eh4OtdOes9ApIlivHkc8zA84pkQ+HBOBp0r+6E8RE8Y="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix b/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix index b1a38f11f6ac..2f059d19a1b9 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyfibaro"; - version = "0.7.5"; + version = "0.7.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rappenze"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hllYxPPbLu3dpjHwXfIvTMW0LWtcglTVfN7youZaXTw="; + hash = "sha256-yE9HkAlGj1t90FwmwHDsk3ea2UOl0bG3UtYXxz/SWbI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pylint-venv/default.nix b/nixpkgs/pkgs/development/python-modules/pylint-venv/default.nix index 1ba6e062989a..b12ae73b8c34 100644 --- a/nixpkgs/pkgs/development/python-modules/pylint-venv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylint-venv/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pylint-venv"; - version = "3.0.2"; + version = "3.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "jgosmann"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mYG9iZHbA67oJc2sshtV3w8AQaqPsXGqMuLJFI4jAI0="; + hash = "sha256-dsVEHJawsTNKVCVmeOa61wOU5GPeyzAU/eUDFrK9PPg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pymunk/default.nix b/nixpkgs/pkgs/development/python-modules/pymunk/default.nix index 869a2a085eb8..8df9d0c7e918 100644 --- a/nixpkgs/pkgs/development/python-modules/pymunk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymunk/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pymunk"; - version = "6.5.1"; + version = "6.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-ZEO7YJBkCMgsD9MnwBn/X3qt39+IiecM453bjDgZDls="; + hash = "sha256-AV6upaZcnbKmQm9tTItRB6LpckappjdHvMH/awn/KeE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyrad/default.nix b/nixpkgs/pkgs/development/python-modules/pyrad/default.nix index 36bc9156964f..8a7074888716 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrad/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "Python RADIUS Implementation"; homepage = "https://github.com/pyradius/pyrad"; license = licenses.bsd3; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix b/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix index 52649fed6710..c960cfedfdde 100644 --- a/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix @@ -1,6 +1,7 @@ { lib , pythonOlder , fetchFromGitHub +, fetchpatch , buildPythonPackage , cython , slurm @@ -20,9 +21,15 @@ buildPythonPackage rec { hash = "sha256-M8seh5pkw2OTiDU4O96D0Lg3+FrlB2w4ehy53kSxyoU="; }; + patches = [ (fetchpatch { + name = "remove-undeclared-KILL_JOB_ARRAY"; + url = "https://github.com/PySlurm/pyslurm/commit/f7a7d8beb8ceb4e4c1b248bab2ebb995dcae77e2.patch"; + hash = "sha256-kQLGiGzAhqP8Z6pObz9vdTRdITd12w7KuUDXsfyLIU8="; + })]; + buildInputs = [ cython slurm ]; - setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; + setupPyBuildFlags = [ "--slurm-lib=${lib.getLib slurm}/lib" "--slurm-inc=${lib.getDev slurm}/include" ]; # Test cases need /etc/slurm/slurm.conf and require a working slurm installation doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix b/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix index 6309cfc03429..e63ecdc66690 100644 --- a/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pysolcast"; - version = "1.0.14"; + version = "1.0.15"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mcaulifn"; repo = "solcast"; rev = "refs/tags/v${version}"; - hash = "sha256-SI8lRihzJClciPLX9DXOO0K7YWgix74aM784j7fVu/g="; + hash = "sha256-CvijYl6zSwQ6BrGZPJWp75jAApc2y/7cPdZxMq5AjmI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/pystemd/default.nix b/nixpkgs/pkgs/development/python-modules/pystemd/default.nix index dcaeb3355bfa..ff4c6f669223 100644 --- a/nixpkgs/pkgs/development/python-modules/pystemd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pystemd/default.nix @@ -4,6 +4,8 @@ , python , fetchPypi , systemd +, lxml +, psutil , pytest , mock , pkg-config }: @@ -22,7 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; - nativeCheckInputs = [ pytest mock ]; + nativeCheckInputs = [ lxml mock psutil pytest ]; checkPhase = "pytest tests"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix index d8a188af25de..7b7189e78684 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "2.2.1"; + version = "2.2.2"; format = "pyproject"; src = fetchPypi { pname = "pytest_check"; inherit version; - hash = "sha256-3rN/iB36DV4kbymWI4rvdFp5ANezUjp0FgV3K4osSVI="; + hash = "sha256-eufpnpDxJ9PQLSnAKostlbWofbPTDczRaen9ZsRP2+g="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix b/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix index c73160c55e6e..fe81dda8939c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "23.10.0"; + version = "23.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-me7HO6BiW+0S1GDbKkbJiRrUQotEP1MPo/d0Xc84mIg="; + hash = "sha256-OG45mKYqWrgyDyTlWPz95VXQDKAx4QeU1ZZGmHhbviI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-myq/default.nix b/nixpkgs/pkgs/development/python-modules/python-myq/default.nix index f596828e6f9f..88248abde3a3 100644 --- a/nixpkgs/pkgs/development/python-modules/python-myq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-myq/default.nix @@ -22,6 +22,11 @@ buildPythonPackage rec { hash = "sha256-kW03swRXZdkh45I/up/FIxv0WGBRqTlDt1X71Ow/hrg="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry-core==1.6.1" "poetry-core" + ''; + nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/pywemo/default.nix b/nixpkgs/pkgs/development/python-modules/pywemo/default.nix index 277de7a83170..69b8114a95e5 100644 --- a/nixpkgs/pkgs/development/python-modules/pywemo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywemo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "1.3.0"; + version = "1.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+AdNT7ClT8JkYLkwk+IVNWgXGS04WNtENOtqmbjv7nQ="; + hash = "sha256-RZeg6/xAGRumd4aM/mQQnIrIXB/rUrdeQQxk2c1mJNI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qasync/default.nix b/nixpkgs/pkgs/development/python-modules/qasync/default.nix index bdbede92c5d4..c3761210a1c1 100644 --- a/nixpkgs/pkgs/development/python-modules/qasync/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qasync/default.nix @@ -3,23 +3,28 @@ , fetchFromGitHub , pyqt5 , pytestCheckHook +, poetry-core }: buildPythonPackage rec { pname = "qasync"; - version = "0.24.1"; + version = "0.26.1"; + + format = "pyproject"; src = fetchFromGitHub { owner = "CabbageDevelopment"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DAzmobw+c29Pt/URGO3bWXHBxgu9bDHhdTUBE9QJDe4="; + hash = "sha256-vtRmThXKxqof+Rz3Dngtc9tuwL1bPYFHDq4DBRCsrIU="; }; postPatch = '' rm qasync/_windows.py # Ignoring it is not taking effect and it will not be used on Linux ''; + buildInputs = [ poetry-core ]; + propagatedBuildInputs = [ pyqt5 ]; checkInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix b/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix index a31438335ef8..16ad74dd2469 100644 --- a/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2023.9.53"; + version = "2023.10.54"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-/q0bL1WxIn6giOp9kLUCLZRpS/2d2Rdr61rRwZXQRP8="; + hash = "sha256-xCHB/pPURc1+vje6IhBHZ6HogUsmYfBE9977Qtwoc2w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix b/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix index 78fdcc99d267..72d1a9f43a89 100644 --- a/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "qcelemental"; - version = "0.26.0"; + version = "0.27.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-oU6FEM2/2mRe8UYcGv0C77WZMRcz27pfg/zR1haKbd0="; + hash = "sha256-5VLNGD4glAIGgtt+q8YvwyAQvJU9mfyTpngwVr6gOYg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qds_sdk/default.nix b/nixpkgs/pkgs/development/python-modules/qds-sdk/default.nix index b172f0e71816..d4fb7a503144 100644 --- a/nixpkgs/pkgs/development/python-modules/qds_sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qds-sdk/default.nix @@ -1,26 +1,32 @@ -{ lib, - fetchFromGitHub, - buildPythonPackage, - boto, - inflection, - pytest, - mock, - requests, - six, - urllib3 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, boto +, inflection +, requests +, six +, urllib3 +, mock +, pytestCheckHook +}: buildPythonPackage rec { - pname = "qds_sdk"; + pname = "qds-sdk"; version = "1.16.1"; + pyproject = true; - # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "qubole"; repo = "qds-sdk-py"; - rev = "V${version}"; - sha256 = "05c7g63rcvvi4fgkcfsxh2a6hwlffbs18dhki222s5rpc49wi8zi"; + rev = "refs/tags/V${version}"; + hash = "sha256-8aPIE2E3Fy2EiBM2FPRyjnJolIBdOzafI3Fvlod5hxU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ boto inflection @@ -29,15 +35,17 @@ buildPythonPackage rec { urllib3 ]; - nativeCheckInputs = [ pytest mock ]; - checkPhase = '' - py.test --disable-pytest-warnings tests - ''; + nativeCheckInputs = [ pytestCheckHook mock ]; + + pythonImportsCheck = [ + "qds_sdk" + ]; meta = with lib; { description = "A Python module that provides the tools you need to authenticate with, and use the Qubole Data Service API"; homepage = "https://github.com/qubole/qds-sdk-py"; license = licenses.asl20; maintainers = with maintainers; [ shahrukh330 ]; + mainProgram = "qds.py"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/qgrid/default.nix b/nixpkgs/pkgs/development/python-modules/qgrid/default.nix index 645328f1a712..f5758c3182d9 100644 --- a/nixpkgs/pkgs/development/python-modules/qgrid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qgrid/default.nix @@ -42,6 +42,8 @@ buildPythonPackage rec { "test_edit_multi_index_df" "test_multi_index" "test_period_object_column" + # probably incompatible with pandas>=2.1 + "test_add_row_button" ]; pythonImportsCheck = [ "qgrid" ]; diff --git a/nixpkgs/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/nixpkgs/pkgs/development/python-modules/rotary-embedding-torch/default.nix index 1c93184a36e6..450fa9c8bee2 100644 --- a/nixpkgs/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; rev = version; - hash = "sha256-EozW8J1i/2ym1hwUMciaWVtp7kSWfG+mC5RkWLJdK3g="; + hash = "sha256-uTOKdxqbSLRJl0gnz3TvpVwhrfqflAp0wfn6d13+YrM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix index 2a988049f447..a9393cb48781 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix @@ -1,6 +1,6 @@ { lib -, fetchPypi , buildPythonPackage +, fetchFromGitHub , cython , gfortran , git @@ -15,12 +15,13 @@ buildPythonPackage rec { pname = "scikit-misc"; version = "0.3.0"; - format = "pyproject"; + pyproject = true; - src = fetchPypi { - pname = "scikit_misc"; - inherit version; - hash = "sha256-mom0Ch+b3bViErh9ueVYiGfVz5SQUSqCCcGsBJ7+Nrg="; + src = fetchFromGitHub { + owner = "has2k1"; + repo = "scikit-misc"; + rev = "refs/tags/v${version}"; + hash = "sha256-XV3s+y3JdMr1770S91ek6Y7MqvTg7/2cphLQldUPe5s="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix b/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix index e7eca13d7300..73564d11e8f8 100644 --- a/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.9.3"; + version = "0.9.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0qB+FWqlh5qdy/jKLPYCXl3DewurLSOlYgcdiDtzeYE="; + hash = "sha256-OdAhA+vzIrUnE8Xdv52x7ij0LJKyxawaSY4QORP1TUg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix b/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix index aa8a970364d8..e07e6e994d43 100644 --- a/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , cmake , swig4 +, elastix , itk , numpy , simpleitk @@ -20,8 +21,17 @@ buildPythonPackage rec { make ''; - nativeBuildInputs = [ cmake swig4 scikit-build ]; - propagatedBuildInputs = [ itk simpleitk numpy ]; + nativeBuildInputs = [ + cmake + swig4 + scikit-build + ]; + propagatedBuildInputs = [ + elastix + itk + simpleitk + numpy + ]; pythonImportsCheck = [ "SimpleITK" ]; } diff --git a/nixpkgs/pkgs/development/python-modules/smpplib/default.nix b/nixpkgs/pkgs/development/python-modules/smpplib/default.nix index 92e14af59fc0..a991532fa917 100644 --- a/nixpkgs/pkgs/development/python-modules/smpplib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/smpplib/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-smpplib/python-smpplib"; changelog = "https://github.com/python-smpplib/python-smpplib/releases/tag/${version}"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/sphinx-automodapi/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-automodapi/default.nix index 3071d86dc46b..bc74fae5491e 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx-automodapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx-automodapi/default.nix @@ -1,29 +1,36 @@ { lib , buildPythonPackage -, cython , fetchFromGitHub , fetchurl -, gcc -, graphviz -, pytestCheckHook , pythonOlder +, setuptools-scm +, git , sphinx +, pytestCheckHook +, cython +, gcc +, graphviz }: buildPythonPackage rec { pname = "sphinx-automodapi"; version = "0.16.0"; - format = "setuptools"; - + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "astropy"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-7/b3PlgoqXyzmj4KDoHJf5gd3SUSiyhkpcDWl3u+0Bs="; + rev = "v${version}"; + hash = "sha256-ecOwBtJBkGsBShMG5fK22V1EHLe6pCmOdHPrS/k6rno="; + leaveDotGit = true; }; + nativeBuildInputs = [ + setuptools-scm + git + ]; + propagatedBuildInputs = [ sphinx ]; # https://github.com/astropy/sphinx-automodapi/issues/155 @@ -34,11 +41,8 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace "sphinx_automodapi/tests/helpers.py" \ - --replace '[0]), None)' "[0]), (None, '${testInventory}'))" - - substituteInPlace "sphinx_automodapi/tests/test_cases.py" \ - --replace '[0]), None)' "[0]), (None, '${testInventory}'))" + substituteInPlace sphinx_automodapi/tests/{helpers,test_cases}.py \ + --replace ", None)" ", (None, '${testInventory}'))" ''; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix index 1c43bcd6a661..04630f189d5a 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "sphinx-tabs"; - version = "3.4.1"; + version = "3.4.4"; format = "pyproject"; outputs = [ "out" "doc" ]; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; repo = "sphinx-tabs"; - rev = "v${version}"; - hash = "sha256-5lpo7NRCksXJOdbLSFjDxQV/BsxRBb93lA6tavz6YEs="; + rev = "refs/tags/v${version}"; + hash = "sha256-RcCADGJfwXP/U7Uws/uX+huaJzRDRUabQOnc9gqMUzM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 1486372b02ab..0ed95a19b98f 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; - version = "0.8.1"; + version = "0.8.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-BPz4fCWTRRYqUEzj3+4PcTifUHw3l3mNxTHHdImVtOs="; + hash = "sha256-nGIRdUC1J2AGrHrUrzRpbQKvJ4r6KZcSdAw2gKmp3mw="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix b/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix index 39de5e760490..6a06ef247a0b 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { description = "A one step database access tool, built on the SQLAlchemy ORM"; homepage = "https://github.com/zzzeek/sqlsoup"; license = licenses.mit; - maintainers = [ maintainers.globin ]; + maintainers = []; broken = true; # incompatible with sqlalchemy>=1.4 and unmaintained since 2016 }; } diff --git a/nixpkgs/pkgs/development/python-modules/stem/default.nix b/nixpkgs/pkgs/development/python-modules/stem/default.nix index dc90700948c0..8cd6ff3f3d6e 100644 --- a/nixpkgs/pkgs/development/python-modules/stem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stem/default.nix @@ -1,38 +1,51 @@ -{ lib, buildPythonPackage, fetchPypi, python, mock, pythonAtLeast }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, cryptography +, mock +, python +}: buildPythonPackage rec { pname = "stem"; version = "1.8.2"; - # As of May 2023, the master branch of stem contains fixes for Python 3.11 - # that the last release (1.8.1) doesn't. The test suite fails on both master - # and the 1.8.1 release, so disabling rather than switching to an unstable - # source. - disabled = pythonAtLeast "3.11"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-g/sZ/9TJ+CIHwAYFFIA4n4CvIhp+R4MACu3sTjhOtYI="; + pyproject = true; + + src = fetchFromGitHub { + owner = "torproject"; + repo = "stem"; + rev = "refs/tags/${version}"; + hash = "sha256-9BXeE/sVa13jr8G060aWjc49zgDVBhjaR6nt4lSxc0g="; }; - postPatch = '' - rm test/unit/installation.py - sed -i "/test.unit.installation/d" test/settings.cfg - # https://github.com/torproject/stem/issues/56 - sed -i '/MOCK_VERSION/d' run_tests.py - ''; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ mock ]; + nativeCheckInputs = [ + cryptography + mock + ]; checkPhase = '' - touch .gitignore - ${python.interpreter} run_tests.py -u + runHook preCheck + + ${python.interpreter} run_tests.py --unit + + runHook postCheck ''; meta = with lib; { + changelog = "https://github.com/torproject/stem/blob/${src.rev}/docs/change_log.rst"; description = "Controller library that allows applications to interact with Tor"; + downloadPage = "https://github.com/torproject/stem"; homepage = "https://stem.torproject.org/"; - license = licenses.gpl3; - maintainers = with maintainers; [ ]; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tlds/default.nix b/nixpkgs/pkgs/development/python-modules/tlds/default.nix index 1b001cd53659..33dd694a7f5f 100644 --- a/nixpkgs/pkgs/development/python-modules/tlds/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tlds/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "tlds"; - version = "2023080900"; + version = "2023101900"; format = "setuptools"; src = fetchFromGitHub { owner = "kichik"; repo = "tlds"; rev = "refs/tags/${version}"; - hash = "sha256-n6SGOBkwGrjnH01yFd9giODUDkPGVMwB1H/fozzwQwU="; + hash = "sha256-ac4gM2+7RvmUl8ZI+XhjOkvR3lsTgoowowFo5K+ZFJ8="; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix b/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix index f458db0ced03..85e85c16afc7 100644 --- a/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix +++ b/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix @@ -1,6 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder +, numpy +, lightning-utilities , cloudpickle , scikit-learn , scikit-image @@ -15,7 +18,7 @@ let pname = "torchmetrics"; - version = "1.1.2"; + version = "1.2.0"; in buildPythonPackage { inherit pname version; @@ -24,10 +27,14 @@ buildPythonPackage { owner = "PyTorchLightning"; repo = "metrics"; rev = "refs/tags/v${version}"; - hash = "sha256-qbO2POXJp2O0VL16zY5mb6TDpogs1L34anFVeSf502g="; + hash = "sha256-g5JuTbiRd8yWx2nM3UE8ejOhuZ0XpAQdS5AC9AlrSFY="; }; + disabled = pythonOlder "3.8"; + propagatedBuildInputs = [ + numpy + lightning-utilities packaging py-deprecate ]; diff --git a/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/nixpkgs/pkgs/development/python-modules/transformers/default.nix index e342615d6d66..2b8d597ae67f 100644 --- a/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -51,16 +51,16 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.34.0"; + version = "4.34.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "huggingface"; - repo = pname; + repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-hDZU/3bQ1k4uL3kDEW3+pB4g8jhC8ospRqE55jIqrP0="; + hash = "sha256-ZyRn1AyyKvtrUUSWZ95jfIMXydcCSM5zZeseF7golhU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index ece870d23b03..3943d185255d 100644 --- a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.0.0"; + version = "4.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zPGD9VdMMSdThd/IV2wLF4NA1lZQy9a0SOyOkUGHK7c="; + hash = "sha256-jBVQqYNB8P7E0xkcTH6uYmbBZ/l5P9VLtyyRQxq/fOY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix b/nixpkgs/pkgs/development/python-modules/tvdb-api/default.nix index 0e05aa041dba..bec0964acc0d 100644 --- a/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tvdb-api/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - pname = "tvdb_api"; + pname = "tvdb-api"; version = "3.2.0-beta"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/nixpkgs/pkgs/development/python-modules/uproot/default.nix index a906ce2d76f9..837d16204473 100644 --- a/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -1,11 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder , awkward , hatchling -, importlib-metadata , numpy , packaging , pytestCheckHook @@ -18,16 +16,16 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.0.12"; - format = "pyproject"; + version = "5.1.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-5RJPRrnPRRj1KXeyCqrGwaurXPx0aT6gso1o7gQ1aNs="; + hash = "sha256-TMa+j2jdFagJJhlyCx4rNLaxQhrJyq1HdpnA40xiyME="; }; nativeBuildInputs = [ @@ -38,8 +36,6 @@ buildPythonPackage rec { awkward numpy packaging - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; nativeCheckInputs = [ @@ -61,6 +57,7 @@ buildPythonPackage rec { "test_no_multipart" "test_fallback" "test_pickle_roundtrip_http" + "test_open_fsspec_local" ]; disabledTestPaths = [ diff --git a/nixpkgs/pkgs/development/python-modules/validobj/default.nix b/nixpkgs/pkgs/development/python-modules/validobj/default.nix index 6e96ff579da2..73eaf56f9e9d 100644 --- a/nixpkgs/pkgs/development/python-modules/validobj/default.nix +++ b/nixpkgs/pkgs/development/python-modules/validobj/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "validobj"; - version = "1.0"; + version = "1.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-j1WbPVqYbxoshcvRvc/w0T+YknoSABZ9CrzXzCDSErA="; + sha256 = "sha256-CISX8pycEOYUBolyMoJqaKdE0u/8tf7mvbHYm9m148I="; }; nativeBuildInputs = [ flit ]; diff --git a/nixpkgs/pkgs/development/python-modules/whispers/default.nix b/nixpkgs/pkgs/development/python-modules/whispers/default.nix index 9a0ad6756c2c..bba0f14e159b 100644 --- a/nixpkgs/pkgs/development/python-modules/whispers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/whispers/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "whispers"; - version = "2.1.5"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adeptex"; repo = pname; - rev = version; - hash = "sha256-vY8ruemRYJ05YtJAYX3TFlp+pRwF7Tkp7eft9e+HrgA="; + rev = "refs/tags/${version}"; + hash = "sha256-9vXku8BWJtlf+lmAcQ8a7qTisRNc+xVw0T0Eunc4lt4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/winacl/default.nix b/nixpkgs/pkgs/development/python-modules/winacl/default.nix index dc378d34d013..ab27147d6519 100644 --- a/nixpkgs/pkgs/development/python-modules/winacl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/winacl/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "winacl"; - version = "0.1.7"; + version = "0.1.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ymYsCRRxpsYp12xe7GPYob8a98BUNI8JwSQvM4hQsr0="; + hash = "sha256-RCcaMCVi3lFin2jvFUDUDzom57wBc2RrAaZ3nO2tZEw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix b/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix index 39829fc3acd0..6c8624608764 100644 --- a/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.3.0"; + version = "2.3.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QL8S5fDNi6msyaV14E6tgN0C/nvXqV0+Mx+4AY0um4o="; + hash = "sha256-rWJojH2vitkoCRthaczWW/wGLdxsMlmJ4b/2vdaZhdA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index bbe3f2b54f31..b7e0608428ff 100644 --- a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.105"; + version = "0.0.106"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-k4azIBjlS/J448ncu6cgB6oJtpS0Qb2Bnm11vq7RFEI="; + hash = "sha256-+sL3AbjDg0Kl6eqMwVAN9W85QKJqFR1ANKz1E958KeA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/rocm-modules/5/rocm-core/default.nix b/nixpkgs/pkgs/development/rocm-modules/5/rocm-core/default.nix index aae431be8e62..a29575168b45 100644 --- a/nixpkgs/pkgs/development/rocm-modules/5/rocm-core/default.nix +++ b/nixpkgs/pkgs/development/rocm-modules/5/rocm-core/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-core"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; @@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: { name = finalAttrs.pname; owner = finalAttrs.src.owner; repo = finalAttrs.src.repo; + page = "tags?per_page=1"; + filter = ".[0].name | split(\"-\") | .[1]"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 1cbbdf0bf29d..25412b45b40b 100644 --- a/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-Wvs288K8BVjUuWvvzpDGBwOxL7mAXjVtgIwJAsQd0L4="; }; + strictDeps = true; nativeBuildInputs = [ - autoreconfHook pkg-config + autoreconfHook guile pkg-config ]; buildInputs = [ guile diff --git a/nixpkgs/pkgs/development/tools/algolia-cli/default.nix b/nixpkgs/pkgs/development/tools/algolia-cli/default.nix index a3d5e1353ddc..b9d0a663aaf1 100644 --- a/nixpkgs/pkgs/development/tools/algolia-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/algolia-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-85J4evMEhfkfQ3IoeHulufI9wbwAqW8QmEmJfs5hUpc="; + hash = "sha256-zwlDn545R7A5l6m7lsFSSf3rW96FND6/HRgeykvVCH0="; }; vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; diff --git a/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix b/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix index 93a4ffab388d..61c8dda2e6da 100644 --- a/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/cov-build/default.nix @@ -1,30 +1,49 @@ -{ lib, stdenv, requireFile }: +{ lib +, stdenv +, fetchurl + +, autoPatchelfHook + +, alsa-lib +, libxcrypt-legacy +, lttng-ust_2_12 +, xorg +, zlib +}: -let - message = '' - Register an account at https://scan.coverity.com, download the - build tools, and add it to the nix store with nix-prefetch-url - ''; -in stdenv.mkDerivation rec { pname = "cov-build"; - version = "7.0.2"; + version = "2022.12.2"; src = if stdenv.hostPlatform.system == "i686-linux" - then requireFile { - name = "cov-analysis-linux32-${version}.tar.gz"; - sha256 = "0i06wbd7blgx9adh9w09by4i18vwmldfp9ix97a5dph2cjymsviy"; - inherit message; + then fetchurl { + url = "https://archive.org/download/cov-analysis-linux-${version}.tar/cov-analysis-linux-${version}.tar.gz"; + hash = "sha256-Jr9bMUo9GRp+dgoAPqKxaTqWYWh4djGArdG9ukUK+ZY="; } - else requireFile { - name = "cov-analysis-linux64-${version}.tar.gz"; - sha256 = "0iby75p0g8gv7b501xav47milr8m9781h0hcgm1ch6x3qj6irqd8"; - inherit message; - }; + else if stdenv.hostPlatform.system == "x86_64-linux" + then fetchurl { + url = "https://archive.org/download/cov-analysis-linux64-${version}.tar/cov-analysis-linux64-${version}.tar.gz"; + hash = "sha256-CyNKILJXlDMOCXbZZF4r/knz0orRx32oSj+Kpq/nxXQ="; + } + else throw "Unsupported platform '${stdenv.hostPlatform.system}'"; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + alsa-lib + libxcrypt-legacy + lttng-ust_2_12 + xorg.libXext + xorg.libXrender + xorg.libXtst + zlib + ]; + + dontConfigure = true; + + dontBuild = true; - dontStrip = true; - buildPhase = false; installPhase = '' mkdir -p $out/bin $out/libexec mv * $out/libexec @@ -38,6 +57,8 @@ stdenv.mkDerivation rec { done ''; + dontStrip = true; + meta = { description = "Coverity Scan build tools"; homepage = "https://scan.coverity.com"; diff --git a/nixpkgs/pkgs/development/tools/api-linter/default.nix b/nixpkgs/pkgs/development/tools/api-linter/default.nix index 6caa4d908c7a..b34e2ed4f80f 100644 --- a/nixpkgs/pkgs/development/tools/api-linter/default.nix +++ b/nixpkgs/pkgs/development/tools/api-linter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.58.1"; + version = "1.59.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-4k8Ms+ANROe9wBo5XLckyRZbTVegf3p5ab7HCdTwS+A="; + hash = "sha256-rT7mN/vW7o7Qj2BUYmwePJtvURYdgvRK7Oi7Rw/RK4A="; }; - vendorHash = "sha256-DYGBrzbslrtoUWaUag7tiEpi5Tn4ZbyX62NrQpK1ySA="; + vendorHash = "sha256-TV0lA0DkQu3e9aq2uX4Ea8vrvDXxM8vgOn7EXGjld9E="; subPackages = [ "cmd/api-linter" ]; @@ -23,7 +23,7 @@ buildGoModule rec { "-w" ]; - # reference: https://github.com/googleapis/api-linter/blob/v1.58.1/.github/workflows/release.yaml#L76 + # reference: https://github.com/googleapis/api-linter/blob/v1.59.0/.github/workflows/release.yaml#L76 preBuild = '' cat > cmd/api-linter/version.go <<EOF package main diff --git a/nixpkgs/pkgs/development/tools/azure-static-sites-client/versions.json b/nixpkgs/pkgs/development/tools/azure-static-sites-client/versions.json index 12bba7d28033..88d31f718ef6 100644 --- a/nixpkgs/pkgs/development/tools/azure-static-sites-client/versions.json +++ b/nixpkgs/pkgs/development/tools/azure-static-sites-client/versions.json @@ -1,58 +1,58 @@ [ { "version": "latest", - "buildId": "1.0.024671", - "publishDate": "2023-10-04T00:20:16.1747762Z", + "buildId": "1.0.024871", + "publishDate": "2023-10-24T04:09:23.7109231Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/linux/StaticSitesClient", - "sha": "82b8181bb5ea47e1d449c1c56e622bd350513dd97f27ac4abd25bd139fde92e2" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/linux/StaticSitesClient", + "sha": "13d1c02e43dec373be04152f7f8e71974f080440cb9480c3ccb4f83c8c6f036a" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/windows/StaticSitesClient.exe", - "sha": "a7660746d9dbed8814259547da7f96122d01ae90de6f8aa5ccf7b07b58f59f19" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/windows/StaticSitesClient.exe", + "sha": "868f221ea77b13cea8c6c41edbecea53bf5171d42dc9376f34615e544a3874f0" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/macOS/StaticSitesClient", - "sha": "7584bea04c7d9e685216d4248063226d5a230cc955e560885a48737d1abd385e" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/macOS/StaticSitesClient", + "sha": "63c9027a7b5e597ae9e0ad8311b31a587bd977ed758555784d08cc3ff35e80a4" } } }, { "version": "stable", - "buildId": "1.0.024611", - "publishDate": "2023-09-27T15:56:00.9865712Z", + "buildId": "1.0.024741", + "publishDate": "2023-10-10T20:13:22.904778Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024611/linux/StaticSitesClient", - "sha": "73354b661a8644d78a3024ef1da856468e0704ab861b5a174ec82303bf389771" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024741/linux/StaticSitesClient", + "sha": "0e174b1551a495dbb751240201b8d264f86264c704d66678c189fe4d94f53502" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024611/windows/StaticSitesClient.exe", - "sha": "a34fa2e4e37739bf2b38c60c7d7978570e4f624b6feb38cea1d1310f1ab77bed" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024741/windows/StaticSitesClient.exe", + "sha": "cb8d6e7cf83ab7ee394627b088f42de6e63fa77ed5c56eb79a088a1de02163ff" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024611/macOS/StaticSitesClient", - "sha": "9600ded6fa5208cbb943f0aba4d2ca25f03baeca46f1363cbfc465b10e3bbb90" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024741/macOS/StaticSitesClient", + "sha": "1ef4292cad223972ed820921d29f6b844e18edd732c99c183269e86b150a8224" } } }, { "version": "backup", - "buildId": "1.0.023911", - "publishDate": "2023-07-19T16:29:13.2087179Z", + "buildId": "1.0.024671", + "publishDate": "2023-10-04T00:20:16.1747762Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023911/linux/StaticSitesClient", - "sha": "b3073cc39bc362b3838512b3b5f3b3af3a6b1c6f768c323592cd88dc5527046f" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/linux/StaticSitesClient", + "sha": "82b8181bb5ea47e1d449c1c56e622bd350513dd97f27ac4abd25bd139fde92e2" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023911/windows/StaticSitesClient.exe", - "sha": "5f9548aa7f0060f9fce6abdaddea23d5e970e76ce54f1213df6a133764e56337" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/windows/StaticSitesClient.exe", + "sha": "a7660746d9dbed8814259547da7f96122d01ae90de6f8aa5ccf7b07b58f59f19" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023911/macOS/StaticSitesClient", - "sha": "515b60de77132cacc5ef355cc654eaf2a2c3c1ab1ec1d071f6b8ed3062d8ea4e" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/macOS/StaticSitesClient", + "sha": "7584bea04c7d9e685216d4248063226d5a230cc955e560885a48737d1abd385e" } } } diff --git a/nixpkgs/pkgs/development/tools/bearer/default.nix b/nixpkgs/pkgs/development/tools/bearer/default.nix index 371d6e675fd9..05b7d61f858e 100644 --- a/nixpkgs/pkgs/development/tools/bearer/default.nix +++ b/nixpkgs/pkgs/development/tools/bearer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.22.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-nRtbWefRtV9wD4rmnbiZQa0R5JuW8Vs5NRTWBNH4ydc="; + hash = "sha256-3kJPBvw12iyAu9WVIZgyUrsW6XQ0AqpDmDl1E72vyuE="; }; - vendorHash = "sha256-rvL2/YrwkKHs6fTEg3MG2uRx+ii8Hg8c2wPly9In1E8="; + vendorHash = "sha256-ikrpFnn+CTuhttd3gVyoKU3RIBRR/zL8YjvE0tjIH6I="; subPackages = [ "cmd/bearer" diff --git a/nixpkgs/pkgs/development/tools/bomber-go/default.nix b/nixpkgs/pkgs/development/tools/bomber-go/default.nix index 86ba1eb4d8f8..00424389584b 100644 --- a/nixpkgs/pkgs/development/tools/bomber-go/default.nix +++ b/nixpkgs/pkgs/development/tools/bomber-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bomber-go"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "devops-kung-fu"; repo = "bomber"; rev = "refs/tags/v${version}"; - hash = "sha256-vFdXtkz2T6kP/j/j9teHpf4XesqOmKFliZJRyGZKdwg="; + hash = "sha256-TsN/1ZtxVLJIWa7YkkCBzDF3xTeFKzSPLA7tIVe1oCI="; }; - vendorHash = "sha256-GHzJQVq748kG+X9amsQmqZ2cRzwQDO5LfBqvZwVn6W8="; + vendorHash = "sha256-P2g8KfQ+jNZla5GKONtB4MjDnTGBUtd9kmCi0j1xq7s="; ldflags = [ "-w" diff --git a/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix index 62389d622ce8..5aac94c83703 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.5.8"; + version = "1.5.11"; platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { bloop-binary = fetchurl rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = - if stdenv.isLinux && stdenv.isx86_64 then "sha256-KqfXNk89VHhRbTK0kBiO02q/sfp3bs674lU3gUpwAi0=" - else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-1MmX7icqUJgU5y9vYSE4nMzJfLH1SJvYJ24kw697HuY=" + if stdenv.isLinux && stdenv.isx86_64 then "sha256-T07t0CTSkCPQfjhg/L0NhyZgMobXL7DCKZZefPxdBJk=" + else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-3GiMFRikru+8J+eDkba9bNNrpmtuAdH9qEjnH55beiQ=" else throw "unsupported platform"; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index 3e78f7a47688..1b833d6d1f04 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.9.6"; + version = "1.9.7"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-kj15F8y5mp/ZhfSr/YHKrK7UIoTmfT92lsxSOefFlcs="; + hash = "sha256-I1Q7xFl7VS6OLCfWlf5nLsI1q4pk92azeCj7aMbZ2RA="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix index 8ee0811f9871..a22150594361 100644 --- a/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.32.0"; + version = "1.32.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-Sjmh7zVaZ8ATgDr1VN0U03rHlPBvv3lVDxKmAahjJ2M="; + hash = "sha256-imhl8CezFoSi0M0nMxIFL/ZVa8eDAA4s/ZVIMr/QUJ4="; }; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix b/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix index 3082ec2bd798..01b31266d0a3 100644 --- a/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix +++ b/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix @@ -4,7 +4,7 @@ with python3.pkgs; buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.23.3"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "python-jsonschema"; repo = "check-jsonschema"; rev = version; - hash = "sha256-gPFG1AgInakF8leMM0c1zZt2OdZdIKcUmItwICV8p1I="; + hash = "sha256-Hss4MgE09v2KvL8OIapFgocO+5EWE2WEr5xBAjhwNeE="; }; propagatedBuildInputs = [ @@ -34,6 +34,10 @@ buildPythonApplication rec { "check_jsonschema.cli" ]; + disabledTests = [ + "test_schemaloader_yaml_data" + ]; + meta = with lib; { description = "A jsonschema CLI and pre-commit hook"; homepage = "https://github.com/python-jsonschema/check-jsonschema"; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 5e30c977c41e..62856ffd389a 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.105.1"; + version = "0.106.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F0T/4KUz0iU/THE8iRSdKe0Wo3HWQMYOd5vmbO61SzA="; + sha256 = "sha256-W+3sqWPYpMkbmA8dGEodZy+pZGRBLJdthicBFdkn6oU="; }; vendorHash = "sha256-+cxh3/TQqm6n7hUYhW2B3pdfdtzRuepZmLNSGVPA3H0="; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index b6e11c7eb4b1..f07ac564b88a 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.4.0"; + version = "16.5.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-RIxGgS+7gNvexZLLtXymGZaODhax/oSi1gAUxXHZBp4="; + vendorHash = "sha256-C37ijxvyY9PG/Qn29Fmk0pxK+hq45kHIBveBltfIfTo="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-XYlrIUBT/zlnGYxckv36dqSEEpxUom/OJfqnL/HwYDo="; + sha256 = "sha256-NLidtwn1zT7BxzMEF5K41fwbZaICA/KuAr8MIjpJD+A="; }; patches = [ @@ -69,6 +69,6 @@ buildGoModule rec { license = licenses.mit; homepage = "https://about.gitlab.com/gitlab-ci/"; platforms = platforms.unix ++ platforms.darwin; - maintainers = with maintainers; [ bachp zimbatm globin ] ++ teams.gitlab.members; + maintainers = with maintainers; [ bachp zimbatm ] ++ teams.gitlab.members; }; } diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix index dfca2742b58b..899fdc7d82ef 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "woodpecker-plugin-git"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "woodpecker-ci"; repo = "plugin-git"; rev = "refs/tags/${version}"; - hash = "sha256-siPLI463qUQs9tBMlmrMv6G5ry0JrEEIelpid9/cf88="; + hash = "sha256-BQG1+icfV21qZCwgNvLQm8+1f5WF8owKnQKTIF7O80A="; }; vendorHash = "sha256-ol5k37gGFsyeEnGOVcJaerkIejShHyNCBu4RZ8WyHvU="; diff --git a/nixpkgs/pkgs/development/tools/cucumber/Gemfile.lock b/nixpkgs/pkgs/development/tools/cucumber/Gemfile.lock index cad9810973f5..11d066eaea1b 100644 --- a/nixpkgs/pkgs/development/tools/cucumber/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/cucumber/Gemfile.lock @@ -2,37 +2,35 @@ GEM remote: https://rubygems.org/ specs: builder (3.2.4) - cucumber (8.0.0) + cucumber (9.0.2) builder (~> 3.2, >= 3.2.4) - cucumber-ci-environment (~> 9.0, >= 9.0.4) - cucumber-core (~> 11.0, >= 11.0.0) - cucumber-cucumber-expressions (~> 15.1, >= 15.1.1) - cucumber-gherkin (~> 23.0, >= 23.0.1) - cucumber-html-formatter (~> 19.1, >= 19.1.0) - cucumber-messages (~> 18.0, >= 18.0.0) + cucumber-ci-environment (~> 9.2, >= 9.2.0) + cucumber-core (~> 11.1, >= 11.1.0) + cucumber-cucumber-expressions (~> 16.1, >= 16.1.2) + cucumber-gherkin (>= 24, < 26.2.1) + cucumber-html-formatter (~> 20.4, >= 20.4.0) + cucumber-messages (>= 19, < 23) diff-lcs (~> 1.5, >= 1.5.0) - mime-types (~> 3.4, >= 3.4.1) + mini_mime (~> 1.1, >= 1.1.5) multi_test (~> 1.1, >= 1.1.0) - sys-uname (~> 1.2, >= 1.2.2) - cucumber-ci-environment (9.1.0) - cucumber-core (11.0.0) - cucumber-gherkin (~> 23.0, >= 23.0.1) - cucumber-messages (~> 18.0, >= 18.0.0) + sys-uname (~> 1.2, >= 1.2.3) + cucumber-ci-environment (9.2.0) + cucumber-core (11.1.0) + cucumber-gherkin (>= 24, < 27) + cucumber-messages (>= 19, < 22) cucumber-tag-expressions (~> 4.1, >= 4.1.0) - cucumber-cucumber-expressions (15.2.0) - cucumber-gherkin (23.0.1) - cucumber-messages (~> 18.0, >= 18.0.0) - cucumber-html-formatter (19.2.0) - cucumber-messages (~> 18.0, >= 18.0.0) - cucumber-messages (18.0.0) + cucumber-cucumber-expressions (16.1.2) + cucumber-gherkin (26.2.0) + cucumber-messages (>= 19.1.4, < 22.1) + cucumber-html-formatter (20.4.0) + cucumber-messages (>= 18.0, < 22.1) + cucumber-messages (21.0.1) cucumber-tag-expressions (4.1.0) diff-lcs (1.5.0) - ffi (1.15.5) - mime-types (3.4.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) + ffi (1.16.3) + mini_mime (1.1.5) multi_test (1.1.0) - sys-uname (1.2.2) + sys-uname (1.2.3) ffi (~> 1.1) PLATFORMS @@ -42,4 +40,4 @@ DEPENDENCIES cucumber BUNDLED WITH - 2.3.22 + 2.4.20 diff --git a/nixpkgs/pkgs/development/tools/cucumber/default.nix b/nixpkgs/pkgs/development/tools/cucumber/default.nix index fdd77be07f7f..a7da4ab7d046 100644 --- a/nixpkgs/pkgs/development/tools/cucumber/default.nix +++ b/nixpkgs/pkgs/development/tools/cucumber/default.nix @@ -9,9 +9,11 @@ bundlerApp { meta = with lib; { description = "A tool for executable specifications"; - homepage = "https://cucumber.io/"; - license = with licenses; mit; - maintainers = with maintainers; [ manveru nicknovitski ]; - platforms = platforms.unix; + homepage = "https://cucumber.io/"; + changelog = "https://github.com/cucumber/cucumber-ruby/blob/main/CHANGELOG.md"; + license = licenses.mit; + mainProgram = "cucumber"; + maintainers = with maintainers; [ manveru nicknovitski anthonyroussel ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/cucumber/gemset.nix b/nixpkgs/pkgs/development/tools/cucumber/gemset.nix index f702301c2472..16d750887a3e 100644 --- a/nixpkgs/pkgs/development/tools/cucumber/gemset.nix +++ b/nixpkgs/pkgs/development/tools/cucumber/gemset.nix @@ -10,25 +10,25 @@ version = "3.2.4"; }; cucumber = { - dependencies = ["builder" "cucumber-ci-environment" "cucumber-core" "cucumber-cucumber-expressions" "cucumber-gherkin" "cucumber-html-formatter" "cucumber-messages" "diff-lcs" "mime-types" "multi_test" "sys-uname"]; + dependencies = ["builder" "cucumber-ci-environment" "cucumber-core" "cucumber-cucumber-expressions" "cucumber-gherkin" "cucumber-html-formatter" "cucumber-messages" "diff-lcs" "mini_mime" "multi_test" "sys-uname"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ahpifcqv0h5r9cgd97fwr73ps90h50jzi0h17zsaw4ksb3b6g2m"; + sha256 = "0hwbq5sn4hsd922j1p3a4p2404306yczgx2vqggvr20q01fzx55h"; type = "gem"; }; - version = "8.0.0"; + version = "9.0.2"; }; cucumber-ci-environment = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nmn2hfrjlbazgcryr3hwvsa5v4csfbjqxb4q7wbjhaxl9xxn0k7"; + sha256 = "0a11b6w6khjb7rw7ksxdw4bprmg9gfc8xdrsbgv8767ri891s4lq"; type = "gem"; }; - version = "9.1.0"; + version = "9.2.0"; }; cucumber-core = { dependencies = ["cucumber-gherkin" "cucumber-messages" "cucumber-tag-expressions"]; @@ -36,20 +36,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0drg9w5cz5mchh077y9ixsy7yiyrzg3cqc29mmkl3vjcwlkhn3rh"; + sha256 = "02mrykswrxziy08fc9fjvg3l2aa6jfji2012wzh7pyamhm8pcnjb"; type = "gem"; }; - version = "11.0.0"; + version = "11.1.0"; }; cucumber-cucumber-expressions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14xkgpy69p24winh4p5q2b3534i02xxbxl5rn0capqv97qjyj63j"; + sha256 = "0s8bazf8bwlm0zar2316p4xxmpy44wyjnw2z6bj7zc5nl8nmyvym"; type = "gem"; }; - version = "15.2.0"; + version = "16.1.2"; }; cucumber-gherkin = { dependencies = ["cucumber-messages"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dsvcjy78c114q3znacs25zhq3f49q9kkxq4j9iw8b6kwimrl8wj"; + sha256 = "0in9cn9pza3vylc1mlpc3ivri493ikq7f9pnsjkfr6ahagacnh4i"; type = "gem"; }; - version = "23.0.1"; + version = "26.2.0"; }; cucumber-html-formatter = { dependencies = ["cucumber-messages"]; @@ -68,20 +68,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gnmm1r4gyqqwzx482zsbahjyamnj0lxxky86zs4a376jv9bicyz"; + sha256 = "1al5cafzbiqd7fhwyvs0xcpjszav0q5816x9r02v3hzri10wvp5s"; type = "gem"; }; - version = "19.2.0"; + version = "20.4.0"; }; cucumber-messages = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i8abkxykq7ab15pirrrf0jz9200i3x3pda2ffyxmck6063lyjgv"; + sha256 = "0482a63y7my0arn2bv208g401dq8525f0gwhnwaa11mhv6ph0q5i"; type = "gem"; }; - version = "18.0.0"; + version = "21.0.1"; }; cucumber-tag-expressions = { groups = ["default"]; @@ -108,31 +108,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; - mime-types = { - dependencies = ["mime-types-data"]; + mini_mime = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "3.4.1"; - }; - mime-types-data = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; - type = "gem"; - }; - version = "3.2022.0105"; + version = "1.1.5"; }; multi_test = { groups = ["default"]; @@ -150,9 +139,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gk625krfm00nppb2ni0794kzr1cqbs1a0059fhp4s3lcrmx69jc"; + sha256 = "03j9qpqip89a0vk6s0gvhxzhbvafjcj5rss7i3jwha0831aivib3"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; } diff --git a/nixpkgs/pkgs/development/tools/database/litestream/default.nix b/nixpkgs/pkgs/development/tools/database/litestream/default.nix index 818709ae1e96..83b1fb0c9f71 100644 --- a/nixpkgs/pkgs/development/tools/database/litestream/default.nix +++ b/nixpkgs/pkgs/development/tools/database/litestream/default.nix @@ -4,13 +4,13 @@ }: buildGoModule rec { pname = "litestream"; - version = "0.3.11"; + version = "0.3.12"; src = fetchFromGitHub { owner = "benbjohnson"; repo = pname; rev = "v${version}"; - sha256 = "sha256-03gGGx8RZEK2RrToN30gkIlHss/e3UcSi3AmMh9twDU="; + sha256 = "sha256-uao8I3b38JZWpO5iM+qvV4CDxWg1ueYm7BoaW/+FOkA="; }; ldflags = [ diff --git a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 62aaf9973c8b..73bf606aa7aa 100644 --- a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.55.0"; + version = "1.55.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-77bhXeABkV6WZCzoGnRS447pEVcJyj4AF+wihJe62fc="; + hash = "sha256-r4tPFHvxXMgyGc5KTz0fM5nZ20OVSPQ6kKnTkeaefPI="; }; - vendorHash = "sha256-3aHLilu+AZ6376bn9eS8kmSfo6fXikOFJKDRCYu+4a0="; + vendorHash = "sha256-NfSO3JUrFJi1lwxhy+eubNNKuhgLTfDt2KLAnmOjdoA="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/nixpkgs/pkgs/development/tools/hcloud/default.nix b/nixpkgs/pkgs/development/tools/hcloud/default.nix index 39fc54b6ac40..f92a698f7356 100644 --- a/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.37.0"; + version = "1.38.3"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-6UQaO2ArAYd6Lr1maciC83k1GlR8FLx+acAZh6SjI3g="; + hash = "sha256-argcQvt4875TNOX5P5sOF41u6GcFq79gnH41To73foM="; }; - vendorHash = "sha256-mxAG3o3IY70xn8WymUzF96Q2XWwQ0efWrrw1VV4Y8HU="; + vendorHash = "sha256-RXojFeT80oroBSweyb0eYo+LC/JTi1F3LmQ10XpnEXA="; ldflags = [ "-s" @@ -32,11 +32,11 @@ buildGoModule rec { done ''; - meta = { + meta = with lib; { changelog = "https://github.com/hetznercloud/cli/releases/tag/v${version}"; description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; homepage = "https://github.com/hetznercloud/cli"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.zauberpony ]; + license = licenses.mit; + maintainers = with maintainers; [ zauberpony techknowlogick ]; }; } diff --git a/nixpkgs/pkgs/development/tools/hjson-go/default.nix b/nixpkgs/pkgs/development/tools/hjson-go/default.nix index 9237871599cb..00af9d409f81 100644 --- a/nixpkgs/pkgs/development/tools/hjson-go/default.nix +++ b/nixpkgs/pkgs/development/tools/hjson-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "hjson-go"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "hjson"; repo = pname; rev = "v${version}"; - hash = "sha256-WR6wLa/Za5MgcH1enHG/74uq/7PdaY/OzvJdgMgDFIk="; + hash = "sha256-ox6/PY7Nx282bUekLoXezWfKDiDzCBUZMa5/nu2qG40="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/development/tools/kind/default.nix b/nixpkgs/pkgs/development/tools/kind/default.nix index cae88d5416e7..63f6fff66b62 100644 --- a/nixpkgs/pkgs/development/tools/kind/default.nix +++ b/nixpkgs/pkgs/development/tools/kind/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { CGO_ENABLED = 0; GOFLAGS = [ "-trimpath" ]; - ldFlags = [ "-buildid=" "-w" ]; + ldflags = [ "-buildid=" "-w" ]; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix b/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix index df78ed497d2f..9bbd3d5ec804 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.0.1"; + version = "1.1.0"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-AamUE6mr9fwjbDndQtzO2Yscu2T6zUW/DiXMYwv35YE="; + outputHash = "sha256-9zigJM0xEJSYgohbjc9ZLBKbPa/WGVSv3KVFE3QUzWE="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; diff --git a/nixpkgs/pkgs/development/tools/misc/complgen/default.nix b/nixpkgs/pkgs/development/tools/misc/complgen/default.nix index f69b36fc4bc1..81cf9c120edd 100644 --- a/nixpkgs/pkgs/development/tools/misc/complgen/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/complgen/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "complgen"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; rev = "v${version}"; - hash = "sha256-zNYNwPPVlsvQiHy28rWB7OlnriJVktoFrDkJaIO9z8E="; + hash = "sha256-FetiopX4k58JQP67zTh0ssy1HFJHmi0Op9h9vjH1pLE="; }; - cargoHash = "sha256-BkflZ/d4TAZjjkQB5f0+rL4Zt7uWBLM3gM2UNKYZz+Q="; + cargoHash = "sha256-2EJuxoed+6LGpxxqkdFxbntilA2SihQScliUFYgjYmU="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; diff --git a/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index cfcd86f9dc2b..2145c9a249a0 100644 --- a/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , bzip2 @@ -21,6 +22,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-f9Nt303xXZzLSu3GtOEpyaL91WVFUmKO7mxi8UNX3go="; }; + patches = [ + # Backport upstream fix for gcc-13 support: + # https://github.com/nxp-imx/mfgtools/pull/360 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/nxp-imx/mfgtools/commit/24fd043225903247f71ac10666d820277c0b10b1.patch"; + hash = "sha256-P7n6+Tiz10GIQ7QOd/qQ3BI7Wo5/66b0EwjFSpOUSJg="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config installShellFiles ]; buildInputs = [ bzip2 libusb1 libzip openssl zstd ]; diff --git a/nixpkgs/pkgs/development/tools/oxlint/default.nix b/nixpkgs/pkgs/development/tools/oxlint/default.nix index 48534355f461..79afce5dd830 100644 --- a/nixpkgs/pkgs/development/tools/oxlint/default.nix +++ b/nixpkgs/pkgs/development/tools/oxlint/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.0.13"; + version = "0.0.14"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-2Ne0RqwAX0uHWJLAgDRTipSjjWl2Va71uo06IgI9f0Y="; + hash = "sha256-qvUVS/PjocMX57z27Xu6tlqz5bXpvlTuC9ZF+ndfkW8="; }; - cargoHash = "sha256-WI8EvFEz0lflt93YZbGORCLLop7k44yI9r2I1y+Gjkk="; + cargoHash = "sha256-KGs9cEDvLXO26oNv867jMzaQs5I9+8go00FFSH6qexY="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 836f0c848538..29b65870fe29 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -102,4 +102,5 @@ tree-sitter-yaml = lib.importJSON ./tree-sitter-yaml.json; tree-sitter-yang = lib.importJSON ./tree-sitter-yang.json; tree-sitter-zig = lib.importJSON ./tree-sitter-zig.json; + tree-sitter-wgsl = lib.importJSON ./tree-sitter-wgsl.json; } diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json new file mode 100644 index 000000000000..51c6f00b20a3 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/szebniok/tree-sitter-wgsl", + "rev": "40259f3c77ea856841a4e0c4c807705f3e4a2b65", + "date": "2023-01-09T17:32:53+01:00", + "path": "/nix/store/v97b952wz1x5np7cp5as603qzj2686yf-tree-sitter-wgsl", + "sha256": "0w15rhwafbjjmgbxj9fln9pca2w1wr7h5xwni9rniszlkxqf90my", + "hash": "sha256-voLkcJ/062hzipb3Ak/mgQvFbrLUJdnXq1IupzjMJXA=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix index fffab5ea3f5f..b2f301aee54a 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -383,6 +383,10 @@ let orga = "winglang"; repo = "wing"; }; + "tree-sitter-wgsl" = { + orga = "szebniok"; + repo = "tree-sitter-wgsl"; + }; }; allGrammars = diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix index 0147913cca63..f92cfd4d0c6d 100644 --- a/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "connectrpc"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-sKAocI2zT2jbw42Oe7lX8J1wLVBh7RfJe1hP8aXRCuM="; + hash = "sha256-SBPYRmnrwtE9zyPdHWVGgalrRn5TOeewo6fdAwsNQSk="; }; vendorHash = "sha256-3opkr4kUD3NQNbNYOdSWIDqKbArv9OQUkBMzae1ccVY="; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix index 6c085ad23fd1..0ef6f59b89c8 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.18.2"; + version = "0.18.3"; src = fetchCrate { inherit pname version; - hash = "sha256-mBY4M0phjwWS2qWTlVSjLpD0lzMDutMRMbAerbMSXmI="; + hash = "sha256-8KLH6aPZhHtxC4hbMaebv1JiVkZH8p5QqnUXkJrmr4w="; }; - cargoHash = "sha256-bBcyJxlb18Bf76GOR6anTNQYqRpYs3dkGVy9rC5au5k="; + cargoHash = "sha256-8MOZvhREm4ch2flstx7J25j8mvwV3uGez5f1xkZ+S7I="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix index ea860cc0896b..a635e8dbd8cb 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-z69uGnXyzV4spa3pNMwZrqOX1i0RYCgo8dwfZ86MBlA="; + hash = "sha256-OgC8s9xFKsm2Q2V3Y0jodp521IQixJxeCn27zT8Uv4U="; }; - cargoHash = "sha256-/eXdbHDVzM4hHRfP/gw+IXZVDuZcergGyotnvQEKEiw="; + cargoHash = "sha256-2Uh2H4HdmlHNLCsTQzbsgDkPnKRpMkopfTyLHIsUbKY="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix index 1f16cfe63136..6b02e7b812d5 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-W5p2lE6YTspuVqXXzwT0fcZF1cv2GxceXZ5kMgpHKTA="; + hash = "sha256-zXpV5BkZTcvrDNt0rj1IvIuCQuxJW3tDr3h0PaBMMcg="; }; - cargoHash = "sha256-8OgksGuzc23/pB2x+zsXDpfByvfvMraJW6/wo4E1ZOQ="; + cargoHash = "sha256-nUtE7Uk0Gf+zQBlbnBPWstMonnJYBJZKb+ML9doYOFo="; nativeBuildInputs = [ pkg-config @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; # requires the wasm32-wasi target diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix index 22466ca34bdc..075363057bc8 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-h3ga4H9gIS3H6krPqXyYHMIhlxFQPbEfZV8cpQWWhpw="; + hash = "sha256-Y4dCkyOAOQRnaHWMuPTpjgIqlnzYw+sQbTyxp1pO7oo="; }; - cargoHash = "sha256-RP4/bcKA+5tjBFkR6DGNUPLpi/1fZAsRZeLMRSg1aes="; + cargoHash = "sha256-Fuc5lToojwcRbcKrApQ8vxd8ZdjEJTDQULYfzV4K4GA="; nativeBuildInputs = [ pkg-config @@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ git - ] ++ lib.optionals stdenv.isDarwin [ rustup ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix index f2890b0cd63e..73eac19e5622 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flamegraph"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "flamegraph-rs"; repo = "flamegraph"; rev = "v${version}"; - sha256 = "sha256-npPE9dB7yxIfCxq3NGgI1J6OkDI7qfsusY/dD9w3bp4="; + sha256 = "sha256-yeNA6HkhWEUqarBDRbyD3RBIlBZZVrbAMng7d5beBB4="; }; - cargoSha256 = "sha256-m92PT89uTuJWlGAAL/wopHYv7vXaRd3woEW70S7kVUI="; + cargoSha256 = "sha256-IHOVaRfjopaSRY8HF8ATdNNLfhTVrIKvYsAuocqRdWI="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix index 94b64c8e6ce3..4de6345b9bf6 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.11"; + version = "0.6.13"; src = fetchCrate { inherit pname version; - hash = "sha256-lgrbqNK6CdrVo2u05CfVev+ZYa1BbhB4QVCGSMxAvO8="; + hash = "sha256-5WwbtubANrLHXvaWzO/u1NeeetVUvl/ujq89BqFZ2ZQ="; }; - cargoHash = "sha256-3tM84DHGEablj7B0SdX9LdjYh1tq5t5ORjkbp/iqUqg="; + cargoHash = "sha256-25I1j0QiyeHtUq6IK7ehRK3JLKygiigtfvEe+N74TgY="; # some necessary files are absent in the crate version doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix index 0dc2a708afe3..f911f5ee5873 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -1,19 +1,21 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.59"; + version = "0.9.61"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-32n1z5e40qkhHBAbwGhXa7L5NfkkN72AIKF796y82+g="; + hash = "sha256-kVADlW5XqKAuQ2n0lmEin67CXGkhTVWgJaPMKpvS5Gs="; }; - cargoHash = "sha256-sme7VE5JnjIWONaFYIOnv72UjUC/S+VezNSmRunmDv0="; + cargoHash = "sha256-IU2oW00VzEV8p3BpqIJZwXvdcaeweAF9nGHwtX+98vY="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; cargoBuildFlags = [ "-p" "cargo-nextest" ]; cargoTestFlags = [ "-p" "cargo-nextest" ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 3bf3add13e16..00976e8b015d 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-K6csc/jJ0iDegK9ZSOy1aNb0GSxSXHMSOVUtFEYUBhc="; + hash = "sha256-RElxCmffF1PKSgg9ATI7zY/lqD+vUaW/rnKtk7VEa+c="; }; - cargoHash = "sha256-9tWzJ64UlMHQ61SRbEXACNDA+4hTPjQTBzSjEO+0rik="; + cargoHash = "sha256-ozd8bjsVCmUunFLXb/bdeMQZ1VjNPLnccO1fxp0N3m4="; nativeBuildInputs = [ cmake diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock index 3373eb3e9dc6..265e0a32f2c0 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock @@ -4,20 +4,11 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli 0.27.3", -] - -[[package]] -name = "addr2line" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli 0.28.0", + "gimli", ] [[package]] @@ -40,9 +31,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -76,30 +67,29 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -115,9 +105,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -130,6 +120,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] +name = "arbitrary" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2e1373abdaa212b704512ec2bd8b26bd0b7d5c3f70117411a5d9a451383c859" + +[[package]] name = "arc-swap" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -267,14 +263,14 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "async-stripe" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dd8d77f5bfefa28601194c7233e7c3dc6a9833dae6c990804a2d90a95d6354" +checksum = "e1b39347f478f57a40cbaf82cbaebb4a350acc757cda30fc7ff88707a11d1d81" dependencies = [ "futures-util", "http-types", @@ -292,13 +288,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -338,7 +334,7 @@ dependencies = [ "hex", "http", "hyper", - "ring", + "ring 0.16.20", "time", "tokio", "tower", @@ -499,7 +495,7 @@ dependencies = [ "once_cell", "percent-encoding", "regex", - "sha2 0.10.7", + "sha2 0.10.8", "time", "tracing", ] @@ -772,12 +768,12 @@ version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ - "addr2line 0.21.0", + "addr2line", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.32.1", + "object", "rustc-demangle", ] @@ -856,9 +852,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" dependencies = [ "serde", ] @@ -910,9 +906,9 @@ dependencies = [ [[package]] name = "bollard" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af254ed2da4936ef73309e9597180558821cb16ae9bba4cb24ce6b612d8d80ed" +checksum = "f03db470b3c0213c47e978da93200259a1eb4dae2e5512cba9955e2b540a6fc6" dependencies = [ "base64 0.21.4", "bollard-stubs", @@ -939,12 +935,13 @@ dependencies = [ [[package]] name = "bollard-stubs" -version = "1.42.0-rc.7" +version = "1.43.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602bda35f33aeb571cef387dcd4042c643a8bf689d8aaac2cc47ea24cb7bc7e0" +checksum = "b58071e8fd9ec1e930efd28e3a90c1251015872a2ce49f81f36421b86466932e" dependencies = [ "serde", - "serde_with 2.3.3", + "serde_repr", + "serde_with 3.3.0", ] [[package]] @@ -970,12 +967,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", - "regex-automata 0.3.8", + "regex-automata 0.4.3", "serde", ] @@ -996,9 +993,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -1033,38 +1030,50 @@ dependencies = [ [[package]] name = "cap-fs-ext" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc48200a1a0fa6fba138b1802ad7def18ec1cdd92f7b2a04e21f1bd887f7b9" +checksum = "b779b2d0a001c125b4584ad586268fb4b92d957bff8d26d7fe0dd78283faa814" dependencies = [ "cap-primitives", "cap-std", - "io-lifetimes 1.0.11", + "io-lifetimes", "windows-sys 0.48.0", ] [[package]] +name = "cap-net-ext" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ffc30dee200c20b4dcb80572226f42658e1d9c4b668656d7cc59c33d50e396e" +dependencies = [ + "cap-primitives", + "cap-std", + "rustix", + "smallvec", +] + +[[package]] name = "cap-primitives" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b6df5b295dca8d56f35560be8c391d59f0420f72e546997154e24e765e6451" +checksum = "2bf30c373a3bee22c292b1b6a7a26736a38376840f1af3d2d806455edf8c3899" dependencies = [ "ambient-authority", - "fs-set-times 0.19.2", + "fs-set-times", "io-extras", - "io-lifetimes 1.0.11", + "io-lifetimes", "ipnet", "maybe-owned", - "rustix 0.37.23", + "rustix", "windows-sys 0.48.0", - "winx 0.35.1", + "winx", ] [[package]] name = "cap-rand" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25555efacb0b5244cf1d35833d55d21abc916fff0eaad254b8e2453ea9b8ab" +checksum = "577de6cff7c2a47d6b13efe5dd28bf116bd7f8f7db164ea95b7cc2640711f522" dependencies = [ "ambient-authority", "rand 0.8.5", @@ -1072,26 +1081,26 @@ dependencies = [ [[package]] name = "cap-std" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3373a62accd150b4fcba056d4c5f3b552127f0ec86d3c8c102d60b978174a012" +checksum = "84bade423fa6403efeebeafe568fdb230e8c590a275fba2ba978dd112efcf6e9" dependencies = [ "cap-primitives", "io-extras", - "io-lifetimes 1.0.11", - "rustix 0.37.23", + "io-lifetimes", + "rustix", ] [[package]] name = "cap-time-ext" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e95002993b7baee6b66c8950470e59e5226a23b3af39fc59c47fe416dd39821a" +checksum = "f8f52b3c8f4abfe3252fd0a071f3004aaa3b18936ec97bdbd8763ce03aff6247" dependencies = [ "cap-primitives", "once_cell", - "rustix 0.37.23", - "winx 0.35.1", + "rustix", + "winx", ] [[package]] @@ -1100,7 +1109,7 @@ version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" dependencies = [ - "semver 1.0.19", + "semver 1.0.20", "serde", "toml 0.7.8", "url", @@ -1108,16 +1117,16 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" dependencies = [ "serde", ] [[package]] name = "cargo-shuttle" -version = "0.29.1" +version = "0.30.1" dependencies = [ "anyhow", "assert_cmd", @@ -1150,7 +1159,7 @@ dependencies = [ "reqwest-retry", "rexpect", "rmp-serde", - "semver 1.0.19", + "semver 1.0.20", "serde", "serde_json", "shuttle-common", @@ -1182,7 +1191,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.19", + "semver 1.0.20", "serde", "serde_json", "thiserror", @@ -1206,9 +1215,9 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfg-expr" -version = "0.15.2" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -1241,20 +1250,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.24" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb690e81c7840c0d7aade59f242ea3b41b9bc27bcd5997890e7702ae4b32e487" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.24" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ed2e96bc16d8d740f6f48d663eddf4b8a0983e79210fd55479b7bcd0a69860e" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -1264,23 +1272,23 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.1" +version = "4.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" +checksum = "e3ae8ba90b9d8b007efe66e55e48fb936272f5ca00349b5b0e89877520d35ea7" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -1390,7 +1398,7 @@ dependencies = [ "hmac 0.12.1", "percent-encoding", "rand 0.8.5", - "sha2 0.10.7", + "sha2 0.10.8", "subtle", "time", "version_check", @@ -1443,27 +1451,28 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0853f4732d9557cc1f3b4a97112bd5f00a7c619c9828edb45d0a2389ce2913f9" +checksum = "03b9d1a9e776c27ad55d7792a380785d1fe8c2d7b099eed8dbd8f4af2b598192" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed06a9dd2e065be7c1f89cdc820c8c328d2cb69b2be0ba6338fe4050b30bf510" +checksum = "5528483314c2dd5da438576cd8a9d0b3cedad66fb8a4727f90cd319a81950038" dependencies = [ "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", + "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli 0.27.3", - "hashbrown 0.13.2", + "gimli", + "hashbrown 0.14.1", "log", "regalloc2", "smallvec", @@ -1472,33 +1481,43 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416f0e0e34689be78c2689b31374404d21f1c7667431fd7cd29bed0fa8a67ce8" +checksum = "0f46a8318163f7682e35b8730ba93c1b586a2da8ce12a0ed545efc1218550f70" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05c0a89f82c5731ccad8795cd91cc3c771295aa42c268c7f81607388495d374" +checksum = "37d1239cfd50eecfaed468d46943f8650e32969591868ad50111613704da6c70" + +[[package]] +name = "cranelift-control" +version = "0.100.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc530560c8f16cc1d4dd7ea000c56f519c60d1a914977abe849ce555c35a61d" +dependencies = [ + "arbitrary", +] [[package]] name = "cranelift-entity" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f184fc14ff49b119760e5f96d1c836d89ee0f5d1b94073ebe88f45b745a9c7a5" +checksum = "f333fa641a9ad2bff0b107767dcb972c18c2bfab7969805a1d7e42449ccb0408" dependencies = [ "serde", + "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1990b107c505d3bb0e9fe7ee9a4180912c924c12da1ebed68230393789387858" +checksum = "06abf6563015a80f03f8bc4df307d0a81363f4eb73108df3a34f6e66fb6d5307" dependencies = [ "cranelift-codegen", "log", @@ -1508,15 +1527,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47d398114545d4de2b152c28b1428c840e55764a6b58eea2a0e5c661d9a382a" +checksum = "0eb29d0edc8a5c029ed0f7ca77501f272738e3c410020b4a00f42ffe8ad2a8aa" [[package]] name = "cranelift-native" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c769285ed99f5791ca04d9716b3ca3508ec4e7b959759409fddf51ad0481f51" +checksum = "006056a7fa920870bad06bf8e1b3033d70cbb7ee625b035efa9d90882a931868" dependencies = [ "cranelift-codegen", "libc", @@ -1525,9 +1544,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cbcdec1d7b678919910d213b9e98d5d4c65eeb2153ac042535b00931f093d3" +checksum = "7b3d08c05f82903a1f6a04d89c4b9ecb47a4035710f89a39a21a147a80214672" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1535,7 +1554,7 @@ dependencies = [ "itertools 0.10.5", "log", "smallvec", - "wasmparser", + "wasmparser 0.112.0", "wasmtime-types", ] @@ -1638,7 +1657,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "crossterm_winapi", "libc", "mio", @@ -1739,10 +1758,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.0", + "hashbrown 0.14.1", "lock_api", "once_cell", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -1752,6 +1771,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "uuid", +] + +[[package]] name = "der" version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1778,10 +1806,11 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ + "powerfmt", "serde", ] @@ -1926,7 +1955,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -1985,27 +2014,14 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", + "syn 2.0.38", ] [[package]] @@ -2016,26 +2032,15 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys 0.48.0", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] name = "etcetera" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2054,9 +2059,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "faster-hex" @@ -2078,9 +2083,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fd-lock" @@ -2089,21 +2094,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b0377f1edc77dbd1118507bc7a66e4ab64d2b90c66f90726dc801e73a8c68f9" dependencies = [ "cfg-if 1.0.0", - "rustix 0.38.13", + "rustix", "windows-sys 0.48.0", ] [[package]] -name = "file-per-thread-logger" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" -dependencies = [ - "env_logger", - "log", -] - -[[package]] name = "filetime" version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2129,9 +2124,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -2139,13 +2134,12 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", - "pin-project", "spin 0.9.8", ] @@ -2172,23 +2166,12 @@ checksum = "3b5dd19b048b2dfde153588594b4f3da47b18afd18d171bb8d1d27741256bbaa" [[package]] name = "fs-set-times" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "857cf27edcb26c2a36d84b2954019573d335bb289876113aceacacdca47a4fd4" -dependencies = [ - "io-lifetimes 1.0.11", - "rustix 0.36.15", - "windows-sys 0.45.0", -] - -[[package]] -name = "fs-set-times" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d167b646a876ba8fda6b50ac645cfd96242553cbaf0ca4fccaa39afcbf0801f" +checksum = "dd738b84894214045e8414eaded76359b4a5773f0a0a56b16575110739cdcf39" dependencies = [ - "io-lifetimes 1.0.11", - "rustix 0.38.13", + "io-lifetimes", + "rustix", "windows-sys 0.48.0", ] @@ -2280,7 +2263,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -2332,6 +2315,19 @@ dependencies = [ ] [[package]] +name = "fxprof-processed-profile" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" +dependencies = [ + "bitflags 2.4.1", + "debugid", + "fxhash", + "serde", + "serde_json", +] + +[[package]] name = "generic-array" version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2367,22 +2363,16 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" dependencies = [ "fallible-iterator", - "indexmap 1.9.3", + "indexmap 2.0.2", "stable_deref_trait", ] [[package]] -name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[package]] name = "git2" version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2501,9 +2491,9 @@ dependencies = [ [[package]] name = "gix-command" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f28f654184b5f725c5737c7e4f466cbd8f0102ac352d5257eeab19647ee4256" +checksum = "3c576cfbf577f72c097b5f88aedea502cd62952bdc1fb3adcab4531d5525a4c7" dependencies = [ "bstr", ] @@ -2549,7 +2539,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bstr", "gix-path", "libc", @@ -2664,7 +2654,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d76e85f11251dcf751d2c5e918a14f562db5be6f727fd24775245653e9b19d" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bstr", "gix-features", "gix-path", @@ -2672,9 +2662,9 @@ dependencies = [ [[package]] name = "gix-hash" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ccf425543779cddaa4a7c62aba3fa9d90ea135b160be0a72dd93c063121ad4a" +checksum = "1884c7b41ea0875217c1be9ce91322f90bde433e91d374d0e1276073a51ccc60" dependencies = [ "faster-hex", "thiserror", @@ -2687,7 +2677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16" dependencies = [ "gix-hash", - "hashbrown 0.14.0", + "hashbrown 0.14.1", "parking_lot 0.12.1", ] @@ -2709,7 +2699,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f54d63a9d13c13088f41f5a3accbec284e492ac8f4f707fcc307c139622e17b7" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bstr", "btoi", "filetime", @@ -2745,7 +2735,7 @@ checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -2754,7 +2744,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f1697bf9911c6d1b8d709b9e6ef718cb5ea5821a1b7991520125a8134448004" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "gix-commitgraph", "gix-date", "gix-hash", @@ -2824,9 +2814,9 @@ dependencies = [ [[package]] name = "gix-packetline" -version = "0.16.6" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6df0b75361353e7c0a6d72d49617a37379a7a22cba4569ae33a7720a4c8755a" +checksum = "8a8384b1e964151aff0d5632dd9b191059d07dff358b96bd940f1b452600d7ab" dependencies = [ "bstr", "faster-hex", @@ -2863,7 +2853,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3e26c9b47c51be73f98d38c84494bd5fb99334c5d6fda14ef5d036d50a9e5fd" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bstr", "gix-attributes", "gix-config-value", @@ -2881,7 +2871,7 @@ dependencies = [ "gix-command", "gix-config-value", "parking_lot 0.12.1", - "rustix 0.38.13", + "rustix", "thiserror", ] @@ -2986,7 +2976,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "gix-path", "libc", "windows", @@ -3081,7 +3071,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b85d89dc728613e26e0ed952a19583744e7f5240fcd4aa30d6c824ffd8b52f0f" dependencies = [ - "fastrand 2.0.0", + "fastrand 2.0.1", ] [[package]] @@ -3193,9 +3183,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" dependencies = [ "ahash", "allocator-api2", @@ -3207,7 +3197,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] @@ -3245,9 +3235,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -3375,12 +3365,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] name = "hyper" version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3473,16 +3457,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -3557,20 +3541,20 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", "serde", ] [[package]] name = "indicatif" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -3581,9 +3565,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "infer" @@ -3612,7 +3596,7 @@ dependencies = [ "base64 0.21.4", "hyper", "hyper-rustls 0.24.1", - "ring", + "ring 0.16.20", "serde", "serde_json", "thiserror", @@ -3630,22 +3614,11 @@ dependencies = [ [[package]] name = "io-extras" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde93d48f0d9277f977a333eca8313695ddd5301dc96f7e02aeddcb0dd99096f" -dependencies = [ - "io-lifetimes 1.0.11", - "windows-sys 0.48.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "9d3c230ee517ee76b1cc593b52939ff68deda3fae9e41eca426c6b4993df51c4" dependencies = [ - "hermit-abi", - "libc", + "io-lifetimes", "windows-sys 0.48.0", ] @@ -3680,7 +3653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.13", + "rustix", "windows-sys 0.48.0", ] @@ -3710,9 +3683,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "ittapi" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e0d0b7b3b53d92a7e8b80ede3400112a6b8b4c98d1f5b8b16bb787c780582c" +checksum = "25a5c0b993601cad796222ea076565c5d9f337d35592f8622c753724f06d7271" dependencies = [ "anyhow", "ittapi-sys", @@ -3721,9 +3694,9 @@ dependencies = [ [[package]] name = "ittapi-sys" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f8763c96e54e6d6a0dccc2990d8b5e33e3313aaeae6185921a3f4c1614a77c" +checksum = "cb7b5e473765060536a660eed127f758cf1a810c73e49063264959c60d1727d9" dependencies = [ "cc", ] @@ -3752,9 +3725,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -3776,7 +3749,7 @@ checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ "base64 0.21.4", "pem", - "ring", + "ring 0.16.20", "serde", "serde_json", "simple_asn1", @@ -3799,9 +3772,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libgit2-sys" @@ -3817,9 +3790,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libsqlite3-sys" @@ -3852,27 +3825,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -3934,9 +3895,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matchit" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "maybe-async" @@ -3957,26 +3918,27 @@ checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if 1.0.0", "digest 0.10.7", ] [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memfd" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.37.23", + "rustix", ] [[package]] @@ -3999,15 +3961,6 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" @@ -4060,9 +4013,9 @@ dependencies = [ [[package]] name = "mongodb" -version = "2.6.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16928502631c0db72214720aa479c722397fe5aed6bf1c740a3830b3fe4bfcfe" +checksum = "e22d517e7e678e1c9a2983ec704b43f3b22f38b1b7a247ea3ddb36d21578bf4e" dependencies = [ "async-trait", "base64 0.13.1", @@ -4083,26 +4036,26 @@ dependencies = [ "percent-encoding", "rand 0.8.5", "rustc_version_runtime", - "rustls 0.20.9", + "rustls 0.21.7", "rustls-pemfile", "serde", "serde_bytes", "serde_with 1.14.0", "sha-1", - "sha2 0.10.7", + "sha2 0.10.8", "socket2 0.4.9", "stringprep", "strsim", "take_mut", "thiserror", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls 0.24.1", "tokio-util", "trust-dns-proto 0.21.2", "trust-dns-resolver 0.21.2", "typed-builder", "uuid", - "webpki-roots 0.22.6", + "webpki-roots 0.25.2", ] [[package]] @@ -4215,9 +4168,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -4259,22 +4212,13 @@ dependencies = [ [[package]] name = "object" -version = "0.30.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" -dependencies = [ - "crc32fast", - "hashbrown 0.13.2", - "indexmap 1.9.3", - "memchr", -] - -[[package]] -name = "object" version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ + "crc32fast", + "hashbrown 0.14.1", + "indexmap 2.0.2", "memchr", ] @@ -4426,9 +4370,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -4448,7 +4392,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -4467,13 +4411,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -4524,7 +4468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.0.2", ] [[package]] @@ -4544,7 +4488,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -4611,6 +4555,12 @@ dependencies = [ ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4618,13 +4568,13 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", - "itertools 0.10.5", + "itertools 0.11.0", "predicates-core", ] @@ -4690,9 +4640,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -4705,19 +4655,19 @@ checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf" [[package]] name = "proptest" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" +checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" dependencies = [ "bit-set", - "bitflags 1.3.2", - "byteorder", + "bit-vec", + "bitflags 2.4.1", "lazy_static", "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.6.29", + "regex-syntax 0.7.5", "rusty-fork", "tempfile", "unarray", @@ -4788,9 +4738,9 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.8.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" +checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" dependencies = [ "bitflags 1.3.2", "memchr", @@ -4912,9 +4862,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -4922,14 +4872,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -4939,7 +4887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", + "ring 0.16.20", "time", "yasna", ] @@ -4963,6 +4911,15 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] name = "redox_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4975,26 +4932,27 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.6.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621" +checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ - "fxhash", + "hashbrown 0.13.2", "log", + "rustc-hash", "slice-group-by", "smallvec", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.8", - "regex-syntax 0.7.5", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -5008,13 +4966,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -5030,10 +4988,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64 0.21.4", "bytes", @@ -5058,10 +5022,11 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-rustls 0.24.1", "tower-service", - "trust-dns-resolver 0.22.0", + "trust-dns-resolver 0.23.1", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -5120,9 +5085,9 @@ dependencies = [ [[package]] name = "retry-policies" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a715dc4d0e8aea3085a9a94d76e79c79c7df7c9f6be609da841a6d2489ca3687" +checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd" dependencies = [ "anyhow", "chrono", @@ -5152,12 +5117,26 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] [[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + +[[package]] name = "rmp" version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5222,7 +5201,7 @@ dependencies = [ "quote", "rust-embed-utils", "shellexpand", - "syn 2.0.33", + "syn 2.0.38", "walkdir", ] @@ -5232,7 +5211,7 @@ version = "7.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" dependencies = [ - "sha2 0.10.7", + "sha2 0.10.8", "walkdir", ] @@ -5263,7 +5242,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.19", + "semver 1.0.20", ] [[package]] @@ -5287,55 +5266,27 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.15" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "errno", - "io-lifetimes 1.0.11", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes 1.0.11", "itoa", "libc", - "linux-raw-sys 0.3.8", + "linux-raw-sys", "once_cell", "windows-sys 0.48.0", ] [[package]] -name = "rustix" -version = "0.38.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys 0.4.7", - "windows-sys 0.48.0", -] - -[[package]] name = "rustls" version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] @@ -5347,8 +5298,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", - "rustls-webpki 0.101.5", + "ring 0.16.20", + "rustls-webpki", "sct", ] @@ -5375,29 +5326,19 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.100.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.5" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "rustrict" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368755f1833925b12b50b2d5ca0b10571e84397a1ef180dc5b3d870741fd4dd6" +checksum = "1f35794fdc3d71a3ac840726c688e7892e58ed71f407b48a975b9d41fc819e80" dependencies = [ "arrayvec 0.7.4", "bitflags 1.3.2", @@ -5464,8 +5405,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -5502,9 +5443,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] @@ -5517,9 +5458,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] @@ -5535,13 +5476,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -5550,7 +5491,7 @@ version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -5596,7 +5537,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -5632,14 +5573,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.3" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ - "base64 0.13.1", + "base64 0.21.4", "chrono", "hex", "indexmap 1.9.3", + "indexmap 2.0.2", "serde", "serde_json", "time", @@ -5670,9 +5612,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -5700,9 +5642,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -5711,9 +5653,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -5735,7 +5677,7 @@ dependencies = [ [[package]] name = "shuttle-admin" -version = "0.29.0" +version = "0.30.1" dependencies = [ "anyhow", "clap", @@ -5752,7 +5694,7 @@ dependencies = [ [[package]] name = "shuttle-auth" -version = "0.29.0" +version = "0.30.1" dependencies = [ "anyhow", "async-stripe", @@ -5767,7 +5709,7 @@ dependencies = [ "opentelemetry", "portpicker", "rand 0.8.5", - "ring", + "ring 0.16.20", "serde", "serde_json", "shuttle-common", @@ -5783,7 +5725,7 @@ dependencies = [ [[package]] name = "shuttle-builder" -version = "0.29.0" +version = "0.30.1" dependencies = [ "async-trait", "clap", @@ -5809,7 +5751,7 @@ dependencies = [ [[package]] name = "shuttle-codegen" -version = "0.29.0" +version = "0.30.1" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -5819,14 +5761,14 @@ dependencies = [ "serde", "serde_json", "shuttle-common-tests", - "syn 2.0.33", + "syn 2.0.38", "tokio", "trybuild", ] [[package]] name = "shuttle-common" -version = "0.29.0" +version = "0.30.1" dependencies = [ "anyhow", "async-trait", @@ -5851,10 +5793,10 @@ dependencies = [ "proptest", "rand 0.8.5", "reqwest", - "ring", + "ring 0.16.20", "rmp-serde", "rustrict", - "semver 1.0.19", + "semver 1.0.20", "serde", "serde_json", "sqlx", @@ -5875,7 +5817,7 @@ dependencies = [ [[package]] name = "shuttle-common-tests" -version = "0.29.0" +version = "0.30.1" dependencies = [ "cargo-shuttle", "hyper", @@ -5891,7 +5833,7 @@ dependencies = [ [[package]] name = "shuttle-deployer" -version = "0.29.0" +version = "0.30.1" dependencies = [ "anyhow", "async-trait", @@ -5945,7 +5887,7 @@ dependencies = [ [[package]] name = "shuttle-gateway" -version = "0.29.0" +version = "0.30.1" dependencies = [ "anyhow", "async-trait", @@ -5973,7 +5915,7 @@ dependencies = [ "rand 0.8.5", "rcgen", "reqwest", - "ring", + "ring 0.16.20", "rustls 0.20.9", "rustls-pemfile", "serde", @@ -6003,7 +5945,7 @@ dependencies = [ [[package]] name = "shuttle-logger" -version = "0.29.0" +version = "0.30.1" dependencies = [ "async-trait", "chrono", @@ -6029,11 +5971,11 @@ dependencies = [ [[package]] name = "shuttle-orchestrator" -version = "0.29.0" +version = "0.30.1" [[package]] name = "shuttle-proto" -version = "0.29.0" +version = "0.30.1" dependencies = [ "anyhow", "chrono", @@ -6052,7 +5994,7 @@ dependencies = [ [[package]] name = "shuttle-provisioner" -version = "0.29.0" +version = "0.30.1" dependencies = [ "aws-config", "aws-sdk-rds", @@ -6078,7 +6020,7 @@ dependencies = [ [[package]] name = "shuttle-resource-recorder" -version = "0.29.0" +version = "0.30.1" dependencies = [ "async-trait", "chrono", @@ -6102,7 +6044,7 @@ dependencies = [ [[package]] name = "shuttle-runtime" -version = "0.29.0" +version = "0.30.1" dependencies = [ "anyhow", "async-trait", @@ -6136,7 +6078,7 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.29.0" +version = "0.30.1" dependencies = [ "anyhow", "async-trait", @@ -6221,9 +6163,9 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smart-default" @@ -6301,6 +6243,12 @@ dependencies = [ ] [[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + +[[package]] name = "sqlformat" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6313,9 +6261,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" dependencies = [ "sqlx-core", "sqlx-macros", @@ -6326,9 +6274,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" dependencies = [ "ahash", "atoi", @@ -6347,7 +6295,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.0.0", + "indexmap 2.0.2", "log", "memchr", "once_cell", @@ -6357,7 +6305,7 @@ dependencies = [ "rustls-pemfile", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlformat", "thiserror", @@ -6371,9 +6319,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" dependencies = [ "proc-macro2", "quote", @@ -6384,9 +6332,9 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" dependencies = [ "dotenvy", "either", @@ -6397,7 +6345,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sqlx-core", "sqlx-mysql", "sqlx-postgres", @@ -6410,13 +6358,13 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" dependencies = [ "atoi", "base64 0.21.4", - "bitflags 2.4.0", + "bitflags 2.4.1", "byteorder", "bytes", "chrono", @@ -6442,7 +6390,7 @@ dependencies = [ "rsa", "serde", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", @@ -6454,13 +6402,13 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" dependencies = [ "atoi", "base64 0.21.4", - "bitflags 2.4.0", + "bitflags 2.4.1", "byteorder", "chrono", "crc", @@ -6483,7 +6431,7 @@ dependencies = [ "serde", "serde_json", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", @@ -6495,9 +6443,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" dependencies = [ "atoi", "chrono", @@ -6587,9 +6535,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.33" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -6615,19 +6563,40 @@ dependencies = [ ] [[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "system-interface" -version = "0.25.9" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10081a99cbecbc363d381b9503563785f0b02735fccbb0d4c1a2cb3d39f7e7fe" +checksum = "27ce32341b2c0b70c144bbf35627fdc1ef18c76ced5e5e7b3ee8b5ba6b2ab6a0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cap-fs-ext", "cap-std", "fd-lock", - "io-lifetimes 2.0.2", - "rustix 0.38.13", + "io-lifetimes", + "rustix", "windows-sys 0.48.0", - "winx 0.36.2", + "winx", ] [[package]] @@ -6686,17 +6655,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.0", + "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix 0.38.13", + "rustix", "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -6730,22 +6699,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -6760,14 +6729,15 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", "libc", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -6775,15 +6745,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -6805,9 +6775,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -6840,7 +6810,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -6890,9 +6860,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", @@ -6900,14 +6870,14 @@ dependencies = [ "tokio", "tokio-rustls 0.24.1", "tungstenite", - "webpki-roots 0.23.1", + "webpki-roots 0.25.2", ] [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -6971,7 +6941,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -7086,7 +7056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "base64 0.21.4", - "bitflags 2.4.0", + "bitflags 2.4.1", "bytes", "futures-core", "futures-util", @@ -7126,11 +7096,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if 1.0.0", "log", "pin-project-lite", "tracing-attributes", @@ -7139,20 +7108,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -7249,20 +7218,20 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +checksum = "559ac980345f7f5020883dd3bcacf176355225e01916f8c2efecad7534f682c6" dependencies = [ "async-trait", "cfg-if 1.0.0", "data-encoding", - "enum-as-inner 0.5.1", + "enum-as-inner 0.6.0", "futures-channel", "futures-io", "futures-util", - "idna 0.2.3", + "idna 0.4.0", "ipnet", - "lazy_static", + "once_cell", "rand 0.8.5", "smallvec", "thiserror", @@ -7294,22 +7263,23 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" +checksum = "c723b0e608b24ad04c73b2607e0241b2c98fd79795a95e98b068b6966138a29d" dependencies = [ "cfg-if 1.0.0", "futures-util", "ipconfig", - "lazy_static", "lru-cache", + "once_cell", "parking_lot 0.12.1", + "rand 0.8.5", "resolv-conf", "smallvec", "thiserror", "tokio", "tracing", - "trust-dns-proto 0.22.0", + "trust-dns-proto 0.23.1", ] [[package]] @@ -7320,9 +7290,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "trybuild" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5c89fd17b7536f2cf66c97cff6e811e89e728ca0ed13caeed610c779360d8b4" +checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1" dependencies = [ "basic-toml", "glob", @@ -7344,9 +7314,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", "bytes", @@ -7439,9 +7409,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -7462,6 +7432,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] name = "url" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7506,7 +7482,7 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d82b1bc5417102a73e8464c686eef947bdfb99fcdfc0a4f228e81afa9526470a" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_json", "utoipa-gen", @@ -7521,7 +7497,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", "uuid", ] @@ -7543,9 +7519,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom 0.2.10", "serde", @@ -7592,9 +7568,9 @@ checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -7623,9 +7599,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasi-cap-std-sync" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ef833092c0215e44f601591593cb3bf0853d5cd1e3104d698808dc525f2852" +checksum = "ec076cd75f207327f5bfaebb915ef03d82c3a01a6d9b5d0deb6eafffceab3095" dependencies = [ "anyhow", "async-trait", @@ -7633,36 +7609,36 @@ dependencies = [ "cap-rand", "cap-std", "cap-time-ext", - "fs-set-times 0.18.1", + "fs-set-times", "io-extras", - "io-lifetimes 1.0.11", + "io-lifetimes", "is-terminal", "once_cell", - "rustix 0.36.15", + "rustix", "system-interface", "tracing", "wasi-common", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "wasi-common" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474a216b3461220699d5e192ceac8fbc5b489af020760803b5a9d1e030dc8b0f" +checksum = "3f391b334c783c1154369be62c31dc8598ffa1a6c34ea05d7f8cf0b18ce7c272" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags 2.4.1", "cap-rand", "cap-std", "io-extras", "log", - "rustix 0.36.15", + "rustix", "thiserror", "tracing", "wasmtime", "wiggle", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -7686,7 +7662,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -7720,7 +7696,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7741,6 +7717,15 @@ dependencies = [ ] [[package]] +name = "wasm-encoder" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca90ba1b5b0a70d3d49473c5579951f3bddc78d47b59256d2f9d4922b150aca" +dependencies = [ + "leb128", +] + +[[package]] name = "wasm-timer" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7757,85 +7742,113 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.100.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" +checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" dependencies = [ - "indexmap 1.9.3", - "url", + "indexmap 2.0.2", + "semver 1.0.20", +] + +[[package]] +name = "wasmparser" +version = "0.115.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e06c0641a4add879ba71ccb3a1e4278fd546f76f1eafb21d8f7b07733b547cd5" +dependencies = [ + "indexmap 2.0.2", + "semver 1.0.20", +] + +[[package]] +name = "wasmprinter" +version = "0.2.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e74458a9bc5cc9c7108abfa0fe4dc88d5abf1f3baf194df3264985f17d559b5e" +dependencies = [ + "anyhow", + "wasmparser 0.115.0", ] [[package]] name = "wasmtime" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15ac4b4bee3bcf3750911c7104cf50f12c6b1055cc491254c508294b019fd79" +checksum = "16ed7db409c1acf60d33128b2a38bee25aaf38c4bd955ab98a5b623c8294593c" dependencies = [ "anyhow", "async-trait", "bincode", + "bumpalo", "cfg-if 1.0.0", - "indexmap 1.9.3", + "encoding_rs", + "fxprof-processed-profile", + "indexmap 2.0.2", "libc", "log", - "object 0.30.4", + "object", "once_cell", "paste", "psm", "rayon", "serde", + "serde_derive", + "serde_json", "target-lexicon", - "wasmparser", + "wasm-encoder 0.32.0", + "wasmparser 0.112.0", "wasmtime-cache", "wasmtime-component-macro", + "wasmtime-component-util", "wasmtime-cranelift", "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit", "wasmtime-runtime", + "wasmtime-winch", "wat", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-asm-macros" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06f9859a704f6b807a3e2e3466ab727f3f748134a96712d0d27c48ba32b32992" +checksum = "53af0f8f6271bd687fe5632c8fe0a0f061d0aa1b99a0cd4e1df8e4cbeb809d2f" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "wasmtime-cache" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66f6967ff6d89a4aa0abe11a145c7a2538f10d9dca6a0718dba6470166c8182" +checksum = "41376a7c094335ee08abe6a4eff79a32510cc805a249eff1b5e7adf0a42e7cdf" dependencies = [ "anyhow", "base64 0.21.4", "bincode", "directories-next", - "file-per-thread-logger", "log", - "rustix 0.36.15", + "rustix", "serde", - "sha2 0.10.7", + "serde_derive", + "sha2 0.10.8", "toml 0.5.11", - "windows-sys 0.45.0", + "windows-sys 0.48.0", "zstd", ] [[package]] name = "wasmtime-component-macro" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f851a08ee7b76f74a51d1fd1ce22b139a40beb1792b4f903279c46b568eb1ec" +checksum = "74ab5b291f2dad56f1e6929cc61fb7cac68845766ca77c3838b5d05d82c33976" dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -7843,173 +7856,262 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc0e0e733a8d097a137e05d5e7f62376600d32bd89bdc22c002d1826ae5af2e" +checksum = "21436177bf19f6b60dc0b83ad5872e849892a4a90c3572785e1a28c0e2e1132c" [[package]] name = "wasmtime-cranelift" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ce3bc589c19cd055cc5210daaf77288563010f45cce40c58b57182b9b5bdd" +checksum = "920e42058862d1f7a3dd3fca73cb495a20d7506e3ada4bbc0a9780cd636da7ca" dependencies = [ "anyhow", + "cfg-if 1.0.0", "cranelift-codegen", + "cranelift-control", "cranelift-entity", "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.27.3", + "gimli", "log", - "object 0.30.4", + "object", "target-lexicon", "thiserror", - "wasmparser", + "wasmparser 0.112.0", + "wasmtime-cranelift-shared", + "wasmtime-environ", + "wasmtime-versioned-export-macros", +] + +[[package]] +name = "wasmtime-cranelift-shared" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516d63bbe18219e64a9705cf3a2c865afe1fb711454ea03091dc85a1d708194d" +dependencies = [ + "anyhow", + "cranelift-codegen", + "cranelift-control", + "cranelift-native", + "gimli", + "object", + "target-lexicon", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a205f0f0ea33bcb56756718a9a9ca1042614237d6258893c519f6fed593325" +checksum = "59cef239d663885f1427f8b8f4fde7be6075249c282580d94b480f11953ca194" dependencies = [ "anyhow", "cranelift-entity", - "gimli 0.27.3", - "indexmap 1.9.3", + "gimli", + "indexmap 2.0.2", "log", - "object 0.30.4", + "object", "serde", + "serde_derive", "target-lexicon", "thiserror", - "wasmparser", + "wasm-encoder 0.32.0", + "wasmparser 0.112.0", + "wasmprinter", + "wasmtime-component-util", "wasmtime-types", ] [[package]] name = "wasmtime-fiber" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d55f4f52b3f26b03e6774f2e6c41c72d4106175c58ddd0b74b4b4a81c1ba702c" +checksum = "2ef118b557df6193cd82cfb45ab57cd12388fedfe2bb76f090b2d77c96c1b56e" dependencies = [ "cc", "cfg-if 1.0.0", - "rustix 0.36.15", + "rustix", "wasmtime-asm-macros", - "windows-sys 0.45.0", + "wasmtime-versioned-export-macros", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-jit" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b111d642a32c858096a57456e503f6b72abdbd04d15b44e12f329c238802f66" +checksum = "c8089d5909b8f923aad57702ebaacb7b662aa9e43a3f71e83e025c5379a1205f" dependencies = [ - "addr2line 0.19.0", + "addr2line", "anyhow", "bincode", "cfg-if 1.0.0", "cpp_demangle", - "gimli 0.27.3", + "gimli", "ittapi", "log", - "object 0.30.4", + "object", "rustc-demangle", + "rustix", "serde", + "serde_derive", "target-lexicon", "wasmtime-environ", "wasmtime-jit-debug", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-jit-debug" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7da0f3ae2e2cefa9d28f3f11bcf7d956433a60ccb34f359cd8c930e2bf1cf5a" +checksum = "9b13924aedf6799ad66edb25500a20e3226629978b30a958c55285352bad130a" dependencies = [ - "object 0.30.4", + "object", "once_cell", - "rustix 0.36.15", + "rustix", + "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52aab5839634bd3b158757b52bb689e04815023f2a83b281d657b3a0f061f7a0" +checksum = "c6ff5f3707a5e3797deeeeac6ac26b2e1dd32dbc06693c0ab52e8ac4d18ec706" dependencies = [ "cfg-if 1.0.0", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-runtime" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b738633d1c81b5df6f959757ac529b5c0f69ca917c1cfefac2e114af5c397014" +checksum = "11ab4ce04ac05342edfa7f42895f2a5d8b16ee914330869acb865cd1facf265f" dependencies = [ "anyhow", "cc", "cfg-if 1.0.0", - "indexmap 1.9.3", + "encoding_rs", + "indexmap 2.0.2", "libc", "log", "mach", "memfd", - "memoffset 0.8.0", + "memoffset 0.9.0", "paste", "rand 0.8.5", - "rustix 0.36.15", + "rustix", + "sptr", + "wasm-encoder 0.32.0", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit-debug", - "windows-sys 0.45.0", + "wasmtime-versioned-export-macros", + "wasmtime-wmemcheck", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-types" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc565951214d0707de731561b84457e1200c545437a167f232e150c496295c6e" +checksum = "ecf61e21d5bd95e1ad7fa42b7bdabe21220682d6a6046d376edca29760849222" dependencies = [ "cranelift-entity", "serde", + "serde_derive", "thiserror", - "wasmparser", + "wasmparser 0.112.0", +] + +[[package]] +name = "wasmtime-versioned-export-macros" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe877472cbdd6d96b4ecdc112af764e3b9d58c2e4175a87828f892ab94c60643" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] name = "wasmtime-wasi" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e94602bafb39e36746156127a97f4e33991fa02179f9f8e5b3372365ec61da8" +checksum = "b6db393deb775e8bece53a6869be6425e46b28426aa7709df8c529a19759f4be" dependencies = [ "anyhow", + "async-trait", + "bitflags 2.4.1", + "bytes", + "cap-fs-ext", + "cap-net-ext", + "cap-rand", + "cap-std", + "cap-time-ext", + "fs-set-times", + "futures", + "io-extras", + "io-lifetimes", + "is-terminal", "libc", + "once_cell", + "rustix", + "system-interface", + "thiserror", + "tokio", + "tracing", "wasi-cap-std-sync", "wasi-common", "wasmtime", "wiggle", + "windows-sys 0.48.0", +] + +[[package]] +name = "wasmtime-winch" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bc5a770003807c55f2187a0092dea01722b0e24151e35816bd5091538bb8e88" +dependencies = [ + "anyhow", + "cranelift-codegen", + "gimli", + "object", + "target-lexicon", + "wasmparser 0.112.0", + "wasmtime-cranelift-shared", + "wasmtime-environ", + "winch-codegen", ] [[package]] name = "wasmtime-wit-bindgen" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f2a35ff0a64ae07d4fcfd7c9b745e517be00ddb9991f8e2ad2c913cc11094" +checksum = "62003d48822f89cc393e93643366ddbee1766779c0874353b8ba2ede4679fbf9" dependencies = [ "anyhow", "heck", + "indexmap 2.0.2", "wit-parser", ] [[package]] +name = "wasmtime-wmemcheck" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5412bb464066d64c3398c96e6974348f90fa2a55110ad7da3f9295438cd4de84" + +[[package]] name = "wast" version = "35.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8020,23 +8122,23 @@ dependencies = [ [[package]] name = "wast" -version = "64.0.0" +version = "66.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc" +checksum = "93cb43b0ac6dd156f2c375735ccfd72b012a7c0a6e6d09503499b8d3cb6e6072" dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder", + "wasm-encoder 0.35.0", ] [[package]] name = "wat" -version = "1.0.71" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6" +checksum = "e367582095d2903caeeea9acbb140e1db9c7677001efa4347c3687fd34fe7072" dependencies = [ - "wast 64.0.0", + "wast 66.0.2", ] [[package]] @@ -8051,9 +8153,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" +checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" dependencies = [ "core-foundation", "home", @@ -8068,30 +8170,12 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.3", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -8100,7 +8184,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki 0.101.5", + "rustls-webpki", ] [[package]] @@ -8118,7 +8202,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.13", + "rustix", ] [[package]] @@ -8135,13 +8219,13 @@ checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "wiggle" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6627da83e9cdf851594a1dcf047573e700ecaa7ce79b70e02f3df5e5d24d0096" +checksum = "da341f21516453768bd115bdc17b186c0a1ab6773c2b2eeab44a062db49bd616" dependencies = [ "anyhow", "async-trait", - "bitflags 1.3.2", + "bitflags 2.4.1", "thiserror", "tracing", "wasmtime", @@ -8150,28 +8234,28 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0857652586aafc82fca56bbbf90fde5d5e086ffba58b0f1c0f113e54c500b55b" +checksum = "e22c6bd943a4bae37052b79d249fb32d7afa22b3f6a147a5f2e7bc2b9f901879" dependencies = [ "anyhow", "heck", "proc-macro2", "quote", "shellexpand", - "syn 1.0.109", + "syn 2.0.38", "witx", ] [[package]] name = "wiggle-macro" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97189f1092c8877865aa64467ca99afd0182eb23ad1b4ce22319f18422543d55" +checksum = "7d72d838b7c9302b2ca7c44f36d6af5ce1988239a16deba951d99c4630d17caf" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "wiggle-generate", ] @@ -8193,9 +8277,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -8207,6 +8291,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "winch-codegen" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50647204d600a2a112eefac0645ba6653809a15bd362c7e4e6a049a5bdff0de9" +dependencies = [ + "anyhow", + "cranelift-codegen", + "gimli", + "regalloc2", + "smallvec", + "target-lexicon", + "wasmparser 0.112.0", + "wasmtime-environ", +] + +[[package]] name = "windows" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8216,6 +8316,15 @@ dependencies = [ ] [[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] name = "windows-sys" version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8349,9 +8458,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] @@ -8368,36 +8477,28 @@ dependencies = [ [[package]] name = "winx" -version = "0.35.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c52a121f0fbf9320d5f2a9a5d82f6cb7557eda5e8b47fc3e7f359ec866ae960" -dependencies = [ - "bitflags 1.3.2", - "io-lifetimes 1.0.11", - "windows-sys 0.48.0", -] - -[[package]] -name = "winx" version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357bb8e2932df531f83b052264b050b81ba0df90ee5a59b2d1d3949f344f81e5" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "windows-sys 0.48.0", ] [[package]] name = "wit-parser" -version = "0.6.4" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f887c3da527a51b321076ebe6a7513026a4757b6d4d144259946552d6fc728b3" +checksum = "a39edca9abb16309def3843af73b58d47d243fe33a9ceee572446bcc57556b9a" dependencies = [ "anyhow", "id-arena", - "indexmap 1.9.3", + "indexmap 2.0.2", "log", "pulldown-cmark", + "semver 1.0.20", + "serde", + "serde_json", "unicode-xid", "url", ] @@ -8452,9 +8553,9 @@ dependencies = [ [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "yansi" @@ -8510,11 +8611,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix index 6ba94b645df9..ec3be0eb3fd8 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.29.1"; + version = "0.30.1"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-sNrYrV+oGvGCwVzuEoTNr1SawQUULfAsPAqjE35vjl8="; + hash = "sha256-zfRIw1PN3KCMrwnlFM3AFh/Dt8ywu2l3EABz87s8JK0="; }; cargoLock = { diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 2b1e893fd0c4..5a4e14a733c9 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.17.3"; + version = "0.17.4"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-l9uPn5eLGfCq2E6gogXCefbhxro6iOOYraeIPj9/S50="; + hash = "sha256-7XY2hFmc4Vqh8fVCSrpQkoXZKZxX3kqppIDGc3T7qRw="; }; - cargoHash = "sha256-2mbGwElBfo4L/iGZm3iRBR5UGeMFlfaSp79vVvCAIo0="; + cargoHash = "sha256-a/WRXiTSmQyAlxXqeFUWWSPFbHKL7Sifv2CW7rgbLWk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix b/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix index cba3b4b3dd7d..5f8b3d2cdc6e 100644 --- a/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "crate2nix"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { - owner = "kolloch"; + owner = "nix-community"; repo = pname; rev = version; - sha256 = "sha256-JaF9/H3m4Wrc5MtXcONkOAgKVkswLVw0yZe0dBr2e4Y="; + sha256 = "sha256-nyX1lfaA0eBSB/BaxPzCsyD8p/hxCwNIvr4Ru3i/YX0="; }; sourceRoot = "${src.name}/crate2nix"; - cargoSha256 = "sha256-PD7R1vcb3FKd4hfpViKyvfCExJ5H1Xo2HPYden5zpxQ="; + cargoSha256 = "sha256-3+emOr3hh+DDkboJbYyJFZgkzmcdA9jdronz7wM4x28="; nativeBuildInputs = [ makeWrapper ]; @@ -32,6 +32,13 @@ rustPlatform.buildRustPackage rec { postFixup = '' wrapProgram $out/bin/crate2nix \ --suffix PATH ":" ${lib.makeBinPath [ cargo nix nix-prefetch-git ]} + + rm -rf $out/lib $out/bin/crate2nix.d + mkdir -p \ + $out/share/bash-completion/completions \ + $out/share/zsh/vendor-completions + $out/bin/crate2nix completions -s 'bash' -o $out/share/bash-completion/completions + $out/bin/crate2nix completions -s 'zsh' -o $out/share/zsh/vendor-completions ''; meta = with lib; { @@ -40,9 +47,10 @@ rustPlatform.buildRustPackage rec { Crate2nix generates Nix files from Cargo.toml/lock files so that you can build every crate individually in a Nix sandbox. ''; - homepage = "https://github.com/kolloch/crate2nix"; + homepage = "https://github.com/nix-community/crate2nix"; license = licenses.asl20; maintainers = with maintainers; [ kolloch cole-h ]; platforms = platforms.all; }; } + diff --git a/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix index c9445882282d..999ae8b5ebab 100644 --- a/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.30.1"; + version = "0.30.2"; src = fetchCrate { inherit pname version; - hash = "sha256-Yjdrz/8uonM2kRCNAe6YZNPDDVmjqDiEk8CwgZUbBCg="; + hash = "sha256-nZ9c4Rog7dvlsnu4y33Yp+PJzwvBKvwyxF4V5UeJCVE="; }; - cargoHash = "sha256-875B7e/RCXs84yiwou5NZgxmjolxCKkQsUcRxXnV+Qo="; + cargoHash = "sha256-wVv46yYlKsyxk+2eXwsd0jMC64Xk5+Krp18B2pKo0mo="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/skaffold/default.nix b/nixpkgs/pkgs/development/tools/skaffold/default.nix index 8625bdcff334..a80cb9ac1b6e 100644 --- a/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-szoeGv8U8M4Wai1GFUkgE8Rn+URRrlkZvzMBxCcqvGI="; + hash = "sha256-Ng+JMhGnbZEum+nmuA/omgDhg5U1UpcOZ9+avUZeTK8="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/development/tools/squawk/default.nix b/nixpkgs/pkgs/development/tools/squawk/default.nix index 15072d956884..8e7dc13393f0 100644 --- a/nixpkgs/pkgs/development/tools/squawk/default.nix +++ b/nixpkgs/pkgs/development/tools/squawk/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "squawk"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "sbdchd"; repo = pname; rev = "v${version}"; - hash = "sha256-eic5j/mD4PBCMcATTSTJSKazZFJOxQuW7NyiYPjKCcM="; + hash = "sha256-XQU/1uAas1bT7FSgBzJSPRe4ET9ysjpFGhV+qi23AAY="; }; - cargoHash = "sha256-kzb00W9IlshhiV+vUIOlO6BnprHr2XPf8P207WYFP5I="; + cargoHash = "sha256-Qg2VcsAqXpYamO35t/lvlXUPTdjAqZ4z3Nm0hYdhjEM="; nativeBuildInputs = [ pkg-config @@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://squawkhq.com/"; changelog = "https://github.com/sbdchd/squawk/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with lib.maintainers; [ andrewsmith ]; + maintainers = with lib.maintainers; [ andrewsmith marsam ]; }; } diff --git a/nixpkgs/pkgs/development/tools/twitch-cli/default.nix b/nixpkgs/pkgs/development/tools/twitch-cli/default.nix index 7daa9401a18b..42dfe97d8c24 100644 --- a/nixpkgs/pkgs/development/tools/twitch-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/twitch-cli/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "twitch-cli"; - version = "1.1.20"; + version = "1.1.21"; src = fetchFromGitHub { owner = "twitchdev"; repo = pname; rev = "v${version}"; - hash = "sha256-hIyZwXDI3lJQOK27RaABf7cnj7jOxKdLUdZB5fp+7kY="; + hash = "sha256-LJWZi83AynmmGBajtk8CLmQ6Vd1IqLKNaiZMLZCLly0="; }; patches = [ ./application-name.patch ]; - vendorHash = "sha256-OhcRMXY8s+XciF+gV3cZ8fxtzo9+I76tBPZ0xG8ddHU="; + vendorHash = "sha256-1uUokMeI0D/apDFJLq+Go5BQp1JMYxJQF8nKvw52E7o="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/development/tools/viceroy/default.nix b/nixpkgs/pkgs/development/tools/viceroy/default.nix index 9f6716e191ee..eeccc89a7b18 100644 --- a/nixpkgs/pkgs/development/tools/viceroy/default.nix +++ b/nixpkgs/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-Z5poizMXp4xgn0Tx0E36rvueBx3dFL7++alewqG9E9w="; + hash = "sha256-vMyNsLXMJk8MTiZYRiGQpOLZfeJbKlYcG1U8xTQIty0="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-EbvEclXwQgNIYQ/ppbZGhT4v4rMSpreURg2OYhQ7dRI="; + cargoHash = "sha256-+v2P9ISSA7Xy5fTjfVNETAStPo19dLxv5K57MC/GU4E="; cargoTestFlags = [ "--package viceroy-lib" diff --git a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index 16dfcd878ab6..4130c52ce160 100644 --- a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.18.2"; + version = "2.19.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - hash = "sha256-RW8t5s28eUxHKEz+UHdeHlRMYprKlA9AdtiEy661des="; + hash = "sha256-RLJtDzG3dKaJkppJO/cAggvgB9egCxCWd1mbQ91KPuY="; }; - vendorHash = "sha256-61hdhkFyp4an9KtqDzB4Sd2+t40QEoLgq7MvUBxEQKs="; + vendorHash = "sha256-lVZcmqEC4InZr2zcgI4WVg6Pl3Cv/crTWuLSnqY3Vyk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/web/deno/default.nix b/nixpkgs/pkgs/development/web/deno/default.nix index 9e201961f1d3..71c206dfda92 100644 --- a/nixpkgs/pkgs/development/web/deno/default.nix +++ b/nixpkgs/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.37.1"; + version = "1.37.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-ZfICDkW6q4OLvpSZnRpa6i324OuLNuOHXuSOQ7/aUJ8="; + hash = "sha256-F04Dxt3pLtUaku6bWGDSwJQwk/NUyBfZPhT7zLyBq48="; }; - cargoHash = "sha256-n+6Hz9Q20vq1Bf/Ny7I3IpGbkEECjjBG8xHN1v0z0Pw="; + cargoHash = "sha256-PfChqb2yMFk4HAAspkKHjstlxCTkEA2k+VRMf8MVwTw="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/nixpkgs/pkgs/development/web/deno/librusty_v8.nix b/nixpkgs/pkgs/development/web/deno/librusty_v8.nix index 522fe48a3b4f..4f6817685813 100644 --- a/nixpkgs/pkgs/development/web/deno/librusty_v8.nix +++ b/nixpkgs/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.78.0"; + version = "0.79.2"; shas = { - x86_64-linux = "sha256-1df7bH3ZdgIasZvvNH3iKQ4lmcGNq6ldgMV9nDgOC14="; - aarch64-linux = "sha256-riSyGvOGwqL1hSAXpUvBju/3DN20THtg0NuIzn1m1M8="; - x86_64-darwin = "sha256-4Nnkrj9GfliYUInb7SssqzFIDbV0XVxdEBC28klqBDM="; - aarch64-darwin = "sha256-oepRKVb05zAUeZo2RN3Vca0CUQ+Fd1duIU3xOG+FEJw="; + x86_64-linux = "sha256-efpB4BayPvB7KrP9v+U/jlS+Vs7QeURmPm5dnGmDD8Q="; + aarch64-linux = "sha256-agtWSohMkkhxfKU+BQvHXomZSxVQLafma4IfiDO7vvo="; + x86_64-darwin = "sha256-UWZAm7punliDUOOdD+vqZXpChyMXw5AMw8kgJ6nclzs="; + aarch64-darwin = "sha256-p8lulv3E9A48nMH1KdROSY0L3Q/hqPVtTp9qIpUl1SM="; }; } diff --git a/nixpkgs/pkgs/development/web/nodejs/v20.nix b/nixpkgs/pkgs/development/web/nodejs/v20.nix index 4f5ad039393e..a66db24b0e0f 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v20.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v20.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.8.1"; - sha256 = "sha256-95nGb2pjhruKwsdaN490DEVel/H+lkOT3TnJ+fbvvHA="; + version = "20.9.0"; + sha256 = "sha256-oj2WgQq/BFVCazSdR85TEPMwlbe8BXG5zFEPSBw6RRk="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/nixpkgs/pkgs/development/web/nodejs/v21.nix b/nixpkgs/pkgs/development/web/nodejs/v21.nix index 6d59e20dfa5f..904bff2fef89 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v21.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v21.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "21.0.0"; - sha256 = "sha256-vFYZK5Ua0YNQbcqaz3pNDAJZEUC3/I8lZhN1GZJm8/I="; + version = "21.1.0"; + sha256 = "sha256-kaxy5ERMXlq0tEgDCmH/qVrNNdNKnTHS0iDuK+0BuSU="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/nixpkgs/pkgs/games/eidolon/default.nix b/nixpkgs/pkgs/games/eidolon/default.nix index 8807852f2486..34bfd4151894 100644 --- a/nixpkgs/pkgs/games/eidolon/default.nix +++ b/nixpkgs/pkgs/games/eidolon/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { owner = "~nicohman"; repo = pname; rev = version; - sha256 = "sha256-Ofc3i+iMmbUgY3bomUk4rM3bEQInTV3rIPz3m0yZw/o="; + hash = "sha256-Ofc3i+iMmbUgY3bomUk4rM3bEQInTV3rIPz3m0yZw/o="; }; cargoLock = { diff --git a/nixpkgs/pkgs/games/extremetuxracer/default.nix b/nixpkgs/pkgs/games/extremetuxracer/default.nix index a2614b2f1a9e..446c692ad81f 100644 --- a/nixpkgs/pkgs/games/extremetuxracer/default.nix +++ b/nixpkgs/pkgs/games/extremetuxracer/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; homepage = "https://sourceforge.net/projects/extremetuxracer/"; maintainers = with lib.maintainers; [ ]; + mainProgram = "etr"; platforms = with lib.platforms; linux; }; } diff --git a/nixpkgs/pkgs/games/freenukum/default.nix b/nixpkgs/pkgs/games/freenukum/default.nix index 89c26099db09..ed6c41edac44 100644 --- a/nixpkgs/pkgs/games/freenukum/default.nix +++ b/nixpkgs/pkgs/games/freenukum/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { owner = "silwol"; repo = "freenukum"; rev = "v${version}"; - sha256 = "sha256-Tk9n2gPwyPin6JZ4RSO8d/+xVpEz4rF8C2eGKwrAXU0="; + hash = "sha256-Tk9n2gPwyPin6JZ4RSO8d/+xVpEz4rF8C2eGKwrAXU0="; }; cargoSha256 = "sha256-8RfiObWDqZJg+sjjDBk+sRoS5CiECIdNPH79T+O8e8M="; diff --git a/nixpkgs/pkgs/games/infra-arcana/default.nix b/nixpkgs/pkgs/games/infra-arcana/default.nix index 4e80ad3e4d13..6eb1f44aa8cc 100644 --- a/nixpkgs/pkgs/games/infra-arcana/default.nix +++ b/nixpkgs/pkgs/games/infra-arcana/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "infra-arcana"; - version = "22.0.0"; + version = "22.1.0"; src = fetchFromGitLab { owner = "martin-tornqvist"; repo = "ia"; rev = "v${version}"; - sha256 = "sha256-EFpeuzxhRriQOBtmw0D+SY6sOWGyY8iA5Xnm6PCaMX0="; + sha256 = "sha256-MI+wH0+1f41JYXT2hzDs3RrrR3eTfOzgtCa5T6m8oQc="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/nixpkgs/pkgs/games/lgogdownloader/default.nix b/nixpkgs/pkgs/games/lgogdownloader/default.nix index e538a19938a7..a28ccea53ca1 100644 --- a/nixpkgs/pkgs/games/lgogdownloader/default.nix +++ b/nixpkgs/pkgs/games/lgogdownloader/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lgogdownloader"; - version = "3.11"; + version = "3.12"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "v${version}"; - hash = "sha256-zSAtQPgniI4hwhqiknP4zQAH6dhEmoAC1iF577ahnFU="; + hash = "sha256-IjZizO0HWDqtviY3TZ3AYYm5A0sU74YXjfFEtvQvv04="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/games/quake3/wrapper/default.nix b/nixpkgs/pkgs/games/quake3/wrapper/default.nix index 3c777c5b27fb..a1a5bfb03d26 100644 --- a/nixpkgs/pkgs/games/quake3/wrapper/default.nix +++ b/nixpkgs/pkgs/games/quake3/wrapper/default.nix @@ -20,11 +20,11 @@ in stdenv.mkDerivation { # We add Mesa to the end of $LD_LIBRARY_PATH to provide fallback # software rendering. GCC is needed so that libgcc_s.so can be found # when Mesa is used. - makeWrapper ${env}/bin/ioquake3.* $out/bin/quake3 \ + makeWrapper ${env}/bin/ioquake3* $out/bin/quake3 \ --suffix-each LD_LIBRARY_PATH ':' "${libPath}" \ --add-flags "+set fs_basepath ${env} +set r_allowSoftwareGL 1" - makeWrapper ${env}/bin/ioq3ded.* $out/bin/quake3-server \ + makeWrapper ${env}/bin/ioq3ded* $out/bin/quake3-server \ --add-flags "+set fs_basepath ${env}" ''; diff --git a/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index 9d598798defe..8d1078a8a01f 100644 --- a/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -31,7 +31,7 @@ , gdk-pixbuf }: let - version = "0.22.1"; + version = "0.24.0"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -44,7 +44,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; rev = "v${version}"; - hash = "sha256-I+Kj8amgFxT6yEXI5s1y0n1rgfzIrLtMOkYjguu6wpo="; + hash = "sha256-n0OiNxw9QDibX5HBSzq6jdOxyUd0bPkjKd+mtb/S/BY="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/games/vintagestory/default.nix b/nixpkgs/pkgs/games/vintagestory/default.nix index 22f64b383f00..d2138759bca8 100644 --- a/nixpkgs/pkgs/games/vintagestory/default.nix +++ b/nixpkgs/pkgs/games/vintagestory/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.18.12"; + version = "1.18.15"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-akeW03+IdRvt3Fs3gF6TcYv9gD33DHPtpmiiMa0b92k="; + hash = "sha256-luZwRKVptSd69tCaf6Jv0YOfwOeDOcuY7VoL+21tTEo="; }; diff --git a/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix b/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix index 7d00c7586e09..6522924a3139 100644 --- a/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.6943"; + version = "1.0.7531"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "MrLRA0XdaDWD7frh4XDXLTcjsAYWal5qwT5C6cq4MKc="; + sha256 = "ppRjUhx/VBkbFNhQunaUfOnwckOqJRQUTVMhKYZ0StU="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/misc/seafile-shared/default.nix b/nixpkgs/pkgs/misc/seafile-shared/default.nix index dfbe3998c919..5add4a5b530f 100644 --- a/nixpkgs/pkgs/misc/seafile-shared/default.nix +++ b/nixpkgs/pkgs/misc/seafile-shared/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "9.0.3"; + version = "9.0.4"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "sha256-g8MQFhDBBUuEDGsJ14rHGsaGEznOtCMVOv+5kljXByY="; + sha256 = "sha256-WBbJ6e2I7SGqvZo3yH8L1ZbNPkyA6zTGS12Gq186DL4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/misc/vencord/default.nix b/nixpkgs/pkgs/misc/vencord/default.nix index 287799bcf1e0..0fa670faf61e 100644 --- a/nixpkgs/pkgs/misc/vencord/default.nix +++ b/nixpkgs/pkgs/misc/vencord/default.nix @@ -2,12 +2,11 @@ , fetchFromGitHub , lib , esbuild -, buildGoModule , buildWebExtension ? false }: let - version = "1.5.7"; - gitHash = "5d7ede3"; + version = "1.5.8"; + gitHash = "544edce"; in buildNpmPackage rec { pname = "vencord"; @@ -17,27 +16,25 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - hash = "sha256-/LrM9lBxuM5+KQJqRlP/lBV+krwZIV2GjMi33N/s+V0="; + hash = "sha256-cJ+8CKCET7Z2MebyrW5OQr50tvbDM3mkvEQQm3zSbdU="; }; - ESBUILD_BINARY_PATH = lib.getExe (esbuild.override { - buildGoModule = args: buildGoModule (args // rec { - version = "0.15.18"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE="; - }; - vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; - }); - }); + ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { + version = "0.15.18"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${final.version}"; + hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + })); # Supresses an error about esbuild's version. npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-Moy7VlAgl31H8QO+aOVano92C4L/wclHhj+JTnbRM6c="; + npmDepsHash = "sha256-JeJjjrCfJMuxP9sVVkKJQ7bRCGu0jbGfiw78jS0r2Sg="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; @@ -57,6 +54,8 @@ buildNpmPackage rec { cp -r dist/ $out ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Vencord web extension"; homepage = "https://github.com/Vendicated/Vencord"; diff --git a/nixpkgs/pkgs/misc/vencord/package-lock.json b/nixpkgs/pkgs/misc/vencord/package-lock.json index eb01a29cb26c..3c06525bb5bb 100644 --- a/nixpkgs/pkgs/misc/vencord/package-lock.json +++ b/nixpkgs/pkgs/misc/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.5.7", + "version": "1.5.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.5.7", + "version": "1.5.8", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -326,6 +326,246 @@ "postcss-selector-parser": "^6.0.13" } }, + "node_modules/@esbuild/android-arm": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz", + "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz", + "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@esbuild/linux-x64": { "version": "0.18.20", "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", @@ -342,6 +582,102 @@ "node": ">=12" } }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -390,21 +726,21 @@ } }, "node_modules/@eslint/js": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz", - "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz", + "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.11", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz", - "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==", + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", + "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", "minimatch": "^3.0.5" }, @@ -426,9 +762,9 @@ } }, "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", "dev": true }, "node_modules/@nodelib/fs.scandir": { @@ -512,72 +848,72 @@ } }, "node_modules/@types/diff": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.5.tgz", - "integrity": "sha512-rt7WqM1bWwKJMRxlB5Rhke56UN21Bqwp1ILER31bafTivcapYdfhtPd5xRWfhf08yjPxoDcfjVkkECdRwFe7EA==", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.7.tgz", + "integrity": "sha512-adBosR2GntaQQiuHnfRN9HtxYpoHHJBcdyz7VSXhjpSAmtvIfu/S1fjTqwuIx/Ypba6LCZdfWIqPYx2BR5TneQ==", "dev": true }, "node_modules/@types/filesystem": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/@types/filesystem/-/filesystem-0.0.33.tgz", - "integrity": "sha512-2KedRPzwu2K528vFkoXnnWdsG0MtUwPjuA7pRy4vKxlxHEe8qUDZibYHXJKZZr2Cl/ELdCWYqyb/MKwsUuzBWw==", + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/filesystem/-/filesystem-0.0.34.tgz", + "integrity": "sha512-La4bGrgck8/rosDUA1DJJP8hrFcKq0BV6JaaVlNnOo1rJdJDcft3//slEbAmsWNUJwXRCc0DXpeO40yuATlexw==", "dev": true, "dependencies": { "@types/filewriter": "*" } }, "node_modules/@types/filewriter": { - "version": "0.0.30", - "resolved": "https://registry.npmjs.org/@types/filewriter/-/filewriter-0.0.30.tgz", - "integrity": "sha512-lB98tui0uxc7erbj0serZfJlHKLNJHwBltPnbmO1WRpL5T325GOHRiQfr2E29V2q+S1brDO63Fpdt6vb3bES9Q==", + "version": "0.0.31", + "resolved": "https://registry.npmjs.org/@types/filewriter/-/filewriter-0.0.31.tgz", + "integrity": "sha512-12df1utOvPC80+UaVoOO1d81X8pa5MefHNS+gWX9R2ucSESpMz9K5QwlTWDGKASrzCpSFwj7NPYh+nTsolgEGA==", "dev": true }, "node_modules/@types/har-format": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/@types/har-format/-/har-format-1.2.13.tgz", - "integrity": "sha512-PwBsCBD3lDODn4xpje3Y1di0aDJp4Ww7aSfMRVw6ysnxD4I7Wmq2mBkSKaDtN403hqH5sp6c9xQUvFYY3+lkBg==", + "version": "1.2.14", + "resolved": "https://registry.npmjs.org/@types/har-format/-/har-format-1.2.14.tgz", + "integrity": "sha512-pEmBAoccWvO6XbSI8A7KvIDGEoKtlLWtdqVCKoVBcCDSFvR4Ijd7zGLu7MWGEqk2r8D54uWlMRt+VZuSrfFMzQ==", "dev": true }, "node_modules/@types/json-schema": { - "version": "7.0.13", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz", - "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==", + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz", + "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==", "dev": true }, "node_modules/@types/lodash": { - "version": "4.14.199", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz", - "integrity": "sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg==", + "version": "4.14.200", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.200.tgz", + "integrity": "sha512-YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q==", "dev": true }, "node_modules/@types/minimist": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.3.tgz", - "integrity": "sha512-ZYFzrvyWUNhaPomn80dsMNgMeXxNWZBdkuG/hWlUvXvbdUH8ZERNBGXnU87McuGcWDsyzX2aChCv/SVN348k3A==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.4.tgz", + "integrity": "sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ==", "dev": true }, "node_modules/@types/node": { - "version": "18.18.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.3.tgz", - "integrity": "sha512-0OVfGupTl3NBFr8+iXpfZ8NR7jfFO+P1Q+IO/q0wbo02wYkP5gy36phojeYWpLQ6WAMjl+VfmqUk2YbUfp0irA==", + "version": "18.18.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.6.tgz", + "integrity": "sha512-wf3Vz+jCmOQ2HV1YUJuCWdL64adYxumkrxtc+H1VUQlnQI04+5HtH+qZCOE21lBE7gIrt+CwX2Wv8Acrw5Ak6w==", "dev": true }, "node_modules/@types/normalize-package-data": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.2.tgz", - "integrity": "sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz", + "integrity": "sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg==", "dev": true }, "node_modules/@types/prop-types": { - "version": "15.7.8", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.8.tgz", - "integrity": "sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ==", + "version": "15.7.9", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.9.tgz", + "integrity": "sha512-n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g==", "dev": true }, "node_modules/@types/react": { - "version": "18.2.24", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.24.tgz", - "integrity": "sha512-Ee0Jt4sbJxMu1iDcetZEIKQr99J1Zfb6D4F3qfUWoR1JpInkY1Wdg4WwCyBjL257D0+jGqSl1twBjV8iCaC0Aw==", + "version": "18.2.31", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.31.tgz", + "integrity": "sha512-c2UnPv548q+5DFh03y8lEDeMfDwBn9G3dRwfkrxQMo/dOtRHUUO57k6pHvBIfH/VF4Nh+98mZ5aaSe+2echD5g==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -586,30 +922,30 @@ } }, "node_modules/@types/react-dom": { - "version": "18.2.8", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.8.tgz", - "integrity": "sha512-bAIvO5lN/U8sPGvs1Xm61rlRHHaq5rp5N3kp9C+NJ/Q41P8iqjkXSu0+/qu8POsjH9pNWb0OYabFez7taP7omw==", + "version": "18.2.14", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.14.tgz", + "integrity": "sha512-V835xgdSVmyQmI1KLV2BEIUgqEuinxp9O4G6g3FqO/SqLac049E53aysv0oEFD2kHfejeKU+ZqL2bcFWj9gLAQ==", "dev": true, "dependencies": { "@types/react": "*" } }, "node_modules/@types/scheduler": { - "version": "0.16.4", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.4.tgz", - "integrity": "sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ==", + "version": "0.16.5", + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.5.tgz", + "integrity": "sha512-s/FPdYRmZR8SjLWGMCuax7r3qCWQw9QKHzXVukAuuIJkXkDRwp+Pu5LMIVFi0Fxbav35WURicYr8u1QsoybnQw==", "dev": true }, "node_modules/@types/semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==", "dev": true }, "node_modules/@types/yauzl": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.1.tgz", - "integrity": "sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw==", + "version": "2.10.2", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.2.tgz", + "integrity": "sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==", "dev": true, "optional": true, "dependencies": { @@ -617,9 +953,9 @@ } }, "node_modules/@types/yazl": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/@types/yazl/-/yazl-2.4.3.tgz", - "integrity": "sha512-pZtZPktPV+rN+6oje9Akz5kBwOhpjKlr7X74osNVtmYKcMdgoBtMFbNNPeS2+juE5aEVGZuIbHISqMCn2RupNw==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/yazl/-/yazl-2.4.4.tgz", + "integrity": "sha512-oIm9eKVrxukZgW05COfMzX9Zcz+cJmywKAULOVMr2ji9Bjly701zgjNDtFsVQsVlXsRMLwnIfUNqSpC1Uz+iaw==", "dev": true, "dependencies": { "@types/node": "*" @@ -813,6 +1149,12 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, "node_modules/@vap/core": { "version": "0.0.12", "resolved": "https://registry.npmjs.org/@vap/core/-/core-0.0.12.tgz", @@ -1444,12 +1786,12 @@ } }, "node_modules/css-functions-list": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.0.tgz", - "integrity": "sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz", + "integrity": "sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==", "dev": true, "engines": { - "node": ">=12.22" + "node": ">=12 || >=16" } }, "node_modules/css-tree": { @@ -1694,6 +2036,118 @@ "esbuild-windows-arm64": "0.15.18" } }, + "node_modules/esbuild-android-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz", + "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-android-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz", + "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-darwin-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz", + "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-darwin-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz", + "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-freebsd-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz", + "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-freebsd-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz", + "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-32": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz", + "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/esbuild-linux-64": { "version": "0.15.18", "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz", @@ -1710,6 +2164,198 @@ "node": ">=12" } }, + "node_modules/esbuild-linux-arm": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz", + "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz", + "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-mips64le": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz", + "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-ppc64le": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz", + "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-riscv64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz", + "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-s390x": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz", + "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-netbsd-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz", + "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-openbsd-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz", + "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-sunos-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz", + "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-32": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz", + "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz", + "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz", + "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -1732,18 +2378,19 @@ } }, "node_modules/eslint": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz", - "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz", + "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.50.0", - "@humanwhocodes/config-array": "^0.11.11", + "@eslint/js": "8.52.0", + "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -2137,12 +2784,12 @@ } }, "node_modules/flat-cache": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz", - "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", + "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", "dev": true, "dependencies": { - "flatted": "^3.2.7", + "flatted": "^3.2.9", "keyv": "^4.5.3", "rimraf": "^3.0.2" }, @@ -2189,11 +2836,28 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/get-caller-file": { "version": "2.0.5", @@ -2317,9 +2981,9 @@ } }, "node_modules/globals": { - "version": "13.22.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz", - "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==", + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -2390,18 +3054,6 @@ "node": ">=6" } }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -2450,6 +3102,18 @@ "node": ">=0.10.0" } }, + "node_modules/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/highlight.js": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.6.0.tgz", @@ -2618,12 +3282,12 @@ "dev": true }, "node_modules/is-core-module": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", - "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2838,9 +3502,9 @@ } }, "node_modules/keyv": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz", - "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==", + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, "dependencies": { "json-buffer": "3.0.1" @@ -2856,9 +3520,9 @@ } }, "node_modules/known-css-properties": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.28.0.tgz", - "integrity": "sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==", + "version": "0.29.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.29.0.tgz", + "integrity": "sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==", "dev": true }, "node_modules/levn": { @@ -4239,9 +4903,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.15", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz", - "integrity": "sha512-lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ==", + "version": "3.0.16", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", + "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", "dev": true }, "node_modules/split-string": { @@ -4430,9 +5094,9 @@ "dev": true }, "node_modules/stylelint": { - "version": "15.10.3", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.10.3.tgz", - "integrity": "sha512-aBQMMxYvFzJJwkmg+BUUg3YfPyeuCuKo2f+LOw7yYbU8AZMblibwzp9OV4srHVeQldxvSFdz0/Xu8blq2AesiA==", + "version": "15.11.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.11.0.tgz", + "integrity": "sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==", "dev": true, "dependencies": { "@csstools/css-parser-algorithms": "^2.3.1", @@ -4442,12 +5106,12 @@ "balanced-match": "^2.0.0", "colord": "^2.9.3", "cosmiconfig": "^8.2.0", - "css-functions-list": "^3.2.0", + "css-functions-list": "^3.2.1", "css-tree": "^2.3.1", "debug": "^4.3.4", "fast-glob": "^3.3.1", "fastest-levenshtein": "^1.0.16", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^7.0.0", "global-modules": "^2.0.0", "globby": "^11.1.0", "globjoin": "^0.1.4", @@ -4456,13 +5120,13 @@ "import-lazy": "^4.0.0", "imurmurhash": "^0.1.4", "is-plain-object": "^5.0.0", - "known-css-properties": "^0.28.0", + "known-css-properties": "^0.29.0", "mathml-tag-names": "^2.1.3", "meow": "^10.1.5", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.27", + "postcss": "^8.4.28", "postcss-resolve-nested-selector": "^0.1.1", "postcss-safe-parser": "^6.0.0", "postcss-selector-parser": "^6.0.13", @@ -4514,6 +5178,18 @@ "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", "dev": true }, + "node_modules/stylelint/node_modules/file-entry-cache": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-7.0.1.tgz", + "integrity": "sha512-uLfFktPmRetVCbHe5UPuekWrQ6hENufnA46qEGbfACkK5drjTTdQYUragRgMjHldcbYG+nslUerqMPjbBSHXjQ==", + "dev": true, + "dependencies": { + "flat-cache": "^3.1.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/stylelint/node_modules/is-plain-object": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", @@ -4741,9 +5417,9 @@ } }, "node_modules/tsx": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.13.0.tgz", - "integrity": "sha512-rjmRpTu3as/5fjNq/kOkOtihgLxuIz6pbKdj9xwP4J5jOLkBxw/rjN5ANw+KyrrOXV5uB7HC8+SrrSJxT65y+A==", + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.14.0.tgz", + "integrity": "sha512-xHtFaKtHxM9LOklMmJdI3BEnQq/D5F73Of2E1GDrITi9sgoVkvIsrQUTY1G8FlmGtA+awCI4EBlTRRYxkL2sRg==", "dev": true, "dependencies": { "esbuild": "~0.18.20", @@ -4757,6 +5433,38 @@ "fsevents": "~2.3.3" } }, + "node_modules/tsx/node_modules/@esbuild/android-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/linux-loong64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/tsx/node_modules/esbuild": { "version": "0.18.20", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", diff --git a/nixpkgs/pkgs/misc/vencord/update.sh b/nixpkgs/pkgs/misc/vencord/update.sh new file mode 100755 index 000000000000..0317f695f91f --- /dev/null +++ b/nixpkgs/pkgs/misc/vencord/update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env nix-shell +#! nix-shell -I nixpkgs=../../.. -i bash -p curl jq common-updater-scripts prefetch-npm-deps nodejs +set -eou pipefail + +tempDir=$(mktemp -d) + +ghTags=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/Vendicated/Vencord/tags") +latestTag=$(echo "$ghTags" | jq -r .[0].name) +gitHash=$(echo "$ghTags" | jq -r .[0].commit.sha) + +pushd "$tempDir" +curl "https://raw.githubusercontent.com/Vendicated/Vencord/$latestTag/package.json" -o package.json +npm install --legacy-peer-deps -f + +npmDepsHash=$(prefetch-npm-deps ./package-lock.json) +popd + +pushd ../../.. +update-source-version vencord "${latestTag#v}" +popd + +sed -E 's#\bgitHash = ".*?"#gitHash = "'"${gitHash:0:7}"'"#' -i default.nix +sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i default.nix +cp "$tempDir/package-lock.json" package-lock.json diff --git a/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix index aa73c7f86c40..5cf92a41a6f8 100644 --- a/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix @@ -1,19 +1,23 @@ -{ fetchFromGitHub, stdenv }: +{ lib, fetchFromGitHub, stdenv }: -# Reverse engineered CoreSymbolication to make dtrace buildable - -stdenv.mkDerivation rec { - name = "CoreSymbolication"; +stdenv.mkDerivation { + pname = "core-symbolication"; + version = "unstable-2018-06-17"; src = fetchFromGitHub { - repo = name; + repo = "CoreSymbolication"; owner = "matthewbauer"; - rev = "671fcb66c82eac1827f3f53dc4cc4e9b1b94da0a"; - sha256 = "0qpw46gwgjxiwqqjxksb8yghp2q8dwad6hzaf4zl82xpvk9n5ahj"; + rev = "24c87c23664b3ee05dc7a5a87d647ae476a680e4"; + hash = "sha256-PzvLq94eNhP0+rLwGMKcMzxuD6MlrNI7iT/eV0obtSE="; }; - installPhase = '' - mkdir -p $out/include - cp -r CoreSymbolication $out/include - ''; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; + + meta = with lib; { + description = "Reverse engineered headers for Apple's CoreSymbolication framework"; + homepage = "https://github.com/matthewbauer/CoreSymbolication"; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ matthewbauer ]; + }; } diff --git a/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix b/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix index 30fc882f0090..eedc9ac87fcc 100644 --- a/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.59.0"; + version = "1.60.1"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-EA8DzfJtd1lM0/N1bQ8x9GQ8KiILwRKPIFKk6XlaBhg="; + hash = "sha256-LO4EJR8+qzX17P2UpW/CiTR1BdvM8LSey0rnD6OiIU8="; }; dontPatch = true; diff --git a/nixpkgs/pkgs/os-specific/darwin/utm/default.nix b/nixpkgs/pkgs/os-specific/darwin/utm/default.nix index 7ab35aee0b43..f7055d378cbb 100644 --- a/nixpkgs/pkgs/os-specific/darwin/utm/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/utm/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - hash = "sha256-U1HB8uP8OzHX8LzBE8u7YSDI4vlY9vlMRE+JI+x9rvk="; + hash = "sha256-SyrqkNWRUKQS3D17XYsC/dcCKlPLGNNsG5obEiHE1Lk="; }; nativeBuildInputs = [ undmg makeWrapper ]; diff --git a/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix b/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix index 200021024aab..fc2b2f0c4e38 100644 --- a/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix @@ -3,7 +3,21 @@ , python3 }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + # autosuspend is incompatible with tzlocal v5 + # See https://github.com/regebro/tzlocal#api-change + tzlocal = super.tzlocal.overridePythonAttrs (prev: { + src = prev.src.override { + version = "4.3.1"; + hash = "sha256-7jLvjCCAPBmpbtNmrd09SnKe9jCctcc1mgzC7ut/pGo="; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "autosuspend"; version = "6.0.0"; @@ -21,27 +35,28 @@ python3.pkgs.buildPythonApplication rec { --replace '--cov-config=setup.cfg' "" ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ + dbus-python + icalendar + jsonpath-ng + lxml + mpd2 portalocker psutil - dbus-python - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - python-dbusmock - pytest-httpserver - dateutils - freezegun - pytest-mock + python-dateutil + pytz requests requests-file - icalendar tzlocal - jsonpath-ng - mpd2 - lxml + ]; + + nativeCheckInputs = with python.pkgs; [ + freezegun pytest-datadir + pytest-httpserver + pytest-mock + pytestCheckHook + python-dbusmock ]; # Disable tests that need root diff --git a/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix b/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix index e1c026fb533a..53a255fc2157 100644 --- a/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix +++ b/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,9 +1,9 @@ { - version = "2023.1"; + version = "2023.2"; sha256 = { - batman-adv = "sha256-9GpyhmYKXsNQahvn72C0ccUaxwVQWX1ZgEBHmre5Nrg="; - alfred = "sha256-Q4BIJI83N1fTqL3ny8bbZoX00BBdEw2i9aVPKQkMaXQ="; - batctl = "sha256-5b9HMF2VWrsZkkS9Dl//q5YQixr/q9DZcFUz+AWTlfE="; + batman-adv = "sha256-OQfc1X4sW/2dQHE5YLlAK/HaT4DFm1/wN3ifu7vY+iU="; + alfred = "sha256-qSBgKFZPieW/t3FK4piDoWEPYr4+YcCW4f6zYgBxjg4="; + batctl = "sha256-cLX5MfpjYyVpe9829tE0oDxJBvTBfLdlCjxxSQFDbsg="; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix b/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix index c3bd0c64a4ba..c92f40e3935f 100644 --- a/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix @@ -15,14 +15,14 @@ let mod = kernel != null; - dpdkVersion = "22.11.1"; -in stdenv.mkDerivation rec { + dpdkVersion = "23.07"; +in stdenv.mkDerivation { pname = "dpdk"; version = "${dpdkVersion}" + lib.optionalString mod "-${kernel.version}"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${dpdkVersion}.tar.xz"; - sha256 = "sha256-3gdkZfcXSg1ScUuQcuSDenJrqsgtj+fcZEytXIz3TUw="; + sha256 = "sha256-4IYU6K65KUB9c9cWmZKJpE70A0NSJx8JOX7vkysjs9Y="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index cadef31334df..a5ee8344b328 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.135-hardened1.patch", - "sha256": "0ld2apj2nc6y5c8h60cczjpi2vdz3askmpsjv7glfrqfqlw1a680", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.135-hardened1/linux-hardened-5.15.135-hardened1.patch" + "name": "linux-hardened-5.15.136-hardened1.patch", + "sha256": "11cw8pqcjqbmxgkqh42p58q1pi6m684qjyjf7fcw2bip8jdbvqk7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.136-hardened1/linux-hardened-5.15.136-hardened1.patch" }, - "sha256": "0w3i8jvzqvfnlarcvg89k1144ln96fszv16lzrn16zr3kri5x0ql", - "version": "5.15.135" + "sha256": "1f5cxrair8qycjcc931kcdsarbrph32ypdyhrws8sw74gvzbj966", + "version": "5.15.136" }, "5.4": { "patch": { @@ -52,21 +52,21 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.58-hardened1.patch", - "sha256": "0xca1pf6hkipci7blly111cchfw58cj22b73nr38dks0xvyb4rx6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.58-hardened1/linux-hardened-6.1.58-hardened1.patch" + "name": "linux-hardened-6.1.59-hardened1.patch", + "sha256": "19x0hc3h80r5i3lm09pky5i4hzapd8p53hr9hqk3g6yaj4k24h9q", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.59-hardened1/linux-hardened-6.1.59-hardened1.patch" }, - "sha256": "1b913ina3rcw4dx2s7n37kynv8rqsmrqa2ialsib6h7nsb9px66f", - "version": "6.1.58" + "sha256": "1860r1aan258yi2jq68bp1kdbcyy7ygc7d8g54wnc0vmqqj7fzv2", + "version": "6.1.59" }, "6.5": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.5.7-hardened1.patch", - "sha256": "0l0psja9zaw8b1bqw19nf1pjf4syxzh0gqjrfppyv40wbf5lsgjn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.7-hardened1/linux-hardened-6.5.7-hardened1.patch" + "name": "linux-hardened-6.5.8-hardened1.patch", + "sha256": "09dvz9massj8rwrwvr2n1y2v8k4c3ic8gfrp049p7g0npzag2cwl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.8-hardened1/linux-hardened-6.5.8-hardened1.patch" }, - "sha256": "135v3y2vgc83dca4xi7q52wqi4dkfal74k1y73jwzj85h12fl28d", - "version": "6.5.7" + "sha256": "05zpdh4dxaadq52hlczdmwb7bsqfm3q45v7bdqbsmplhgn4wm719", + "version": "6.5.8" } } diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json b/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json index 94c383ff8dbd..926a172a7240 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,38 +1,38 @@ { "testing": { - "version": "6.6-rc6", - "hash": "sha256:1yzzf0bswqqarmbkw17vqcrkghivin7ca84x919aa2i8z7fyg2hw" + "version": "6.6-rc7", + "hash": "sha256:1zzd32ya4hldfywicgpnc2cyd412s7q9c31qvxx2nl9nkx11xsxv" }, "6.5": { - "version": "6.5.8", - "hash": "sha256:05zpdh4dxaadq52hlczdmwb7bsqfm3q45v7bdqbsmplhgn4wm719" + "version": "6.5.9", + "hash": "sha256:1mcg0lpxr832mwyqlbn0s5gssvsk2nn2xhq9w0qbymizf5j2yrn6" }, "6.4": { "version": "6.4.16", "hash": "sha256:0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln" }, "6.1": { - "version": "6.1.59", - "hash": "sha256:1860r1aan258yi2jq68bp1kdbcyy7ygc7d8g54wnc0vmqqj7fzv2" + "version": "6.1.60", + "hash": "sha256:02pvymr1dgd36mp7yikxqqv0sfrpwi1grnvxvx6jbbx6wmx0wljq" }, "5.15": { - "version": "5.15.136", - "hash": "sha256:1f5cxrair8qycjcc931kcdsarbrph32ypdyhrws8sw74gvzbj966" + "version": "5.15.137", + "hash": "sha256:1xxjbxldrhmnh2q6rykpxyfbj8xqgl82q30n8sfavrzr14bb4jcp" }, "5.10": { - "version": "5.10.198", - "hash": "sha256:01gsw96anw44nh8ii3zipp6vh61m1n8yf0bv2fzznr23k771y51b" + "version": "5.10.199", + "hash": "sha256:1h944syk7n6c4j1djlx19n77alzwbxcdza77c9ykicgfynhpgsm0" }, "5.4": { - "version": "5.4.258", - "hash": "sha256:0gk2xav1ng565l1qsqlr8ja6m4j5g8rfj66vad1fmdd1lwaihw1r" + "version": "5.4.259", + "hash": "sha256:195v4fidavzm637glj6580006mrcaygnbj4za874imb62bxf9rpz" }, "4.19": { - "version": "4.19.296", - "hash": "sha256:1bk051canr4fb00j6x9ff2wam2f20whw4h4z767x2cn2kmv6cqb3" + "version": "4.19.297", + "hash": "sha256:0c9xxqgv2i36hrr06dwz7f3idc04xpv0a5pxg08xdh03cnyf12cx" }, "4.14": { - "version": "4.14.327", - "hash": "sha256:0nharfyxlr17yan86zrhlbq7idm0g3zvvvmy2zbw7m9dhgc8bw5z" + "version": "4.14.328", + "hash": "sha256:1igcpvnhwwrczfdsafmszvi0456k7f6j4cgpfw6v6afw09p95d8x" } } diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index ef020b7eb56c..b99a19bf9d04 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19408"; - sha256 = "1bfpzdfd7k859ids5d5ixzn36c7f62gh2lw6gv4szwakw032gh9i"; + rev = "19417"; + sha256 = "1m7zbc5hjjcckr271cg2vgpxmy9ih4hf54fsvmpz75j45lcqvqik"; } , ... }: diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index 0050e77bb565..eadd57c1e3b1 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.133-rt69"; # updated by ./update-rt.sh + version = "5.15.133-rt70"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -25,7 +25,7 @@ in buildLinux (args // { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0iikbpb1wcf7fm18j230cd4p4cksr0k6041c8w0gvznws8mr3dww"; + sha256 = "0n066vd63wm08dzpr0c79k2b454vslgwcjjhp8kh672j5acxii9p"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index f45926020b5b..85c8a8b8a10e 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.54-rt15"; # updated by ./update-rt.sh + version = "6.1.59-rt16"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "09sfrq2l8f777mx2n9mhb6bgz1064bl04921byqnmk87si31w653"; + sha256 = "1860r1aan258yi2jq68bp1kdbcyy7ygc7d8g54wnc0vmqqj7fzv2"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0ihdid1ihg26kjini66j87vh4220gl8xm9dai7zignha2zh238kh"; + sha256 = "1cmgw6a8zlj89172mp85lxaksz1pvc155mj2fq59l1ry35gwb5q7"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/nixpkgs/pkgs/os-specific/linux/nftables/default.nix b/nixpkgs/pkgs/os-specific/linux/nftables/default.nix index e84d6aa6ac5c..4482170d346b 100644 --- a/nixpkgs/pkgs/os-specific/linux/nftables/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nftables/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { - version = "1.0.8"; + version = "1.0.9"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.xz"; - hash = "sha256-k3N0DeQagtvJiBjgpGoHP664qNBon6T6GnQ5nDK/PVA="; + hash = "sha256-o8MEzZugYSOe4EdPmvuTipu5nYm5YCRvZvDDoKheFM0="; }; nativeBuildInputs = [ @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { ++ lib.optional withXtables "--with-xtables"; passthru.tests = { - inherit (nixosTests) firewall-nftables lxd-nftables; + inherit (nixosTests) firewall-nftables; + lxd-nftables = nixosTests.lxd.nftables; nat = { inherit (nixosTests.nat.nftables) firewall standalone; }; }; diff --git a/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix b/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix index c6ec0866791e..4ff0c8c32913 100644 --- a/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -32,6 +32,7 @@ substituteAll { # run some a simple installer tests to make sure nixos-rebuild still works for them passthru.tests = { + install-bootloader = nixosTests.nixos-rebuild-install-bootloader; simple-installer = nixosTests.installer.simple; specialisations = nixosTests.nixos-rebuild-specialisations; }; diff --git a/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 68e00690652e..9e75db6d27b5 100755 --- a/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -659,6 +659,7 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = cmd=( "systemd-run" "-E" "LOCALE_ARCHIVE" # Will be set to new value early in switch-to-configuration script, but interpreter starts out with old value + "-E" "NIXOS_INSTALL_BOOTLOADER" "--collect" "--no-ask-password" "--pty" @@ -679,7 +680,12 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = cmd=() elif ! targetHostCmd "${cmd[@]}" true &>/dev/null; then logVerbose "Skipping systemd-run to switch configuration since it is not working in target host." - cmd=("env" "-i" "LOCALE_ARCHIVE=$LOCALE_ARCHIVE") + cmd=( + "env" + "-i" + "LOCALE_ARCHIVE=$LOCALE_ARCHIVE" + "NIXOS_INSTALL_BOOTLOADER=$NIXOS_INSTALL_BOOTLOADER" + ) else logVerbose "Using systemd-run to switch configuration." fi diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index c116c6053007..39ebe3e27e24 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -65,11 +65,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "535.43.13"; + version = "535.43.15"; persistencedVersion = "535.98"; settingsVersion = "535.98"; - sha256_64bit = "sha256-qrzoZWoUSTh4UQ8e/amOhwPrspZOI1kwdPHLn4ySc/Q="; - openSha256 = "sha256-aVUdHNoFaUY7MiwEFxwsj8XS1+onckT3V7RiVMEkQP8="; + sha256_64bit = "sha256-DyEBrVV9DmeeOU2C0eitQLh9mGo4kxG3xxRsImrIFyo="; + openSha256 = "sha256-eW0Z70BTF0j8TmsOiVzbLOyiyScR/7hgEp9GYI9RZbA="; settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s="; persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; diff --git a/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix b/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix index 5c8cd9efc986..7ac560824db8 100644 --- a/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "odp-dpdk"; - version = "1.41.0.0_DPDK_22.11"; + version = "1.42.0.0_DPDK_22.11"; src = fetchurl { url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz"; - hash = "sha256-4p+R+7IeDKQFqBzQTvXfR407exxhoS8pnKxF9Qnr8tw="; + hash = "sha256-qtdqYE4+ab6/9Z0YXXCItcfj+3+gyprcNMAnAZkl4GA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix index 001162608cd0..e1f88469e04f 100644 --- a/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "19.0.0-54570"; + version = "19.1.0-54729"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-y7UC+E5i2cxkOJ9nVI6aQAFJ5kTXv9uaZoMO4/SCS6k="; + hash = "sha256-Qo/6EuILu5i3hjhxecf3qfoMFEJHJZVY19tDIXDJiag="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 954977882ee9..01054fa7fc6b 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -740,7 +740,7 @@ stdenv.mkDerivation (finalAttrs: { # To cross compile a derivation that builds a UKI with ukify, we need to wrap # ukify with the correct binutils. When wrapping, no splicing happens so we # have to explicitly pull binutils from targetPackages. - wrapProgram $out/lib/systemd/ukify --set PATH ${lib.makeBinPath [ targetPackages.stdenv.cc.bintools ] } + wrapProgram $out/lib/systemd/ukify --prefix PATH : ${lib.makeBinPath [ targetPackages.stdenv.cc.bintools ] }:${placeholder "out"}/lib/systemd ''; disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) diff --git a/nixpkgs/pkgs/os-specific/linux/tailor-gui/default.nix b/nixpkgs/pkgs/os-specific/linux/tailor-gui/default.nix index 86964ab4d36a..ecbec75fd82d 100644 --- a/nixpkgs/pkgs/os-specific/linux/tailor-gui/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/tailor-gui/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { cargoDeps = rustPlatform.fetchCargoTarball { inherit src sourceRoot; name = "${pname}-${version}"; - hash = "sha256-DUaSLv1V6skWXQ7aqD62uspq+I9KiWmjlwwxykVve5A="; + hash = "sha256-mt4YQ0iB/Mlnm+o9sGgYVEdbxjF7qArxA5FIK4MAZ8M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/os-specific/linux/tuxedo-rs/default.nix b/nixpkgs/pkgs/os-specific/linux/tuxedo-rs/default.nix index c9fb057da68b..04c1518aab83 100644 --- a/nixpkgs/pkgs/os-specific/linux/tuxedo-rs/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/tuxedo-rs/default.nix @@ -9,21 +9,21 @@ let src = fetchFromGitHub { owner = "AaronErhardt"; repo = "tuxedo-rs"; - rev = "a77a9f6c64e6dd1ede3511934392cbc16271ef6b"; - hash = "sha256-bk17vI1gLHayvCWfmZdCMqgmbJFOTDaaCaHcj9cLpMY="; + rev = "74b863e6dcb1ec2e6c8fb02c16bb6f23b59e67f6"; + hash = "sha256-Yujki2vGzaT8Ze5Usk8FPg8bn86MvyyPTiWuWwEw7Xs="; }; in rustPlatform.buildRustPackage { pname = "tuxedo-rs"; - version = "0.2.2"; + version = "0.2.3"; inherit src; # Some of the tests are impure and rely on files in /etc/tailord doCheck = false; - cargoHash = "sha256-vuXqab9W8NSD5U9dk15xM4fM/vd/fGgGdsvReMncWHg="; + cargoHash = "sha256-uYt442u/BIzw/lBu18LrsJf5D46oUOFzBJ5pUjCpK6w="; postInstall = '' install -Dm444 tailord/com.tux.Tailor.conf -t $out/share/dbus-1/system.d diff --git a/nixpkgs/pkgs/os-specific/linux/zfs/generic.nix b/nixpkgs/pkgs/os-specific/linux/zfs/generic.nix index 7bb4a1b7496e..8adbb8cab8f9 100644 --- a/nixpkgs/pkgs/os-specific/linux/zfs/generic.nix +++ b/nixpkgs/pkgs/os-specific/linux/zfs/generic.nix @@ -202,15 +202,15 @@ stdenv'.mkDerivation { changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; license = lib.licenses.cddl; - # The case-block for TARGET_CPU has branches for only five CPU families, + # The case-block for TARGET_CPU has branches for only some CPU families, # which prevents ZFS from building on any other platform. Since the NixOS # `boot.zfs.enabled` property is `readOnly`, excluding platforms where ZFS # does not build is the only way to produce a NixOS installer on such # platforms. - # https://github.com/openzfs/zfs/blob/6a6bd493988c75331deab06e5352a9bed035a87d/config/always-arch.m4#L16 + # https://github.com/openzfs/zfs/blob/6723d1110f6daf93be93db74d5ea9f6b64c9bce5/config/always-arch.m4#L12 platforms = with lib.systems.inspect.patterns; - map (p: p // isLinux) [ isx86_32 isx86_64 isPower isAarch64 isSparc ]; + map (p: p // isLinux) ([ isx86_32 isx86_64 isPower isAarch64 isSparc ] ++ isArmv7); maintainers = with lib.maintainers; [ jcumming jonringer globin raitobezarius ]; mainProgram = "zfs"; diff --git a/nixpkgs/pkgs/servers/akkoma/default.nix b/nixpkgs/pkgs/servers/akkoma/default.nix index 90c7c53525cc..36fa26bd0181 100644 --- a/nixpkgs/pkgs/servers/akkoma/default.nix +++ b/nixpkgs/pkgs/servers/akkoma/default.nix @@ -1,7 +1,7 @@ { lib , beamPackages , fetchFromGitea, fetchFromGitHub, fetchFromGitLab -, cmake, file, libxcrypt +, cmake, file , writeText , nixosTests , ... @@ -48,6 +48,9 @@ beamPackages.mixRelease rec { rev = "3bbfa8b5ea13accc1b1c40579a380d8e5cfd6ad2"; hash = "sha256-skZ0QwF46lUTfsgACMR0AR5ymY2F50BQy1AUBjWVdro="; }; + + # the binary is not getting installed by default + postInstall = "mv priv/* $out/lib/erlang/lib/${name}-${version}/priv/"; }; concurrent_limiter = beamPackages.buildMix rec { name = "concurrent_limiter"; diff --git a/nixpkgs/pkgs/servers/atlassian/confluence.nix b/nixpkgs/pkgs/servers/atlassian/confluence.nix index 30c5a0afc008..b6af64e984e7 100644 --- a/nixpkgs/pkgs/servers/atlassian/confluence.nix +++ b/nixpkgs/pkgs/servers/atlassian/confluence.nix @@ -52,6 +52,6 @@ optionalWarning (crowdProperties != null) "Using `crowdProperties` is deprecated homepage = "https://www.atlassian.com/software/confluence"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - maintainers = with maintainers; [ globin willibutz ciil techknowlogick ]; + maintainers = with maintainers; [ willibutz ciil techknowlogick ]; }; }) diff --git a/nixpkgs/pkgs/servers/atlassian/crowd.nix b/nixpkgs/pkgs/servers/atlassian/crowd.nix index 918aec8e16b8..4544ea56ff21 100644 --- a/nixpkgs/pkgs/servers/atlassian/crowd.nix +++ b/nixpkgs/pkgs/servers/atlassian/crowd.nix @@ -51,6 +51,6 @@ optionalWarning (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` description = "Single sign-on and identity management tool"; homepage = "https://www.atlassian.com/software/crowd"; license = licenses.unfree; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; }) diff --git a/nixpkgs/pkgs/servers/atlassian/jira.nix b/nixpkgs/pkgs/servers/atlassian/jira.nix index 42e0a223a6ba..d50873a83347 100644 --- a/nixpkgs/pkgs/servers/atlassian/jira.nix +++ b/nixpkgs/pkgs/servers/atlassian/jira.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { description = "Proprietary issue tracking product, also providing project management functions"; homepage = "https://www.atlassian.com/software/jira"; license = licenses.unfree; - maintainers = with maintainers; [ globin ciil megheaiulian techknowlogick ]; + maintainers = with maintainers; [ ciil megheaiulian techknowlogick ]; }; } diff --git a/nixpkgs/pkgs/servers/audiobookshelf/default.nix b/nixpkgs/pkgs/servers/audiobookshelf/default.nix index 51dbc97b07b2..b3c2604d62ee 100644 --- a/nixpkgs/pkgs/servers/audiobookshelf/default.nix +++ b/nixpkgs/pkgs/servers/audiobookshelf/default.nix @@ -17,13 +17,13 @@ let nodejs = nodejs_18; pname = "audiobookshelf"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "advplyr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Eqi6QVX8ZxX87IJcDNlDEzWYH7FBvYMs/iBAopLGYl4="; + sha256 = "sha256-W0Vk1G/NI2u/iWhR5Q9Dwo9Ndq4QDiWUae6K22QfHfo="; }; client = buildNpmPackage { @@ -37,7 +37,7 @@ let NODE_OPTIONS = "--openssl-legacy-provider"; npmBuildScript = "generate"; - npmDepsHash = "sha256-j6Q3i3ktvBUMQxCMNIqRjSMly6UMzewaF1EfAmNF8mQ="; + npmDepsHash = "sha256-ep67S92WWvZO578EIpJCkdgMJAG/qJLe8twy4663RHQ="; }; wrapper = import ./wrapper.nix { @@ -52,7 +52,7 @@ in buildNpmPackage { dontNpmBuild = true; npmInstallFlags = [ "--only-production" ]; - npmDepsHash = "sha256-fxXetf6KVK8hEwYZsER/rmt5tDagEOiyh+dJJE8FOXY="; + npmDepsHash = "sha256-SutXEc9kKV/9E/Sh1gl49W6JcN/w+6FIJwL8rxPbBVA="; installPhase = '' mkdir -p $out/opt/client diff --git a/nixpkgs/pkgs/servers/bililiverecorder/default.nix b/nixpkgs/pkgs/servers/bililiverecorder/default.nix index 98cdd42dde86..fbd2db4ec3f5 100644 --- a/nixpkgs/pkgs/servers/bililiverecorder/default.nix +++ b/nixpkgs/pkgs/servers/bililiverecorder/default.nix @@ -13,8 +13,8 @@ let aspnetcore_6_0 ]; - version = "2.9.1"; - hash = "sha256-jAjUrEYfaihMuyL/sLDzdPfq0sKoEglCfRFz0sAtx3g="; + version = "2.10.0"; + hash = "sha256-RpcT2zneKbbZieI2Omf+fcfmU7/MnkpYGKhFj9tnKrs="; in stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/servers/bloat/default.nix b/nixpkgs/pkgs/servers/bloat/default.nix index 8b982429644d..4a28c4377ff6 100644 --- a/nixpkgs/pkgs/servers/bloat/default.nix +++ b/nixpkgs/pkgs/servers/bloat/default.nix @@ -6,12 +6,12 @@ buildGoModule { pname = "bloat"; - version = "unstable-2023-10-02"; + version = "unstable-2023-10-15"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; - rev = "b83a00aa2cdabfc20c162379c885caac0110e167"; - hash = "sha256-E04XP3frzwaRNoc8HM96buODtGMs/nBJ7BDJD5VX40g="; + rev = "67b13c71baea56eeb15532ca1b1377f6da8d18ac"; + hash = "sha256-h885uAuVjpVsp5cAAX9pIxfydcBiajBX3ZSmQUr3/4Q="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/servers/computing/slurm/default.nix b/nixpkgs/pkgs/servers/computing/slurm/default.nix index 226755b14c9e..fe8f95ecdf36 100644 --- a/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { # increase string length to allow for full # path of 'echo' in nix store ./common-env-echo.patch - # Required for configure to pick up the right dlopen path - ./pmix-configure.patch ]; prePatch = '' @@ -72,6 +70,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc/slurm" "--with-pmix=${pmix}" "--with-bpf=${libbpf}" + "--without-rpath" # Required for configure to pick up the right dlopen path ] ++ (optional enableGtk2 "--disable-gtktest") ++ (optional (!enableX11) "--disable-x11"); diff --git a/nixpkgs/pkgs/servers/computing/slurm/pmix-configure.patch b/nixpkgs/pkgs/servers/computing/slurm/pmix-configure.patch deleted file mode 100644 index 21c2197c3ff1..000000000000 --- a/nixpkgs/pkgs/servers/computing/slurm/pmix-configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index 1cf53bc..ab68441 100755 ---- a/configure -+++ b/configure -@@ -21207,7 +21207,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext - as_fn_error $? "error processing $x_ac_cv_pmix_libdir: PMIx v3.x was already found in one of the previous paths" "$LINENO" 5 - fi - _x_ac_pmix_v3_found="1" -- PMIX_V3_CPPFLAGS="-I$x_ac_cv_pmix_dir/include" -+ PMIX_V3_CPPFLAGS="-I$x_ac_cv_pmix_dir/include -DPMIXP_V3_LIBPATH=\\\"$x_ac_cv_pmix_libdir\\\"" - if test "$ac_with_rpath" = "yes"; then - PMIX_V3_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir" - else diff --git a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index afba49779c0f..bc18c91ef7fe 100644 --- a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { inherit knot-resolver; } // lib.optionalAttrs stdenv.isLinux { inherit (nixosTests) knot kea; + prometheus-exporter = nixosTests.prometheus-exporters.knot; # Some dependencies are very version-sensitive, so the might get dropped # or embedded after some update, even if the nixPackagers didn't intend to. # For non-linux I don't know a good replacement for `ldd`. diff --git a/nixpkgs/pkgs/servers/fastnetmon-advanced/default.nix b/nixpkgs/pkgs/servers/fastnetmon-advanced/default.nix index 76994cac91bb..f08e4662c93e 100644 --- a/nixpkgs/pkgs/servers/fastnetmon-advanced/default.nix +++ b/nixpkgs/pkgs/servers/fastnetmon-advanced/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook, bzip2 }: +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, bzip2 +, nixosTests +}: stdenv.mkDerivation rec { pname = "fastnetmon-advanced"; - version = "2.0.350"; + version = "2.0.351"; src = fetchurl { url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb"; - hash = "sha256-rd0xdpENsdH8jOoUkQHW8/fXE4zEjQemFT4Q2tXjtT8="; + hash = "sha256-gLR4Z5VZyyt6CmoWcqDT75o50KyEJsfsx67Sqpiwh04="; }; nativeBuildInputs = [ @@ -58,6 +64,8 @@ stdenv.mkDerivation rec { $out/bin/fnm-gobgpd --help 2>&1 | grep "Application Options" ''; + passthru.tests = { inherit (nixosTests) fastnetmon-advanced; }; + meta = with lib; { description = "A high performance DDoS detector / sensor - commercial edition"; homepage = "https://fastnetmon.com"; diff --git a/nixpkgs/pkgs/servers/geospatial/mbtileserver/default.nix b/nixpkgs/pkgs/servers/geospatial/mbtileserver/default.nix index ac5c008990eb..7907ba186079 100644 --- a/nixpkgs/pkgs/servers/geospatial/mbtileserver/default.nix +++ b/nixpkgs/pkgs/servers/geospatial/mbtileserver/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mbtileserver"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "consbio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HGzgqUH9OxwjfYR9I9JzcP11+SB8A3hC/3Uk1dOCq+k="; + sha256 = "sha256-hKDgKiy3tmZ7gxmxZlflJHcxatrSqE1d1uhSLJh8XLo="; }; - vendorHash = "sha256-vuNOOPVGUkmKJ477N20DvhJTcMIW1lNmrgJLeMpNImM="; + vendorHash = "sha256-QcyFnzRdGdrVqgKEMbhaD7C7dkGKKhTesMMZKrrLx70="; meta = with lib; { description = "A simple Go-based server for map tiles stored in mbtiles format"; diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 7f9efafdfe9a..d1ebe9fefa17 100644 --- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.10.4"; + version = "2023.10.5"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/nixpkgs/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix index 39c2c075eadd..1be1169c7786 100644 --- a/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -87,16 +87,6 @@ let }; }); - faadelays = super.faadelays.overridePythonAttrs (oldAttrs: rec { - version = "0.0.7"; - src = fetchFromGitHub { - owner = "ntilley905"; - repo = "faadelays"; - rev = "refs/tags/v${version}"; - hash = "sha256-NmBijDr/6pGATvzZhCrOjdDU7DKwLFAfwSgozvBYHMo="; - }; - }); - geojson = super.geojson.overridePythonAttrs (oldAttrs: rec { version = "2.5.0"; src = fetchFromGitHub { @@ -117,16 +107,6 @@ let }; }); - google-nest-sdm = super.google-nest-sdm.overridePythonAttrs (oldAtrs: rec { - version = "2.2.5"; - src = fetchFromGitHub { - owner = "allenporter"; - repo = "python-google-nest-sdm"; - rev = "refs/tags/${version}"; - hash = "sha256-UMP4FMyS8nAZmN7oKBZhMbqTgi4bSR/JmIeyWaZRZis="; - }; - }); - holidays = super.holidays.overridePythonAttrs (oldAttrs: rec { version = "0.28"; src = fetchFromGitHub { @@ -262,15 +242,6 @@ let }; }); - pysensibo = super.pysensibo.overridePythonAttrs (oldAttrs: rec { - version = "1.0.33"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-A7IzAIV8dQVSmYTEp9yeySQ8eXnLFVkiuWFS3pe2YTA="; - }; - }); - pysnooz = super.pysnooz.overridePythonAttrs (oldAttrs: rec { version = "0.8.6"; src = fetchFromGitHub { @@ -339,27 +310,6 @@ let doCheck = false; }); - screenlogicpy = super.screenlogicpy.overridePythonAttrs (oldAttrs: rec { - version = "0.8.2"; - src = fetchFromGitHub { - owner = "dieselrabbit"; - repo = "screenlogicpy"; - rev = "refs/tags/v${version}"; - hash = "sha256-7w2cg+LfL3w2Xxf8s7lFxE/HkqZ6RBYp8LkZTOwgK+I="; - }; - }); - - syrupy = super.syrupy.overridePythonAttrs (oldAttrs: rec { - version = "4.2.1"; - src = fetchFromGitHub { - owner = "tophat"; - repo = "syrupy"; - rev = "refs/tags/v${version}"; - hash = "sha256-MXUuLw4+J/9JtXY1DYwBjj2sgAbO2cXQi1HnVRx3BhM="; - }; - doCheck = false; - }); - # Pinned due to API changes in 0.3.0 tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { version = "0.2.0"; @@ -371,17 +321,6 @@ let }; }); - velbus-aio = super.velbus-aio.overridePythonAttrs (oldAttrs: rec { - version = "2023.2.0"; - src = fetchFromGitHub { - owner = "Cereal2nd"; - repo = "velbus-aio"; - rev = "refs/tags/${version}"; - hash = "sha256-y8M9Zf/CMM7NH0Sr7E9sx7JnOFGlExEk7cFEGrHBi7g="; - fetchSubmodules = true; - }; - }); - # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; @@ -427,7 +366,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.10.4"; + hassVersion = "2023.10.5"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -443,7 +382,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-HG8Uyk52Bj9CpQ+dn+dbsXVBKakXDlRktG4KSkVVVmE="; + hash = "sha256-jVw0Mudb/L4Lw3AodwcOTrNJZctSfEIcXUzxozo7saA="; }; # Secondary source is git for tests @@ -451,7 +390,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-m3MjJHFq9S0dogFijIlpryqGQoHpLqkqgkWLuIxLHa8="; + hash = "sha256-wKxAwa4t3JbS4puDAufjpzcVLcvEY9Bk73qmg3JeLPk="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/nixpkgs/pkgs/servers/home-assistant/stubs.nix b/nixpkgs/pkgs/servers/home-assistant/stubs.nix index a0146829bf2c..1397abf61cec 100644 --- a/nixpkgs/pkgs/servers/home-assistant/stubs.nix +++ b/nixpkgs/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.10.4"; + version = "2023.10.5"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-iehGVXom5Wjw7A0PC4wfzed+w1h1/g9SKIuCuVRtIAs="; + hash = "sha256-QCdNvEs2LFF43lWLLFX+9VMfQFg1oWUCh/cgxdBQV8w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/home-automation/evcc/default.nix b/nixpkgs/pkgs/servers/home-automation/evcc/default.nix index 279b1750b9e9..8666f906fa95 100644 --- a/nixpkgs/pkgs/servers/home-automation/evcc/default.nix +++ b/nixpkgs/pkgs/servers/home-automation/evcc/default.nix @@ -16,20 +16,20 @@ buildGo121Module rec { pname = "evcc"; - version = "0.120.3"; + version = "0.121.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-FYjDuGIsdGhPXOdYMQuoMp6L4MH70fpOymqw4+bu5hc="; + hash = "sha256-WGce6HszjS/AVwlEmT8KZnFHZieaGzT+yyzxOtqf/zg="; }; - vendorHash = "sha256-LNMNqlb/aj+ZHuwMvtK//oWyi34mm47ShAAD427szS4="; + vendorHash = "sha256-dBJsPv3tOWxLvVlkTG0npKalH2RWfwR3vJRjqb4TYQE="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-quznAvgAFJJnKabsFZxAu7yDkAuvujg6of6En8JaFs4="; + hash = "sha256-KTMUZOW56vPGoJviKRJWM9UL28gXL0L3j4ZmUzSeavU="; }; nativeBuildInputs = [ @@ -85,7 +85,7 @@ buildGo121Module rec { meta = with lib; { description = "EV Charge Controller"; homepage = "https://evcc.io"; - changelog = "https://github.com/andig/evcc/releases/tag/${version}"; + changelog = "https://github.com/evcc-io/evcc/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/nixpkgs/pkgs/servers/homepage-dashboard/default.nix b/nixpkgs/pkgs/servers/homepage-dashboard/default.nix index 87ba408e1f72..4024f3cc4ee6 100644 --- a/nixpkgs/pkgs/servers/homepage-dashboard/default.nix +++ b/nixpkgs/pkgs/servers/homepage-dashboard/default.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-p2h1XPVMTZ23nxu/rX/qOQ5DXOZ0ORaXR41ng4pgmmg="; + hash = "sha256-ANQbbKXA1G6O/qEK6frTp9J26nNM+NgVya6d6DsPrv4="; }; - npmDepsHash = "sha256-ZUdBXkQnwh0jrrSKukHeSv3HS1q24Qd12zVnpV71qIY="; + npmDepsHash = "sha256-sk1RqMX4aGJcjysN7udBSPnUvD1vLHdyZ88JQbReOqw="; preBuild = '' mkdir -p config diff --git a/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/nixpkgs/pkgs/servers/http/nginx/mainline.nix index 4fc050396ff4..39877f115d8c 100644 --- a/nixpkgs/pkgs/servers/http/nginx/mainline.nix +++ b/nixpkgs/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.25.2"; - hash = "sha256-Bd1tk1bWanTmEDXypCFi+MdUyXzxumTnqAG6FY1sBxE="; + version = "1.25.3"; + hash = "sha256-ZMW5dcooeTnoKDA/qFfSLxQrJR8XgI3+QXM1EtnN7YY="; } diff --git a/nixpkgs/pkgs/servers/http/nginx/modules.nix b/nixpkgs/pkgs/servers/http/nginx/modules.nix index 2ffb65a3a9f1..c81449aa762e 100644 --- a/nixpkgs/pkgs/servers/http/nginx/modules.nix +++ b/nixpkgs/pkgs/servers/http/nginx/modules.nix @@ -41,8 +41,9 @@ let name = "http_proxy_connect_module_generic"; owner = "chobits"; repo = "ngx_http_proxy_connect_module"; - rev = "96ae4e06381f821218f368ad0ba964f87cbe0266"; - sha256 = "1nc7z31i7x9dzp67kzgvs34hs6ps749y26wcpi3wf5mm63i803rh"; + # 2023-06-19 + rev = "dcb9a2c614d376b820d774db510d4da12dfe1e5b"; + hash = "sha256-AzMhTSzmk3osSYy2q28/hko1v2AOTnY/dP5IprqGlQo="; }; patches = [ @@ -303,12 +304,12 @@ let self = { }; }; - http_proxy_connect_module_v18 = http_proxy_connect_module_generic "proxy_connect_rewrite_1018" // { - supports = with lib.versions; version: major version == "1" && minor version == "18"; + http_proxy_connect_module_v24 = http_proxy_connect_module_generic "proxy_connect_rewrite_102101" // { + supports = with lib.versions; version: major version == "1" && minor version == "24"; }; - http_proxy_connect_module_v19 = http_proxy_connect_module_generic "proxy_connect_rewrite_1018" // { - supports = with lib.versions; version: major version == "1" && minor version == "19"; + http_proxy_connect_module_v25 = http_proxy_connect_module_generic "proxy_connect_rewrite_102101" // { + supports = with lib.versions; version: major version == "1" && minor version == "25"; }; ipscrub = { diff --git a/nixpkgs/pkgs/servers/http/trafficserver/default.nix b/nixpkgs/pkgs/servers/http/trafficserver/default.nix index fc80a0988f16..a49acfe9fce8 100644 --- a/nixpkgs/pkgs/servers/http/trafficserver/default.nix +++ b/nixpkgs/pkgs/servers/http/trafficserver/default.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { pname = "trafficserver"; - version = "9.2.2"; + version = "9.2.3"; src = fetchzip { url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; - hash = "sha256-7iKUlbv9yfqO9Gt/BJcuCuDtWemn/+KDg6izT/BNDxw="; + hash = "sha256-WqRqf10QKYepCoaNzG26O2jv54Do3qFawDupSkrAPKk="; }; # NOTE: The upstream README indicates that flex is needed for some features, diff --git a/nixpkgs/pkgs/servers/http/unit/default.nix b/nixpkgs/pkgs/servers/http/unit/default.nix index e053da656be5..5d1da4c47060 100644 --- a/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/nixpkgs/pkgs/servers/http/unit/default.nix @@ -29,14 +29,14 @@ let php82-unit = php82.override phpConfig; in stdenv.mkDerivation rec { - version = "1.31.0"; + version = "1.31.1"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "sha256-N01ANjZES8eJV/gZchyPfxUpRyfDXpebHWK79mCI3Bw="; + sha256 = "sha256-6hecOCEC2MeJJieOOamEf8ytpEVAGs5mB0H16lJDciU="; }; nativeBuildInputs = [ which ]; diff --git a/nixpkgs/pkgs/servers/invidious/lsquic.nix b/nixpkgs/pkgs/servers/invidious/lsquic.nix index c9cdd9958ede..9c88ae004aab 100644 --- a/nixpkgs/pkgs/servers/invidious/lsquic.nix +++ b/nixpkgs/pkgs/servers/invidious/lsquic.nix @@ -57,7 +57,25 @@ let preBuild = preBuild + lib.optionalString stdenv.isLinux '' sed -e '/^build crypto\/fipsmodule\/CMakeFiles\/fipsmodule\.dir\/bcm\.c\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=stringop-overflow/' \ -i build.ninja - ''; + '' + lib.optionalString stdenv.cc.isGNU '' + # Silence warning that causes build failures with GCC. + sed -e '/^build ssl\/test\/CMakeFiles\/bssl_shim\.dir\/settings_writer\.cc\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=ignored-attributes/' \ + -e '/^build ssl\/test\/CMakeFiles\/handshaker\.dir\/settings_writer\.cc\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=ignored-attributes/' \ + -i build.ninja + '' + lib.optionalString stdenv.cc.isClang ( + # Silence warnings that cause build failures with newer versions of clang. + let + clangVersion = lib.getVersion stdenv.cc; + in + lib.optionalString (lib.versionAtLeast clangVersion "13") '' + sed -e '/^build crypto\/CMakeFiles\/crypto\.dir\/x509\/t_x509\.c\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=unused-but-set-variable/' \ + -e '/^build tool\/CMakeFiles\/bssl\.dir\/digest\.cc\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=unused-but-set-variable/' \ + -i build.ninja + '' + lib.optionalString (lib.versionAtLeast clangVersion "16") '' + sed -e '/^build crypto\/CMakeFiles\/crypto\.dir\/trust_token\/trust_token\.c\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=single-bit-bitfield-constant-conversion/' \ + -i build.ninja + '' + ); }); in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/servers/jibri/default.nix b/nixpkgs/pkgs/servers/jibri/default.nix index 108c99ff0473..8ac17d930ffc 100644 --- a/nixpkgs/pkgs/servers/jibri/default.nix +++ b/nixpkgs/pkgs/servers/jibri/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { pname = "jibri"; - version = "8.0-140-gccc7278"; + version = "8.0-145-g1a4bb8e"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "TiKCK41ar3X1aOrGitnNBr/iWru1HOjjGkwLBB76M1M="; + sha256 = "Qemr2108R/Lg1C5UvWQbK7PSbrKvBkfATNpvFDqJ3bI="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/servers/jicofo/default.nix b/nixpkgs/pkgs/servers/jicofo/default.nix index 4bee944a712f..bdae8d3f32e3 100644 --- a/nixpkgs/pkgs/servers/jicofo/default.nix +++ b/nixpkgs/pkgs/servers/jicofo/default.nix @@ -2,10 +2,10 @@ let pname = "jicofo"; - version = "1.0-1038"; + version = "1.0-1050"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "9VO3bKOoHtl/q6gEmwi8Lc4GXgJSyFJ7jxKfaKQ549c="; + sha256 = "fenxq6syLoKV9jgj8qN7JrkWFeFWSk1QmK7o2hLhwyA="; }; in stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix b/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix index 0a4cbb840b58..3b14ac17c1c4 100644 --- a/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix +++ b/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.2-69-gad606ca2"; + version = "2.3-44-g8983b11f"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "+5fcxUiCMy45CdDuORU5Xo//f4iAAJEzt1gO+fKU43c="; + sha256 = "TUWACKQz4wEGv2VKqKsuQLjtJZr24gtVZ4l7LCXe7VE="; }; in stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/servers/keycloak/default.nix b/nixpkgs/pkgs/servers/keycloak/default.nix index 41b872fb4a77..4ed62d93a040 100644 --- a/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/nixpkgs/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "22.0.4"; + version = "22.0.5"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-wl6kZmm6o9UspKdVHDqUvoDCRALp1ut7Sun/RDuEMLI="; + hash = "sha256-D08WPJUOIIDD9JTTq4C4+wzj/fTZvFbxVXWbVzx0MKY="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix b/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix index ba2a894e12b8..9c335f11820d 100644 --- a/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix @@ -71,6 +71,6 @@ buildPythonPackage rec { description = "Archiver for GNU Mailman v3"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ globin qyliss ]; + maintainers = with lib.maintainers; [ qyliss ]; }; } diff --git a/nixpkgs/pkgs/servers/mail/mailman/mailman-hyperkitty.nix b/nixpkgs/pkgs/servers/mail/mailman/mailman-hyperkitty.nix index 4bb9cdda1a46..ba3fdbacdb72 100644 --- a/nixpkgs/pkgs/servers/mail/mailman/mailman-hyperkitty.nix +++ b/nixpkgs/pkgs/servers/mail/mailman/mailman-hyperkitty.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Mailman archiver plugin for HyperKitty"; homepage = "https://gitlab.com/mailman/mailman-hyperkitty"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ globin qyliss ]; + maintainers = with maintainers; [ qyliss ]; }; } diff --git a/nixpkgs/pkgs/servers/mail/mailman/postorius.nix b/nixpkgs/pkgs/servers/mail/mailman/postorius.nix index 1e93b20f3232..14a31b59da4c 100644 --- a/nixpkgs/pkgs/servers/mail/mailman/postorius.nix +++ b/nixpkgs/pkgs/servers/mail/mailman/postorius.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://docs.mailman3.org/projects/postorius"; description = "Web-based user interface for managing GNU Mailman"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ globin qyliss ]; + maintainers = with maintainers; [ qyliss ]; }; } diff --git a/nixpkgs/pkgs/servers/mail/stalwart/Cargo.lock b/nixpkgs/pkgs/servers/mail/stalwart/Cargo.lock index 8a6878319e30..c2d471f00054 100644 --- a/nixpkgs/pkgs/servers/mail/stalwart/Cargo.lock +++ b/nixpkgs/pkgs/servers/mail/stalwart/Cargo.lock @@ -40,9 +40,9 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead", "aes", @@ -73,7 +73,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom", + "getrandom 0.2.10", "once_cell", "version_check", ] @@ -85,7 +85,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", - "getrandom", + "getrandom 0.2.10", "once_cell", "serde", "version_check", @@ -93,9 +93,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -123,9 +123,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -137,15 +137,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -161,22 +161,15 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", ] [[package]] -name = "antispam" -version = "0.1.0" -dependencies = [ - "fancy-regex", -] - -[[package]] name = "anyhow" version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -184,9 +177,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "argon2" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e554a8638bdc1e4eae9984845306cc95f8a9208ba8d49c3859fd958b46774d" +checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" dependencies = [ "base64ct", "blake2", @@ -207,6 +200,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + +[[package]] name = "asn1-rs" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -219,7 +221,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.28", + "time", ] [[package]] @@ -247,13 +249,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -275,18 +277,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -333,15 +335,15 @@ dependencies = [ "rust-ini", "serde", "thiserror", - "time 0.3.28", + "time", "url", ] [[package]] name = "aws-region" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "056557a61427d0e5ba29dd931031c8ffed4ee7a550e7cd55692a9d8deb0a9dba" +checksum = "42fed2b9fca70f2908268d057a607f2a906f47edbf856ea8587de9038d264e22" dependencies = [ "thiserror", ] @@ -426,9 +428,9 @@ checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -491,13 +493,13 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "prettyplease 0.2.12", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.29", + "syn 2.0.38", "which", ] @@ -517,12 +519,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] -name = "bitfield" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" - -[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -530,9 +526,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" dependencies = [ "serde", ] @@ -579,16 +575,15 @@ dependencies = [ [[package]] name = "blake3" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq 0.3.0", - "digest 0.10.7", ] [[package]] @@ -640,48 +635,38 @@ dependencies = [ ] [[package]] -name = "bstr" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "buffer-redux" -version = "1.0.0" +name = "buffered-reader" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2886ea01509598caac116942abd33ab5a88fa32acdf7e4abfa0fc489ca520c9" +checksum = "66d3bea5bcc3ecc38fe5388e6bc35e6fe7bd665eb3ae9a44283e15b91ad3867d" dependencies = [ - "memchr", - "safemem", + "lazy_static", + "libc", ] [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bzip2" @@ -705,16 +690,6 @@ dependencies = [ ] [[package]] -name = "camellia" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3264e2574e9ef2b53ce6f536dea83a69ac0bc600b762d1523ff83fe07230ce30" -dependencies = [ - "byteorder", - "cipher 0.4.4", -] - -[[package]] name = "cast5" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -761,6 +736,17 @@ dependencies = [ ] [[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + +[[package]] name = "cfb-mode" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -777,18 +763,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -823,20 +808,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.1" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.4.1" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -846,14 +830,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -863,6 +847,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] +name = "cmac" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8543454e3c3f5126effff9cd44d562af4e31fb8ce1cc0d3dcd8f084515dbc1aa" +dependencies = [ + "cipher 0.4.4", + "dbl", + "digest 0.10.7", +] + +[[package]] name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -923,9 +918,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" dependencies = [ "libc", ] @@ -946,12 +941,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" [[package]] -name = "crc24" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd121741cf3eb82c08dd3023eb55bf2665e5f60ec20f89760cf836ae4562e6a0" - -[[package]] name = "crc32fast" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1021,12 +1010,12 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" dependencies = [ "generic-array", - "rand_core", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -1038,7 +1027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core", + "rand_core 0.6.4", "typenum", ] @@ -1054,9 +1043,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -1066,9 +1055,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -1084,75 +1073,38 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest 0.10.7", - "fiat-crypto", - "platforms", - "rustc_version", + "byteorder", + "digest 0.9.0", + "rand_core 0.5.1", "subtle", "zeroize", ] [[package]] -name = "curve25519-dalek-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[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]] -name = "darling_macro" -version = "0.14.4" +name = "curve25519-dalek-ng" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", + "byteorder", + "digest 0.9.0", + "rand_core 0.6.4", + "subtle-ng", + "zeroize", ] [[package]] name = "dashmap" -version = "5.5.1" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "lock_api", "once_cell", "parking_lot_core", @@ -1165,6 +1117,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] +name = "dbl" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd2735a791158376708f9347fe8faba9667589d82427ef3aed6794a8981de3d9" +dependencies = [ + "generic-array", +] + +[[package]] +name = "decancer" +version = "1.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080b09f6adad25c23d8c47c54e52e59b0dc09d079c4b23e0f147dac440359d0d" + +[[package]] name = "der" version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1191,45 +1158,15 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ + "powerfmt", "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", - "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 = "des" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1240,17 +1177,24 @@ dependencies = [ [[package]] name = "dialoguer" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" +checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" dependencies = [ "console", "shell-words", "tempfile", + "thiserror", "zeroize", ] [[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] name = "digest" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1279,6 +1223,7 @@ dependencies = [ "argon2", "async-trait", "bb8", + "flate2", "futures", "ldap3", "lru-cache", @@ -1291,14 +1236,16 @@ dependencies = [ "pbkdf2 0.12.2", "pwhash", "regex", + "reqwest", "rustls 0.21.7", "scrypt", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", + "sieve-rs", "smtp-proto", "sqlx", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing", "utils", ] @@ -1352,7 +1299,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1374,6 +1321,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] +name = "dyn-clone" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" + +[[package]] +name = "eax" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9954fabd903b82b9d7a68f65f97dc96dd9ad368e40ccc907a7c19d53e6bfac28" +dependencies = [ + "aead", + "cipher 0.4.4", + "cmac", + "ctr", + "subtle", +] + +[[package]] +name = "ecb" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a8bfa975b1aec2145850fcaa1c6fe269a16578c44705a532ae3edc92b8881c7" +dependencies = [ + "cipher 0.4.4", +] + +[[package]] name = "ecdsa" version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1383,7 +1358,7 @@ dependencies = [ "digest 0.10.7", "elliptic-curve", "rfc6979", - "signature", + "signature 2.1.0", "spki", ] @@ -1401,30 +1376,29 @@ dependencies = [ "once_cell", "openssl", "serde", - "sha2 0.10.7", + "sha2 0.10.8", "thiserror", ] [[package]] name = "ed25519" -version = "2.2.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "pkcs8", - "signature", + "signature 1.6.4", ] [[package]] name = "ed25519-dalek" -version = "2.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ "curve25519-dalek", "ed25519", - "serde", - "sha2 0.10.7", + "rand 0.7.3", + "sha2 0.9.9", "zeroize", ] @@ -1439,9 +1413,9 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" dependencies = [ "base16ct", "crypto-bigint", @@ -1452,13 +1426,22 @@ dependencies = [ "hkdf", "pem-rfc7468", "pkcs8", - "rand_core", + "rand_core 0.6.4", "sec1", "subtle", "zeroize", ] [[package]] +name = "ena" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +dependencies = [ + "log", +] + +[[package]] name = "encode_unicode" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1481,14 +1464,14 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -1499,26 +1482,15 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys 0.48.0", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] name = "etcetera" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1571,9 +1543,9 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "ff" @@ -1581,17 +1553,11 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "rand_core", + "rand_core 0.6.4", "subtle", ] [[package]] -name = "fiat-crypto" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" - -[[package]] name = "filetime" version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1604,6 +1570,12 @@ dependencies = [ ] [[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + +[[package]] name = "fixedbitset" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1611,9 +1583,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "libz-sys", @@ -1622,13 +1594,12 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", - "pin-project", "spin 0.9.8", ] @@ -1691,7 +1662,7 @@ dependencies = [ "foundationdb-sys", "futures", "memchr", - "rand", + "rand 0.8.5", "serde", "serde_bytes", "serde_json", @@ -1716,7 +1687,7 @@ checksum = "83c8d52fe8b46ab822b4decdcc0d6d85aeedfc98f0d52ba2bd4aec4a97807516" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "try_map", ] @@ -1802,7 +1773,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1867,13 +1838,28 @@ dependencies = [ [[package]] name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "getrandom" version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -1905,7 +1891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -1939,9 +1925,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ "ahash 0.8.3", "allocator-api2", @@ -1953,7 +1939,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] @@ -1967,9 +1953,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -1978,6 +1964,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hickory-proto" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand 0.8.5", + "ring 0.16.20", + "rustls 0.21.7", + "rustls-pemfile", + "thiserror", + "tinyvec", + "tokio", + "tokio-rustls", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand 0.8.5", + "resolv-conf", + "rustls 0.21.7", + "smallvec", + "thiserror", + "tokio", + "tokio-rustls", + "tracing", +] + +[[package]] name = "hkdf" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2105,7 +2142,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -2144,7 +2181,7 @@ dependencies = [ "hyper 0.14.27", "rustls 0.21.7", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -2162,15 +2199,17 @@ dependencies = [ [[package]] name = "hyper-util" version = "0.0.0" -source = "git+https://github.com/hyperium/hyper-util#f898015fc9eca9f459ddac521db278d904099e89" +source = "git+https://github.com/hyperium/hyper-util#1ed4c2ccdb23f576eb7024555f08b376b9d5c9eb" dependencies = [ + "bytes", "futures-channel", "futures-util", "http", + "http-body 1.0.0-rc.2", "hyper 1.0.0-rc.4", "once_cell", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.5.5", "tokio", "tower", "tower-service", @@ -2179,16 +2218,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -2210,18 +2249,11 @@ dependencies = [ ] [[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] name = "idna" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -2237,8 +2269,14 @@ dependencies = [ ] [[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[package]] name = "imap" -version = "0.3.6" +version = "0.4.0" dependencies = [ "ahash 0.8.3", "dashmap", @@ -2249,12 +2287,13 @@ dependencies = [ "mail-parser", "mail-send", "md5", + "nlp", "parking_lot", "rustls 0.21.7", "rustls-pemfile", "store", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing", "utils", ] @@ -2282,19 +2321,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] name = "indicatif" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -2304,6 +2343,15 @@ dependencies = [ ] [[package]] +name = "infer" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199" +dependencies = [ + "cfb", +] + +[[package]] name = "inout" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2328,7 +2376,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.5", "widestring", "windows-sys 0.48.0", "winreg", @@ -2361,6 +2409,15 @@ dependencies = [ ] [[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.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2394,7 +2451,7 @@ checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e" dependencies = [ "cedarwood", "fxhash", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "lazy_static", "phf", "phf_codegen", @@ -2403,14 +2460,14 @@ dependencies = [ [[package]] name = "jmap" -version = "0.3.6" +version = "0.4.0" dependencies = [ "aes", "aes-gcm", "aes-gcm-siv", "async-stream", "async-trait", - "base64 0.21.3", + "base64 0.21.4", "bincode", "cbc", "chrono", @@ -2429,33 +2486,34 @@ dependencies = [ "mail-parser", "mail-send", "mime", + "nlp", "p256", - "pgp", - "rand", + "rand 0.8.5", "rasn", "rasn-cms", "rasn-pkix", "reqwest", "rsa", + "sequoia-openpgp", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sieve-rs", "smtp", "smtp-proto", "sqlx", "store", "tokio", - "tokio-tungstenite 0.20.0", + "tokio-tungstenite 0.20.1", "tracing", - "tungstenite 0.20.0", + "tungstenite 0.20.1", "utils", ] [[package]] name = "jmap-client" version = "0.3.0" -source = "git+https://github.com/stalwartlabs/jmap-client#a55af189d41a21cf5a51c1c69852cf6143cc8102" +source = "git+https://github.com/stalwartlabs/jmap-client#5b6595e770c75c3a5b2ae2e90ee18e35d6c6b5cf" dependencies = [ "ahash 0.8.3", "async-stream", @@ -2489,9 +2547,9 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -2506,15 +2564,6 @@ dependencies = [ ] [[package]] -name = "keccak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" -dependencies = [ - "cpufeatures", -] - -[[package]] name = "konst" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2535,6 +2584,34 @@ dependencies = [ ] [[package]] +name = "lalrpop" +version = "0.19.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" +dependencies = [ + "ascii-canvas", + "bit-set", + "diff", + "ena", + "is-terminal", + "itertools 0.10.5", + "lalrpop-util", + "petgraph", + "regex", + "regex-syntax 0.6.29", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", +] + +[[package]] +name = "lalrpop-util" +version = "0.19.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" + +[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2574,12 +2651,12 @@ dependencies = [ "log", "nom", "percent-encoding", - "ring", + "ring 0.16.20", "rustls 0.21.7", "rustls-native-certs", "thiserror", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-stream", "tokio-util", "url", @@ -2588,9 +2665,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -2604,9 +2681,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "librocksdb-sys" @@ -2654,15 +2731,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2695,36 +2772,36 @@ dependencies = [ [[package]] name = "mail-auth" -version = "0.3.2" -source = "git+https://github.com/stalwartlabs/mail-auth#a6cd1d6cc0a79943903e8154eecc29f2de003e2a" +version = "0.3.6" +source = "git+https://github.com/stalwartlabs/mail-auth#8a1b216adc60b95192645033aed6d20fa89821cd" dependencies = [ "ahash 0.8.3", "flate2", + "hickory-resolver", "lru-cache", "mail-builder", "mail-parser", "parking_lot", - "quick-xml 0.28.2", - "ring", + "quick-xml 0.30.0", + "ring 0.17.5", "rustls-pemfile", "serde", "serde_json", - "trust-dns-resolver", "zip", ] [[package]] name = "mail-builder" version = "0.3.1" -source = "git+https://github.com/stalwartlabs/mail-builder#1eb0b5a72211c491cbe338920e8dfd3a675d6653" +source = "git+https://github.com/stalwartlabs/mail-builder#665f46db8542a97f5b86fd1ff9ea8d74d5ab7e4f" dependencies = [ "gethostname", ] [[package]] name = "mail-parser" -version = "0.8.2" -source = "git+https://github.com/stalwartlabs/mail-parser#da62659eb609a8222edf7d1f57b28550a853921e" +version = "0.9.1" +source = "git+https://github.com/stalwartlabs/mail-parser#b6c080ff45c0de95703a4fadb6a41dab49cd1566" dependencies = [ "encoding_rs", "serde", @@ -2732,8 +2809,8 @@ dependencies = [ [[package]] name = "mail-send" -version = "0.4.0" -source = "git+https://github.com/stalwartlabs/mail-send#ffa60e3f653d0f4057b7c97d103751a80adc4c12" +version = "0.4.1" +source = "git+https://github.com/stalwartlabs/mail-send#53904ce6cf4fcb9a42a92a541f5d64d4d972d6cb" dependencies = [ "base64 0.20.0", "gethostname", @@ -2741,13 +2818,13 @@ dependencies = [ "rustls 0.21.7", "smtp-proto", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "webpki-roots 0.25.2", ] [[package]] name = "mail-server" -version = "0.3.6" +version = "0.4.0" dependencies = [ "directory", "imap", @@ -2782,7 +2859,7 @@ dependencies = [ "sieve-rs", "store", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing", "utils", ] @@ -2809,16 +2886,10 @@ dependencies = [ ] [[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] name = "matchit" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "maybe-async" @@ -2853,10 +2924,11 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest 0.10.7", ] @@ -2868,9 +2940,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.6.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76fc44e2588d5b436dbc3c6cf62aef290f90dab6235744a93dfe1cc18f451e2c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -2891,6 +2963,12 @@ dependencies = [ ] [[package]] +name = "memsec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa0916b001582d253822171bd23f4a0229d32b9507fae236f5da8cad515ba7c" + +[[package]] name = "mime" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2933,10 +3011,10 @@ dependencies = [ ] [[package]] -name = "multimap" -version = "0.8.3" +name = "new_debug_unreachable" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "nix" @@ -2952,6 +3030,35 @@ dependencies = [ ] [[package]] +name = "nlp" +version = "0.4.0" +dependencies = [ + "ahash 0.8.3", + "bincode", + "farmhash", + "jieba-rs", + "lazy_static", + "lru-cache", + "nohash", + "parking_lot", + "phf", + "rust-stemmers", + "serde", + "siphasher 1.0.0", + "tinysegmenter", + "tokio", + "utils", + "whatlang", + "xxhash-rust", +] + +[[package]] +name = "nohash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f889fb66f7acdf83442c35775764b51fed3c606ab9cee51500dbde2cf528ca" + +[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2994,24 +3101,12 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand", - "serde", + "rand 0.8.5", "smallvec", "zeroize", ] [[package]] -name = "num-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3034,9 +3129,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -3060,9 +3155,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3094,7 +3189,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -3111,7 +3206,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3122,18 +3217,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.27.0+1.1.1v" +version = "300.1.5+3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02" +checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.92" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -3144,9 +3239,9 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" +checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" dependencies = [ "opentelemetry_api", "opentelemetry_sdk", @@ -3154,9 +3249,9 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" +checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b" dependencies = [ "async-trait", "bytes", @@ -3167,17 +3262,18 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" +checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275" dependencies = [ "async-trait", - "futures", - "futures-util", + "futures-core", "http", - "opentelemetry", "opentelemetry-http", "opentelemetry-proto", + "opentelemetry-semantic-conventions", + "opentelemetry_api", + "opentelemetry_sdk", "prost", "reqwest", "thiserror", @@ -3187,34 +3283,31 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" +checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb" dependencies = [ - "futures", - "futures-util", - "opentelemetry", + "opentelemetry_api", + "opentelemetry_sdk", "prost", "tonic", - "tonic-build", ] [[package]] name = "opentelemetry-semantic-conventions" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b02e0230abb0ab6636d18e2ba8fa02903ea63772281340ccac18e0af3ec9eeb" +checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269" dependencies = [ "opentelemetry", ] [[package]] name = "opentelemetry_api" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" dependencies = [ - "fnv", "futures-channel", "futures-util", "indexmap 1.9.3", @@ -3222,31 +3315,42 @@ dependencies = [ "once_cell", "pin-project-lite", "thiserror", + "urlencoding", ] [[package]] name = "opentelemetry_sdk" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" dependencies = [ "async-trait", "crossbeam-channel", - "dashmap", - "fnv", "futures-channel", "futures-executor", "futures-util", "once_cell", "opentelemetry_api", + "ordered-float", "percent-encoding", - "rand", + "rand 0.8.5", + "regex", + "serde_json", "thiserror", "tokio", "tokio-stream", ] [[package]] +name = "ordered-float" +version = "3.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +dependencies = [ + "num-traits", +] + +[[package]] name = "ordered-multimap" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3271,19 +3375,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "primeorder", - "sha2 0.10.7", -] - -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3298,13 +3390,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -3316,7 +3408,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" dependencies = [ "base64ct", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -3327,7 +3419,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -3346,7 +3438,7 @@ dependencies = [ "digest 0.10.7", "hmac 0.12.1", "password-hash 0.4.2", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3358,7 +3450,7 @@ dependencies = [ "digest 0.10.7", "hmac 0.12.1", "password-hash 0.5.0", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3389,59 +3481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", -] - -[[package]] -name = "pgp" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27e1f8e085bfa9b85763fe3ddaacbe90a09cd847b3833129153a6cb063bbe132" -dependencies = [ - "aes", - "base64 0.21.3", - "bitfield", - "block-padding", - "blowfish 0.9.1", - "bstr", - "buffer-redux", - "byteorder", - "camellia", - "cast5", - "cfb-mode", - "chrono", - "cipher 0.4.4", - "crc24", - "curve25519-dalek", - "derive_builder", - "des", - "digest 0.10.7", - "ed25519-dalek", - "elliptic-curve", - "flate2", - "generic-array", - "hex", - "idea", - "log", - "md-5 0.10.5", - "nom", - "num-bigint-dig", - "num-derive", - "num-traits", - "p256", - "p384", - "rand", - "ripemd", - "rsa", - "sha1", - "sha2 0.10.7", - "sha3", - "signature", - "smallvec", - "thiserror", - "twofish", - "x25519-dalek", - "zeroize", + "indexmap 2.0.2", ] [[package]] @@ -3451,7 +3491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", - "phf_shared", + "phf_shared 0.11.2", ] [[package]] @@ -3461,7 +3501,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.11.2", ] [[package]] @@ -3470,8 +3510,8 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared", - "rand", + "phf_shared 0.11.2", + "rand 0.8.5", ] [[package]] @@ -3481,10 +3521,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher 0.3.11", ] [[package]] @@ -3493,7 +3542,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -3513,7 +3562,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3556,12 +3605,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] -name = "platforms" -version = "3.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" - -[[package]] name = "polyval" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3580,29 +3623,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "prettyplease" -version = "0.1.25" +name = "precomputed-hash" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "prettyplease" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3640,9 +3685,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -3658,50 +3703,19 @@ dependencies = [ ] [[package]] -name = "prost-build" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" -dependencies = [ - "bytes", - "heck", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease 0.1.25", - "prost", - "prost-types", - "regex", - "syn 1.0.109", - "tempfile", - "which", -] - -[[package]] name = "prost-derive" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", ] [[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost", -] - -[[package]] name = "pwhash" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3711,8 +3725,8 @@ dependencies = [ "byteorder", "hmac 0.10.1", "md-5 0.9.1", - "rand", - "sha-1", + "rand 0.8.5", + "sha-1 0.9.8", "sha2 0.9.9", ] @@ -3734,9 +3748,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.28.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] @@ -3769,13 +3783,36 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + +[[package]] +name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", ] [[package]] @@ -3785,7 +3822,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", ] [[package]] @@ -3794,14 +3840,23 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.10", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", ] [[package]] name = "rasn" -version = "0.9.5" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe5ce12835340cdd47a8abf36aabc02ce2d2a1d88e29d6c5126b5e7bf95eb53" +checksum = "0ef6075807dc2ea24ddbfaf1546bf4b956ac1f8338eae4dffa35d69846c8b691" dependencies = [ "arrayvec", "bitvec", @@ -3821,9 +3876,9 @@ dependencies = [ [[package]] name = "rasn-cms" -version = "0.9.5" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae05ee5eb8b58bcbbb7d5d28270281b9aa305b9a6aa271cac54f3a967f11fa2" +checksum = "8d8d8656a9e88bca3a726fc7c365e4c8a4455d1f95ecd58f7817cfc642674cbc" dependencies = [ "rasn", "rasn-pkix", @@ -3831,12 +3886,12 @@ dependencies = [ [[package]] name = "rasn-derive" -version = "0.9.5" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c8ad6b5a6cd2f18516cde588b72797c56b884f0bd2dfdd82eb392781b85507" +checksum = "eda946c91626f958f853e47616cdfdd1fcd9c36a65a2388eb9a5d80dd644efd3" dependencies = [ "either", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "rayon", @@ -3846,18 +3901,18 @@ dependencies = [ [[package]] name = "rasn-pkix" -version = "0.9.5" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b82b75a434efa7dbb6ff898c9504586e3adffa9e445336edd9c0431c27b4c2" +checksum = "6c91ef69d71656ca94e119989fd2056679823852d2544f94cd96bd6912a49a06" dependencies = [ "rasn", ] [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -3865,14 +3920,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -3894,26 +3947,35 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] name = "redox_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom", + "getrandom 0.2.10", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.9.4" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.7", - "regex-syntax 0.7.5", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -3927,13 +3989,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -3944,17 +4006,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -3977,8 +4039,9 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -4026,12 +4089,26 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] [[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + +[[package]] name = "ripemd" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4087,8 +4164,8 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8", - "rand_core", - "signature", + "rand_core 0.6.4", + "signature 2.1.0", "spki", "subtle", "zeroize", @@ -4110,7 +4187,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4152,9 +4229,9 @@ dependencies = [ "reqwest", "serde", "serde_derive", - "sha2 0.10.7", + "sha2 0.10.8", "thiserror", - "time 0.3.28", + "time", "tokio", "tokio-stream", "url", @@ -4183,15 +4260,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] name = "rusticata-macros" version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4202,11 +4270,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.10" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -4220,7 +4288,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] @@ -4232,8 +4300,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", - "rustls-webpki 0.101.4", + "ring 0.16.20", + "rustls-webpki 0.101.6", "sct", ] @@ -4255,27 +4323,27 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", ] [[package]] name = "rustls-webpki" -version = "0.100.2" +version = "0.100.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" +checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4291,12 +4359,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] name = "salsa20" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4338,7 +4400,7 @@ dependencies = [ "password-hash 0.5.0", "pbkdf2 0.12.2", "salsa20", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -4347,8 +4409,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4389,16 +4451,64 @@ dependencies = [ ] [[package]] -name = "semver" -version = "1.0.18" +name = "sequoia-openpgp" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "a16854c0f6297de6db4df195e28324dfbc2429802f0e48cd04007db8e3049709" +dependencies = [ + "aes", + "anyhow", + "base64 0.21.4", + "block-padding", + "blowfish 0.9.1", + "buffered-reader", + "cast5", + "cfb-mode", + "chrono", + "cipher 0.4.4", + "des", + "digest 0.10.7", + "dyn-clone", + "eax", + "ecb", + "ecdsa", + "ed25519", + "ed25519-dalek", + "generic-array", + "getrandom 0.2.10", + "idea", + "idna 0.3.0", + "lalrpop", + "lalrpop-util", + "lazy_static", + "libc", + "md-5 0.10.6", + "memsec", + "num-bigint-dig", + "once_cell", + "p256", + "rand 0.7.3", + "rand 0.8.5", + "rand_core 0.6.4", + "regex", + "regex-syntax 0.6.29", + "ripemd", + "rsa", + "sha-1 0.10.1", + "sha1collisiondetection", + "sha2 0.10.8", + "thiserror", + "twofish", + "typenum", + "x25519-dalek-ng", + "xxhash-rust", +] [[package]] name = "serde" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] @@ -4414,20 +4524,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -4468,7 +4578,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -4485,10 +4595,10 @@ dependencies = [ ] [[package]] -name = "sha1" -version = "0.10.5" +name = "sha-1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", @@ -4496,44 +4606,55 @@ dependencies = [ ] [[package]] -name = "sha2" -version = "0.9.9" +name = "sha1" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "block-buffer 0.9.0", "cfg-if", "cpufeatures", + "digest 0.10.7", +] + +[[package]] +name = "sha1collisiondetection" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b20793cf8330b2c7da4c438116660fed24e380bcb8a1bcfff2581b5593a0b38e" +dependencies = [ "digest 0.9.0", - "opaque-debug", + "generic-array", ] [[package]] name = "sha2" -version = "0.10.7" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ + "block-buffer 0.9.0", "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest 0.9.0", + "opaque-debug", ] [[package]] -name = "sha3" +name = "sha2" version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ + "cfg-if", + "cpufeatures", "digest 0.10.7", - "keccak", ] [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -4546,14 +4667,14 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "sieve-rs" version = "0.3.1" -source = "git+https://github.com/stalwartlabs/sieve#cea1451c13006016cff96aacfb88290318576e96" +source = "git+https://github.com/stalwartlabs/sieve#b7b62b3b33d05b7c1e50ea5123a35ef461c66b8d" dependencies = [ "ahash 0.8.3", "bincode", @@ -4575,12 +4696,18 @@ dependencies = [ [[package]] name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" + +[[package]] +name = "signature" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ "digest 0.10.7", - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -4590,6 +4717,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] +name = "siphasher" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" + +[[package]] name = "slab" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4600,31 +4733,37 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smtp" -version = "0.3.6" +version = "0.4.0" dependencies = [ "ahash 0.8.3", "blake3", "dashmap", + "decancer", "directory", "form_urlencoded", "http-body-util", "hyper 1.0.0-rc.4", "hyper-util", + "idna 0.4.0", + "imagesize", + "infer", "lazy_static", "lru-cache", "mail-auth", "mail-builder", "mail-parser", "mail-send", + "md5", + "nlp", "num_cpus", "parking_lot", - "rand", + "rand 0.8.5", "rayon", "regex", "reqwest", @@ -4633,22 +4772,24 @@ dependencies = [ "serde", "serde_json", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "sieve-rs", "smtp-proto", "sqlx", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing", + "unicode-security", "utils", - "webpki-roots 0.23.1", + "webpki-roots 0.25.2", + "whatlang", "x509-parser", ] [[package]] name = "smtp-proto" version = "0.1.1" -source = "git+https://github.com/stalwartlabs/smtp-proto#434ede72159b5f9ea588b9ee8c361a3247aa2f35" +source = "git+https://github.com/stalwartlabs/smtp-proto#d5949da111db6d9299c6a8928bf77f3dce337a1d" [[package]] name = "snafu" @@ -4675,9 +4816,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -4685,9 +4826,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -4720,20 +4861,20 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" +checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" dependencies = [ - "itertools", + "itertools 0.11.0", "nom", "unicode_categories", ] [[package]] name = "sqlx" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" dependencies = [ "sqlx-core", "sqlx-macros", @@ -4744,9 +4885,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" dependencies = [ "ahash 0.8.3", "atoi", @@ -4764,7 +4905,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.0.0", + "indexmap 2.0.2", "log", "memchr", "once_cell", @@ -4774,7 +4915,7 @@ dependencies = [ "rustls-pemfile", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlformat", "thiserror", @@ -4787,9 +4928,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" dependencies = [ "proc-macro2", "quote", @@ -4800,9 +4941,9 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" dependencies = [ "dotenvy", "either", @@ -4813,7 +4954,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sqlx-core", "sqlx-mysql", "sqlx-postgres", @@ -4826,13 +4967,13 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" dependencies = [ "atoi", - "base64 0.21.3", - "bitflags 2.4.0", + "base64 0.21.4", + "bitflags 2.4.1", "byteorder", "bytes", "crc", @@ -4849,15 +4990,15 @@ dependencies = [ "hmac 0.12.1", "itoa", "log", - "md-5 0.10.5", + "md-5 0.10.6", "memchr", "once_cell", "percent-encoding", - "rand", + "rand 0.8.5", "rsa", "serde", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", @@ -4868,13 +5009,13 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" dependencies = [ "atoi", - "base64 0.21.3", - "bitflags 2.4.0", + "base64 0.21.4", + "bitflags 2.4.1", "byteorder", "crc", "dotenvy", @@ -4889,14 +5030,14 @@ dependencies = [ "home", "itoa", "log", - "md-5 0.10.5", + "md-5 0.10.6", "memchr", "once_cell", - "rand", + "rand 0.8.5", "serde", "serde_json", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", @@ -4907,9 +5048,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" dependencies = [ "atoi", "flume", @@ -4929,7 +5070,7 @@ dependencies = [ [[package]] name = "stalwart-cli" -version = "0.3.6" +version = "0.4.0" dependencies = [ "clap", "console", @@ -4951,9 +5092,9 @@ dependencies = [ [[package]] name = "stalwart-install" -version = "0.3.6" +version = "0.4.0" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "clap", "dialoguer", "flate2", @@ -4961,7 +5102,7 @@ dependencies = [ "libc", "openssl", "pwhash", - "rand", + "rand 0.8.5", "reqwest", "rpassword", "rusqlite", @@ -4985,36 +5126,47 @@ dependencies = [ "farmhash", "foundationdb", "futures", - "jieba-rs", "lazy_static", "lru-cache", "maybe-async 0.2.7", + "nlp", "num_cpus", "parking_lot", "r2d2", - "rand", + "rand 0.8.5", "rayon", "roaring", "rocksdb", "rusqlite", "rust-s3", - "rust-stemmers", "serde", - "siphasher", - "tinysegmenter", + "siphasher 1.0.0", "tokio", "tracing", "utils", - "whatlang", "xxhash-rust", ] [[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", +] + +[[package]] name = "stringprep" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" dependencies = [ + "finl_unicode", "unicode-bidi", "unicode-normalization", ] @@ -5032,6 +5184,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] +name = "subtle-ng" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" + +[[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5044,9 +5202,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -5072,6 +5230,27 @@ dependencies = [ ] [[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "tap" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5118,7 +5297,7 @@ version = "0.1.0" dependencies = [ "ahash 0.8.3", "async-trait", - "base64 0.21.3", + "base64 0.21.4", "bytes", "chrono", "csv", @@ -5140,6 +5319,7 @@ dependencies = [ "mail-parser", "mail-send", "managesieve", + "nlp", "num_cpus", "rayon", "reqwest", @@ -5154,7 +5334,7 @@ dependencies = [ "sqlx", "store", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing", "tracing-subscriber", "utils", @@ -5162,22 +5342,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5192,23 +5372,13 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -5216,20 +5386,29 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] [[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] name = "tinysegmenter" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5256,9 +5435,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -5268,7 +5447,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] @@ -5291,18 +5470,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", + "syn 2.0.38", ] [[package]] @@ -5336,28 +5504,28 @@ dependencies = [ "log", "rustls 0.21.7", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tungstenite 0.19.0", "webpki-roots 0.23.1", ] [[package]] name = "tokio-tungstenite" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", "tokio", - "tungstenite 0.20.0", + "tungstenite 0.20.1", ] [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -5369,14 +5537,13 @@ dependencies = [ [[package]] name = "tonic" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ - "async-stream", "async-trait", "axum", - "base64 0.13.1", + "base64 0.21.4", "bytes", "futures-core", "futures-util", @@ -5388,28 +5555,12 @@ dependencies = [ "percent-encoding", "pin-project", "prost", - "prost-derive", "tokio", "tokio-stream", - "tokio-util", "tower", "tower-layer", "tower-service", "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" -dependencies = [ - "prettyplease 0.1.25", - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.109", ] [[package]] @@ -5423,7 +5574,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand", + "rand 0.8.5", "slab", "tokio", "tokio-util", @@ -5446,11 +5597,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -5464,39 +5614,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.28", + "time", "tracing-subscriber", ] [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", ] [[package]] -name = "tracing-futures" -version = "0.2.5" +name = "tracing-journald" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +checksum = "ba316a74e8fc3c3896a850dba2375928a9fa171b085ecddfc7c054d39970f3fd" dependencies = [ - "pin-project", - "tracing", + "libc", + "tracing-core", + "tracing-subscriber", ] [[package]] @@ -5512,12 +5663,14 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.18.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" +checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8" dependencies = [ "once_cell", "opentelemetry", + "opentelemetry_sdk", + "smallvec", "tracing", "tracing-core", "tracing-log", @@ -5543,59 +5696,6 @@ dependencies = [ ] [[package]] -name = "trust-dns-proto" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static", - "rand", - "ring", - "rustls 0.20.9", - "rustls-pemfile", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tokio-rustls 0.23.4", - "tracing", - "url", - "webpki", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static", - "lru-cache", - "parking_lot", - "resolv-conf", - "rustls 0.20.9", - "smallvec", - "thiserror", - "tokio", - "tokio-rustls 0.23.4", - "tracing", - "trust-dns-proto", - "webpki-roots 0.22.6", -] - -[[package]] name = "try-lock" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5619,7 +5719,7 @@ dependencies = [ "http", "httparse", "log", - "rand", + "rand 0.8.5", "rustls 0.21.7", "sha1", "thiserror", @@ -5630,9 +5730,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", "bytes", @@ -5640,7 +5740,7 @@ dependencies = [ "http", "httparse", "log", - "rand", + "rand 0.8.5", "sha1", "thiserror", "url", @@ -5658,15 +5758,24 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typewit" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5cee357cc77d1e02f10a3e6c4e13b8462fafab05998b62d331b7d9485589ff" +checksum = "6779a69cc5f9a7388274a0a8a353eb1c9e45195f9ae74a26690b055a7cf9592a" +dependencies = [ + "typewit_proc_macros", +] + +[[package]] +name = "typewit_proc_macros" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6" [[package]] name = "unicase" @@ -5685,9 +5794,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -5699,6 +5808,22 @@ dependencies = [ ] [[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-security" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef5756b3097992b934b06608c69f48448a0fbe804bb1e72b982f6d7983e9e63" +dependencies = [ + "unicode-normalization", + "unicode-script", +] + +[[package]] name = "unicode-segmentation" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5706,9 +5831,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -5739,6 +5864,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] name = "url" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5750,6 +5881,12 @@ dependencies = [ ] [[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] name = "utf-8" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5763,9 +5900,10 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utils" -version = "0.3.6" +version = "0.4.0" dependencies = [ "ahash 0.8.3", + "chrono", "dashmap", "mail-auth", "mail-send", @@ -5778,20 +5916,21 @@ dependencies = [ "serde", "smtp-proto", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing", "tracing-appender", + "tracing-journald", "tracing-opentelemetry", "tracing-subscriber", ] [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ - "getrandom", + "getrandom 0.2.10", ] [[package]] @@ -5823,9 +5962,9 @@ dependencies = [ [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" +version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" @@ -5854,7 +5993,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -5888,7 +6027,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5924,12 +6063,12 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -5947,7 +6086,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "rustls-webpki 0.100.2", + "rustls-webpki 0.100.3", ] [[package]] @@ -5956,7 +6095,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki 0.101.4", + "rustls-webpki 0.101.6", ] [[package]] @@ -5977,13 +6116,14 @@ dependencies = [ [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix", ] [[package]] @@ -6021,10 +6161,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets 0.48.5", ] @@ -6181,14 +6321,14 @@ dependencies = [ ] [[package]] -name = "x25519-dalek" -version = "2.0.0" +name = "x25519-dalek-ng" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "bf7074de8999662970c3c4c8f7f30925028dd8f4ca31ad4c055efa9cdf2ec326" dependencies = [ - "curve25519-dalek", - "rand_core", - "serde", + "curve25519-dalek-ng", + "rand 0.8.5", + "rand_core 0.6.4", "zeroize", ] @@ -6206,7 +6346,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.28", + "time", ] [[package]] @@ -6220,15 +6360,15 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "xxhash-rust" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "735a71d46c4d68d71d4b24d03fdc2b98e38cea81730595801db779c04fe80d70" +checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" [[package]] name = "zeroize" @@ -6247,7 +6387,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -6266,7 +6406,7 @@ dependencies = [ "hmac 0.12.1", "pbkdf2 0.11.0", "sha1", - "time 0.3.28", + "time", "zstd", ] @@ -6302,11 +6442,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/nixpkgs/pkgs/servers/mail/stalwart/default.nix b/nixpkgs/pkgs/servers/mail/stalwart/default.nix index 6a1044c38b23..f76d34cf29ee 100644 --- a/nixpkgs/pkgs/servers/mail/stalwart/default.nix +++ b/nixpkgs/pkgs/servers/mail/stalwart/default.nix @@ -13,7 +13,7 @@ }: let - version = "0.3.6"; + version = "0.4.0"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -23,21 +23,21 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "v${version}"; - hash = "sha256-QZF51TkuV73EHWXABvqybEZ56CR4zXC/HrmWtVDuM0U="; + hash = "sha256-T61GlSzKdJZiSyRyxyk7PKhm0jmEtrMxoaTyM3FeDCU="; fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "hyper-util-0.0.0" = "sha256-wGtB6hUjIOKR7UZJrX9ve4x4/7TDQuSPG0Sq9VyW7iI="; - "jmap-client-0.3.0" = "sha256-GNqSPygiVq5Z9y8Kfhzacq3lTIEg2o4UxzOMDbBO7xY="; - "mail-auth-0.3.2" = "sha256-CTafQCXPo91ZUlfS9JUqU+RfUf4+6EbdG97+nIqQtNw="; - "mail-builder-0.3.1" = "sha256-r32iiHtQp0C94Qqc4Vspc08QaXZ+e1u7e39fNYoQGsY="; - "mail-parser-0.8.2" = "sha256-XvKEgzQ+HDoLI16CmqE/RRgApg0q9Au9sqOOEpZz6W0="; - "mail-send-0.4.0" = "sha256-czfzadxvrLQD4qhw/yVI45ajo5EAVu1Bj2lwBY1dVQY="; - "sieve-rs-0.3.1" = "sha256-JIhOklif2IuU3kUVxZb68BZvMV1dR0NtQe3UOayC+vM="; - "smtp-proto-0.1.1" = "sha256-HhKZQHQv3tMEfRZgCoAtyxVzwHbcB4FSjKlMoU1PkHg="; + "hyper-util-0.0.0" = "sha256-9vp8eWjK/pjkJCMjVSI9J2b4amhXK5sat1VAq5Jd6mI="; + "jmap-client-0.3.0" = "sha256-TJQEi2qH/92QA3YJrPBWgpO0nE5o7Atv6btq2gPNTmw="; + "mail-auth-0.3.6" = "sha256-FTC0ZHyZ5H2yBlmNrOijm50xQ3qd2Q+52z8THCW5A5Q="; + "mail-builder-0.3.1" = "sha256-JPV3vp/5+9yFoNNZzxuQ9sbnF8HgDbfHhtb6zQfLFqQ="; + "mail-parser-0.9.1" = "sha256-PJh6s7SvspakhuziEy+dZccIN0hJpjkcIUGTYQRvKGc="; + "mail-send-0.4.1" = "sha256-WK6pC8ZtSoIScanNatDbb3Y7Ch43Dj3463VHDwmEyG0="; + "sieve-rs-0.3.1" = "sha256-PJ24mwlpA6EpB3l749HfSFQhYAmpPxKmYJh/nBmDKDs="; + "smtp-proto-0.1.1" = "sha256-C73wm+dfq+LKteHH9wATw2L23YMw3dhzTIyFJMoqvBA="; }; }; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 04077ad2c261..02d164216f46 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -16,20 +16,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.94.0"; + version = "1.95.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-26w926IPkVJiPVMoJUYvIFQMv5Kc6bl7Ps1mZsZJ2Xs="; + hash = "sha256-WYKuWTOP0w9Xtao9vF3+km4mXVTrt/mshcaXuF92voQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-xq6qPr7gfdIleV2znUdKftkOU8MB8j55m78TJR4C5Vs="; + hash = "sha256-uUu2Hu4a7J49S3rhZ7xsLJQC7seYkVScYYbWaw4Q/rU="; }; postPatch = '' @@ -113,10 +113,6 @@ python3.pkgs.buildPythonApplication rec { sentry = [ sentry-sdk ]; - opentracing = [ - jaeger-client - opentracing - ]; jwt = [ authlib ]; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix b/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix index 37023092a079..5ae3077060ca 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "synadm"; - version = "0.43.1"; + version = "0.44"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-z8OXrra7+fptd4zs1gxJVGLR+SA8hoexK2qY9zpSowU="; + hash = "sha256-BNmdyEITSZJb+wwyLU+zZi70kmfuYOqVDhKi8xFCf2E="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/servers/mattermost/matterircd.nix b/nixpkgs/pkgs/servers/mattermost/matterircd.nix index a456ee8c3f3f..c66d5557d76f 100644 --- a/nixpkgs/pkgs/servers/mattermost/matterircd.nix +++ b/nixpkgs/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "matterircd"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "sha256-bDM+P9UwH4cpieOQQfEi2xIKTRQ1zInW9iFK3yAU1Xk="; + sha256 = "sha256-qA07i31fGLLIfWoCBW1f5nvf4AWEIkSXZh22F6rRnpM="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/servers/monitoring/cockpit/update.sh b/nixpkgs/pkgs/servers/monitoring/cockpit/update.sh deleted file mode 100755 index c1834db9d39c..000000000000 --- a/nixpkgs/pkgs/servers/monitoring/cockpit/update.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts - -set -eu -o pipefail - -version="$(curl --silent "https://api.github.com/repos/cockpit-project/cockpit/releases" | jq '.[0].tag_name' --raw-output)" - -update-source-version cockpit "$version" diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix index f0b6055f2ba0..8b2573db4f77 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -1,39 +1,41 @@ -{ stdenv, fetchFromGitHub, lib, python3, nixosTests }: +{ lib +, python3 +, fetchPypi +, nixosTests +}: -stdenv.mkDerivation rec { +python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "unstable-2021-08-21"; + version = "3.3.2"; + pyproject = true; - src = fetchFromGitHub { - owner = "ghedo"; - repo = "knot_exporter"; - rev = "b18eb7db735b50280f0815497475f4c7092a6550"; - sha256 = "sha256-FGzkO/KHDhkM3PA2urNQcrMi3MHADkd0YwAvu1jvfrU="; + src = fetchPypi { + pname = "knot_exporter"; + inherit version; + hash = "sha256-/TBzq9MhYb664TsSD46Ep7gOkLBmmPSK9d89xlgvbSw="; }; - dontBuild = true; + nativeBuildInputs = [ + python3.pkgs.hatchling + ]; - nativeBuildInputs = [ python3.pkgs.wrapPython ]; - buildInputs = [ python3 ]; + propagatedBuildInputs = with python3.pkgs; [ + libknot + prometheus-client + psutil + ]; - installPhase = '' - runHook preInstall - - install -Dm0755 knot_exporter $out/bin/knot_exporter - patchShebangs $out/bin - buildPythonPath ${python3.pkgs.prometheus-client} - patchPythonScript $out/bin/knot_exporter - - runHook postInstall - ''; + pythonImportsCheck = [ + "knot_exporter" + ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) knot; }; meta = with lib; { - homepage = "https://github.com/ghedo/knot_exporter"; - description = " Prometheus exporter for Knot DNS"; + description = "Prometheus exporter for Knot DNS"; + homepage = "https://gitlab.nic.cz/knot/knot-dns/-/tree/master/python/knot_exporter"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ma27 ]; - platforms = platforms.linux; + maintainers = with maintainers; [ ma27 hexa ]; + mainProgram = "knot-exporter"; }; } diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index 6b03f90e58fe..635ca0936b77 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -18,6 +18,6 @@ buildGoModule rec { description = "Prometheus exporter for OpenVPN"; broken = true; license = licenses.asl20; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/promscale/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/promscale/default.nix index d4a67bc83501..821cab907850 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/promscale/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/promscale/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { owner = "timescale"; repo = pname; rev = version; - sha256 = "sha256-JizUI9XRzOEHF1kAblYQRYB11z9KWX7od3lPiRN+JNI="; + hash = "sha256-JizUI9XRzOEHF1kAblYQRYB11z9KWX7od3lPiRN+JNI="; }; vendorHash = "sha256-lnyKsipr/f9W9LWLb2lizKGLvIbS3XnSlOH1u1B87OY="; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index a08a5b41cc8d..666b8ed9bdc7 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "statsd_exporter"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "statsd_exporter"; rev = "v${version}"; - hash = "sha256-I0/UX4Tpbd2cfsMQQ3gAGfJ3Bgr+JxRARNmV2v2mLeM="; + hash = "sha256-H5ckrDAs9gwQCkVe4TKF4yuqLh2S/+dPaaRH+5aoj+o="; }; - vendorHash = "sha256-cTAjOCP0qWMIKa0xGSK7Id+Oqz3ompDlwAqwub9oNWI="; + vendorHash = "sha256-LhPfOc83/IWkTk3C1DZggWngPJWobZFeCl4cum/aIQo="; meta = with lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; diff --git a/nixpkgs/pkgs/servers/mpd/default.nix b/nixpkgs/pkgs/servers/mpd/default.nix index 0f92847a2378..aa781f7e26fb 100644 --- a/nixpkgs/pkgs/servers/mpd/default.nix +++ b/nixpkgs/pkgs/servers/mpd/default.nix @@ -9,7 +9,7 @@ , audiofile, faad2, ffmpeg, flac, fluidsynth, game-music-emu , libmad, libmikmod, mpg123, libopus, libvorbis, lame # Filters -, libsamplerate +, libsamplerate, soxr # Outputs , alsa-lib, libjack2, libpulseaudio, libshout, pipewire # Misc @@ -62,6 +62,7 @@ let lame = [ lame ]; # Filter plugins libsamplerate = [ libsamplerate ]; + soxr = [ soxr ]; # Output plugins alsa = [ alsa-lib ]; jack = [ libjack2 ]; diff --git a/nixpkgs/pkgs/servers/nfs-ganesha/default.nix b/nixpkgs/pkgs/servers/nfs-ganesha/default.nix index 74b340e844e7..f68fe3969b21 100644 --- a/nixpkgs/pkgs/servers/nfs-ganesha/default.nix +++ b/nixpkgs/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "5.5.3"; + version = "5.6"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-bHywbdlUSuwk05FVYK5PR+RGlNisV+syGrs9dtanNg8="; + sha256 = "sha256-QXs42HY2h/s2cT1pG2QjSV2HVAjpo2WSymXEYGgF8rI="; }; preConfigure = "cd src"; diff --git a/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix b/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix index c59678418c31..5f102f1c4162 100644 --- a/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix +++ b/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix @@ -6,13 +6,13 @@ buildGo121Module rec { pname = "ferretdb"; - version = "1.11.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-jasAfbE3CRlBJeyMnqKJBbmA+W/QnytGIUdyXR55EaU="; + hash = "sha256-3fLTiI13Mm+G6EEEOzCuJ9KVebCq5O54hyH6JiCRRL8="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGo121Module rec { echo nixpkgs > build/version/package.txt ''; - vendorHash = "sha256-5TjKGGEX66qNr2/25zRd7UESi03g7FI1AfEsW2mBcDE="; + vendorHash = "sha256-l45KFDpqprBWnsVRhOJkCWolZapArRvjUb52R5hc5zs="; CGO_ENABLED = 0; diff --git a/nixpkgs/pkgs/servers/osmocom/libosmo-sccp/default.nix b/nixpkgs/pkgs/servers/osmocom/libosmo-sccp/default.nix index 54f345e4f962..39b6d845e01b 100644 --- a/nixpkgs/pkgs/servers/osmocom/libosmo-sccp/default.nix +++ b/nixpkgs/pkgs/servers/osmocom/libosmo-sccp/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libosmo-sccp"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmo-sccp"; rev = version; - hash = "sha256-icEyI0zgsiBfawcNW8IarVPj0VNxzsev2W+cRGPev7Y="; + hash = "sha256-GrC++v7PCAnaEtMFt+el/ct2g+/9Axev04g/jMIGyOQ="; }; configureFlags = [ "--with-systemdsystemunitdir=$out" ]; diff --git a/nixpkgs/pkgs/servers/owntracks-recorder/default.nix b/nixpkgs/pkgs/servers/owntracks-recorder/default.nix index 47b3b696fd4c..85985584c827 100644 --- a/nixpkgs/pkgs/servers/owntracks-recorder/default.nix +++ b/nixpkgs/pkgs/servers/owntracks-recorder/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "owntracks-recorder"; - version = "0.9.3"; + version = "0.9.5"; src = fetchFromGitHub { owner = "owntracks"; repo = "recorder"; rev = finalAttrs.version; - hash = "sha256-w0wk69hERGz6fs6uXBYiomcVlQeeTGCfTICu2q7ryNg="; + hash = "sha256-N9qMMAIgmBUEscydJKBQneLcX8odOEXY+560lJJz52g="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/oxigraph/default.nix b/nixpkgs/pkgs/servers/oxigraph/default.nix index 0246d3f5b071..e11167000dfc 100644 --- a/nixpkgs/pkgs/servers/oxigraph/default.nix +++ b/nixpkgs/pkgs/servers/oxigraph/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "oxigraph"; - version = "0.3.19"; + version = "0.3.20"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-lVPRg9zU3VOTrxr2pTHzfvaGjoP/h88W4JmQhOKshRc="; + sha256 = "sha256-gV7Yo14oGFzuO1b/JGXeuqn4k+9aNTwngEJHoD9+NMI="; fetchSubmodules = true; }; - cargoHash = "sha256-+wh6qHXW9KXXOkMIkRr+tI3ViBrHpE2G+96mhXFJDtI="; + cargoHash = "sha256-bXf7PZm2l1hwnFVbfEJWLyRaVY3cZFaDSe8b77JtyaU="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/nixpkgs/pkgs/servers/rt/default.nix b/nixpkgs/pkgs/servers/rt/default.nix index 894da7a652ee..59933570d7b1 100644 --- a/nixpkgs/pkgs/servers/rt/default.nix +++ b/nixpkgs/pkgs/servers/rt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rt"; - version = "5.0.3"; + version = "5.0.5"; src = fetchFromGitHub { repo = pname; rev = "${pname}-${version}"; owner = "bestpractical"; - hash = "sha256-ZitlueLEbV3mGJg0aDrLa5IReJiOVaEf+JicbA9zUS4="; + hash = "sha256-4E6xEk1sIiNBKJT4jD+SNK8Fs+hX8EuTv+jD1U1g6qY="; }; patches = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { GD GDGraph GnuPGInterface - GraphViz + GraphViz2 HTMLFormatExternal HTMLFormatTextWithLinks HTMLFormatTextWithLinksAndTables diff --git a/nixpkgs/pkgs/servers/sks/default.nix b/nixpkgs/pkgs/servers/sks/default.nix index 2ace06edc975..b40f76b26606 100644 --- a/nixpkgs/pkgs/servers/sks/default.nix +++ b/nixpkgs/pkgs/servers/sks/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/servers/sql/dolt/default.nix b/nixpkgs/pkgs/servers/sql/dolt/default.nix index cd1a03ff04c6..7500c0ca4ff2 100644 --- a/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.18.1"; + version = "1.21.4"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-fjiKUKI+NH825Pb0jCE4AN1ZU075J8jk3avWe0oYAWI="; + sha256 = "sha256-pa9xsbO/d5/3wCx2XKn4dzlqPlO3Ie/cGJiwfWTEUKc="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-wjZ28ttrKaumQXhU/BUYUxXfsdM1QqlKVt9NKglVyjU="; + vendorHash = "sha256-1Cy0PmDmMPpPZ2PLDP6sywb39MuExv2yabqSeP3Of9M="; proxyVendor = true; doCheck = false; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/hypopg.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/hypopg.nix new file mode 100644 index 000000000000..62f2e9263e76 --- /dev/null +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/hypopg.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + pname = "hypopg"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "HypoPG"; + repo = "hypopg"; + rev = version; + hash = "sha256-YzQnkQi9BlDryUySnWHWeTanhgfVUXjHjOqj+nQucCY="; + }; + + buildInputs = [ postgresql ]; + + installPhase = '' + install -D -t $out/lib *${postgresql.dlSuffix} + install -D -t $out/share/postgresql/extension *.control + install -D -t $out/share/postgresql/extension *.sql + ''; + + meta = with lib; { + description = "Hypothetical Indexes for PostgreSQL"; + homepage = "https://hypopg.readthedocs.io"; + license = licenses.postgresql; + platforms = postgresql.meta.platforms; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix new file mode 100644 index 000000000000..6daa5e0cf0ef --- /dev/null +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, postgresql +}: + +stdenv.mkDerivation rec { + pname = "pg_uuidv7"; + version = "1.3.0"; + + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "fboulnois"; + repo = "pg_uuidv7"; + rev = "v${version}"; + hash = "sha256-kHxS9tL7fpKhjJ8Xx5tee1fv10zVcTt2FgUQSaRdNZo="; + }; + + installPhase = '' + install -D -t $out/lib pg_uuidv7${postgresql.dlSuffix} + install -D {sql/pg_uuidv7--${lib.versions.majorMinor version}.sql,pg_uuidv7.control} -t $out/share/postgresql/extension + ''; + + meta = with lib; { + description = "A tiny Postgres extension to create version 7 UUIDs"; + homepage = "https://github.com/fboulnois/pg_uuidv7"; + changelog = "https://github.com/fboulnois/pg_uuidv7/blob/main/CHANGELOG.md"; + maintainers = with maintainers; [ gaelreyrol ]; + platforms = postgresql.meta.platforms; + license = licenses.mpl20; + broken = versionOlder postgresql.version "13"; + }; +} diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index a37556436e74..83acc0804eee 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - hash = "sha256-IR1x1duROt3IHYQx8CYXqUxTmFgB1sbia93k3oBfEkw="; + hash = "sha256-fahL+8aq4rUGYgEq6ri5wzVprDqvMmZCNkxwKtcPO68="; }; buildInputs = [ postgresql ]; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/packages.nix b/nixpkgs/pkgs/servers/sql/postgresql/packages.nix index 64254e826154..69309d0c4824 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/packages.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/packages.nix @@ -4,6 +4,8 @@ self: super: { apache_datasketches = super.callPackage ./ext/apache_datasketches.nix { }; + hypopg = super.callPackage ./ext/hypopg.nix { }; + jsonb_deep_sum = super.callPackage ./ext/jsonb_deep_sum.nix { }; periods = super.callPackage ./ext/periods.nix { }; @@ -77,6 +79,8 @@ self: super: { pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { }; + pg_uuidv7 = super.callPackage ./ext/pg_uuidv7.nix { }; + promscale_extension = super.callPackage ./ext/promscale_extension.nix { }; repmgr = super.callPackage ./ext/repmgr.nix { }; diff --git a/nixpkgs/pkgs/servers/syncstorage-rs/Cargo.lock b/nixpkgs/pkgs/servers/syncstorage-rs/Cargo.lock index 0f91937acb17..059eca302cc5 100644 --- a/nixpkgs/pkgs/servers/syncstorage-rs/Cargo.lock +++ b/nixpkgs/pkgs/servers/syncstorage-rs/Cargo.lock @@ -14,8 +14,8 @@ dependencies = [ "futures-sink", "log", "pin-project 0.4.30", - "tokio", - "tokio-util", + "tokio 0.2.25", + "tokio-util 0.3.1", ] [[package]] @@ -77,7 +77,7 @@ dependencies = [ "futures-core", "futures-util", "fxhash", - "h2", + "h2 0.2.7", "http", "httparse", "indexmap", @@ -90,7 +90,7 @@ dependencies = [ "pin-project 1.1.3", "rand 0.7.3", "regex", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "serde_urlencoded", "sha-1", @@ -118,7 +118,7 @@ dependencies = [ "http", "log", "regex", - "serde 1.0.188", + "serde 1.0.189", ] [[package]] @@ -133,7 +133,7 @@ dependencies = [ "futures-channel", "futures-util", "smallvec", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -149,7 +149,7 @@ dependencies = [ "futures-channel", "futures-util", "log", - "mio", + "mio 0.6.23", "mio-uds", "num_cpus", "slab", @@ -257,7 +257,7 @@ dependencies = [ "mime", "pin-project 1.1.3", "regex", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "serde_urlencoded", "socket2 0.3.19", @@ -294,9 +294,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -364,19 +364,19 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" dependencies = [ - "serde 1.0.188", + "serde 1.0.189", "serde_json", ] [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -415,7 +415,7 @@ dependencies = [ "mime", "percent-encoding 2.3.0", "rand 0.7.3", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "serde_urlencoded", ] @@ -469,7 +469,7 @@ dependencies = [ "cexpr", "clang-sys", "clap", - "env_logger", + "env_logger 0.9.3", "lazy_static", "lazycell", "log", @@ -490,24 +490,24 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] -name = "bitmaps" -version = "2.1.0" +name = "block-buffer" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "typenum", + "generic-array", ] [[package]] name = "block-buffer" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] @@ -523,9 +523,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -534,9 +534,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -550,9 +550,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -623,8 +623,7 @@ dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits 0.2.16", - "serde 1.0.188", + "num-traits 0.2.17", "wasm-bindgen", "windows-targets", ] @@ -683,7 +682,7 @@ checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" dependencies = [ "lazy_static", "nom 5.1.3", - "serde 1.0.188", + "serde 1.0.189", ] [[package]] @@ -695,7 +694,7 @@ dependencies = [ "lazy_static", "nom 5.1.3", "rust-ini", - "serde 1.0.188", + "serde 1.0.189", "serde-hjson", "serde_json", "toml", @@ -807,13 +806,13 @@ dependencies = [ ] [[package]] -name = "crypto-mac" -version = "0.11.1" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "subtle", + "typenum", ] [[package]] @@ -833,9 +832,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.66+curl-8.3.0" +version = "0.4.68+curl-8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70c44a72e830f0e40ad90dda8a6ab6ed6314d39776599a58a2e5e37fbc6db5b9" +checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" dependencies = [ "cc", "libc", @@ -855,25 +854,28 @@ dependencies = [ "config 0.10.1", "crossbeam-queue", "num_cpus", - "serde 1.0.188", - "tokio", + "serde 1.0.189", + "tokio 0.2.25", ] [[package]] name = "debugid" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ee87af31d84ef885378aebca32be3d682b0e0dc119d5b4860a2c5bb5046730" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ - "serde 1.0.188", - "uuid", + "serde 1.0.189", + "uuid 1.5.0", ] [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "derive_more" @@ -948,6 +950,17 @@ dependencies = [ ] [[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common", + "subtle", +] + +[[package]] name = "dirs-next" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -982,7 +995,7 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.188", + "serde 1.0.189", "strsim 0.10.0", ] @@ -1033,68 +1046,60 @@ dependencies = [ ] [[package]] -name = "erased-serde" -version = "0.3.31" +name = "env_logger" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "serde 1.0.188", + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", ] [[package]] -name = "errno" -version = "0.3.3" +name = "erased-serde" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", + "serde 1.0.189", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "errno" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "cc", "libc", + "windows-sys", ] [[package]] -name = "failure" -version = "0.1.8" +name = "fastrand" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] -name = "failure_derive" -version = "0.1.8" +name = "findshlibs" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", + "cc", + "lazy_static", + "libc", + "winapi 0.3.9", ] [[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1208,7 +1213,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1297,9 +1302,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "google-cloud-rust-raw" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1887de8efd052e35bf75e4ed4bc78de35b69447a4b6d9f2e7ede52579512f318" +checksum = "fbabcfb0bcc5e3222191c3f0fba962b0cbf4242d2effe2a865090eee492ffc9c" dependencies = [ "futures 0.3.28", "grpcio", @@ -1351,13 +1356,32 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", - "tokio-util", + "tokio 0.2.25", + "tokio-util 0.3.1", "tracing", "tracing-futures", ] [[package]] +name = "h2" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +dependencies = [ + "bytes 1.5.0", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio 1.33.0", + "tokio-util 0.7.9", + "tracing", +] + +[[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1407,22 +1431,20 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.11.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" dependencies = [ - "digest", "hmac", ] [[package]] name = "hmac" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "crypto-mac", - "digest", + "digest 0.10.7", ] [[package]] @@ -1467,6 +1489,17 @@ dependencies = [ ] [[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes 1.5.0", + "http", + "pin-project-lite 0.2.13", +] + +[[package]] name = "httparse" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1479,6 +1512,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" [[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1494,15 +1533,39 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.2.7", "http", - "http-body", + "http-body 0.3.1", "httparse", - "httpdate", + "httpdate 0.3.2", "itoa 0.4.8", "pin-project 1.1.3", "socket2 0.3.19", - "tokio", + "tokio 0.2.25", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes 1.5.0", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.21", + "http", + "http-body 0.4.5", + "httparse", + "httpdate 1.0.3", + "itoa 1.0.9", + "pin-project-lite 0.2.13", + "socket2 0.4.9", + "tokio 1.33.0", "tower-service", "tracing", "want", @@ -1516,10 +1579,10 @@ checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" dependencies = [ "bytes 0.5.6", "futures-util", - "hyper", + "hyper 0.13.10", "log", "rustls", - "tokio", + "tokio 0.2.25", "tokio-rustls", "webpki", ] @@ -1531,24 +1594,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ "bytes 0.5.6", - "hyper", + "hyper 0.13.10", "native-tls", - "tokio", + "tokio 0.2.25", "tokio-tls", ] [[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes 1.5.0", + "hyper 0.14.27", + "native-tls", + "tokio 1.33.0", + "tokio-native-tls", +] + +[[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1599,20 +1675,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] -name = "im" -version = "14.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "696059c87b83c5a258817ecd67c3af915e3ed141891fc35a1e79908801cf0ce7" -dependencies = [ - "bitmaps", - "rand_core 0.5.1", - "rand_xoshiro", - "sized-chunks", - "typenum", - "version_check", -] - -[[package]] name = "indexmap" version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1756,9 +1818,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -1790,15 +1852,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1839,9 +1901,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "migrations_internals" @@ -1915,6 +1977,17 @@ dependencies = [ ] [[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", +] + +[[package]] name = "mio-uds" version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1922,7 +1995,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.23", ] [[package]] @@ -2021,14 +2094,14 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -2079,7 +2152,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if 1.0.0", "foreign-types", "libc", @@ -2096,7 +2169,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2118,6 +2191,17 @@ dependencies = [ ] [[package]] +name = "os_info" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +dependencies = [ + "log", + "serde 1.0.189", + "winapi 0.3.9", +] + +[[package]] name = "parking_lot" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2135,7 +2219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -2154,13 +2238,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets", ] @@ -2239,7 +2323,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2267,6 +2351,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2304,9 +2394,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -2463,28 +2553,28 @@ dependencies = [ ] [[package]] -name = "rand_xoshiro" -version = "0.4.0" +name = "redox_syscall" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9fcdd2e881d02f1d9390ae47ad8e5696a9e4be7b547a1da2afbc61973217004" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "rand_core 0.5.1", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] @@ -2502,9 +2592,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -2514,9 +2604,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -2525,9 +2615,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" @@ -2541,10 +2631,10 @@ dependencies = [ "futures-core", "futures-util", "http", - "http-body", - "hyper", + "http-body 0.3.1", + "hyper 0.13.10", "hyper-rustls", - "hyper-tls", + "hyper-tls 0.4.3", "ipnet", "js-sys", "lazy_static", @@ -2555,10 +2645,10 @@ dependencies = [ "percent-encoding 2.3.0", "pin-project-lite 0.2.13", "rustls", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "serde_urlencoded", - "tokio", + "tokio 0.2.25", "tokio-rustls", "tokio-tls", "url 2.4.1", @@ -2570,6 +2660,44 @@ dependencies = [ ] [[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +dependencies = [ + "base64 0.21.4", + "bytes 1.5.0", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.3.21", + "http", + "http-body 0.4.5", + "hyper 0.14.27", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding 2.3.0", + "pin-project-lite 0.2.13", + "serde 1.0.189", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio 1.33.0", + "tokio-native-tls", + "tower-service", + "url 2.4.1", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.50.0", +] + +[[package]] name = "resolv-conf" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2627,16 +2755,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver 1.0.20", ] [[package]] name = "rustix" -version = "0.38.14" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -2745,9 +2873,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "semver-parser" @@ -2757,94 +2885,111 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "sentry" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd0927ec4a785fc4328abe9089afbe074b3874983b3373fc328a73a9f8310cb" +checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc" dependencies = [ "curl", - "httpdate", - "reqwest", + "httpdate 1.0.3", + "native-tls", + "reqwest 0.11.22", "sentry-backtrace", "sentry-contexts", "sentry-core", - "sentry-failure", + "sentry-debug-images", "sentry-panic", - "serde_json", + "sentry-tracing", + "tokio 1.33.0", + "ureq", ] [[package]] name = "sentry-backtrace" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4585422b92435a04569441aef8dc3417eb9d7547fd591b67fdf6fdfe204232c9" +checksum = "18a7b80fa1dd6830a348d38a8d3a9761179047757b7dca29aef82db0118b9670" dependencies = [ "backtrace", - "lazy_static", + "once_cell", "regex", "sentry-core", ] [[package]] name = "sentry-contexts" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d607b3be0593e026f1c089f0086c244429fe3026eca8e075e8f9e834703ee4c0" +checksum = "7615dc588930f1fd2e721774f25844ae93add2dbe2d3c2f995ce5049af898147" dependencies = [ "hostname", - "lazy_static", "libc", - "regex", - "rustc_version 0.2.3", + "os_info", + "rustc_version 0.4.0", "sentry-core", "uname", ] [[package]] name = "sentry-core" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9c118347dc0958e66f8b0f3866f0d85bbf8a63bffe64603baebe3f989e929e6" +checksum = "8f51264e4013ed9b16558cce43917b983fa38170de2ca480349ceb57d71d6053" dependencies = [ - "im", - "lazy_static", - "rand 0.7.3", + "once_cell", + "rand 0.8.5", "sentry-types", + "serde 1.0.189", + "serde_json", ] [[package]] -name = "sentry-failure" -version = "0.19.1" +name = "sentry-debug-images" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8599d375040329e106653a133a1d876af53df8b504cff1de7b6f4471fd41eec3" +checksum = "2fe6180fa564d40bb942c9f0084ffb5de691c7357ead6a2b7a3154fae9e401dd" dependencies = [ - "failure", - "sentry-backtrace", + "findshlibs", + "once_cell", "sentry-core", ] [[package]] name = "sentry-panic" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3943c3fc7fff39244158b625bb2235a27e7e4d0b862b5e52cb57db51e6a6e6e" +checksum = "323160213bba549f9737317b152af116af35c0410f4468772ee9b606d3d6e0fa" dependencies = [ "sentry-backtrace", "sentry-core", ] [[package]] +name = "sentry-tracing" +version = "0.31.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38033822128e73f7b6ca74c1631cef8868890c6cb4008a291cf73530f87b4eac" +dependencies = [ + "sentry-backtrace", + "sentry-core", + "tracing-core", + "tracing-subscriber", +] + +[[package]] name = "sentry-types" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b41bac48a3586249431fa9efb88cd1414c3455117eb57c02f5bda9634e158d" +checksum = "0e663b3eb62ddfc023c9cf5432daf5f1a4f6acb1df4d78dd80b740b32dd1a740" dependencies = [ - "chrono", "debugid", - "serde 1.0.188", + "hex", + "rand 0.8.5", + "serde 1.0.189", "serde_json", "thiserror", + "time 0.3.30", "url 2.4.1", - "uuid", + "uuid 1.5.0", ] [[package]] @@ -2855,9 +3000,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] @@ -2876,13 +3021,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2893,7 +3038,7 @@ checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa 1.0.9", "ryu", - "serde 1.0.188", + "serde 1.0.189", ] [[package]] @@ -2905,7 +3050,7 @@ dependencies = [ "form_urlencoded", "itoa 1.0.9", "ryu", - "serde 1.0.188", + "serde 1.0.189", ] [[package]] @@ -2914,10 +3059,10 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] @@ -2938,15 +3083,13 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" [[package]] name = "sha2" -version = "0.9.9" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "block-buffer", "cfg-if 1.0.0", "cpufeatures", - "digest", - "opaque-debug", + "digest 0.10.7", ] [[package]] @@ -2965,16 +3108,6 @@ dependencies = [ ] [[package]] -name = "sized-chunks" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59044ea371ad781ff976f7b06480b9f0180e834eda94114f2afb4afc12b7718" -dependencies = [ - "bitmaps", - "typenum", -] - -[[package]] name = "slab" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3026,7 +3159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f400f1c5db96f1f52065e8931ca0c524cceb029f7537c9e6d5424488ca137ca0" dependencies = [ "chrono", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "slog", ] @@ -3063,7 +3196,7 @@ dependencies = [ "slog", "term", "thread_local", - "time 0.3.28", + "time 0.3.30", ] [[package]] @@ -3094,6 +3227,16 @@ dependencies = [ ] [[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3136,7 +3279,7 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ "proc-macro2", "quote", - "serde 1.0.188", + "serde 1.0.189", "serde_derive", "syn 1.0.109", ] @@ -3150,7 +3293,7 @@ dependencies = [ "base-x", "proc-macro2", "quote", - "serde 1.0.188", + "serde 1.0.189", "serde_derive", "serde_json", "sha1", @@ -3177,9 +3320,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -3194,9 +3337,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -3205,7 +3348,7 @@ dependencies = [ [[package]] name = "syncserver" -version = "0.14.0" +version = "0.14.1" dependencies = [ "actix-cors", "actix-http", @@ -3218,7 +3361,7 @@ dependencies = [ "chrono", "docopt", "dyn-clone", - "env_logger", + "env_logger 0.10.0", "futures 0.3.28", "hawk", "hex", @@ -3228,10 +3371,10 @@ dependencies = [ "mime", "rand 0.8.5", "regex", - "reqwest", + "reqwest 0.10.10", "sentry", "sentry-backtrace", - "serde 1.0.188", + "serde 1.0.189", "serde_derive", "serde_json", "sha2", @@ -3248,12 +3391,12 @@ dependencies = [ "syncstorage-db", "syncstorage-settings", "thiserror", - "time 0.3.28", + "time 0.3.30", "tokenserver-auth", "tokenserver-common", "tokenserver-db", "tokenserver-settings", - "tokio", + "tokio 0.2.25", "urlencoding", "validator", "validator_derive", @@ -3262,13 +3405,13 @@ dependencies = [ [[package]] name = "syncserver-common" -version = "0.14.0" +version = "0.14.1" dependencies = [ "actix-web", "cadence", "futures 0.3.28", "hkdf", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "sha2", "slog", @@ -3277,7 +3420,7 @@ dependencies = [ [[package]] name = "syncserver-db-common" -version = "0.14.0" +version = "0.14.1" dependencies = [ "backtrace", "deadpool", @@ -3291,11 +3434,11 @@ dependencies = [ [[package]] name = "syncserver-settings" -version = "0.14.0" +version = "0.14.1" dependencies = [ "config 0.11.0", "num_cpus", - "serde 1.0.188", + "serde 1.0.189", "slog-scope", "syncserver-common", "syncstorage-settings", @@ -3305,11 +3448,11 @@ dependencies = [ [[package]] name = "syncstorage-db" -version = "0.14.0" +version = "0.14.1" dependencies = [ "async-trait", "cadence", - "env_logger", + "env_logger 0.10.0", "futures 0.3.28", "hostname", "lazy_static", @@ -3323,12 +3466,12 @@ dependencies = [ "syncstorage-mysql", "syncstorage-settings", "syncstorage-spanner", - "tokio", + "tokio 0.2.25", ] [[package]] name = "syncstorage-db-common" -version = "0.14.0" +version = "0.14.1" dependencies = [ "async-trait", "backtrace", @@ -3338,7 +3481,7 @@ dependencies = [ "futures 0.3.28", "http", "lazy_static", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "syncserver-common", "syncserver-db-common", @@ -3347,7 +3490,7 @@ dependencies = [ [[package]] name = "syncstorage-mysql" -version = "0.14.0" +version = "0.14.1" dependencies = [ "async-trait", "backtrace", @@ -3355,7 +3498,7 @@ dependencies = [ "diesel", "diesel_logger", "diesel_migrations", - "env_logger", + "env_logger 0.10.0", "futures 0.3.28", "http", "slog-scope", @@ -3370,23 +3513,24 @@ dependencies = [ [[package]] name = "syncstorage-settings" -version = "0.14.0" +version = "0.14.1" dependencies = [ "rand 0.8.5", - "serde 1.0.188", + "serde 1.0.189", "syncserver-common", - "time 0.3.28", + "time 0.3.30", ] [[package]] name = "syncstorage-spanner" -version = "0.14.0" +version = "0.14.1" dependencies = [ "async-trait", "backtrace", "cadence", "deadpool", - "env_logger", + "env_logger 0.10.0", + "form_urlencoded", "futures 0.3.28", "google-cloud-rust-raw", "grpcio", @@ -3399,21 +3543,30 @@ dependencies = [ "syncstorage-db-common", "syncstorage-settings", "thiserror", - "tokio", + "tokio 0.2.25", "url 2.4.1", - "uuid", + "uuid 0.8.2", ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "system-configuration" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", ] [[package]] @@ -3466,22 +3619,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3520,24 +3673,25 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa 1.0.9", "libc", "num_threads", - "serde 1.0.188", + "powerfmt", + "serde 1.0.189", "time-core", - "time-macros 0.2.14", + "time-macros 0.2.15", ] [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" @@ -3551,9 +3705,9 @@ dependencies = [ [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -3588,29 +3742,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokenserver-auth" -version = "0.14.0" +version = "0.14.1" dependencies = [ "async-trait", "dyn-clone", "futures 0.3.28", "mockito", "pyo3", - "reqwest", - "serde 1.0.188", + "reqwest 0.10.10", + "serde 1.0.189", "serde_json", "syncserver-common", "tokenserver-common", "tokenserver-settings", - "tokio", + "tokio 0.2.25", ] [[package]] name = "tokenserver-common" -version = "0.14.0" +version = "0.14.1" dependencies = [ "actix-web", "backtrace", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "syncserver-common", "thiserror", @@ -3618,17 +3772,17 @@ dependencies = [ [[package]] name = "tokenserver-db" -version = "0.14.0" +version = "0.14.1" dependencies = [ "async-trait", "backtrace", "diesel", "diesel_logger", "diesel_migrations", - "env_logger", + "env_logger 0.10.0", "futures 0.3.28", "http", - "serde 1.0.188", + "serde 1.0.189", "serde_derive", "serde_json", "slog-scope", @@ -3638,14 +3792,14 @@ dependencies = [ "thiserror", "tokenserver-common", "tokenserver-settings", - "tokio", + "tokio 0.2.25", ] [[package]] name = "tokenserver-settings" -version = "0.14.0" +version = "0.14.1" dependencies = [ - "serde 1.0.188", + "serde 1.0.189", "tokenserver-common", ] @@ -3662,9 +3816,8 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.23", "mio-uds", - "num_cpus", "pin-project-lite 0.1.12", "signal-hook-registry", "slab", @@ -3673,6 +3826,22 @@ dependencies = [ ] [[package]] +name = "tokio" +version = "1.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +dependencies = [ + "backtrace", + "bytes 1.5.0", + "libc", + "mio 0.8.8", + "num_cpus", + "pin-project-lite 0.2.13", + "socket2 0.5.4", + "windows-sys", +] + +[[package]] name = "tokio-macros" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3684,6 +3853,16 @@ dependencies = [ ] [[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio 1.33.0", +] + +[[package]] name = "tokio-rustls" version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3691,7 +3870,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", "rustls", - "tokio", + "tokio 0.2.25", "webpki", ] @@ -3702,7 +3881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -3716,7 +3895,21 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.12", - "tokio", + "tokio 0.2.25", +] + +[[package]] +name = "tokio-util" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +dependencies = [ + "bytes 1.5.0", + "futures-core", + "futures-sink", + "pin-project-lite 0.2.13", + "tokio 1.33.0", + "tracing", ] [[package]] @@ -3725,7 +3918,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.188", + "serde 1.0.189", ] [[package]] @@ -3736,11 +3929,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" dependencies = [ - "cfg-if 1.0.0", "log", "pin-project-lite 0.2.13", "tracing-core", @@ -3748,11 +3940,12 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", + "valuable", ] [[package]] @@ -3766,6 +3959,15 @@ dependencies = [ ] [[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "tracing-core", +] + +[[package]] name = "trust-dns-proto" version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3781,7 +3983,7 @@ dependencies = [ "rand 0.7.3", "smallvec", "thiserror", - "tokio", + "tokio 0.2.25", "url 2.4.1", ] @@ -3800,7 +4002,7 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", - "tokio", + "tokio 0.2.25", "trust-dns-proto", ] @@ -3862,12 +4064,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] name = "unindent" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3880,6 +4076,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] +name = "ureq" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +dependencies = [ + "base64 0.21.4", + "log", + "native-tls", + "once_cell", + "url 2.4.1", +] + +[[package]] name = "url" version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3899,7 +4108,7 @@ dependencies = [ "form_urlencoded", "idna 0.4.0", "percent-encoding 2.3.0", - "serde 1.0.188", + "serde 1.0.189", ] [[package]] @@ -3915,30 +4124,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ "getrandom 0.2.10", - "serde 1.0.188", + "serde 1.0.189", +] + +[[package]] +name = "uuid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +dependencies = [ + "serde 1.0.189", ] [[package]] name = "validator" -version = "0.14.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0f08911ab0fee2c5009580f04615fa868898ee57de10692a45da0c3bcc3e5e" +checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" dependencies = [ - "idna 0.2.3", + "idna 0.4.0", "lazy_static", "regex", - "serde 1.0.188", + "serde 1.0.189", "serde_derive", "serde_json", "url 2.4.1", - "validator_types", ] [[package]] name = "validator_derive" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d85135714dba11a1bd0b3eb1744169266f1a38977bf4e3ff5e2e1acb8c2b7eee" +checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" dependencies = [ "if_chain", "lazy_static", @@ -3952,15 +4169,21 @@ dependencies = [ [[package]] name = "validator_types" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded9d97e1d42327632f5f3bae6403c04886e2de3036261ef42deebd931a6a291" +checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" dependencies = [ "proc-macro2", "syn 1.0.109", ] [[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4016,7 +4239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "wasm-bindgen-macro", ] @@ -4032,7 +4255,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -4066,7 +4289,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4168,10 +4391,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets", ] @@ -4261,10 +4484,20 @@ dependencies = [ ] [[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys", +] + +[[package]] name = "woothee" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d5a45c5d9c772e577c263597681448fd91a46aed911783394eec396e45d4ee" +checksum = "896174c6a4779d4d7d4523dd27aef7d46609eda2497e370f6c998325c6bf6971" dependencies = [ "lazy_static", "regex", diff --git a/nixpkgs/pkgs/servers/syncstorage-rs/default.nix b/nixpkgs/pkgs/servers/syncstorage-rs/default.nix index d80f76446362..399c56376ecf 100644 --- a/nixpkgs/pkgs/servers/syncstorage-rs/default.nix +++ b/nixpkgs/pkgs/servers/syncstorage-rs/default.nix @@ -2,7 +2,6 @@ , rustPlatform , pkg-config , python3 -, openssl , cmake , libmysqlclient , makeBinaryWrapper @@ -21,13 +20,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HGX4uLiOqIRjluMLL0QY7YjVYVCkQLe8IiuYdkmAjBQ="; + hash = "sha256-7lIFHK0XSOtfDEy6N9jcPGOd5Por5i1CBdDZQBiHm8c="; }; nativeBuildInputs = [ @@ -39,7 +38,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libmysqlclient - openssl ]; preFixup = '' diff --git a/nixpkgs/pkgs/servers/tacacsplus/default.nix b/nixpkgs/pkgs/servers/tacacsplus/default.nix index 9acba4631025..7761695042f4 100644 --- a/nixpkgs/pkgs/servers/tacacsplus/default.nix +++ b/nixpkgs/pkgs/servers/tacacsplus/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.shrubbery.net/pub/tac_plus/tacacs-F${version}.tar.gz"; - sha256 = "17i18z3s58c8yy8jxp01q3hzz5nirs4cjxms18zzkli6ip4jszql"; + hash = "sha256-FH8tyY0m0vk/Crp2yYjO0Zb/4cAB3C6R94ihosdHIZ4="; }; nativeBuildInputs = [ flex bison ]; diff --git a/nixpkgs/pkgs/servers/tracing/tempo/default.nix b/nixpkgs/pkgs/servers/tracing/tempo/default.nix index 2a992d01ad6a..d837b6b26427 100644 --- a/nixpkgs/pkgs/servers/tracing/tempo/default.nix +++ b/nixpkgs/pkgs/servers/tracing/tempo/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "tempo"; @@ -12,6 +12,15 @@ buildGoModule rec { hash = "sha256-23wjD8HTSEGonIMAWCoKORMLIISASxlN4FeY+Bmt/+I="; }; + patches = [ + # Backport patch for Go 1.21 compatibility + # FIXME: remove after 2.3.0 + (fetchpatch { + url = "https://github.com/grafana/tempo/commit/0d37e8f0edd8a96876b0a5f5ab97ef79ff04608f.patch"; + hash = "sha256-YC59g5pdcrwJeQ4raS0Oq+fZvRBKFj4johZtGTAYpEs="; + }) + ]; + vendorHash = null; subPackages = [ diff --git a/nixpkgs/pkgs/servers/traefik/default.nix b/nixpkgs/pkgs/servers/traefik/default.nix index ff6103c94d4c..41b6ae78a878 100644 --- a/nixpkgs/pkgs/servers/traefik/default.nix +++ b/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.10.4"; + version = "2.10.5"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-rpXSK/6ssUxzYbR1Nf0Cw7Sk6GnhExO4z8OZGQWITZM="; + hash = "sha256-b6CqpVDgyZvgBInlgni1+zukZ7DMzFUV3JdXmh+A+18="; stripRoot = false; }; - vendorHash = "sha256-CsLn8YqQozO+H66ss59Jh+fmDLVx/CzpFY09x2SoI2k="; + vendorHash = "sha256-bQy003IqezNSZU4K9qvApvYW+W4g6RkIqr4okkN/0gI="; subPackages = [ "cmd/traefik" ]; diff --git a/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix index 0930b3a4978d..4318f2d29a14 100644 --- a/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = "https://github.com/mattrude/pgpkeyserver-lite"; description = "A lightweight static front-end for a sks keyserver"; license = licenses.gpl3; - maintainers = with maintainers; [ calbrecht globin ]; + maintainers = with maintainers; [ calbrecht ]; }; } diff --git a/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix b/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix index 70cf53e725be..e1c459541e84 100644 --- a/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix @@ -2,21 +2,18 @@ stdenv.mkDerivation rec { pname = "rss-bridge"; - version = "2022-06-14"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; rev = version; - sha256 = "sha256-yH+m65CIZokZSbnv1zfpKC/Qr/mPPC6dG49Zn62X0l4="; + sha256 = "sha256-N1pbveOgJrB1M+WelKD07Jmv9Vz5NqT+IJf//L8UEnU="; }; - postPatch = '' - substituteInPlace lib/rssbridge.php \ - --replace "define('PATH_CACHE', PATH_ROOT . 'cache/');" "define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/');" \ - --replace "define('FILE_CONFIG', PATH_ROOT . 'config.ini.php');" "define('FILE_CONFIG', getenv('RSSBRIDGE_DATA') . '/config.ini.php');" \ - --replace "define('WHITELIST', PATH_ROOT . 'whitelist.txt');" "define('WHITELIST', getenv('RSSBRIDGE_DATA') . '/whitelist.txt');" - ''; + patches = [ + ./paths.patch + ]; installPhase = '' mkdir $out/ @@ -27,7 +24,7 @@ stdenv.mkDerivation rec { description = "The RSS feed for websites missing it"; homepage = "https://github.com/RSS-Bridge/rss-bridge"; license = licenses.unlicense; - maintainers = with maintainers; [ dawidsowa ]; + maintainers = with maintainers; [ dawidsowa mynacol ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/servers/web-apps/rss-bridge/paths.patch b/nixpkgs/pkgs/servers/web-apps/rss-bridge/paths.patch new file mode 100644 index 000000000000..b226676cb28a --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/rss-bridge/paths.patch @@ -0,0 +1,43 @@ +diff --git a/lib/Configuration.php b/lib/Configuration.php +index c38d7cc9..d95e5174 100644 +--- a/lib/Configuration.php ++++ b/lib/Configuration.php +@@ -104,8 +104,8 @@ final class Configuration + } + } + +- if (file_exists(__DIR__ . '/../whitelist.txt')) { +- $enabledBridges = trim(file_get_contents(__DIR__ . '/../whitelist.txt')); ++ if (file_exists(getenv('RSSBRIDGE_DATA') . '/whitelist.txt')) { ++ $enabledBridges = trim(file_get_contents(getenv('RSSBRIDGE_DATA') . '/whitelist.txt')); + if ($enabledBridges === '*') { + self::setConfig('system', 'enabled_bridges', ['*']); + } else { +diff --git a/lib/RssBridge.php b/lib/RssBridge.php +index 6ba952eb..a0bbaf03 100644 +--- a/lib/RssBridge.php ++++ b/lib/RssBridge.php +@@ -11,8 +11,8 @@ final class RssBridge + Configuration::verifyInstallation(); + + $customConfig = []; +- if (file_exists(__DIR__ . '/../config.ini.php')) { +- $customConfig = parse_ini_file(__DIR__ . '/../config.ini.php', true, INI_SCANNER_TYPED); ++ if (file_exists(getenv('RSSBRIDGE_DATA') . '/config.ini.php')) { ++ $customConfig = parse_ini_file(getenv('RSSBRIDGE_DATA') . '/config.ini.php', true, INI_SCANNER_TYPED); + } + Configuration::loadConfiguration($customConfig, getenv()); + +diff --git a/lib/bootstrap.php b/lib/bootstrap.php +index dc1c0f04..194a3f8f 100644 +--- a/lib/bootstrap.php ++++ b/lib/bootstrap.php +@@ -27,7 +27,7 @@ const PATH_LIB_CACHES = __DIR__ . '/../caches/'; + const PATH_LIB_ACTIONS = __DIR__ . '/../actions/'; + + /** Path to the cache folder */ +-const PATH_CACHE = __DIR__ . '/../cache/'; ++define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/'); + + /** URL to the RSS-Bridge repository */ + const REPOSITORY = 'https://github.com/RSS-Bridge/rss-bridge/'; diff --git a/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix b/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix index 7ad83147fa16..9bfc745ff51a 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix +++ b/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "23.2.1"; + version = "23.2.2"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-7rwmksOqgGF9eEKLxux7kbJUqYIU0qcOmXCYUDzW75A="; + sha256 = "sha256-n3wJONKkHpQf+gT5nDXl2yvNPuwDSv6NNdXIEKIusKg="; }; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/nixpkgs/pkgs/servers/xmpp/prosody/default.nix index bb8b68c17ddf..91eac4aaa9de 100644 --- a/nixpkgs/pkgs/servers/xmpp/prosody/default.nix +++ b/nixpkgs/pkgs/servers/xmpp/prosody/default.nix @@ -86,6 +86,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = "https://prosody.im"; platforms = platforms.linux; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix b/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix index 8643faccd8ff..5aa0adae6ebb 100644 --- a/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix +++ b/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "unstable-2023-10-07"; + version = "unstable-2023-10-19"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "85da8c2fb5967a7f575d8f63ebeb8d49d36fc139"; - hash = "sha256-tT/BTnIXEgcMoyfujzWMFlOM7EclWT9LL/dt5jj7Y2M="; + rev = "7b2856ddff8afac538d826df4abc08325c4be39d"; + hash = "sha256-9OFKtaADDV5I5Yu0sCfQABAmf8yqwX2QwDhPPkh5BEo="; }; installPhase = '' diff --git a/nixpkgs/pkgs/shells/nushell/plugins/default.nix b/nixpkgs/pkgs/shells/nushell/plugins/default.nix index dfe2a4062c89..bb3f631cf225 100644 --- a/nixpkgs/pkgs/shells/nushell/plugins/default.nix +++ b/nixpkgs/pkgs/shells/nushell/plugins/default.nix @@ -5,4 +5,5 @@ lib.makeScope newScope (self: with self; { formats = callPackage ./formats.nix { inherit IOKit Foundation; }; query = callPackage ./query.nix { inherit IOKit CoreFoundation; }; regex = callPackage ./regex.nix { }; + net = callPackage ./net.nix { inherit IOKit CoreFoundation; }; }) diff --git a/nixpkgs/pkgs/shells/nushell/plugins/formats.nix b/nixpkgs/pkgs/shells/nushell/plugins/formats.nix index 5f75951b8c95..0603ba9bfb6b 100644 --- a/nixpkgs/pkgs/shells/nushell/plugins/formats.nix +++ b/nixpkgs/pkgs/shells/nushell/plugins/formats.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-WS8VRpJnn/VWS7GUkGowFf51ifUx0SbEZzcoTfx2dp0="; + cargoHash = "sha256-Nuo+i1j2l5p3p1hFWipSk0EqZiR+9ZsQyTl3YmyBk+0="; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit Foundation ]; diff --git a/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix b/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix index bf788098a5eb..e35a7c483d86 100644 --- a/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix +++ b/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-6luY3SIRRd9vaY9KIJcj8Q974FW0LtAvRjVpdpzkdLo="; + cargoHash = "sha256-GIIY4wK85igsfkwEiQ2+jJQTv5qekqx4y+OG0yt8TgE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/nixpkgs/pkgs/shells/nushell/plugins/net.nix b/nixpkgs/pkgs/shells/nushell/plugins/net.nix new file mode 100644 index 000000000000..031fa30eb61e --- /dev/null +++ b/nixpkgs/pkgs/shells/nushell/plugins/net.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, IOKit +, CoreFoundation +, unstableGitUpdater +}: + +rustPlatform.buildRustPackage { + pname = "nu-plugin-net"; + version = "unstable-2023-10-24"; + + src = fetchFromGitHub { + owner = "fennewald"; + repo = "nu_plugin_net"; + rev = "8b63996ea2ff8bf282c9b0f5f6d01960cfe3d074"; + hash = "sha256-QFo2cMI41GDBsuPNay5MyVyY+HdrLjAWedz8kDNA3JY="; + }; + + cargoHash = "sha256-ekfUQOsaWdpDASnRzoYh5Y/p3BnP7rvSYCCWQ6DJDnE="; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + CoreFoundation + IOKit + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A nushell plugin to list system network interfaces"; + homepage = "https://github.com/fennewald/nu_plugin_net"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + mainProgram = "nu-plugin-net"; + }; +} diff --git a/nixpkgs/pkgs/shells/nushell/plugins/query.nix b/nixpkgs/pkgs/shells/nushell/plugins/query.nix index 25097a5d6297..b34d0b17df13 100644 --- a/nixpkgs/pkgs/shells/nushell/plugins/query.nix +++ b/nixpkgs/pkgs/shells/nushell/plugins/query.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-xyty3GfI+zNkuHs7LYHBctqXUHZ4/MNNcnnfYvI18do="; + cargoHash = "sha256-l32TKBM01JAiUqhkxPsg76dodirZ/NuGn6/KKgHKS8I="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; cargoBuildFlags = [ "--package nu_plugin_query" ]; diff --git a/nixpkgs/pkgs/shells/nushell/plugins/regex.nix b/nixpkgs/pkgs/shells/nushell/plugins/regex.nix index 457c7170a5b3..24cffddc27c2 100644 --- a/nixpkgs/pkgs/shells/nushell/plugins/regex.nix +++ b/nixpkgs/pkgs/shells/nushell/plugins/regex.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , rustPlatform , fetchFromGitHub , nix-update-script diff --git a/nixpkgs/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix b/nixpkgs/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix index 5f9573b71aa7..fa4d9f4cf477 100644 --- a/nixpkgs/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix +++ b/nixpkgs/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "agkozak-zsh-prompt"; - version = "3.11.1"; + version = "3.11.2"; src = fetchFromGitHub { owner = "agkozak"; repo = "agkozak-zsh-prompt"; rev = "v${version}"; - sha256 = "sha256-TOfAWxw1uIV0hKV9o4EJjOlp+jmGWCONDex86ipegOY="; + sha256 = "sha256-QDUI9EYflITttkX9Khij62ybBMYJwPfayqj+wr495mM="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/test/cross/default.nix b/nixpkgs/pkgs/test/cross/default.nix index ff83aedca123..8daa03c56222 100644 --- a/nixpkgs/pkgs/test/cross/default.nix +++ b/nixpkgs/pkgs/test/cross/default.nix @@ -141,6 +141,7 @@ let pkgs.pkgsCross.m68k.stdenv pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc + pkgs.pkgsCross.s390.stdenv pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv pkgs.pkgsCross.mips64el-linux-gnuabin32.stdenv pkgs.pkgsCross.mingwW64.stdenv diff --git a/nixpkgs/pkgs/tools/admin/aws-env/default.nix b/nixpkgs/pkgs/tools/admin/aws-env/default.nix index dff375207976..3ec84e80bb94 100644 --- a/nixpkgs/pkgs/tools/admin/aws-env/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-env/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "aws-env"; - version = "0.4"; + version = "0.5"; rev = "v${version}"; goPackagePath = "github.com/Droplr/aws-env"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "Droplr"; repo = pname; inherit rev; - sha256 = "0pw1qz1nn0ig90p8d8c1qcwsdz0m9w63ib07carhh86gw55425j7"; + sha256 = "sha256-dzXgQW5noWT7u276tlwhvgvu2J8VYrOdW9vidZ3W3t0="; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/nixpkgs/pkgs/tools/admin/awscli2/default.nix index 2e022467ce67..c56acff3ccb1 100644 --- a/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -30,14 +30,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.13.25"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.13.28"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-8Euc2yOWv0TRz4SgjRAMdTogGQNE4J/XtadPNe5kKKI="; + hash = "sha256-rl4gBjuCnXfyJMv/2KIeujK0ouR624+AYaVYn4ri1Nk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/admin/cf-vault/default.nix b/nixpkgs/pkgs/tools/admin/cf-vault/default.nix index 5823d0cbc788..3dd693b13d59 100644 --- a/nixpkgs/pkgs/tools/admin/cf-vault/default.nix +++ b/nixpkgs/pkgs/tools/admin/cf-vault/default.nix @@ -1,16 +1,16 @@ {buildGoModule, fetchFromGitHub, lib}: buildGoModule rec { pname = "cf-vault"; - version = "0.0.15"; + version = "0.0.16"; src = fetchFromGitHub { owner = "jacobbednarz"; repo = pname; rev = version; - sha256 = "sha256-+6+I69LRCoU35lTrM8cZnzJsHB9SIr6OQKaiRFo7aW4="; + sha256 = "sha256-puuP7L8KJ3MvlWz5tOeov8HZad+Lvo64DqTbaKPfg6o="; }; - vendorHash = "sha256-oNLGHV0NFYAU1pHQWeCmegonkEtMtGts0uWZWPnLVuY="; + vendorHash = "sha256-cnv3vustgougdfU9RlyP4O3e7kx9nNzzJm1Q2d+sCDo="; meta = with lib; { description = '' diff --git a/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix b/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix index 7c56d6952b98..8257c7a3869d 100644 --- a/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.30.1"; + version = "1.31.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-ldSF+M6gYKJ6EDJ4jKpPS+XTyybynsRhibNtLG1+DlE="; + hash = "sha256-9+K1d35wghK/j4hp7tGRDvj/5s3wiwj/++wovUf6n4Q="; }; - vendorHash = "sha256-/2uUiFL2wL+gAzqY2S3sqytPLKB5+QkYXCBNLqSJSWU="; + vendorHash = "sha256-qV2uZX2In+NYpzlQRuTfRtmWhozYwviVaFxMC+4kf7I="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix b/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix index 9483d59846d6..5b7aed1f125f 100644 --- a/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.19"; + version = "2.9.22"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-7Bmw3rJbb+Ae6gvVROz7hADDrGr8eiZX6g+ZpWSd99k="; + sha256 = "sha256-snQLZ/bHYDdC62Ti1E4zUmBHR8TtrKCx0BC2i6GAfdE="; }; # these tests require network access that we're not going to give them diff --git a/nixpkgs/pkgs/tools/admin/lxd/default.nix b/nixpkgs/pkgs/tools/admin/lxd/default.nix index cc5550395feb..13589edd6bdc 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -18,11 +18,11 @@ buildGoModule rec { pname = "lxd-unwrapped"; - version = "5.18"; + version = "5.19"; src = fetchurl { url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; - hash = "sha256-4F4q+jnypE4I2/5D65UT3NRpdJertSRni8JvHkpTFVI="; + hash = "sha256-Ttw3Hox+GfoI8dE2KpZ2HUTblOPFBUs63IBRI18lAiM="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix b/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix index e01f156a0b1f..73b8ada86eee 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,52 +1,52 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.89.0"; + version = "3.90.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.89.0-linux-x64.tar.gz"; - sha256 = "1difz8nnfhqmjsmcfdk8d8pdwjflzx339rbn3rhg8rh78hr8nld4"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.90.0-linux-x64.tar.gz"; + sha256 = "1d1mmfvhbj6s9lfjmb7dw46byngh2fh3g8mhnpbgqpifl5iabldp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-linux-amd64.tar.gz"; sha256 = "11dgpi0bg975iyf0xa8r9vyvs4r3nj7nn8mp36w9b5m7128mpkwp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.2.0-linux-amd64.tar.gz"; - sha256 = "0l1qn85iq4sq1wg0c5ivwcv2i35w97nkmq6sanzvvsdjy4cx2zfr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.0-linux-amd64.tar.gz"; + sha256 = "0dlk2f37r8bv30dc630x5zh0wy9fd49zz9fbpmc0g4a1vr2scqxm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.0-linux-amd64.tar.gz"; - sha256 = "0nbrfqh79hp17mp6f9yb9j6dxfa6n0xf17ks8rkbivzbxq9kqijv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.1-linux-amd64.tar.gz"; + sha256 = "055j0jv9zahqb0j4rx0ck62yw9zda9j4w420bbgmqjx8hyd46x9y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.2.0-linux-amd64.tar.gz"; - sha256 = "0aacw3c63xnl4hgnrh8z2yvpccpj3qfc9hvirwagsnjwd43lvvld"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.3.0-linux-amd64.tar.gz"; + sha256 = "0qzqz0wxwc0bvpchhbmpy46pa796x9yprgw9qm8jzf6cihws3s8n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-linux-amd64.tar.gz"; sha256 = "0vyhmdyln0cpcf1fgc0v641c78a66dzx97i7xq6isspl6zx9njn5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.5.0-linux-amd64.tar.gz"; - sha256 = "177bfrjfs6r42mhvscp0rpb7ypqmyxc5vj4cyggb7wbhhmvlw66q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.6.0-linux-amd64.tar.gz"; + sha256 = "00345k517ndy743y4vxkyihzlfvgqw0k4z3ds7gfaby0qa5hlkpg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.42.0-linux-amd64.tar.gz"; - sha256 = "1hcl3arsi1crcczqxkcak721n2yzq75pzrxk32q9hfm78lifz2q9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.43.0-linux-amd64.tar.gz"; + sha256 = "1dsqa72hg9c1qwyncm5jnsgj36xpb4v9h05kq93khz2bsap1qh18"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.13.0-linux-amd64.tar.gz"; sha256 = "1hz2xavx3h19dgq8j7x9wfa3p93ki60z6vrkgxgj0x2ws606wqb3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-linux-amd64.tar.gz"; - sha256 = "0dm7qid20yq490yfls0qg8c9cwxm30qgvg581lwk312pk5zc7l6b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.53.0-linux-amd64.tar.gz"; + sha256 = "1xmp3rm2174xlfkyyj9hghlmicg2fw0b4jmkwzdf1k3nr0kwq8p7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.12.0-linux-amd64.tar.gz"; - sha256 = "06k14jcz2z9p28wllq9kaxmqrhx0dxa2pq1zjbgbiym4w2zi4bbi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.0-linux-amd64.tar.gz"; + sha256 = "0hlqm8k3bclpxs3fnn722dsv2n8pv78smndrlbwi3kaw8x051jby"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.9.0-linux-amd64.tar.gz"; @@ -61,8 +61,8 @@ sha256 = "059mh2p2f8wdkgqkcf7nvdwibb5kc0c2924w88z5f3kmchr3mfr1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.3-linux-amd64.tar.gz"; - sha256 = "1qxlny0d97zaghikynpx2wlk5qjwgfvkbfjwfv13a3c2nqbk5q7c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.4-linux-amd64.tar.gz"; + sha256 = "01zckkhkji8579r6b18mc6h36ap5qm8pa5kjf3mzgy1j1v1mhlww"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; @@ -93,12 +93,12 @@ sha256 = "00vvb17q05r5yn2i7yv3163gxvnakxkjl6a7n1dyb8yzr39ic7ff"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.4.0-linux-amd64.tar.gz"; - sha256 = "0h3529s7szbhn309h1xksjprwv2pf512kqwzslfdmlvnmvidivsm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.0-linux-amd64.tar.gz"; + sha256 = "1msc2f0ygqddb57fw8yyvb4lj3ql8mydwcw1z9pksjvi7f02c9s7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.1-linux-amd64.tar.gz"; - sha256 = "15y992kidym9ca4w4bl36riq462cb78n36s4giwfnm4h2cmv1mrp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.2-linux-amd64.tar.gz"; + sha256 = "16df311564z7v872amhvsvqixkj9i2r2ra1yak8yc47iqjdwv2jk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-amd64.tar.gz"; @@ -121,14 +121,17 @@ sha256 = "1v59k0m4rrad5vbd2x4znb985cbwj9py6ki60x1skq704pmcli5g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.36.0-linux-amd64.tar.gz"; - sha256 = "0sf2bxlqv98xyhq213gfkh3cd59mbgc21b07kii1j0465xl78jmp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.37.0-linux-amd64.tar.gz"; + sha256 = "1i8hqw2id0lbgck0wibwb4by07i0x4ssqbsaysxrbibvvzbxjp8p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.56.0-linux-amd64.tar.gz"; - sha256 = "0bsjlv07lzkx53wi34wc2xz2qlz8yilack3qd3zys8d53qz5yv55"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.57.0-linux-amd64.tar.gz"; + sha256 = "1c0q68ivbx8rbqkw3yy9m8v10v6jc4hwywr1gqlfsbvjbg5zllx9"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-linux-amd64.tar.gz"; + sha256 = "1knsb0ha7xbgvlna67nhxmmrr6rw3h52va3dh4ra47b7r8ii7dca"; } - # pulumi-resource-sumologic skipped (does not exist on remote) { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-linux-amd64.tar.gz"; sha256 = "06gvx51nl93rj244yximp6059yiyxh4jcdqqcrjic8r7wabzsiiw"; @@ -150,8 +153,8 @@ sha256 = "0av9vs3l5jpmwxcgjaxp5jlnz4v0kdc4fr0fxqz0rdxsakd51lrs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.2-linux-amd64.tar.gz"; - sha256 = "1fgchr4psb42abfg5xbwqbs8y73s59q5z1l7p5zlrsfqsbmxa3wi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.3-linux-amd64.tar.gz"; + sha256 = "0d4zdfp62v5kd5k1bc1kivpapnj5v04lbrwnbjbm7ba6ab81i480"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz"; @@ -160,48 +163,48 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.89.0-darwin-x64.tar.gz"; - sha256 = "0w8lmglfi9200lkqi4gjw18qrnqalpkq23ysvjhzrywr52pkcscd"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.90.0-darwin-x64.tar.gz"; + sha256 = "037d30vb2fkcjpdqs57bcai1glsfds4494amgifm0fz44vcsn6h8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-darwin-amd64.tar.gz"; sha256 = "1jp28j1xzn0a5dn4ysa7cp9x7l9fzmbcylasmm2a5rdvvq627s1l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.2.0-darwin-amd64.tar.gz"; - sha256 = "0f0yjarvr9rhgmz818663hmjjr8d3bihaxrxrfdfz3i5fizb7v9r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.0-darwin-amd64.tar.gz"; + sha256 = "05n88fabm55x538yqm16mhz8rgpdcxrnlcwv6aj0zb6fjn9c0jhi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.0-darwin-amd64.tar.gz"; - sha256 = "1mb8xr16h156yj10mzfsprflbv72ldk9ap9w2cw40l8fvbq33lm4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.1-darwin-amd64.tar.gz"; + sha256 = "1va17d1bxkb8i1ycg8xi0slcrqg1rx40d2zz8jy4mjkxbwy9nnsy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.2.0-darwin-amd64.tar.gz"; - sha256 = "0bl50wavpimlf16z6k5mxzq9m2cbvhiypznklgs0avkidyjiiix9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.3.0-darwin-amd64.tar.gz"; + sha256 = "0zzshzvyb8r98xlvn92qk64qjhxwx1403bpkvsk0y6gbp185p2y9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-darwin-amd64.tar.gz"; sha256 = "04imkdrj388nk88r734f0p0a6z1hffzmplwgmx55kfwqz3zpz4y5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.5.0-darwin-amd64.tar.gz"; - sha256 = "0fyi3im07a1fxziip6g73z7aqv8hjsqk5g67l3b2mcnz0myzmqwn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.6.0-darwin-amd64.tar.gz"; + sha256 = "05fyb8irmilgd48m2zl9x9gncgg1gds5nw08fbndzarag11yyfs7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.42.0-darwin-amd64.tar.gz"; - sha256 = "1x2ldnkcf9ygn9cymvr1ylpr6wpkymvwz3n1iksq0a80n8fg8i6g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.43.0-darwin-amd64.tar.gz"; + sha256 = "02xccgq0jls7mivxz0yc6hbmrjnbpapwwmz4j96ssd9cw2pgkkz2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.13.0-darwin-amd64.tar.gz"; sha256 = "0rzwkwrjm5p59maz371ndf9mcsdlz98n756k125wylxbp5xygcyv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-darwin-amd64.tar.gz"; - sha256 = "0x4zcfbp7vy349q1cj5phlikfx95n9fcmq74h9ihdgr0xbavbbn2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.53.0-darwin-amd64.tar.gz"; + sha256 = "0bf6w7vdw68fmhkqhhsn664jbar1ly3d4qvzjlhzz09r9kw2h86r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.12.0-darwin-amd64.tar.gz"; - sha256 = "014hi8zxrnf30q4nfxxpc19wf8ip8487h2wspl1rwa6mpwfn34ss"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.0-darwin-amd64.tar.gz"; + sha256 = "09qffncb6fpawnv1svma1nwg5ckjylpg1vnrbc04ya3cpqpim79i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.9.0-darwin-amd64.tar.gz"; @@ -216,8 +219,8 @@ sha256 = "1zqfzpc4647x965l5phqz67cq7hbnmyc20acmgb4xvax4hif8yk7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.3-darwin-amd64.tar.gz"; - sha256 = "1hz46nak73svzc4mppdw4n34szj9lncx102lhrknq89mrx5b1wlb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.4-darwin-amd64.tar.gz"; + sha256 = "10w91x51by096blmvgdyci1xan9xw7yh9ky7ajpz3mmr3y3npqn8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; @@ -248,12 +251,12 @@ sha256 = "1mpx6355bvp3dp8w6x9hrrswfid592jzp1srsv0acd4ypzskm8zv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.4.0-darwin-amd64.tar.gz"; - sha256 = "1xp48f3h8zkbvi5jasw9ax0pcz1z0awz5ssm1sms2s6wglmklrja"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.0-darwin-amd64.tar.gz"; + sha256 = "0f75hi8kg3pc1gmj89lm37zf8vgk9xx2hblvq8vx6vh70pkivhlj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.1-darwin-amd64.tar.gz"; - sha256 = "1s5zphspan0wyz74hqv4156msx60mjkrbpvgy7f4mkhwl9wygjk1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.2-darwin-amd64.tar.gz"; + sha256 = "1rkxyz1h337vz19qvpcirrldi578cmrgw240v6bg63qzsgxnj1gg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-amd64.tar.gz"; @@ -276,14 +279,17 @@ sha256 = "1jg3qdm331dvnq2igf6q0xd2ld21jnhm0h756pmxszngadfnmcdw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.36.0-darwin-amd64.tar.gz"; - sha256 = "1h96dih1pi95066kmk4whbds0w0lzal5pyxwwl1prxpr4w8yb6sd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.37.0-darwin-amd64.tar.gz"; + sha256 = "1bgylspgdsfl4i2fnh328kcxysd3fqlc7xhh3irlf6vqfxak0njy"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.57.0-darwin-amd64.tar.gz"; + sha256 = "1cwkm8kpjwznvsf0v2h6qz8wbih59zxnw99g07jr86n5k790bxf9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.56.0-darwin-amd64.tar.gz"; - sha256 = "0m8hb602zgkvqis2sl033ajz85sk3yjbksbb5r6vqd6y7w9xi7k1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-darwin-amd64.tar.gz"; + sha256 = "0xgihb099s99qb5bk6wavwm9227z73jgqrysmvjrqkn83kh7942v"; } - # pulumi-resource-sumologic skipped (does not exist on remote) { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-darwin-amd64.tar.gz"; sha256 = "1pm5j9q4kvv70c6paficcfb664df6666mq559zvdklf5ndjpw5z9"; @@ -305,8 +311,8 @@ sha256 = "1i6igx9yz0pa5brb056w0vzdp945xs723qmmmm84px06qd3przf2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.2-darwin-amd64.tar.gz"; - sha256 = "1bawapsj1xngiigbwwwin7xmz138s6fd71qdcrcax0pnfw1dycix"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.3-darwin-amd64.tar.gz"; + sha256 = "1xpdniixahizpbijbp5px76sxw2yljks965kigrxlkqqgiv7n0ii"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; @@ -315,48 +321,48 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.89.0-linux-arm64.tar.gz"; - sha256 = "0bdlppjxy92ffl5rgka8pqx07xh4m0x1cnqi2hnkpizmrfzxlfkl"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.90.0-linux-arm64.tar.gz"; + sha256 = "07z1psrh4b2bn5k3kvdwd4ql3nslfnaginbmfiw4k0p51fh7y8j9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-linux-arm64.tar.gz"; sha256 = "09n456hm9d3bv7krlkw04wmra55xinb311051cghpyxsrwpv5qid"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.2.0-linux-arm64.tar.gz"; - sha256 = "13v3kmypadvr4c4jfdzd1bnzbsclw4fr016kqd7qv82fg8yf4bln"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.0-linux-arm64.tar.gz"; + sha256 = "08iz8fa5yfq0cscvqm8nl8z191lriimw8rbc03amh25amv8y3snh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.0-linux-arm64.tar.gz"; - sha256 = "1g2bnrmzs9lyzrz7jn7hn6c1chzvg4bdxvza8kzafqrrynsqpisl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.1-linux-arm64.tar.gz"; + sha256 = "01n6b9hwil9wni4p5vp4iymfsrbs1sa5ilg6i0cc8i2776c96qrh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.2.0-linux-arm64.tar.gz"; - sha256 = "03f32qvwlvblg5qb1fpy0cy0aifk0n2w0vqra3fqw1v3pmk5d7ar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.3.0-linux-arm64.tar.gz"; + sha256 = "15n3ivsgslq36n72hvv3r8jmg8lspalnrxfpd7azb21sz69ym4lm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-linux-arm64.tar.gz"; sha256 = "11ph5yjy754sb55sncdlgibrmijg2jsylrjfpvy4mclrwg64cari"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.5.0-linux-arm64.tar.gz"; - sha256 = "1a22i6b3xcps8wj4hjg5sfcmglkl40njx5d25874yrzqvlarvlpq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.6.0-linux-arm64.tar.gz"; + sha256 = "1saq2z1yxs73c4rxgi34nmdapri90qhz109h4y03qak4sifj4hcg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.42.0-linux-arm64.tar.gz"; - sha256 = "19zyn04jncv5jm6kf9vclcrmk0w99hflw7pv7kbvshlgj0y5ly2m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.43.0-linux-arm64.tar.gz"; + sha256 = "1p7a5v4gi0a8h3slpi7j46h6w1vmfqhfi2px0gw1bc8gjsj2j0ch"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.13.0-linux-arm64.tar.gz"; sha256 = "0c4m9y4hh6k4f9v4xidijpwyc2650v4180zkdy5cpl7shfdk3n75"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-linux-arm64.tar.gz"; - sha256 = "18d3xgjha67i3qln1n6wg5fzhr8jwc1x2fh3zg630y4wdw3jsqix"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.53.0-linux-arm64.tar.gz"; + sha256 = "074wrmzqan8mjv178bxfkhma2qx0qlfsy2s3vvjqpjvg2kp8yqli"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.12.0-linux-arm64.tar.gz"; - sha256 = "1j8ab4m9jr7q0k89pinr93izdyvq0jk0nm2gr5rjrq5wrwirly9i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.0-linux-arm64.tar.gz"; + sha256 = "1yhjdnc9n0531ckjmnazq3nc54l642g3p6kn3an08w2ykzdscf8x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.9.0-linux-arm64.tar.gz"; @@ -371,8 +377,8 @@ sha256 = "0d2z8ig79qr4qc7xv0ak00h7n2k613dqpifbdbkp6dhxiw4zmxcq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.3-linux-arm64.tar.gz"; - sha256 = "0n3a3xaq7raf715r5gyr5v40wdy800c5arvqnd4sq7yvpkh1mcn6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.4-linux-arm64.tar.gz"; + sha256 = "0rl4ckrna59qgyhzmrzzlhl08c13979gjfx0pbhk6m6ahcm6whyc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; @@ -403,12 +409,12 @@ sha256 = "17zpwizdsavsnhq179hw67wppdm61hzl6qrycl4anf074h5fy9rw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.4.0-linux-arm64.tar.gz"; - sha256 = "190mi8sbwn6g4ggx3j3mbpwpp61kazpcj9qwmbb35x14miqppc2a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.0-linux-arm64.tar.gz"; + sha256 = "03xsszzclhr34yj0axafnqvgw77z7m73r0nq8yr3hydzjwazkrl1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.1-linux-arm64.tar.gz"; - sha256 = "07h3a5h86vcxv5qwgfc34knh640s8ynws0pc39sps5rhd90rdsyj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.2-linux-arm64.tar.gz"; + sha256 = "0mpwj7iykz4w1wh247qacam50qr9x03yrqbyf79n42pw3l4skyld"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-arm64.tar.gz"; @@ -431,14 +437,17 @@ sha256 = "18wkr5sfa9v8b9b4c3hdgnq8wd8qpykcyqbcmiypykj8y954hxjk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.36.0-linux-arm64.tar.gz"; - sha256 = "09j6cw9m1aa60n0gq68dmpk70gyh69qqkm98djrcn6134j2xf555"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.37.0-linux-arm64.tar.gz"; + sha256 = "1205k1yc0pax25fj5dgp39bxq7m7q6f60abqr7ka4sqx3f8fz4aa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.56.0-linux-arm64.tar.gz"; - sha256 = "0kfavb72qw4bdnj7q6n248vzpkgghi07dsjq6k0p51zs0spsm5mx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.57.0-linux-arm64.tar.gz"; + sha256 = "123aa4j74fs9idlyyaydzgsfaaxay4wj9s8y83zz1b0xlwfq11jd"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-linux-arm64.tar.gz"; + sha256 = "1kqv70w3d84a9a0kj0w2hmd88h50zlfc35xkf57kgd43l948wcin"; } - # pulumi-resource-sumologic skipped (does not exist on remote) { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-linux-arm64.tar.gz"; sha256 = "1rlf5gl7a7ym8zl4h0v7i42a9830zi401axw032h0v4q6w4zki3n"; @@ -460,8 +469,8 @@ sha256 = "0ifzw0az0xglk599f5kzyrss1lkk622lclpzqcvm89rl5ad6hglr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.2-linux-arm64.tar.gz"; - sha256 = "0cykvh8zzsdzlp4nqsphhn4is8nm1sqcmc0hhgi4lq7wppgf1w9h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.3-linux-arm64.tar.gz"; + sha256 = "0xbbfcgsm0w1ik237wdhdvaikmy19k6bclxxg07x3vc03lyfbd7m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz"; @@ -470,48 +479,48 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.89.0-darwin-arm64.tar.gz"; - sha256 = "02phzva1f0y8zhdaghb80q1axb1drlkyrbw1ndi5cq6fvdr4pd3b"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.90.0-darwin-arm64.tar.gz"; + sha256 = "1vgm028gc05xjmdgdvpbf7x8r671xzk0wzli23qy513i4rk2hjdf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-darwin-arm64.tar.gz"; sha256 = "09zcxyrpad8iz3yqvrd7g8x61pbk4gqfqa7jgiqnqxmrr1vf8idd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.2.0-darwin-arm64.tar.gz"; - sha256 = "0rj745xaaw7a1437yfbi6awahyd1zvj1gc90pcv3bc44s0k1n9hi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.0-darwin-arm64.tar.gz"; + sha256 = "0npsl2lfz1fwrlsyyglazmcyjmfm538nazha64q3llib2ymn7y7v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.0-darwin-arm64.tar.gz"; - sha256 = "0ma5n4mcilnqmhxyr2pn1j6xxm25hd52f7sxs7y8h38a87a54xfq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.1-darwin-arm64.tar.gz"; + sha256 = "1jd1h6sazx6d6qbfd2qvq7aqsbqhszap5ccxsgsaqypzhdc3xqah"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.2.0-darwin-arm64.tar.gz"; - sha256 = "1n67diprsfwwas5qlb7krlbf22x5kg2cmrjhf7x39my5ysak6l9f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.3.0-darwin-arm64.tar.gz"; + sha256 = "01wfscnchz069akmm3nz2ifkl4il26k53i0hnz2i62y86x461fdn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-darwin-arm64.tar.gz"; sha256 = "07f30h74hyg3j9dj78a0al5v9i5n105y52yn362mlyvfh807blml"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.5.0-darwin-arm64.tar.gz"; - sha256 = "1qinp5qqb2ab9d8nwwllrsz1q007hhnjc6m5x4b1m7ffvhjbxmyy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.6.0-darwin-arm64.tar.gz"; + sha256 = "1dpwdy7v7l5nw5zvibpc0i4j5kvxha6jifcqzwrgg2qz9r1sgqgn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.42.0-darwin-arm64.tar.gz"; - sha256 = "0lba3ghd350r59v694l9qnziydlyh63wk1hgbpiy2cmdg20addbx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.43.0-darwin-arm64.tar.gz"; + sha256 = "0x9w3c34d96w793phwbcjwfkawsm1kqqcw98v109bnqjprlfz3xy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.13.0-darwin-arm64.tar.gz"; sha256 = "18gzy9kpz74ycdl988r3mxzxakbd74vn2rl5y3hzlhgyd03vqmfm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-darwin-arm64.tar.gz"; - sha256 = "03x2h0nivi5ygn8lk57g4xky29256hczgmf0qwfrb9lb49qnvrss"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.53.0-darwin-arm64.tar.gz"; + sha256 = "07zb9z3n9k6alqx1q4d886z1zlb7mid5swd31gl0qx8szljjxv98"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.12.0-darwin-arm64.tar.gz"; - sha256 = "1kmy7krwbgyxlk4f83nw6npll3svymbigzdr9kaj3ab8bcbj0wpn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.0-darwin-arm64.tar.gz"; + sha256 = "0p8hsfr7gk2kinprg1cjbqp01j8f4l2d41jcf6ykzf22qd8gwczw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.9.0-darwin-arm64.tar.gz"; @@ -526,8 +535,8 @@ sha256 = "0nvdhfw4bfizq6hmwng7glf248qvz5gzfbfm7ha50zaajbhrilkv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.3-darwin-arm64.tar.gz"; - sha256 = "00n7jwqwcxgrjxb6bn3sdba79fcg5y6fh22zmrcnn3g07hh0jnf2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.4-darwin-arm64.tar.gz"; + sha256 = "0xh2r364xkfxq4dlxskxm449d2iqrc2105y72km6w6wrmdvazpn7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; @@ -558,12 +567,12 @@ sha256 = "1f4xnjwbp1qbx0hcym4gxynb4j1vxlj7iqh1naays3ypc4mgnms1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.4.0-darwin-arm64.tar.gz"; - sha256 = "1ngrba277225i8c7vyx90w71p8w6lh0y8d108sba738b2kjxrr9h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.0-darwin-arm64.tar.gz"; + sha256 = "0mxfcj8b5kjz64g5hmnynqsvay3vpsajhi4ggx09lj9w185ack1d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.1-darwin-arm64.tar.gz"; - sha256 = "0hkyf0m1s63l0c5f84a6jafcxdyqvxi92597m01bd3zp3938qv1b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.2-darwin-arm64.tar.gz"; + sha256 = "0ggmw0xc132rhcz8vdjyhdmnjcl47dhc89wn67wyr3zqfh2ma596"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-arm64.tar.gz"; @@ -586,14 +595,17 @@ sha256 = "08llqzf509ds0nbcllpq5k3zl6l656yxx0bx0z9pibd9iwzjy3wj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.36.0-darwin-arm64.tar.gz"; - sha256 = "1v0k309w96f9s9nvslh7dx6mhk5prxcbd83fgrcfhsk784hrrzqi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.37.0-darwin-arm64.tar.gz"; + sha256 = "0i3h26kmkybkni70rb8b19wya7gsq8276zm8sqvy29lysnngl23s"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.57.0-darwin-arm64.tar.gz"; + sha256 = "1vlbr7yap89bmj7r86jr7nik3mlhr437qbwg3scbc0j72v4463ny"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.56.0-darwin-arm64.tar.gz"; - sha256 = "0d6xhmdisafpspycqfh6p4d42d6331lkspwmizzdvqwq96awd6pn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-darwin-arm64.tar.gz"; + sha256 = "17ngmwyh6z1g6x3lrd77pxa9wwwarh4mqdcq7aiwf57plx4a4l6j"; } - # pulumi-resource-sumologic skipped (does not exist on remote) { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-darwin-arm64.tar.gz"; sha256 = "09agrp3sb7mzhwaja4rvz0p25rpsb2n4v3s2kyzcx3pyfyhigvfn"; @@ -615,8 +627,8 @@ sha256 = "1fvdbw76ax20z9dx3amlmr5b0r28i9d09khbpgdhl83d1j54z15s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.2-darwin-arm64.tar.gz"; - sha256 = "1wq7b4r7abjzxcawybwi7v2pdc6sm429mvs6hm0mixxbbqynn07c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.3-darwin-arm64.tar.gz"; + sha256 = "0hw9k17b74b5mni9l9a0l9ab6q08kgmcqd9vyyib2b9p3r0wwdzh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz"; diff --git a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix index 5dcd156d555b..74d9bb28a501 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix @@ -4,15 +4,30 @@ mkPulumiPackage rec { owner = "pulumi"; repo = "pulumi-azure-native"; - version = "1.92.0"; + version = "2.11.0"; rev = "v${version}"; - hash = "sha256-eSHD7ckiHJJoqJFeSlwxl063QRRTtiWdpu1m9OVRhoA="; - vendorHash = "sha256-DI92fCe8HPwjERkBVlOebZpvCreq9850OeERDkiayz8="; + hash = "sha256-qz/dCQR4BV+noJj7WPGuzDNMaR7I/D01F7FfvxU8z28="; + vendorHash = "sha256-SICms1JJk8Q10XWC69bw/RXsIPL43l1s+Aqy+cLOwRI="; cmdGen = "pulumi-gen-azure-native"; cmdRes = "pulumi-resource-azure-native"; extraLdflags = [ - "-X github.com/pulumi/${repo}/provider/pkg/version.Version=v${version}" + "-X github.com/pulumi/${repo}/v2/provider/pkg/version.Version=${version}" ]; + postConfigure = '' + pushd .. + + chmod +w . provider/cmd/${cmdRes} sdk/ + chmod -R +w reports/ versions/ + mkdir bin + ${cmdGen} schema ${version} + + cp bin/schema-full.json provider/cmd/${cmdRes} + cp bin/metadata-compact.json provider/cmd/${cmdRes} + + popd + + VERSION=v${version} go generate cmd/${cmdRes}/main.go + ''; fetchSubmodules = true; __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix index 7ef597201b98..ef43a412482e 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix @@ -8,7 +8,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/go/pulumi-language-go"; - vendorHash = "sha256-6/umLzw7HMplP/cJknBsWmiwAnc+YM4tIz4Zl2QMTOQ="; + vendorHash = "sha256-6JnRPns+qOLXP2RBjsgq4v6nuLn3uX8jF4+uinr2Wt8"; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix index 02bb86d0e8e5..dc1368afe2df 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix @@ -9,7 +9,14 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/nodejs/cmd/pulumi-language-nodejs"; - vendorHash = "sha256-3kDWb+1aebV2D+Nm5bkhKrJZMe/lD0ltFQ7p+Bfk644="; + vendorHash = "sha256-gbZoDUJCKb5wcLhJ7DRSGHT3Q0xUlptUeS6Wen4dle0"; + + postPatch = '' + # Gives github.com/pulumi/pulumi/pkg/v3: is replaced in go.mod, but not marked as replaced in vendor/modules.txt etc + substituteInPlace language_test.go \ + --replace "TestLanguage" \ + "SkipTestLanguage" + ''; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix index e63e311fabec..16610c2f46f6 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix @@ -1,32 +1,22 @@ -{ lib -, buildGoModule +{ buildGoModule , pulumi , python3 }: buildGoModule rec { - inherit (pulumi) version src sdkVendorHash; + inherit (pulumi) version src; pname = "pulumi-language-python"; - sourceRoot = "${src.name}/sdk"; + sourceRoot = "${src.name}/sdk/python/cmd/pulumi-language-python"; - vendorHash = sdkVendorHash; + vendorHash = "sha256-aLCgAcrgnNH/eYpGkr5Kj4xWjSgP76nz0YoV6998i9M="; postPatch = '' - # Requires network - substituteInPlace python/python_test.go \ - --replace "TestRunningPipInVirtualEnvironment" \ - "SkipTestRunningPipInVirtualEnvironment" - - substituteInPlace python/cmd/pulumi-language-python/main_test.go \ + substituteInPlace main_test.go \ --replace "TestDeterminePulumiPackages" \ "SkipTestDeterminePulumiPackages" ''; - subPackages = [ - "python/cmd/pulumi-language-python" - ]; - ldflags = [ "-s" "-w" @@ -38,8 +28,8 @@ buildGoModule rec { ]; postInstall = '' - cp python/cmd/pulumi-language-python-exec $out/bin - cp python/dist/pulumi-resource-pulumi-python $out/bin - cp python/dist/pulumi-analyzer-policy-python $out/bin + cp ../pulumi-language-python-exec $out/bin + cp ../../dist/pulumi-resource-pulumi-python $out/bin + cp ../../dist/pulumi-analyzer-policy-python $out/bin ''; } diff --git a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-random.nix b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-random.nix index 4248ae73dda7..af704eac192d 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-random.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-random.nix @@ -4,10 +4,10 @@ mkPulumiPackage rec { owner = "pulumi"; repo = "pulumi-random"; - version = "4.8.2"; + version = "4.14.0"; rev = "v${version}"; - hash = "sha256-tFEtBgNpl8090RuVMEkyGmdfpZK8wvOD4iog1JRq+GY="; - vendorHash = "sha256-H3mpKxb1lt+du3KterYPV6WWs1D0XXlmemMyMiZBnqs="; + hash = "sha256-1MR7zWNBDbAUoRed7IU80PQxeH18x95MKJKejW5m2Rs="; + vendorHash = "sha256-YDuF89F9+pxVq4TNe5l3JlbcqpnJwSTPAP4TwWTriWA="; cmdGen = "pulumi-tfgen-random"; cmdRes = "pulumi-resource-random"; extraLdflags = [ diff --git a/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/nixpkgs/pkgs/tools/admin/pulumi/default.nix index 7f724d8b4c7e..3aa9e58985c5 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -14,21 +14,21 @@ buildGoModule rec { pname = "pulumi"; - version = "3.72.2"; + version = "3.90.1"; # Used in pulumi-language packages, which inherit this prop - sdkVendorHash = "sha256-S8eb2V7ZHhQ0xas+88lwxjL50+22dbyJ0aM60dAtb5k="; + sdkVendorHash = lib.fakeHash; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-g/8l/ebtb1Gs6TKtg0joe55TyWj1/SAiA4Ds1NHKLFI="; + hash = "sha256-dAQpQapkdccRr/O8XT8dHrLwPvIPqeV8f3HS+GtK2GM="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorHash = "sha256-eOxlTsvC/B+YTFlmT7MtiBBSJIntI4vogdiZ1gOkehw="; + vendorHash = "sha256-ijFYlHVH0axDpFoPGvthGVRt8UIUZDsWv3vAOe0U4H4"; sourceRoot = "${src.name}/pkg"; @@ -51,6 +51,25 @@ buildGoModule rec { disabledTests = [ # Flaky test "TestPendingDeleteOrder" + # Tries to clone repo: github.com/pulumi/templates.git + "TestGenerateOnlyProjectCheck" + # Following tests give this error, not quite sure why: + # Error Trace: /build/pulumi/pkg/engine/lifecycletest/update_plan_test.go:273 + # Error: Received unexpected error: + # Unexpected diag message: <{%reset%}>using pulumi-resource-pkgA from $PATH at /build/tmp.bS8caxmTx7/pulumi-resource-pkgA<{%reset%}> + # Test: TestUnplannedDelete + "TestExpectedDelete" + "TestPlannedInputOutputDifferences" + "TestPlannedUpdateChangedStack" + "TestExpectedCreate" + "TestUnplannedDelete" + # Following test gives this error, not sure why: + # --- Expected + # +++ Actual + # @@ -1 +1 @@ + # -gcp + # +aws + "TestPluginMapper_MappedNamesDifferFromPulumiName" ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/tools/admin/scalr-cli/default.nix b/nixpkgs/pkgs/tools/admin/scalr-cli/default.nix index 125d20351464..3450019afa26 100644 --- a/nixpkgs/pkgs/tools/admin/scalr-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/scalr-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "scalr-cli"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "Scalr"; repo = "scalr-cli"; rev = "v${version}"; - hash = "sha256-8KhFF/bD//NYRQ7v+ksGAE6bKVu+nE3o3R119XbHVDA="; + hash = "sha256-vuYkUFh9C+D6Sbu/vbEFV57FDVQVSCkvOxdLeDVbe18="; }; - vendorHash = "sha256-xoxSQ9V9i7yxJzn8wAtIAtWlTn4q/UnNqMT93RyBHII="; + vendorHash = "sha256-zyshSluHq5f+DQV4K7qxHNsZ4nKzL8J5A25rdg9fHeM="; ldflags = [ "-s" "-w" diff --git a/nixpkgs/pkgs/tools/audio/piper/default.nix b/nixpkgs/pkgs/tools/audio/piper/default.nix index d753d7bb3e1e..d68ffa2b77ea 100644 --- a/nixpkgs/pkgs/tools/audio/piper/default.nix +++ b/nixpkgs/pkgs/tools/audio/piper/default.nix @@ -7,6 +7,7 @@ , pkg-config # runtime +, fmt , onnxruntime , pcaudiolib , piper-phonemize @@ -18,22 +19,26 @@ stdenv.mkDerivation (finalAttrs: { pname = "piper"; - version = "1.2.0"; + version = "2023.9.27-1"; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-6WNWqJt0PO86vnf+3iHaRRg2KwBOEj4aicmB+P2phlk="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-U7yOiqNvE0WqZB8qaKf3U7gnTJ6q+9W5lviW79b6h/o="; }; - sourceRoot = "${finalAttrs.src.name}/src/cpp"; - nativeBuildInputs = [ cmake pkg-config ]; + cmakeFlags = [ + "-DFMT_DIR=${fmt}" + "-DSPDLOG_DIR=${spdlog.src}" + "-DPIPER_PHONEMIZE_DIR=${piper-phonemize}" + ]; + buildInputs = [ onnxruntime pcaudiolib diff --git a/nixpkgs/pkgs/tools/audio/tts/default.nix b/nixpkgs/pkgs/tools/audio/tts/default.nix index bdd0f58235e5..d4147faf960f 100644 --- a/nixpkgs/pkgs/tools/audio/tts/default.nix +++ b/nixpkgs/pkgs/tools/audio/tts/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.17.4"; + version = "0.18.2"; format = "pyproject"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "refs/tags/v${version}"; - hash = "sha256-yZHdPqvYmlq/ZKeinez4MmO9+jCIl9JAD0t/tc/Uz8c="; + hash = "sha256-bTShJwzxff+R9GkR72qNzd22zY8LwUUsD8r30kZXAsI="; }; postPatch = let diff --git a/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix b/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix index 7238a5493245..dd928ab3e418 100644 --- a/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix +++ b/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix @@ -5,7 +5,7 @@ }: let pname = "whisper-ctranslate2"; - version = "0.3.1"; + version = "0.3.2"; in python3.pkgs.buildPythonApplication { inherit pname version; @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication { owner = "Softcatala"; repo = "whisper-ctranslate2"; rev = version; - hash = "sha256-dUmQNKgH+SIlLhUEiaEGXUHZQDr3fidsAU2vATJiXBU="; + hash = "sha256-9Y9y7DihDnbREaeARCGC7ctwwBAoZPpIWDAOdeDnB6E="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/backup/autorestic/default.nix b/nixpkgs/pkgs/tools/backup/autorestic/default.nix index b4c873554241..114789505271 100644 --- a/nixpkgs/pkgs/tools/backup/autorestic/default.nix +++ b/nixpkgs/pkgs/tools/backup/autorestic/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "autorestic"; - version = "1.7.7"; + version = "1.7.9"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-drinKUJAlgY1PEP7NHOFfmvDVib1AFjT8hRktQgxJ4A="; + sha256 = "sha256-7KYbA9qKa1o0ZLb+6S/UgAPT7wpsIugEFzWYB3voqBU="; }; vendorHash = "sha256-K3+5DRXcx56sJ4XHikVtmoxmpJbBeAgPkN9KtHVgvYA="; diff --git a/nixpkgs/pkgs/tools/backup/restic/default.nix b/nixpkgs/pkgs/tools/backup/restic/default.nix index 9a7e4d676a18..5b4e2f03751f 100644 --- a/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/nixpkgs/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-kxxQlU3bKBjCb1aEtcLBmcnPg4KFgFlbFhs9MmbAgk8="; + hash = "sha256-sMxOZEnZr2UdhmwLXQnggQzw+pXcoWmqqADlQ0yDhj8="; }; patches = [ @@ -17,7 +17,7 @@ buildGoModule rec { ./0001-Skip-testing-restore-with-permission-failure.patch ]; - vendorHash = "sha256-m5smEyAt9RxgvUf1pZqIhgja2h8MWfEgjJ4jUgrPMPY="; + vendorHash = "sha256-Ctg6bln5kzGs7gDLo9zUpsbSybKOtHFuHvHG3cxCfac="; subPackages = [ "cmd/restic" ]; diff --git a/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix b/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix index 94cb3790a567..b5cd6b9e50c2 100644 --- a/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix +++ b/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix @@ -1,22 +1,34 @@ -{ buildPythonApplication, click, fetchPypi, hypothesis, pytest -, lib, stringcase +{ buildPythonApplication +, click +, fetchPypi +, hypothesis +, lib +, poetry-core +, pytest +, pytestCheckHook +, stringcase }: buildPythonApplication rec { - pname = "zfs-replicate"; - version = "1.2.3"; + pname = "zfs_replicate"; + version = "3.1.4"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "b2cb9d4670a6e12d14a446c10d857862e91af6e4526f607e08b41bde89953bb8"; + hash = "sha256-mRINo20/uFlWtP5W7w+D2E9o89hlAsqZmBjuv0qWP9k="; }; postPatch = '' - sed -i setup.cfg \ - -e '/--cov.*/d' + sed -i pyproject.toml -e '/--cov[^"]*/d' ''; + nativeBuildInputs = [ + poetry-core + ]; + nativeCheckInputs = [ + pytestCheckHook hypothesis pytest ]; @@ -26,11 +38,8 @@ buildPythonApplication rec { stringcase ]; - doCheck = true; - - checkPhase = '' - pytest --doctest-modules - ''; + # Current releases do not include tests. + doCheck = false; meta = with lib; { homepage = "https://github.com/alunduil/zfs-replicate"; diff --git a/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix b/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix index 4018d06b7432..6b1260553188 100644 --- a/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bluetuith"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "darkhz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8FVXVawmaCgnsexnNRw53tVR2a2fRyDK+h959Ezw7Zg="; + sha256 = "sha256-b+J+8nxFZYJlAKOStpH7ItPqMw7inM5pss17kyX1brg="; }; - vendorHash = "sha256-mudJN7rYWpdv2X4hrYjPBtEILyrdext4q+maDK1dC44="; + vendorHash = "sha256-d0O54KNGLXU8FGr1eSEp30JMWNVo91Le2MI8UnAfTuU="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/tools/cd-dvd/ventoy/default.nix b/nixpkgs/pkgs/tools/cd-dvd/ventoy/default.nix index cf3bd1fe6c52..f7b90e6e252d 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/ventoy/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/ventoy/default.nix @@ -50,7 +50,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy"; - version = "1.0.95"; + version = "1.0.96"; src = let @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - hash = "sha256-Tsi541GAMrWBl5xLo/K+uEyaoaDSWvwp5RMzZ5V6RAU="; + hash = "sha256-eUpxfJQ0u3bpAXTUCKlMO/ViwKcBI59YFKJ3xGzSdcg="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix index 64edc17a89f6..6fbd6b805570 100644 --- a/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix @@ -1,42 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, curl, gnutls, libgcrypt, libuuid, fuse, boost }: +{ lib, buildGoModule, fetchFromGitHub, fuse3, testers, blobfuse }: let - version = "1.3.7"; + version = "2.1.0"; src = fetchFromGitHub { - owner = "Azure"; - repo = "azure-storage-fuse"; - rev = "blobfuse-${version}-Linux"; - sha256 = "sha256-yihIuS4AG489U7eBi/p7H6S7Cg54kkQeNVCexxQZ60A="; + owner = "Azure"; + repo = "azure-storage-fuse"; + rev = "blobfuse2-${version}"; + sha256 = "sha256-+MnqIwLuR+YBTowgIQokV0kFzfYtMBdhd/+m9MOrF1Y="; }; - cpplite = stdenv.mkDerivation rec { - pname = "cpplite"; - inherit version src; - - sourceRoot = "${src.name}/cpplite"; - patches = [ ./install-adls.patch ]; - - cmakeFlags = [ "-DBUILD_ADLS=ON" "-DUSE_OPENSSL=OFF" ]; - - buildInputs = [ curl libuuid gnutls ]; - nativeBuildInputs = [ cmake pkg-config ]; - }; -in stdenv.mkDerivation rec { +in buildGoModule { pname = "blobfuse"; inherit version src; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=deprecated-declarations" - "-Wno-error=catch-value" - ]; + vendorHash = "sha256-WfVFV/6Owx51rHXyfMp7CRW7aQ3R5BFyfHronQ58Gik="; + + buildInputs = [ fuse3 ]; + + # Many tests depend on network or needs to be configured to pass. See the link below for a starting point + # https://github.com/NixOS/nixpkgs/pull/201196/files#diff-e669dbe391f8856f4564f26023fe147a7b720aeefe6869ab7a218f02a8247302R20 + doCheck = false; - buildInputs = [ curl gnutls libgcrypt libuuid fuse boost cpplite ]; - nativeBuildInputs = [ cmake pkg-config ]; + passthru.tests.version = testers.testVersion { package = blobfuse; }; meta = with lib; { description = "Mount an Azure Blob storage as filesystem through FUSE"; license = licenses.mit; maintainers = with maintainers; [ jbgi ]; platforms = platforms.linux; + mainProgram = "azure-storage-fuse"; }; } diff --git a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index 879075101b2c..602e1ff77071 100644 --- a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-xViy3dQ/V0ei9ctirtPlxQmXA4hkhaSAMQ/tRpjTYQw="; + hash = "sha256-/OfLP5IOYV5j+vJlpM2fK/OdStyqZiEcmHaX2oWi7t0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index 3cbf3704fbe9..241bf71985a0 100644 --- a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -165,18 +165,6 @@ let # Watch out for python <> boost compatibility python = python310.override { packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy.overridePythonAttrs rec { - version = "1.4.46"; - src = fetchPypi { - pname = "SQLAlchemy"; - inherit version; - hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; - }; - disabledTestPaths = [ - "test/aaa_profiling" - "test/ext/mypy" - ]; - }; }; }; diff --git a/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix b/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix index e44e961e3aeb..f32d026ac1cf 100644 --- a/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, libgcrypt , pkg-config, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite -, util-linux }: +, util-linux, testers, duperemove }: stdenv.mkDerivation rec { pname = "duperemove"; @@ -21,7 +21,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgcrypt glib linuxHeaders sqlite ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "VERSION=v${version}" + ]; + + passthru.tests.version = testers.testVersion { + package = duperemove; + command = "duperemove --version"; + version = "v${version}"; + }; meta = with lib; { description = "A simple tool for finding duplicated extents and submitting them for deduplication"; diff --git a/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix b/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix index 397f85478889..0ca64234e5f0 100644 --- a/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { (enableFeature doCheck "tests") ]; + makeFlags = [ + "AR:=$(AR)" + ]; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix b/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix index 79447e64a759..e927f2daf256 100644 --- a/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix @@ -6,24 +6,24 @@ python3Packages.buildPythonApplication rec { pname = "stratis-cli"; - version = "3.5.3"; + version = "3.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "v${version}"; - hash = "sha256-YoPi2AtP6qZPMrlxbDAD0sDEKrSBHLLRcHbNLxlXXCk="; + hash = "sha256-mLmjMofdr0U+Bfnkde7lJqPXkd1ICPYdlcsOm2nOcQA="; }; propagatedBuildInputs = with python3Packages; [ - psutil - python-dateutil - wcwidth - justbytes dbus-client-gen dbus-python-client-gen + justbytes packaging + psutil + python-dateutil + wcwidth ]; nativeCheckInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock b/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock index 97a211387195..1d258d784188 100644 --- a/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock +++ b/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock @@ -3,21 +3,6 @@ version = 3 [[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] name = "aho-corasick" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -92,9 +77,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.12" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" +checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" dependencies = [ "anstyle", "bstr", @@ -113,9 +98,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", @@ -129,27 +114,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "backtrace" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] name = "bindgen" -version = "0.63.0" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cexpr", "clang-sys", "lazy_static", @@ -160,7 +130,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] @@ -186,9 +156,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "block-buffer" @@ -201,11 +171,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" dependencies = [ "memchr", + "once_cell", "regex-automata", "serde", ] @@ -274,21 +245,22 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.19" +version = "4.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "2686c4115cb0810d9a984776e197823d08ec94f176549a89a9efded477c456dc" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "2e53afce1efce6ed1f633cf0e57612fe51db54a1ee4fd8f8503d078fe02d69ae" dependencies = [ "anstream", "anstyle", + "bitflags 1.3.2", "clap_lex", "strsim", ] @@ -313,9 +285,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" dependencies = [ "libc", ] @@ -373,11 +345,11 @@ dependencies = [ [[package]] name = "devicemapper" -version = "0.33.5" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a9fd602a98d192f7662a1f4c4cf6920a1b454c3a9e724f6490cf8e30910114" +checksum = "9ff98688149bf6128f259f0009f98eb8ad82584aa0aae143081fdfde513d3d13" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "devicemapper-sys", "env_logger", "lazy_static", @@ -391,12 +363,11 @@ dependencies = [ [[package]] name = "devicemapper-sys" -version = "0.1.5" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b0f9d16560f830ae6e90b769017333c4561d2c84f39e7aa7d935d2e7bcbc4c" +checksum = "734fba4d2e6b551396439ea7dd4f56980b11bb096bbf505d4a259943b228367b" dependencies = [ "bindgen", - "nix 0.26.2", ] [[package]] @@ -423,9 +394,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "either" -version = "1.9.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "env_logger" @@ -474,9 +445,12 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] [[package]] name = "float-cmp" @@ -604,12 +578,6 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -617,6 +585,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" @@ -651,6 +628,26 @@ dependencies = [ ] [[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.2", + "libc", + "windows-sys", +] + +[[package]] name = "iocuddle" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -658,11 +655,12 @@ checksum = "d8972d5be69940353d5347a1344cb375d9b457d6809b428b05bb1ca2fb9ce007" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.2", + "io-lifetimes", "rustix", "windows-sys", ] @@ -687,9 +685,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" @@ -714,9 +712,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libblkid-rs" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de9a402d7e440c9f84431b566cbc523140e9354610a4dca35aa7b927400cb040" +checksum = "0b43fd7c0de11a5209aff91fb625c118fc15173ae3dd0ac11e8f61a1b4d1a863" dependencies = [ "either", "libblkid-rs-sys", @@ -726,9 +724,9 @@ dependencies = [ [[package]] name = "libblkid-rs-sys" -version = "0.1.5" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ee2322d6a28f5672b3d8640fb672c9dbe89e6f1135eb0721eb6ba4e7315ac3" +checksum = "163068067b2faf263fb2fc3daff137b45608ee185044ca849dc41438aa38e23a" dependencies = [ "bindgen", "cc", @@ -736,21 +734,22 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libcryptsetup-rs" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54de25d80cf59c099a01fc9939251bbf8021c131adf97beb7d57c094b16ed474" +checksum = "73d2aa26d63e5289d6fac1e7e0be2e248ded9b5dfb3e2c345820d060c537d4b6" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "either", "lazy_static", "libc", "libcryptsetup-rs-sys", + "log", "pkg-config", "semver", "serde_json", @@ -759,9 +758,9 @@ dependencies = [ [[package]] name = "libcryptsetup-rs-sys" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c355c283a470a1a09924182b3606999786979697753df3c2206948dcd8f4eb" +checksum = "20fc299fd05078d353a895d940fc463d1008d94258fc8096c095467549324707" dependencies = [ "bindgen", "cc", @@ -827,9 +826,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "log" @@ -840,7 +839,7 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "loopdev" version = "0.4.0" -source = "git+https://github.com/mulkieran/loopdev?branch=bump-bindgen-reduce-version#f780d0e873960e0eeb997e2bda106d1e30c3afd0" +source = "git+https://github.com/mulkieran/loopdev?branch=bump-bindgen-reduce-version-0.68.1#63e6105d5599d9df00041de873d7fc91f53b9f20" dependencies = [ "bindgen", "errno 0.2.8", @@ -869,15 +868,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] name = "mio" version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -933,9 +923,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", "libm", @@ -943,24 +933,15 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.16.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] [[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - -[[package]] name = "once_cell" version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -974,9 +955,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -1070,9 +1051,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.32" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -1127,26 +1108,20 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax 0.7.4", + "regex-syntax 0.7.2", ] [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.7.4", -] +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" @@ -1156,34 +1131,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "retry" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac95c60a949a63fd2822f4964939662d8f2c16c4fa0624fd954bc6e703b9a3f6" -dependencies = [ - "rand", -] - -[[package]] -name = "rpassword" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -1193,12 +1149,13 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.4" +version = "0.37.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" dependencies = [ - "bitflags 2.3.3", + "bitflags 1.3.2", "errno 0.3.1", + "io-lifetimes", "libc", "linux-raw-sys", "windows-sys", @@ -1218,21 +1175,24 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "semver" -version = "1.0.18" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.175" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +dependencies = [ + "serde_derive", +] [[package]] name = "serde_derive" @@ -1247,9 +1207,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" dependencies = [ "itoa", "ryu", @@ -1309,7 +1269,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stratisd" -version = "3.5.9" +version = "3.6.0" dependencies = [ "assert_cmd", "assert_matches", @@ -1332,6 +1292,7 @@ dependencies = [ "libblkid-rs", "libc", "libcryptsetup-rs", + "libcryptsetup-rs-sys", "libmount", "libudev", "log", @@ -1344,13 +1305,13 @@ dependencies = [ "rand", "regex", "retry", - "rpassword", "serde", "serde_derive", "serde_json", "sha2", "stratisd_proc_macros", "tempfile", + "termios", "tokio", "uuid", ] @@ -1394,10 +1355,11 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ + "autocfg", "cfg-if 1.0.0", "fastrand", "redox_syscall", @@ -1415,6 +1377,15 @@ dependencies = [ ] [[package]] +name = "termios" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" +dependencies = [ + "libc", +] + +[[package]] name = "termtree" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1422,12 +1393,11 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "tokio" -version = "1.29.1" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", - "backtrace", "libc", "mio", "num_cpus", @@ -1463,9 +1433,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "utf8parse" @@ -1475,9 +1445,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" dependencies = [ "getrandom", "serde", @@ -1615,9 +1585,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", diff --git a/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix b/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix index a9e5e4ca3680..cea2d392ad88 100644 --- a/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix @@ -28,19 +28,19 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.5.9"; + version = "3.6.0"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-E4bBrbkqEh2twolPIHpHxphMG3bnDj0tjEBUWhrwL+M="; + hash = "sha256-IDCAhAioFFN4FqgdB6Bp38RG1G3n3NWQTIxK4/1TTFs="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "loopdev-0.4.0" = "sha256-nV52zjsg5u6++J8CdN2phii8AwjHg1uap2lt+U8obDQ="; + "loopdev-0.4.0" = "sha256-YS0hqxphxbbImT/mn/XBzkgabK2kbIym5VqG3XDVAx8="; }; }; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "initrd" ]; - EXECUTABLES_PATHS = lib.makeBinPath ([ + env.EXECUTABLES_PATHS = lib.makeBinPath ([ xfsprogs thin-provisioning-tools ] ++ lib.optionals clevisSupport [ diff --git a/nixpkgs/pkgs/tools/graphics/blockhash/default.nix b/nixpkgs/pkgs/tools/graphics/blockhash/default.nix index 4f63cf90a3ae..0a08e0cd31ff 100644 --- a/nixpkgs/pkgs/tools/graphics/blockhash/default.nix +++ b/nixpkgs/pkgs/tools/graphics/blockhash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "blockhash"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "commonsmachinery"; repo = "blockhash"; rev = "v${version}"; - sha256 = "0x3lvhnkb4c3pyq6p81qnnqimz35wpippiac506dgjx3b1848v35"; + sha256 = "sha256-QoqFTCfWtXIrFF3Yx4NfOa9cSjHtCSKz3k3i0u9Qx9M="; }; nativeBuildInputs = [ python3 pkg-config wafHook ]; diff --git a/nixpkgs/pkgs/tools/graphics/gifski/Cargo.lock b/nixpkgs/pkgs/tools/graphics/gifski/Cargo.lock index bc5b95bc75aa..ee579a5e9799 100644 --- a/nixpkgs/pkgs/tools/graphics/gifski/Cargo.lock +++ b/nixpkgs/pkgs/tools/graphics/gifski/Cargo.lock @@ -10,29 +10,30 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" dependencies = [ "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -44,15 +45,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -68,9 +69,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys", @@ -105,7 +106,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn", + "syn 1.0.109", ] [[package]] @@ -157,18 +158,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.4" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.4" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -287,9 +288,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -316,18 +317,8 @@ dependencies = [ ] [[package]] -name = "gifsicle" -version = "1.93.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d2c35b9670c2a3313343ce54d00669ca18a8236fe727f52e0cf8c5a77acac07" -dependencies = [ - "cc", - "libc", -] - -[[package]] name = "gifski" -version = "1.12.2" +version = "1.13.0" dependencies = [ "clap", "crossbeam-channel", @@ -336,7 +327,6 @@ dependencies = [ "ffmpeg-next", "gif", "gif-dispose", - "gifsicle", "imagequant", "imgref", "lodepng", @@ -347,7 +337,6 @@ dependencies = [ "quick-error", "resize", "rgb", - "scopeguard", "wild", ] @@ -374,12 +363,11 @@ checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "imagequant" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9427afad20d287aad11e5981db8beb68d0a20e2e4cbd8280e05f95e05b31668a" +checksum = "84d51957ac48371e8e2eaaeb4eba56150ff2109c1c8c200002afb7dd6e2d260f" dependencies = [ "arrayvec", - "num_cpus", "once_cell", "rayon", "rgb", @@ -388,9 +376,9 @@ dependencies = [ [[package]] name = "imgref" -version = "1.9.4" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2cf49df1085dcfb171460e4592597b84abe50d900fb83efb6e41b20fefd6c2c" +checksum = "90d944e334f00f4449c9640b440a171f816be0152305c12ef90424fc35fd035c" [[package]] name = "lazy_static" @@ -406,9 +394,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -422,9 +410,9 @@ dependencies = [ [[package]] name = "lodepng" -version = "3.8.2" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73c81862c9e16a943631de5160969379758f13fb3c788110db4ab49430b4feab" +checksum = "a3cdccd0cf57a5d456f0656ebcff72c2e19503287e1afbf3b84382812adc0606" dependencies = [ "crc32fast", "fallible_collections", @@ -444,9 +432,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -490,9 +478,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -538,9 +526,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -582,9 +570,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -594,9 +582,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -605,9 +593,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "resize" @@ -664,6 +652,17 @@ dependencies = [ ] [[package]] +name = "syn" +version = "2.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] name = "thread_local" version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -799,3 +798,23 @@ name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "zerocopy" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] diff --git a/nixpkgs/pkgs/tools/graphics/gifski/default.nix b/nixpkgs/pkgs/tools/graphics/gifski/default.nix index ed3c332cc452..53180d0094a8 100644 --- a/nixpkgs/pkgs/tools/graphics/gifski/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gifski/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - hash = "sha256-KiedPhlPcFkTiZZfOBlTKqtzU2ND1HXdsfhq+F1MtdU="; + hash = "sha256-Ij+bgL935uLCZeh8GQnTFlPIuUloNCn8LUdvMd+6okM="; }; cargoLock = { diff --git a/nixpkgs/pkgs/tools/graphics/scrot/default.nix b/nixpkgs/pkgs/tools/graphics/scrot/default.nix index c2da0da0b13d..7d0b1abae1b6 100644 --- a/nixpkgs/pkgs/tools/graphics/scrot/default.nix +++ b/nixpkgs/pkgs/tools/graphics/scrot/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "A command-line screen capture utility"; mainProgram = "scrot"; platforms = platforms.linux; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; license = licenses.mitAdvertising; }; } diff --git a/nixpkgs/pkgs/tools/inputmethods/evscript/Cargo.lock b/nixpkgs/pkgs/tools/inputmethods/evscript/Cargo.lock deleted file mode 100644 index 437ec68557af..000000000000 --- a/nixpkgs/pkgs/tools/inputmethods/evscript/Cargo.lock +++ /dev/null @@ -1,596 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "advancedresearch-tree_mem_sort" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab032c118518f4bd1bd8f9efd22a60a7d153a7eafd2ed9709fc224ce4186094" - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[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 = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4" - -[[package]] -name = "bitflags" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[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.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "dyon" -version = "0.47.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d15155013e10adf698bcad154b122132abede1195ad2a33cc83ecbf6fd96e7" -dependencies = [ - "advancedresearch-tree_mem_sort", - "lazy_static", - "piston_meta", - "range", - "read_color", - "read_token", - "vecmath", -] - -[[package]] -name = "evdev" -version = "0.10.1" -source = "git+https://github.com/valpackett/evdev?branch=uinput#4b905750a2103787e3e84241c60aaa79deb7c20c" -dependencies = [ - "bitflags 0.8.2", - "fixedbitset", - "libc", - "nix 0.9.0", - "num 0.1.42", - "strum", - "strum_macros", -] - -[[package]] -name = "evscript" -version = "0.0.0" -dependencies = [ - "clap", - "dyon", - "evdev", - "nix 0.25.0", - "num 0.4.0", - "rusty-sandbox", - "serde", - "serde_derive", - "toml", -] - -[[package]] -name = "fixedbitset" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[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.137" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "nix" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32" -dependencies = [ - "bitflags 0.9.1", - "cfg-if 0.1.10", - "libc", - "void", -] - -[[package]] -name = "nix" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", - "memoffset", - "pin-utils", -] - -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-bigint 0.1.44", - "num-complex 0.1.43", - "num-integer", - "num-iter", - "num-rational 0.1.42", - "num-traits", -] - -[[package]] -name = "num" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" -dependencies = [ - "num-bigint 0.4.3", - "num-complex 0.4.2", - "num-integer", - "num-iter", - "num-rational 0.4.1", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" -dependencies = [ - "num-integer", - "num-traits", - "rand", - "rustc-serialize", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" -dependencies = [ - "num-traits", - "rustc-serialize", -] - -[[package]] -name = "num-complex" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" -dependencies = [ - "num-bigint 0.1.44", - "num-integer", - "num-traits", - "rustc-serialize", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-bigint 0.4.3", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piston-float" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad78bf43dcf80e8f950c92b84f938a0fc7590b7f6866fbcbeca781609c115590" - -[[package]] -name = "piston_meta" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030240ae8cdfabe396630db10cfa80f6965aa45d4c505dc0890b98ba808e149f" -dependencies = [ - "lazy_static", - "range", - "read_token", -] - -[[package]] -name = "proc-macro2" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" - -[[package]] -name = "quote" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "range" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b851d7223b2adbc5d30dea12eeaf45dd58c81559656e056d31ff7d5407ba6f1" - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "read_color" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f4c8858baa4ad3c8bcc156ae91a0ffe22b76a3975c40c49b4f04c15c6bce0da" - -[[package]] -name = "read_token" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051fef16f3ac50a9eacfd64de43e909016df6b722d70b2a6e73eb83c1e891638" -dependencies = [ - "range", -] - -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - -[[package]] -name = "rusty-sandbox" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0be1328117ff55cebdb605c82e7356b8d9d19f8bcdb2a615805298973c73e4" -dependencies = [ - "libc", - "unix_socket", -] - -[[package]] -name = "serde" -version = "1.0.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" - -[[package]] -name = "serde_derive" -version = "1.0.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "syn 1.0.103", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strum" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca6e4730f517e041e547ffe23d29daab8de6b73af4b6ae2a002108169f5e7da" - -[[package]] -name = "strum_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3384590878eb0cab3b128e844412e2d010821e7e091211b9d87324173ada7db8" -dependencies = [ - "quote 0.3.15", - "syn 0.11.11", -] - -[[package]] -name = "syn" -version = "0.11.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" -dependencies = [ - "quote 0.3.15", - "synom", - "unicode-xid", -] - -[[package]] -name = "syn" -version = "1.0.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "unicode-ident", -] - -[[package]] -name = "synom" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -dependencies = [ - "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 = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" - -[[package]] -name = "unix_socket" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa2700417c405c38f5e6902d699345241c28c0b7ade4abaad71e35a87eb1564" -dependencies = [ - "cfg-if 0.1.10", - "libc", -] - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "vecmath" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ae1e0d85bca567dee1dcf87fb1ca2e792792f66f87dced8381f99cd91156a" -dependencies = [ - "piston-float", -] - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[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" diff --git a/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix b/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix index aecfaf949258..d1440bea357f 100644 --- a/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix @@ -2,22 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "evscript"; - version = "unstable-2022-11-20"; + version = "0.1.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "valpackett"; repo = pname; - rev = "ba997c9723a91717c683f08e9957d0ecea3da6cd"; - sha256 = "sha256-wuTPcBUuPK1D4VO8BXexx9AdiPM+X0TkJ3G7b7ofER8="; + rev = version; + hash = "sha256-lCXDDLovUb5aSOPTyVJL25v1JT1BGrrUlUR0Mu0XX4Q="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "evdev-0.10.1" = "sha256-iIzKhlA+7qg+nNwP82OIpoXVUEYU31iSEt1KJA3EewQ="; - }; - }; + cargoHash = "sha256-KcQZnGFtev4ckhtQ7CNB773fAsExZ9EQl9e4Jf4beGo="; meta = with lib; { homepage = "https://codeberg.org/valpackett/evscript"; diff --git a/nixpkgs/pkgs/tools/misc/audible-cli/default.nix b/nixpkgs/pkgs/tools/misc/audible-cli/default.nix index f83a87a75b25..e7f073451b5d 100644 --- a/nixpkgs/pkgs/tools/misc/audible-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/audible-cli/default.nix @@ -1,28 +1,63 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "audible-cli"; - version = "0.2.4"; + version = "0.2.5"; + pyproject = true; src = fetchFromGitHub { owner = "mkb79"; - repo = pname; + repo = "audible-cli"; rev = "refs/tags/v${version}"; - sha256 = "sha256-umIPHKPfWKlzEVyRKbBqmul/8n13EnpfYXmSQbQtLq8="; + hash = "sha256-YGvnye6YSp/H/2HAw6A8z5VzzCqa3ktJucq+3cXPUpc="; }; - propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools questionary ]; + nativeBuildInputs = with python3Packages; [ + pythonRelaxDepsHook + setuptools + ] ++ [ + installShellFiles + ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "httpx>=0.20.0,<0.24.0" "httpx" \ - --replace "audible>=0.8.2" "audible" + propagatedBuildInputs = with python3Packages; [ + aiofiles + audible + click + httpx + packaging + pillow + questionary + tabulate + toml + tqdm + ]; + + pythonRelaxDeps = [ + "httpx" + "audible" + ]; + + postInstall = '' + export PATH=$out/bin:$PATH + installShellCompletion --cmd audible \ + --bash <(source utils/code_completion/audible-complete-bash.sh) \ + --fish <(source utils/code_completion/audible-complete-zsh-fish.sh) \ + --zsh <(source utils/code_completion/audible-complete-zsh-fish.sh) ''; + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "audible_cli" + ]; + meta = with lib; { description = "A command line interface for audible package. With the cli you can download your Audible books, cover, chapter files"; - license = licenses.agpl3; + license = licenses.agpl3Only; homepage = "https://github.com/mkb79/audible-cli"; + changelog = "https://github.com/mkb79/audible-cli/blob/${src.rev}/CHANGELOG.md"; maintainers = with maintainers; [ jvanbruegge ]; + mainProgram = "audible"; }; } diff --git a/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/nixpkgs/pkgs/tools/misc/autorandr/default.nix index ee1d307af422..cc196de6230b 100644 --- a/nixpkgs/pkgs/tools/misc/autorandr/default.nix +++ b/nixpkgs/pkgs/tools/misc/autorandr/default.nix @@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/phillipberndt/autorandr/"; description = "Automatically select a display configuration based on connected devices"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ coroa globin ]; + maintainers = with maintainers; [ coroa ]; platforms = platforms.unix; mainProgram = "autorandr"; }; diff --git a/nixpkgs/pkgs/tools/misc/blflash/default.nix b/nixpkgs/pkgs/tools/misc/blflash/default.nix index 8cb5d6fcba11..db243a185f97 100644 --- a/nixpkgs/pkgs/tools/misc/blflash/default.nix +++ b/nixpkgs/pkgs/tools/misc/blflash/default.nix @@ -8,10 +8,10 @@ rustPlatform.buildRustPackage rec { owner = "spacemeowx2"; repo = "blflash"; rev = "v${version}"; - sha256 = "sha256-lv5bUbq5AnZVeR8V0A4pamY9ZIQAhLmvZEr+CRMPcj0="; + hash = "sha256-lv5bUbq5AnZVeR8V0A4pamY9ZIQAhLmvZEr+CRMPcj0="; }; - cargoSha256 = "sha256-NRBW2rGrtEmmxONTpCM1D+o5HtnLjp175Sq9+aCp7ZE="; + cargoHash = "sha256-NRBW2rGrtEmmxONTpCM1D+o5HtnLjp175Sq9+aCp7ZE="; meta = with lib; { description = "An bl602 serial flasher written in Rust"; diff --git a/nixpkgs/pkgs/tools/misc/czkawka/default.nix b/nixpkgs/pkgs/tools/misc/czkawka/default.nix index 3379c0fbe012..14908c0a402e 100644 --- a/nixpkgs/pkgs/tools/misc/czkawka/default.nix +++ b/nixpkgs/pkgs/tools/misc/czkawka/default.nix @@ -65,6 +65,18 @@ rustPlatform.buildRustPackage rec { command = "czkawka_cli --version"; }; + postInstall = '' + # Install Icons + install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka.svg + install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka-symbolic.svg + + # Install MetaInfo + install -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml + + # Install Desktop Entry + install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop + ''; + meta = with lib; { changelog = "https://github.com/qarmin/czkawka/raw/${version}/Changelog.md"; description = "A simple, fast and easy to use app to remove unnecessary files from your computer"; diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 2b966474346d..f737b78bb6d7 100644 --- a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -78,11 +78,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "248"; + version = "250"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-Lub+SIr0EyY4YmPsoLXWavXJhcpmK5VRb6eEnozZ0XQ="; + hash = "sha256-M73txRNzYARVdtUXHy4k92akgxfA6Now83KdqS/rHCI="; }; outputs = [ @@ -92,7 +92,6 @@ python3.pkgs.buildPythonApplication rec { patches = [ ./ignore_links.patch - ./fix-test_fit.patch ]; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/fix-test_fit.patch b/nixpkgs/pkgs/tools/misc/diffoscope/fix-test_fit.patch deleted file mode 100644 index cd275ea9e91c..000000000000 --- a/nixpkgs/pkgs/tools/misc/diffoscope/fix-test_fit.patch +++ /dev/null @@ -1,58 +0,0 @@ -From f1e9fa32c925fe7fb3cd825a02dcff52d305d845 Mon Sep 17 00:00:00 2001 -From: Andrew Marshall <andrew@johnandrewmarshall.com> -Date: Mon, 28 Aug 2023 19:03:38 -0400 -Subject: [PATCH] Fix test_fit with file 5.45 - -See also 435a8fe9a201a7e74e705e06cc56b66fa6cb4af9. ---- - tests/comparators/test_fit.py | 20 +++++++++++++------- - 1 file changed, 13 insertions(+), 7 deletions(-) - -diff --git a/tests/comparators/test_fit.py b/tests/comparators/test_fit.py -index d8478c00..47258a3e 100644 ---- a/tests/comparators/test_fit.py -+++ b/tests/comparators/test_fit.py -@@ -27,7 +27,11 @@ - from diffoscope.comparators.utils.specialize import specialize - - from ..utils.data import data, assert_diff, load_fixture --from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least -+from ..utils.tools import ( -+ skip_unless_file_version_is_at_least, -+ skip_unless_tool_is_at_least, -+ skip_unless_tools_exist, -+) - from ..utils.nonexisting import assert_non_existing - - cpio1 = load_fixture("test1.cpio") -@@ -124,19 +128,21 @@ def test_nested_listing(nested_differences): - @skip_unless_tools_exist("cpio") - @skip_unless_tool_is_at_least("dumpimage", dumpimage_version, "2021.01") - @skip_unless_tools_exist("fdtdump") -+@skip_unless_file_version_is_at_least("5.45") - def test_nested_symlink(nested_differences): -- assert nested_differences[1].source1 == "dir/link" -- assert nested_differences[1].comment == "symlink" -- assert_diff(nested_differences[1], "symlink_expected_diff") -+ assert nested_differences[2].source1 == "dir/link" -+ assert nested_differences[2].comment == "symlink" -+ assert_diff(nested_differences[2], "symlink_expected_diff") - - - @skip_unless_tools_exist("cpio") - @skip_unless_tool_is_at_least("dumpimage", dumpimage_version, "2021.01") - @skip_unless_tools_exist("fdtdump") -+@skip_unless_file_version_is_at_least("5.45") - def test_nested_compressed_files(nested_differences): -- assert nested_differences[2].source1 == "dir/text" -- assert nested_differences[2].source2 == "dir/text" -- assert_diff(nested_differences[2], "text_ascii_expected_diff") -+ assert nested_differences[3].source1 == "dir/text" -+ assert nested_differences[3].source2 == "dir/text" -+ assert_diff(nested_differences[3], "text_ascii_expected_diff") - - - @skip_unless_tools_exist("cpio") --- -2.41.0 - diff --git a/nixpkgs/pkgs/tools/misc/envsubst/default.nix b/nixpkgs/pkgs/tools/misc/envsubst/default.nix index b3a1be04d929..8cd59df31b1e 100644 --- a/nixpkgs/pkgs/tools/misc/envsubst/default.nix +++ b/nixpkgs/pkgs/tools/misc/envsubst/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { homepage = "https://github.com/a8m/envsubst"; license = licenses.mit; maintainers = with maintainers; [ nicknovitski ]; + mainProgram = "envsubst"; }; } diff --git a/nixpkgs/pkgs/tools/misc/esphome/default.nix b/nixpkgs/pkgs/tools/misc/esphome/default.nix index de7b7d5d03ef..ef128ff264d0 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.10.1"; + version = "2023.10.3"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XKZYnZYXETv0UXrKtjQvDXyv8lwqfO19jc5Fs3KMhEY="; + hash = "sha256-rvU2eA9HEZv77cn2K4xEL/hqBk2hauFv7eUHZzR5Q5s="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/fclones/default.nix b/nixpkgs/pkgs/tools/misc/fclones/default.nix index bb7dc0a8f288..563b35d665b5 100644 --- a/nixpkgs/pkgs/tools/misc/fclones/default.nix +++ b/nixpkgs/pkgs/tools/misc/fclones/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.32.2"; + version = "0.33.1"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - hash = "sha256-LDbunewSGqIxuy9Z87Aij85xovERuj4W2Jbf2lv2KVM="; + hash = "sha256-MnsA7zZ3T0L80dgCUj4F/F9IKTzADs65esM1DdgQeSU="; }; - cargoHash = "sha256-uKpQ7K8e9bq/7yQdCPlfQnjvOlTRnEUcW9HWE2Vy/lY="; + cargoHash = "sha256-xBoTzDeMmkSExOjD588l1vy73lbkzb60V4Fd4zhrU8c="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit diff --git a/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix b/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix index 368157e9641c..e3070ab6e5a9 100644 --- a/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix +++ b/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix @@ -2,17 +2,18 @@ python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "5.0.1"; + version = "7.0.1"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; rev = "v${version}"; - hash = "sha256-O7YDxNQel1XFSjGrzdBI4PsejmzPVLvYLNF/vZgdh4w="; + hash = "sha256-/Au6a93na3meb2j0eR8UCCg+TVW/UqWz3/TkASB94Eg="; }; propagatedBuildInputs = with python3.pkgs; [ + defusedxml python-dateutil requests ]; diff --git a/nixpkgs/pkgs/tools/misc/grc/default.nix b/nixpkgs/pkgs/tools/misc/grc/default.nix index 5ba9ffb86f9f..19e926c5caf6 100644 --- a/nixpkgs/pkgs/tools/misc/grc/default.nix +++ b/nixpkgs/pkgs/tools/misc/grc/default.nix @@ -21,6 +21,10 @@ buildPythonApplication rec { substituteInPlace $f \ --replace /usr/local/ $out/ done + + # Support for absolute store paths. + substituteInPlace grc.conf \ + --replace "^([/\w\.]+\/)" "^([/\w\.\-]+\/)" ''; nativeBuildInputs = [ installShellFiles ]; @@ -42,7 +46,7 @@ buildPythonApplication rec { beautifying your logfiles or output of commands. ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ]; + maintainers = with maintainers; [ azahi lovek323 AndersonTorres peterhoeg ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/grub/default.nix b/nixpkgs/pkgs/tools/misc/grub/default.nix index 5fc189a4de11..52ccfa8ccaaa 100644 --- a/nixpkgs/pkgs/tools/misc/grub/default.nix +++ b/nixpkgs/pkgs/tools/misc/grub/default.nix @@ -61,7 +61,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-bQPQ65gAcuUQ8ELB2hKywuXZ0kdC2bBCsUII/b4FkvQ="; + outputHash = "sha256-XpQ4tu5eNRARdbg95LOjqp+2RCVRj1qZWe+Sc0O5zNg="; } '' mkdir -p po diff --git a/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/nixpkgs/pkgs/tools/misc/hdf5/default.nix index dc2a1d284527..39c0b680b002 100644 --- a/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -72,7 +72,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DHDF5_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake" - ] ++ lib.optional cppSupport "-DHDF5_BUILD_CPP_LIB=ON" + ] ++ lib.optional stdenv.isDarwin "-DHDF5_BUILD_WITH_INSTALL_NAME=ON" + ++ lib.optional cppSupport "-DHDF5_BUILD_CPP_LIB=ON" ++ lib.optional fortranSupport "-DHDF5_BUILD_FORTRAN=ON" ++ lib.optional szipSupport "-DHDF5_ENABLE_SZIP_SUPPORT=ON" ++ lib.optionals mpiSupport [ "-DHDF5_ENABLE_PARALLEL=ON" "CC=${mpi}/bin/mpicc" ] diff --git a/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix b/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix index c140b9ba1a81..84f1d440c586 100644 --- a/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix +++ b/nixpkgs/pkgs/tools/misc/ideviceinstaller/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { libzip ]; + # the package uses zip_get_num_entries, which is deprecated + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=deprecated-declarations" + ]; + preAutoreconf = '' export RELEASE_VERSION=${version} ''; diff --git a/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix index d5cddeb6e245..e928544d240a 100644 --- a/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,17 +8,18 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.78.0"; + version = "0.87.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-5oTXPQU1aT8Xm1bTjbnauBUqzBqBH+yBzC1tmLHA0v0="; + sha256 = "sha256-b1TCj3aKupqUMQ74O58O5WJfQM9tj1G0ny5YeeilFAM="; }; + # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-ABaRedZXPr2q2AmslVNIJUvONZa4tv7OkxBLR9GuBRE="; + vendorHash = "sha256-o/51Z2Zmdza3pNZa0u3j4uG46orE9S7pUsZOXjHKrnI="; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcontribcol"; @@ -38,6 +39,8 @@ buildGoModule rec { # it instead of trusting the global $PATH. propagatedBuildInputs = lib.optionals withSystemd [ systemdMinimal ]; + preCheck = "export CGO_ENABLED=1"; + # This test fails on darwin for mysterious reasons. checkFlags = lib.optionals stdenv.isDarwin [ "-skip" "TestDefaultExtensions/memory_ballast" ]; diff --git a/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix b/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix index 113da6a8f406..039e9acb2e8e 100644 --- a/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix +++ b/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: let - version = "1.2023.10"; + version = "1.2023.12"; in stdenv.mkDerivation rec { pname = "plantuml-server"; inherit version; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-EIdqY8sonLaHZCfOfAaUhm4M1XOek2M1OqPZkb/CTg4="; + sha256 = "sha256-RHlv0kVJvAInLAd70001OTcJuh3Qg2C9o+//zR37zxc="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix b/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix index d982e94403c1..763485d75585 100644 --- a/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix +++ b/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "pmbootstrap"; - version = "1.50.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - hash = "sha256-2S3I3J3wmRkVSUshyQCUTuYgHLsDMnXZQHt7KySBzIY="; + hash = "sha256-nN4KUP9l3g5Q+QeWr4Fju2GiOyu2f7u94hz/VJlCYdw="; }; repo = fetchFromGitLab { @@ -87,6 +87,12 @@ buildPythonApplication rec { "test_skip_already_built" "test_switch_to_channel_branch" "test_version" + "test_build_abuild_leftovers" + "test_get_all_component_names" + "test_check_config" + "test_extract_arch" + "test_extract_version" + "test_check" ]; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ git openssl ]}" ]; diff --git a/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix b/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix index 61ca001563f5..579aa7fcc5e9 100644 --- a/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix +++ b/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , wrapQtAppsHook , cmake +, pkg-config , util-linux , curl , libarchive @@ -12,23 +13,26 @@ , qttools , qtquickcontrols2 , qtgraphicaleffects +, xz +, testers , nix-update-script , enableTelemetry ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rpi-imager"; - version = "1.7.5"; + version = "1.8.1"; src = fetchFromGitHub { owner = "raspberrypi"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-yB+H1zWL40KzxOrBuvg7nBC3zmWilsOgOW7ndiDWuDA="; + repo = finalAttrs.pname; + rev = "refs/tags/v${finalAttrs.version}"; + sha256 = "sha256-drHiZ0eYYvJg6/v3oEozGAbBKm1KLpec+kYZWwpT9yM="; }; nativeBuildInputs = [ cmake + pkg-config util-linux wrapQtAppsHook ]; @@ -48,40 +52,34 @@ stdenv.mkDerivation rec { qttools qtquickcontrols2 qtgraphicaleffects + xz ]; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; /* By default, the builder checks for JSON support in lsblk by running "lsblk --json", but that throws an error, as /sys/dev doesn't exist in the sandbox. This patch removes the check. */ patches = [ ./lsblkCheckFix.patch ]; - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - - # Without this, the tests fail because they cannot create the QT Window - export QT_QPA_PLATFORM=offscreen - $out/bin/rpi-imager --version - - runHook postInstallCheck - ''; - passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "QT_QPA_PLATFORM=offscreen rpi-imager --version"; + }; updateScript = nix-update-script { }; }; meta = with lib; { description = "Raspberry Pi Imaging Utility"; homepage = "https://www.raspberrypi.com/software/"; - changelog = "https://github.com/raspberrypi/rpi-imager/releases/tag/v${version}"; + changelog = "https://github.com/raspberrypi/rpi-imager/releases/tag/v${finalAttrs.version}"; downloadPage = "https://github.com/raspberrypi/rpi-imager/"; license = licenses.asl20; + mainProgram = "rpi-imager"; maintainers = with maintainers; [ ymarkus anthonyroussel ]; platforms = platforms.all; # does not build on darwin broken = stdenv.isDarwin; }; -} +}) diff --git a/nixpkgs/pkgs/tools/misc/silicon/default.nix b/nixpkgs/pkgs/tools/misc/silicon/default.nix index eadfd64b60f0..ddc1ad6d639a 100644 --- a/nixpkgs/pkgs/tools/misc/silicon/default.nix +++ b/nixpkgs/pkgs/tools/misc/silicon/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "sha256-RuzaRJr1n21MbHSeHBt8CjEm5AwbDbvX9Nw5PeBTl+w="; + hash = "sha256-RuzaRJr1n21MbHSeHBt8CjEm5AwbDbvX9Nw5PeBTl+w="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/misc/snapper/default.nix b/nixpkgs/pkgs/tools/misc/snapper/default.nix index 06eb7d920082..865bd0eb8077 100644 --- a/nixpkgs/pkgs/tools/misc/snapper/default.nix +++ b/nixpkgs/pkgs/tools/misc/snapper/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45 -, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 +, acl, attr, boost, btrfs-progs, coreutils, dbus, diffutils, e2fsprogs, libxml2 , lvm2, pam, util-linux, json_c, nixosTests , ncurses }: @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-tKxjzJ69wr48QQEgYLp7G6aOqxs9CCUiTHV1kaRCiHM="; }; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook pkg-config docbook_xsl libxslt docbook_xml_dtd_45 @@ -40,6 +42,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-ext4" # requires patched kernel & e2fsprogs + "DIFFBIN=${diffutils}/bin/diff" + "RMBIN=${coreutils}/bin/rm" ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/misc/tailspin/default.nix b/nixpkgs/pkgs/tools/misc/tailspin/default.nix index 06678de83589..de8cb9574e2e 100644 --- a/nixpkgs/pkgs/tools/misc/tailspin/default.nix +++ b/nixpkgs/pkgs/tools/misc/tailspin/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "tailspin"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "bensadeh"; repo = "tailspin"; rev = "refs/tags/${version}"; - hash = "sha256-Uqo47g0AXyRNFb1RmVVJzdFI2g1Oakx85Sg+zIN5B2A="; + hash = "sha256-yzG8wFTd4DYnmd+fbBdjZ0fr1iEoL4ZqXr59kX/a0Gs="; }; - cargoHash = "sha256-0ROLrdS3oBZuh+nXW9mTS2Jn/D+iLAUaYqhKvmKAPTo="; + cargoHash = "sha256-v6aOPfQyxqaoxKvT7ak91GvL68h88WfNjlnyU1vH/kY="; meta = with lib; { description = "A log file highlighter"; diff --git a/nixpkgs/pkgs/tools/misc/tbls/default.nix b/nixpkgs/pkgs/tools/misc/tbls/default.nix index de880c201446..8c3f840a6e22 100644 --- a/nixpkgs/pkgs/tools/misc/tbls/default.nix +++ b/nixpkgs/pkgs/tools/misc/tbls/default.nix @@ -1,6 +1,8 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub +, installShellFiles , testers , tbls }: @@ -18,32 +20,34 @@ buildGoModule rec { vendorHash = "sha256-84h+LQzk/xy/Gapy7IxB8IPvsVGRsJP7udd9HhLskew="; - CGO_CFLAGS = [ "-Wno-format-security" ]; + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ "-s" "-w" ]; - ldflags = [ - "-s" - "-w" - "-X github.com/k1LoW/tbls.commit=unspecified" - "-X github.com/k1LoW/tbls.date=unspecified" - "-X github.com/k1LoW/tbls.version=${src.rev}" - "-X github.com/k1LoW/tbls/version.Version=${src.rev}" - ]; + CGO_CFLAGS = [ "-Wno-format-security" ]; preCheck = '' # Remove tests that require additional services. rm -f \ - datasource/datasource_test.go \ + datasource/*_test.go \ drivers/*/*_test.go ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd tbls \ + --bash <($out/bin/tbls completion bash) \ + --fish <($out/bin/tbls completion fish) \ + --zsh <($out/bin/tbls completion zsh) + ''; + passthru.tests.version = testers.testVersion { package = tbls; command = "tbls version"; - version = src.rev; + inherit version; }; meta = with lib; { - description = "A tool to generate documentation based on a database"; + description = "A tool to generate documentation based on a database structure"; homepage = "https://github.com/k1LoW/tbls"; changelog = "https://github.com/k1LoW/tbls/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/misc/toastify/default.nix b/nixpkgs/pkgs/tools/misc/toastify/default.nix index 21e0d7091c18..6b853bc0b299 100644 --- a/nixpkgs/pkgs/tools/misc/toastify/default.nix +++ b/nixpkgs/pkgs/tools/misc/toastify/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "toastify"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "hoodie"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fCwxFdpwtG83xw3DDt9rlnbY8V3eKemRFK/6E1Bhm4c="; + sha256 = "sha256-hSBh1LTfe3rQDPUryo2Swdf/yLYrOQ/Fg3Dz7ZqV3gw="; }; - cargoHash = "sha256-ecc3z0T82pYR9gSYZYxRYhse9IroydPOAtRgDWqHTbo="; + cargoHash = "sha256-Ps2pRLpPxw+OS1ungQtVQ8beoKpc8pjzQEndMNni08k="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa diff --git a/nixpkgs/pkgs/tools/misc/topicctl/default.nix b/nixpkgs/pkgs/tools/misc/topicctl/default.nix index 23ab91092415..b0496914b354 100644 --- a/nixpkgs/pkgs/tools/misc/topicctl/default.nix +++ b/nixpkgs/pkgs/tools/misc/topicctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "topicctl"; - version = "1.10.2"; + version = "1.11.0"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-VyzWaoGOGDtB4fe0Wa6ldeOSEN+Ihu8xapiHcHJos0w="; + sha256 = "sha256-vOcxgqP4M9E9PXaCvLlPuxuu4KaQCyDuw3xF3Bd74/Q="; }; - vendorHash = "sha256-UJ7U9CfQHKgK7wfb8zqLZ7na4OBBZBYiGayII3RTaiQ="; + vendorHash = "sha256-5n1pj0xa6Eh4Azh35J/ys8cjFMUpSkS5KzidYvInvpA="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/nixpkgs/pkgs/tools/misc/ttyplot/default.nix b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix index 7becc090a83b..a136031dfc13 100644 --- a/nixpkgs/pkgs/tools/misc/ttyplot/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ttyplot"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; rev = version; - sha256 = "19qm0hx9ljdw9qg78lydn3c627xy7xnx3knq5f7caw9lf0cdp7kf"; + sha256 = "sha256-COnqzWqah1J/q64XrOBhMOsrafAs/BptqNvrjHJ9edQ="; }; buildInputs = [ ncurses ]; diff --git a/nixpkgs/pkgs/tools/misc/turbo/default.nix b/nixpkgs/pkgs/tools/misc/turbo/default.nix index c887fdc131c2..50192d616676 100644 --- a/nixpkgs/pkgs/tools/misc/turbo/default.nix +++ b/nixpkgs/pkgs/tools/misc/turbo/default.nix @@ -79,7 +79,7 @@ let libiconv ]; - ldFlags = [ + ldflags = [ "-s -w" "-X main.version=${version}" "-X main.commit=${src.rev}" diff --git a/nixpkgs/pkgs/tools/misc/tvnamer/default.nix b/nixpkgs/pkgs/tools/misc/tvnamer/default.nix index 459e3889efc6..a2d5c9e87a4a 100644 --- a/nixpkgs/pkgs/tools/misc/tvnamer/default.nix +++ b/nixpkgs/pkgs/tools/misc/tvnamer/default.nix @@ -38,7 +38,7 @@ pypkgs.buildPythonApplication rec { sha256 = "dc2ea8188df6ac56439343630466b874c57756dd0b2538dd8e7905048f425f04"; }; - propagatedBuildInputs = with pypkgs; [ tvdb_api ]; + propagatedBuildInputs = with pypkgs; [ tvdb-api ]; # no tests from pypi doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/ugs/default.nix b/nixpkgs/pkgs/tools/misc/ugs/default.nix index 61a124faaa1b..c40fbc7a01b8 100644 --- a/nixpkgs/pkgs/tools/misc/ugs/default.nix +++ b/nixpkgs/pkgs/tools/misc/ugs/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "ugs"; - version = "2.0.20"; + version = "2.0.21"; src = fetchzip { url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip"; - hash = "sha256-EPB7irROvFSGeo8XwOGoN9OLcIVJIDUySJ4DLomZPgM="; + hash = "sha256-KZh15M1dRV7oN5Qrg8q+PV3ZHCdNHF2wOUnGq+VLGYI="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix b/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix index 93e0d750a2ac..81db6449eb14 100644 --- a/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Rewrite of unclutter using the X11 Xfixes extension"; platforms = platforms.unix; license = lib.licenses.mit; - maintainers = [ maintainers.globin ]; + maintainers = [ ]; mainProgram = "unclutter"; }; } diff --git a/nixpkgs/pkgs/tools/misc/vtm/default.nix b/nixpkgs/pkgs/tools/misc/vtm/default.nix index bd4941afe5bf..52b561e57904 100644 --- a/nixpkgs/pkgs/tools/misc/vtm/default.nix +++ b/nixpkgs/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.9u"; + version = "0.9.9w.1"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-ySelsabe5J3Wne8L/F01R/CMPibUR18ZKWH2s25t+KY="; + sha256 = "sha256-/EQ8+8ac1MnWuXL9aNYl5U2ZfTpd/iThyvXygorbPmM="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/misc/wakapi/default.nix b/nixpkgs/pkgs/tools/misc/wakapi/default.nix index 5a68dd7a7955..abc36f63bd0b 100644 --- a/nixpkgs/pkgs/tools/misc/wakapi/default.nix +++ b/nixpkgs/pkgs/tools/misc/wakapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakapi"; - version = "2.8.2"; + version = "2.9.1"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "sha256-r6CTWBsaaYzQE9pe3rj/BQudloKGlkf310r39Y0kYuM="; + sha256 = "sha256-uTDvipz08hrdFB/gAoxVp4Eesh57HOFUG4AD/5T33H8="; }; - vendorHash = "sha256-uVdjMgQ1zWFKNwTKIHd7O47oekE9tLBh8LgFgI1SATM="; + vendorHash = "sha256-SqkE4vTT+QoLhKrQcGa2L5WmD+fCX7vli4FjgwLnqjg="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; diff --git a/nixpkgs/pkgs/tools/misc/wit-bindgen/default.nix b/nixpkgs/pkgs/tools/misc/wit-bindgen/default.nix index db2d5c1470fb..990b51e3bf80 100644 --- a/nixpkgs/pkgs/tools/misc/wit-bindgen/default.nix +++ b/nixpkgs/pkgs/tools/misc/wit-bindgen/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.9.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "wit-bindgen-cli-${version}"; - hash = "sha256-ghWwFjpIOTM6//WQ8WySLzKzy2UlaahUjIxxwYUTQWo="; + hash = "sha256-IFMnuXHL8NVHxkV7oXM6WTE+LMZ2D4g1VdDv0J5V72A="; }; - cargoHash = "sha256-Ch/S0/ON2HVEGHJ7jDE9k5q9+/2ANtt8uGv3ze60I6M="; + cargoHash = "sha256-9aocnv4msQ2/aIvN1HymKSuBxrtwdR9i31e7thtMh/k="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. diff --git a/nixpkgs/pkgs/tools/misc/zitadel-tools/default.nix b/nixpkgs/pkgs/tools/misc/zitadel-tools/default.nix index 64bf37eefbb4..51defb87e932 100644 --- a/nixpkgs/pkgs/tools/misc/zitadel-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/zitadel-tools/default.nix @@ -1,26 +1,37 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles }: buildGoModule rec { pname = "zitadel-tools"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "zitadel"; repo = "zitadel-tools"; rev = "v${version}"; - hash = "sha256-yKSpWvv/xW7ID0KhPIsrZOEWuuhEqpJuiswqO71ooEw="; + hash = "sha256-r9GEHpfDlpK98/dnsxjhUgWKn6vHQla8Z+jQUVrHGyo="; }; - vendorHash = "sha256-ZS8m3zjLWvX3kFty2jpObw+rfyozJ3yDfZBcFCdD96U="; + nativeBuildInputs = [ installShellFiles ]; + + vendorHash = "sha256-y2PYj0XRSgfiaYpeqAh4VR/+NKUPKd1c0w9pPCWsUrY="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + postInstall = '' + local INSTALL="$out/bin/zitadel-tools" + installShellCompletion --cmd zitadel-tools \ + --bash <($out/bin/zitadel-tools completion bash) \ + --fish <($out/bin/zitadel-tools completion fish) \ + --zsh <($out/bin/zitadel-tools completion zsh) + ''; + meta = with lib; { description = "Helper tools for zitadel"; homepage = "https://github.com/zitadel/zitadel-tools"; diff --git a/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix b/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix index 59eb35cfe832..ea43200b5349 100644 --- a/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix +++ b/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix @@ -1,29 +1,21 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch , nixosTests }: rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-bScL8hFV/Kot7P9nJRMDDhB8pllPUsejtJpbjmQ8skI="; + hash = "sha256-7nuLHhkVwMc2RYq3rS9bZl39asjFAnsHxnecPypT1HM="; }; - cargoHash = "sha256-rrn+ZTAsFs7UTP4xQL3Cy8G6RG7vwT0wMKnXHHIkB90="; - - patches = [ - (fetchpatch { # https://github.com/containers/aardvark-dns/issues/379 - url = "https://github.com/containers/aardvark-dns/commit/b13f0434f410934b515f086334414c6f5f55096e.diff"; - hash = "sha256-6XReIShEe8+WKc5jK5NzCNMEd4INdOn9Sf8UrQLbj+s="; - }) - ]; + cargoHash = "sha256-WwM4lPWQmfsBjL4M/j3sZkLtH+Wdy9LTv4M4AF0Z6oo="; passthru.tests = { inherit (nixosTests) podman; }; diff --git a/nixpkgs/pkgs/tools/networking/boundary/default.nix b/nixpkgs/pkgs/tools/networking/boundary/default.nix index 8a23a5f8bd5e..7aeed0b339b4 100644 --- a/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.13.1"; + version = "0.14.1"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-SrBfZ0te1l5XDmI8euojpVVRHxqq+T1WDSVbberxJYs="; - aarch64-linux = "sha256-T0t1E8lZMJZVanG7NZh9O+1RwzH82HtGi1ytDYYslhE="; - x86_64-darwin = "sha256-Wmk2hRbRe0dOuPnwISpsh2om1khpE3sX65VfWLYXNFk="; - aarch64-darwin = "sha256-ccfAtuqZSaQG4rCQZ4ujtFhp1e6dsrMAUcRuHT+YqXU="; + x86_64-linux = "sha256-z4pBC/igKpwe1zJpOP8VqBOybtIq0wVaz+rfOwPzht4="; + aarch64-linux = "sha256-f3ofThBmBfV6Fr9FHfAsNz6w1Od0QM9fE8tFVB01PzM="; + x86_64-darwin = "sha256-iU/t35ibkTjgNV3E0xzdrMw63TKVzSlJjhZTxGzHSz0="; + aarch64-darwin = "sha256-213e3J2e9fvuoGPkeeKV46eWxR0nP+uh0f+INeZG738="; }; in fetchzip { diff --git a/nixpkgs/pkgs/tools/networking/curlie/default.nix b/nixpkgs/pkgs/tools/networking/curlie/default.nix index b75d21ede847..68088a03bc20 100644 --- a/nixpkgs/pkgs/tools/networking/curlie/default.nix +++ b/nixpkgs/pkgs/tools/networking/curlie/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "curlie"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "rs"; repo = pname; rev = "v${version}"; - hash = "sha256-EHSFr05VXJuOjUnweEJngdnfSUZUF1HsO28ZBSLGlvE="; + hash = "sha256-YOsq3cB+Pn2eC1Dky3fobBRR7GMxcf/tvWr6i3Vq/BE="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index 4ce4d255ee81..b503cc5785c0 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -10,21 +10,23 @@ , hostname , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , extraTags ? [ ] +, testers +, datadog-agent }: let # keep this in sync with github.com/DataDog/agent-payload dependency - payloadVersion = "5.0.89"; + payloadVersion = "5.0.97"; python = pythonPackages.python; owner = "DataDog"; repo = "datadog-agent"; goPackagePath = "github.com/${owner}/${repo}"; - version = "7.45.1"; + version = "7.48.1"; src = fetchFromGitHub { inherit owner repo; rev = version; - sha256 = "sha256-bG8wsSQvZcG4/Th6mWVdVX9vpeYBZx8FxwdYXpIdXnU="; + hash = "sha256-3PFplTR/L2xJjQ5GEz2ow28SEHWafOmiLjIQHQqAaso="; }; rtloader = stdenv.mkDerivation { pname = "datadog-agent-rtloader"; @@ -41,7 +43,7 @@ in buildGoModule rec { doCheck = false; - vendorHash = "sha256-bGDf48wFa32hURZfGN5pCMmslC3PeLNayKcl5cfjq9M="; + vendorHash = "sha256-o7CTw7IIS5xueW20O1wKDV1Yji7PhGhp+6+i2ymKhxE="; subPackages = [ "cmd/agent" @@ -84,9 +86,9 @@ in buildGoModule rec { postPatch = '' sed -e "s|PyChecksPath =.*|PyChecksPath = \"$out/${python.sitePackages}\"|" \ -e "s|distPath =.*|distPath = \"$out/share/datadog-agent\"|" \ - -i cmd/agent/common/common_nix.go + -i cmd/agent/common/path/path_nix.go sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \ - -i pkg/util/hostname_nix.go + -i pkg/util/hostname/fqdn_nix.go ''; # Install the config files and python modules from the "dist" dir @@ -103,6 +105,11 @@ in buildGoModule rec { --set PYTHONPATH "$out/${python.sitePackages}"'' + lib.optionalString withSystemd '' \ --prefix LD_LIBRARY_PATH : '' + lib.makeLibraryPath [ (lib.getLib systemd) rtloader ]; + passthru.tests.version = testers.testVersion { + package = datadog-agent; + command = "agent version"; + }; + meta = with lib; { description = '' Event collector for the DataDog analysis service diff --git a/nixpkgs/pkgs/tools/networking/godns/default.nix b/nixpkgs/pkgs/tools/networking/godns/default.nix index a75fae9f724c..56b8bf7760b2 100644 --- a/nixpkgs/pkgs/tools/networking/godns/default.nix +++ b/nixpkgs/pkgs/tools/networking/godns/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "godns"; - version = "3.0.1"; + version = "3.0.4"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "refs/tags/v${version}"; - hash = "sha256-MmjPcJxz8wAgBwPg8UaYVniypDeY05yDxehkTL8zjro="; + hash = "sha256-1eJAGBKyTXcFFB7HKkljYQkkidQ3VicHy5MMwHY6iHU="; }; vendorHash = "sha256-iAU62/0MjzxwuMvIobhIZEqDJUpRqwEabnazH7jBRTE="; diff --git a/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix b/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix index efae7622184a..a62f3e3ce467 100644 --- a/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix +++ b/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goimapnotify"; - version = "2.3.7"; + version = "2.3.9"; src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; rev = version; - sha256 = "sha256-Wot+E+rDgXQ4FVgdfqe6a3O9oYUK3X1xImC33eDuUBo="; + sha256 = "sha256-BsoLoCOP6B9WaLBFF/1esPOj+0Rz0jkDJ8XjzirsCoU="; }; vendorHash = "sha256-DphGe9jbKo1aIfpF5kRYNSn/uIYHaRMrygda5t46svw="; diff --git a/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix b/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix index 30a400df0a1a..aef393c91937 100644 --- a/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { version = "2.1.0.203"; src = fetchurl { - url = "https://www.vpn.net/installers/${pname}-${version}-${arch}.tgz"; + url = "https://vpn.net/installers/${pname}-${version}-${arch}.tgz"; inherit sha256; }; diff --git a/nixpkgs/pkgs/tools/networking/netbird/default.nix b/nixpkgs/pkgs/tools/networking/netbird/default.nix index 29624c0693a6..91d34f700121 100644 --- a/nixpkgs/pkgs/tools/networking/netbird/default.nix +++ b/nixpkgs/pkgs/tools/networking/netbird/default.nix @@ -30,16 +30,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.23.8"; + version = "0.24.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fIISVhEtnd7ay3BeTfyRX2Kjs7GSLpgsjWVIa79Thes="; + hash = "sha256-tRezJzHlcJOGqHIV19ZAV58F1RVLQTz2PoYiLwXGBpQ="; }; - vendorHash = "sha256-sb+GSyP1KF1u0aEHp0fqsT5gluk5T08vUB14+MqGE0U="; + vendorHash = "sha256-Wocd15Uva74Fy3nCwWfoH+80lF5ugvX3itpm9bTIL7c="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; diff --git a/nixpkgs/pkgs/tools/networking/nethoscope/default.nix b/nixpkgs/pkgs/tools/networking/nethoscope/default.nix index 9a17adc3800d..478220210b3d 100644 --- a/nixpkgs/pkgs/tools/networking/nethoscope/default.nix +++ b/nixpkgs/pkgs/tools/networking/nethoscope/default.nix @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec { owner = "vvilhonen"; repo = "nethoscope"; rev = "v${version}"; - sha256 = "0dsv1f0ncwji8x7q1ix62955qji4jijgjx6xg3hxvl0vvvwqxcdz"; + hash = "sha256-v7GO+d4b0N3heN10+WSUJEpcShKmx4BPR1FyZoELWzc="; }; - cargoSha256 = "0cl0i4m8fxyxfib95x90x6qr284y41wwgwqhflyfa7d3r6qwq8nk"; + cargoHash = "sha256-0yLMscmjHeU8dRDzx3kgniCRsekg9ZJWdN13hyqJgDI="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/tools/networking/nqptp/default.nix b/nixpkgs/pkgs/tools/networking/nqptp/default.nix index 5261a6afb58f..2db121e2d189 100644 --- a/nixpkgs/pkgs/tools/networking/nqptp/default.nix +++ b/nixpkgs/pkgs/tools/networking/nqptp/default.nix @@ -3,26 +3,36 @@ , fetchFromGitHub , autoreconfHook , pkg-config +, gitUpdater }: stdenv.mkDerivation rec { - version = "1.2.3"; + version = "1.2.4"; pname = "nqptp"; src = fetchFromGitHub { owner = "mikebrady"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Ppsz3hDG6sEf6LJ2WdbTdJ8Gi53f0YmvaUU8TOfVMz4="; + hash = "sha256-roTNcr3v2kzE6vQ5plAVtlw1+2yJplltOYsGGibtoZo="; }; + patches = [ + # this patch should be removed when > 1.2.4 + ./remove-setcap.patch + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - meta = with lib; { + passthru.updateScript = gitUpdater { + ignoredVersions = ".*(-dev|d0)"; + }; + + meta = { homepage = "https://github.com/mikebrady/nqptp"; description = "Daemon and companion application to Shairport Sync that monitors timing data from any PTP clocks"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ jordanisaacs ]; - platforms = platforms.linux ++ platforms.freebsd; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ jordanisaacs adamcstephens ]; + platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; } diff --git a/nixpkgs/pkgs/tools/networking/nqptp/remove-setcap.patch b/nixpkgs/pkgs/tools/networking/nqptp/remove-setcap.patch new file mode 100644 index 000000000000..2fa56ac0150a --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/nqptp/remove-setcap.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index 78f36d7..8dc4e4f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -19,8 +19,6 @@ endif + + install-exec-hook: + if BUILD_FOR_LINUX +-# NQPTP runs as user/group nqptp/nqptp on Linux and uses setcap to access ports 319 and 320 +- setcap 'cap_net_bind_service=+ep' $(bindir)/nqptp + # no installer for System V + if INSTALL_SYSTEMD_STARTUP + getent group nqptp &>/dev/null || groupadd -r nqptp &>/dev/null diff --git a/nixpkgs/pkgs/tools/networking/pmacct/default.nix b/nixpkgs/pkgs/tools/networking/pmacct/default.nix index e850ba1af0a5..dfc31498ddd1 100644 --- a/nixpkgs/pkgs/tools/networking/pmacct/default.nix +++ b/nixpkgs/pkgs/tools/networking/pmacct/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "pmacct"; repo = "pmacct"; rev = "v${version}"; - sha256 = "sha256-AcgZ5/8d1U/zGs4QeOkgkZS7ttCW6gtUv/Xuf4O4VE0="; + hash = "sha256-AcgZ5/8d1U/zGs4QeOkgkZS7ttCW6gtUv/Xuf4O4VE0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/rosenpass/default.nix b/nixpkgs/pkgs/tools/networking/rosenpass/default.nix index 07669cfeb01e..9467904fe698 100644 --- a/nixpkgs/pkgs/tools/networking/rosenpass/default.nix +++ b/nixpkgs/pkgs/tools/networking/rosenpass/default.nix @@ -1,85 +1,53 @@ { lib -, targetPlatform , fetchFromGitHub +, nixosTests , rustPlatform +, targetPlatform +, installShellFiles , cmake -, makeWrapper -, pkg-config -, removeReferencesTo -, coreutils -, findutils -, gawk -, wireguard-tools -, bash , libsodium +, pkg-config }: - -let - rpBinPath = lib.makeBinPath [ - coreutils - findutils - gawk - wireguard-tools - ]; -in rustPlatform.buildRustPackage rec { pname = "rosenpass"; - version = "0.2.0"; + version = "unstable-2023-09-28"; + src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-r7/3C5DzXP+9w4rp9XwbP+/NK1axIP6s3Iiio1xRMbk="; + rev = "b15f17133f8b5c3c5175b4cfd4fc10039a4e203f"; + hash = "sha256-UXAkmt4VY0irLK2k4t6SW+SEodFE3CbX5cFbsPG0ZCo="; }; - cargoHash = "sha256-g2w3lZXQ3Kg3ydKdFs8P2lOPfIkfTbAF0MhxsJoX/E4="; + cargoHash = "sha256-N1DQHkgKgkDQ6DbgQJlpZkZ7AMTqX3P8R/cWr14jK2I="; nativeBuildInputs = [ cmake # for oqs build in the oqs-sys crate - makeWrapper # for the rp shellscript - pkg-config # let libsodium-sys-stable find libsodium - removeReferencesTo + pkg-config rustPlatform.bindgenHook # for C-bindings in the crypto libs + installShellFiles ]; - buildInputs = [ - bash # for patchShebangs to find it - libsodium - ]; - - # otherwise pkg-config tries to link non-existent dynamic libs during the build of liboqs - PKG_CONFIG_ALL_STATIC = true; - - # liboqs requires quite a lot of stack memory, thus we adjust the default stack size picked for - # new threads (which is used by `cargo test`) to be _big enough_ - RUST_MIN_STACK = 8 * 1024 * 1024; # 8 MiB + buildInputs = [ libsodium ]; # nix defaults to building for aarch64 _without_ the armv8-a # crypto extensions, but liboqs depends on these - preBuild = lib.optionalString targetPlatform.isAarch - ''NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -march=armv8-a+crypto"''; - - preInstall = '' - install -D rp $out/bin/rp - wrapProgram $out/bin/rp --prefix PATH : "${ rpBinPath }" - for file in doc/*.1 - do - install -D $file $out/share/man/man1/''${file##*/} - done + preBuild = lib.optionalString targetPlatform.isAarch64 '' + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -march=armv8-a+crypto" ''; - # nix propagates the *.dev outputs of buildInputs for static builds, but that is non-sense for an - # executables only package - postFixup = '' - find -type f -exec remove-references-to -t ${bash.dev} \ - -t ${libsodium.dev} {} \; + postInstall = '' + installManPage doc/rosenpass.1 ''; + passthru.tests.rosenpass = nixosTests.rosenpass; + meta = with lib; { description = "Build post-quantum-secure VPNs with WireGuard!"; homepage = "https://rosenpass.eu/"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ wucke13 ]; - platforms = platforms.all; + platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; + mainProgram = "rosenpass"; }; } diff --git a/nixpkgs/pkgs/tools/networking/rosenpass/tools.nix b/nixpkgs/pkgs/tools/networking/rosenpass/tools.nix new file mode 100644 index 000000000000..fb59436b3810 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/rosenpass/tools.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, makeWrapper +, installShellFiles +, coreutils +, findutils +, gawk +, rosenpass +, wireguard-tools +}: +stdenv.mkDerivation { + inherit (rosenpass) version src; + pname = "rosenpass-tools"; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + postInstall = '' + install -D $src/rp $out/bin/rp + installManPage $src/doc/rp.1 + wrapProgram $out/bin/rp \ + --prefix PATH : ${lib.makeBinPath [ + coreutils findutils gawk rosenpass wireguard-tools + ]} + ''; + + meta = rosenpass.meta // { + description = "This package contains the Rosenpass tool `rp`, which is a script that wraps the `rosenpass` binary."; + mainProgram = "rp"; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/sing-box/default.nix b/nixpkgs/pkgs/tools/networking/sing-box/default.nix index db8aefa1f6fb..460f6f4e039e 100644 --- a/nixpkgs/pkgs/tools/networking/sing-box/default.nix +++ b/nixpkgs/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-Vyp8AlcHhkKitcSaQ3ecjfevjSYPUZQercRJsjaXgTk="; + hash = "sha256-XOp8kdF5UcmWrU43WfHk0EI8E+dPxgR2Ck5yC2ANcWI="; }; - vendorHash = "sha256-Lcrc24GfkVfabMnT15scaoQFSiKJ3umbs0rAMDxtQR8="; + vendorHash = "sha256-ng+6fxmwjRIXuH6xDY9JFefMtlMJqaNlfCET9YRuK3k="; tags = [ "with_quic" diff --git a/nixpkgs/pkgs/tools/networking/tayga/default.nix b/nixpkgs/pkgs/tools/networking/tayga/default.nix index ef393f5bb152..382b010515e8 100644 --- a/nixpkgs/pkgs/tools/networking/tayga/default.nix +++ b/nixpkgs/pkgs/tools/networking/tayga/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url= "http://www.litech.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1700y121lhvpna49bjpssb7jq1abj9qw5wxgjn8gzp6jm4kpj7rb"; + hash = "sha256-Kx95J6nS3P+Qla/zwnGSSwUsz9L6ypWIsndDGkTwAJw="; }; passthru.tests.tayga = nixosTests.tayga; diff --git a/nixpkgs/pkgs/tools/networking/wget2/default.nix b/nixpkgs/pkgs/tools/networking/wget2/default.nix index 0bc5c2942d1b..03eb6135ccd9 100644 --- a/nixpkgs/pkgs/tools/networking/wget2/default.nix +++ b/nixpkgs/pkgs/tools/networking/wget2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "wget2"; - version = "2.0.1"; + version = "2.1.0"; outputs = [ "out" "lib" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "gnuwget"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9IOM8IA8Kezk3SP3YVenxQkm8UMZgD8/ztWoDNqM0vc="; + sha256 = "sha256-+xw1nQMBs0m9RlunyrAYaSDPnLY1yRX8zt8hKOMXQT8="; }; # wget2_noinstall contains forbidden reference to /build/ diff --git a/nixpkgs/pkgs/tools/networking/xdp-tools/default.nix b/nixpkgs/pkgs/tools/networking/xdp-tools/default.nix index d3eb90f258ba..cf24360b1d7f 100644 --- a/nixpkgs/pkgs/tools/networking/xdp-tools/default.nix +++ b/nixpkgs/pkgs/tools/networking/xdp-tools/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "xdp-tools"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "xdp-project"; repo = "xdp-tools"; rev = "v${version}"; - hash = "sha256-XZGbfXQM3catiDavzi2vY5s+EMVgGHq/ju32lBIgg8E="; + hash = "sha256-5rc3RbAgWVd7Tt16NoHymFME5a9tBCmup+1ZmnMGPhs="; }; outputs = [ "out" "lib" ]; diff --git a/nixpkgs/pkgs/tools/networking/xh/default.nix b/nixpkgs/pkgs/tools/networking/xh/default.nix index 52c22e6326cb..9d87db3408ef 100644 --- a/nixpkgs/pkgs/tools/networking/xh/default.nix +++ b/nixpkgs/pkgs/tools/networking/xh/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-O/tHBaopFzAVcWdwiMddemxwuYhYVaShXkP9Mwdqs/w="; + sha256 = "sha256-L+qHcC5SQPHiflTc4vYmVyME1KyfG9wug3fO7ib7Ffk="; }; - cargoSha256 = "sha256-8sss2UG1EVbzCDwCREQx2mb9V0eJjeKhcUUqfN+Aepk="; + cargoSha256 = "sha256-W6fqZJcyKm5+4DFm+lFxIACw3nvQ6TK3sZJdIrkxjjw="; buildFeatures = lib.optional withNativeTls "native-tls"; diff --git a/nixpkgs/pkgs/tools/nix/alejandra/default.nix b/nixpkgs/pkgs/tools/nix/alejandra/default.nix index 0e5d59ee8f88..2dc35be81106 100644 --- a/nixpkgs/pkgs/tools/nix/alejandra/default.nix +++ b/nixpkgs/pkgs/tools/nix/alejandra/default.nix @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { owner = "kamadorueda"; repo = "alejandra"; rev = version; - sha256 = "sha256-xFumnivtVwu5fFBOrTxrv6fv3geHKF04RGP23EsDVaI="; + hash = "sha256-xFumnivtVwu5fFBOrTxrv6fv3geHKF04RGP23EsDVaI="; }; - cargoSha256 = "sha256-tF8E9mnvkTXoViVss9cNjpU4UkEsARp4RtlxKWq55hc="; + cargoHash = "sha256-tF8E9mnvkTXoViVss9cNjpU4UkEsARp4RtlxKWq55hc="; passthru.tests = { version = testers.testVersion { package = alejandra; }; diff --git a/nixpkgs/pkgs/tools/package-management/nix-du/default.nix b/nixpkgs/pkgs/tools/package-management/nix-du/default.nix index 3f9814b36ac5..dcd1e24ff34a 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-du/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-du/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-du"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "symphorien"; repo = "nix-du"; rev = "v${version}"; - sha256 = "sha256-Ft0j9kcR5HTSX0K09OKZMIUz25PR/isqZQIKmlNjqNE="; + sha256 = "sha256-LI9XWqi3ihcmUBjScQVQbn30e5eLaCYwkmnbj7Y8kuU="; }; - cargoSha256 = "sha256-x+NONRKF7b0tADG2flgBKo32wx/TyXm7Z0bd9ZbbES8="; + cargoSha256 = "sha256-AM89yYeEsYOcHtbSiQgz5qVQhFvDibVxA0ACaE8Gw2Y="; doCheck = true; nativeCheckInputs = [ nix graphviz ]; diff --git a/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix b/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix index bc4ba3f630f8..5e57c6964238 100644 --- a/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -16,14 +16,14 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.10.2"; + version = "2.10.3"; format = "pyproject"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - hash = "sha256-x41piT7peYV3sNMVYsqcjCU4u+PayZb05JIWBeWF7jw="; + hash = "sha256-iO+B/4UsMi+vf85oyLwZTigZ+mmt7Sk3qGba20/0XBs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/package-management/poetry/default.nix b/nixpkgs/pkgs/tools/package-management/poetry/default.nix index 4d4a98491cb9..f4a10a8ff2ef 100644 --- a/nixpkgs/pkgs/tools/package-management/poetry/default.nix +++ b/nixpkgs/pkgs/tools/package-management/poetry/default.nix @@ -1,27 +1,24 @@ -{ lib -, python3 -, fetchFromGitHub -, fetchPypi -}: +{ python3, fetchFromGitHub }: let python = python3.override { - packageOverrides = self: super: { + packageOverrides = self: super: rec { poetry = self.callPackage ./unwrapped.nix { }; - # version overrides required by poetry and its plugins - deepdiff = super.deepdiff.overridePythonAttrs (old: rec { - doCheck = false; - }); + # The versions of Poetry and poetry-core need to match exactly, + # and poetry-core in nixpkgs requires a staging cycle to be updated, + # so apply an override here. + # + # We keep the override around even when the versions match, as + # it's likely to become relevant again after the next Poetry update. poetry-core = super.poetry-core.overridePythonAttrs (old: rec { - version = "1.7.0"; + version = poetry.version; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; rev = version; hash = "sha256-OfY2zc+5CgOrgbiPVnvMdT4h1S7Aek8S7iThl6azmsk="; }; - patches = [ ]; }); } // (plugins self); }; diff --git a/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix b/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix index dd1305501916..751db3ceec99 100644 --- a/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , installShellFiles , pythonRelaxDepsHook , build @@ -53,6 +54,15 @@ buildPythonPackage rec { hash = "sha256-/OvYT4Vix1t5Yx/Tx0z3E9L9qJ4OdI4maQqUVl8H524="; }; + patches = [ + # Backport patch to fix pypa/build 1.0 incompatibility + # FIXME: remove in next release + (fetchpatch { + url = "https://github.com/python-poetry/poetry/commit/a16863d1a448ff91a7cc4e48042d3a8669b78b34.patch"; + hash = "sha256-dWa5W1jFS7h5cTgoFy89o1Rbtmyddvme4sus+lld058="; + }) + ]; + nativeBuildInputs = [ installShellFiles pythonRelaxDepsHook diff --git a/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/nixpkgs/pkgs/tools/security/bitwarden/default.nix index 41ce0d7e5e89..84ce6b59d787 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden/default.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden/default.nix @@ -1,9 +1,9 @@ { lib -, applyPatches , buildNpmPackage , cargo +, copyDesktopItems , dbus -, electron_24 +, electron_25 , fetchFromGitHub , glib , gnome @@ -26,36 +26,27 @@ let icon = "bitwarden"; buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; - electron = electron_24; - - desktopItem = makeDesktopItem { - name = "bitwarden"; - exec = "bitwarden %U"; - inherit icon; - comment = description; - desktopName = "Bitwarden"; - categories = [ "Utility" ]; - }; + electron = electron_25; in buildNpmPackage' rec { pname = "bitwarden"; - version = "2023.9.0"; + version = "2023.9.3"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-8rNJmDpKLzTre5c2wktle7tthp1owZK5WAQP80/2R0g="; + hash = "sha256-NiMJmtCx+yD24BCyMgHLpRApNwoIJRps5qmmlVdB0G0="; }; makeCacheWritable = true; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-0q3XoC87kfC2PYMsNse4DV8M8OXjckiLTdN3LK06lZY="; + npmDepsHash = "sha256-HQPxmATA9bUc4NTfvYsL6fGuicU9baySCmNHahs8EF4="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-YF3UHQWCSuWAg2frE8bo1XrLn44P6+1A7YUh4RZxwo0="; + hash = "sha256-mFxvK9cmSBRVnUwEbzADUa5W5TCL51wcUHxuR5JZwLE="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -63,6 +54,7 @@ in buildNpmPackage' rec { nativeBuildInputs = [ cargo + copyDesktopItems jq makeWrapper moreutils @@ -128,6 +120,8 @@ in buildNpmPackage' rec { ''; installPhase = '' + runHook preInstall + mkdir $out pushd apps/desktop/dist/linux-unpacked @@ -141,9 +135,6 @@ in buildNpmPackage' rec { --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - pushd apps/desktop/resources/icons for icon in *.png; do dir=$out/share/icons/hicolor/"''${icon%.png}"/apps @@ -151,8 +142,21 @@ in buildNpmPackage' rec { cp "$icon" "$dir"/${icon}.png done popd + + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = "bitwarden"; + exec = "bitwarden %U"; + inherit icon; + comment = description; + desktopName = "Bitwarden"; + categories = [ "Utility" ]; + }) + ]; + meta = { changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}"; inherit description; diff --git a/nixpkgs/pkgs/tools/security/chain-bench/default.nix b/nixpkgs/pkgs/tools/security/chain-bench/default.nix index 129c21b5d4b2..fef69399cc14 100644 --- a/nixpkgs/pkgs/tools/security/chain-bench/default.nix +++ b/nixpkgs/pkgs/tools/security/chain-bench/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "chain-bench"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UWP/S15s9k92RhH6xr0V544BHF4n9g+inN6Sdpja6uM="; + sha256 = "sha256-vQzxTOShxQGitZRCuR8izSxCkZdPWm2ohoXBOvAkwfw="; }; - vendorHash = "sha256-R6V4dE2cNKcsBweSaUWjZHKnUQP/kADAbW2aTQc7TAg="; + vendorHash = "sha256-sAZIMJRx/E+l12Zyp/vKfuiaCMeaonRbEcsRIRXbXm8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/security/cnspec/default.nix b/nixpkgs/pkgs/tools/security/cnspec/default.nix index 8d73e982e197..bcfadcc4da71 100644 --- a/nixpkgs/pkgs/tools/security/cnspec/default.nix +++ b/nixpkgs/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "8.23.2"; + version = "9.2.3"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-fqbqbKAj7NKtPXbL6iAI4o8Vpr7n6zp1WM72kQXj/H8="; + hash = "sha256-gCKmaioBko4UsfhPBcpVxHC7knhZGZU54HZFu/rHIbw="; }; proxyVendor = true; - vendorHash = "sha256-+gTIBLNiXqcYXK0WGucwXXCBjkhkr5rrTjGKUuqn+mY="; + vendorHash = "sha256-YN1y+K/9EdZ7RlZRVWK/HEppZv/dX6XrkaqIlZVoC8c="; subPackages = [ "apps/cnspec" diff --git a/nixpkgs/pkgs/tools/security/cowpatty/default.nix b/nixpkgs/pkgs/tools/security/cowpatty/default.nix index 934b31a35da6..2c6e0cfa414f 100644 --- a/nixpkgs/pkgs/tools/security/cowpatty/default.nix +++ b/nixpkgs/pkgs/tools/security/cowpatty/default.nix @@ -2,6 +2,7 @@ , stdenv , clang , fetchFromGitHub +, fetchpatch , installShellFiles , openssl , libpcap @@ -18,6 +19,16 @@ stdenv.mkDerivation rec { sha256 = "0fvwwghhd7wsx0lw2dj9rdsjnirawnq3c6silzvhi0yfnzn5fs0s"; }; + patches = [ + # Pull upstream fix for parallel builds: + # https://github.com/joswr1ght/cowpatty/pull/5 + (fetchpatch { + name = "fix-parallel.patch"; + url = "https://github.com/joswr1ght/cowpatty/commit/9c8cc09c4fa90aebee44afcd0ad6a35539178478.patch"; + hash = "sha256-k0Qht80HcjvPoxVPF6wAXwxN3d2mxBrEyeFGuU7w9eA="; + }) + ]; + nativeBuildInputs = [ clang installShellFiles @@ -28,6 +39,8 @@ stdenv.mkDerivation rec { libpcap ]; + enableParallelBuilding = true; + makeFlags = [ "DESTDIR=$(out)" "BINDIR=/bin" diff --git a/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 014b39f87c92..73a297548e70 100644 --- a/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-10-21"; + version = "2023-10-24"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Un8Wnctd8943JXA9GlKlaR2b6mP8BfcYLHSjxpysg3U="; + hash = "sha256-F3UPg7wBpm1iK2hZ9YOC4bRsvGHn7j4U5y4w7qpF+tM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/gau/default.nix b/nixpkgs/pkgs/tools/security/gau/default.nix index 41c858ba9797..1a67b89855f9 100644 --- a/nixpkgs/pkgs/tools/security/gau/default.nix +++ b/nixpkgs/pkgs/tools/security/gau/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gau"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "lc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z8JmMMob12wRTdpFoVbRHTDwet9AMXet49lHEDVVAnw="; + sha256 = "sha256-09Mf6KmTO3gper7txhvPZ/lb/cFOTDWicpu7+JrNrbo="; }; - vendorHash = "sha256-HQATUCzYvhhlqe4HhNu9H4CqmY2IGLNJ9ydt3/igSmQ="; + vendorHash = "sha256-nhsGhuX5AJMHg+zQUt1G1TwVgMCxnuJ2T3uBrx7bJNs="; meta = with lib; { description = "Tool to fetch known URLs"; diff --git a/nixpkgs/pkgs/tools/security/ospd-openvas/default.nix b/nixpkgs/pkgs/tools/security/ospd-openvas/default.nix index 778d3d786625..68c6a7dba953 100644 --- a/nixpkgs/pkgs/tools/security/ospd-openvas/default.nix +++ b/nixpkgs/pkgs/tools/security/ospd-openvas/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ospd-openvas"; - version = "22.6.0"; + version = "22.6.1"; format = "pyproject"; src = fetchFromGitHub { owner = "greenbone"; repo = "ospd-openvas"; rev = "refs/tags/v${version}"; - hash = "sha256-1538XMNnerhfV3xQ8/TyoztCfWnkRvy0p6QtKMQb2p4="; + hash = "sha256-Qm6TTS9yLqQHXsz19yJR3Ccyc+syxkrTJ7upSTXdXSE="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/tools/security/pretender/default.nix b/nixpkgs/pkgs/tools/security/pretender/default.nix index 9ea3918b3699..91452f34d62b 100644 --- a/nixpkgs/pkgs/tools/security/pretender/default.nix +++ b/nixpkgs/pkgs/tools/security/pretender/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pretender"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "RedTeamPentesting"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3i7zNzwURSNSleiW+KBkxdqBv9yshtBu1hLKtjWe9OE="; + hash = "sha256-adWdUlsReRptSgRAjNH9bWy9dpwpuAWtVxlbDL2pMmk="; }; - vendorHash = "sha256-uw3mpf27OH5uNKmvCFcTw+YFoxVEqT4Fz/CSl9Wjbv0="; + vendorHash = "sha256-kDHRjd3Y90ocBGSJ0B2jAM9tO+iDSXoUOzLEWX2G0J4="; # Tests require network access doCheck = false; diff --git a/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/nixpkgs/pkgs/tools/security/trufflehog/default.nix index 2381638cd2e4..de2ec7dfb05a 100644 --- a/nixpkgs/pkgs/tools/security/trufflehog/default.nix +++ b/nixpkgs/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.60.1"; + version = "3.60.3"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-aZA/nIntTiYXvZE6sAjYyWfkm842+O6pwPFUKfnDrY4="; + hash = "sha256-864bq0LK2lRWmbQ7JTGc9gtMsTnoKMLkjyEdTNUBFRg="; }; - vendorHash = "sha256-axB0JcvGeiqz1dBKHknNqW3XzQWaLCHk6gsB9QV3PN8="; + vendorHash = "sha256-TNxZatI9l+dX2WI7SnTH975yrgyuB4VjTJOkaSr5mxc="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/security/webanalyze/default.nix b/nixpkgs/pkgs/tools/security/webanalyze/default.nix index cfce48228b57..3b49b496f62e 100644 --- a/nixpkgs/pkgs/tools/security/webanalyze/default.nix +++ b/nixpkgs/pkgs/tools/security/webanalyze/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "webanalyze"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "rverton"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1z4hi9a/OzBXIMBk1f0JpPMV/kRgBnTQAEygIZqV+1w="; + hash = "sha256-uDf0p4zw23+AVftMmrKfno+FbMZfGC1B5zvutj8qnPg="; }; - vendorHash = "sha256-kXtWYGsZUUhBNvkTOah3Z+ta118k6PXfpBx6MLr/pq0="; + vendorHash = "sha256-XPOsC+HoLytgv1fhAaO5HYSvuOP6OhjLyOYTfiD64QI="; meta = with lib; { description = "Tool to uncover technologies used on websites"; diff --git a/nixpkgs/pkgs/tools/system/at/default.nix b/nixpkgs/pkgs/tools/system/at/default.nix index 11a45fbe391a..e5eebb727b54 100644 --- a/nixpkgs/pkgs/tools/system/at/default.nix +++ b/nixpkgs/pkgs/tools/system/at/default.nix @@ -5,22 +5,38 @@ stdenv.mkDerivation rec { pname = "at"; - version = "3.1.23"; + version = "3.2.5"; src = fetchurl { # Debian is apparently the last location where it can be found. url = "mirror://debian/pool/main/a/at/at_${version}.orig.tar.gz"; - sha256 = "040pr2ivfbrhvrhzis97cpwfkzpr7nin33nc301aga5aajlhlicp"; + hash = "sha256-uwZrOJ18m7nYSjVzgDK4XDDLp9lJ91gZKtxyyUd/07g="; }; patches = [ - ./install.patch + # Remove glibc assumption (fetchpatch { url = "https://raw.githubusercontent.com/riscv/riscv-poky/master/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch"; - sha256 = "1rk4hskp0c1jqkanzdxf873i6jgki3xhrm609fsam8an8sl1njnm"; + hash = "sha256-1UobqEZWoaq0S8DUDPuI80kTx0Gut2/VxDIwcKeGZOY="; }) ]; + postPatch = '' + # Remove chown commands and setuid bit + substituteInPlace Makefile.in \ + --replace ' -o root ' ' ' \ + --replace ' -g root ' ' ' \ + --replace ' -o $(DAEMON_USERNAME) ' ' ' \ + --replace ' -o $(DAEMON_GROUPNAME) ' ' ' \ + --replace ' -g $(DAEMON_GROUPNAME) ' ' ' \ + --replace '$(DESTDIR)$(etcdir)' "$out/etc" \ + --replace '$(DESTDIR)$(ATJOB_DIR)' "$out/var/spool/atjobs" \ + --replace '$(DESTDIR)$(ATSPOOL_DIR)' "$out/var/spool/atspool" \ + --replace '$(DESTDIR)$(LFILE)' "$out/var/spool/atjobs/.SEQ" \ + --replace 'chown' '# skip chown' \ + --replace '6755' '0755' + ''; + nativeBuildInputs = [ bison flex perl /* for `prove` (tests) */ ]; buildInputs = [ pam ]; @@ -45,15 +61,17 @@ stdenv.mkDerivation rec { # Ensure that "batch" can invoke the setuid "at" wrapper, if it exists, or # else we get permission errors (on NixOS). "batch" is a shell script, so - # when the kernel executes it it drops setuid perms. + # when the kernel executes it drops setuid perms. postInstall = '' sed -i "6i test -x ${atWrapperPath} && exec ${atWrapperPath} -qb now # exec doesn't return" "$out/bin/batch" ''; - meta = { + meta = with lib; { description = "The classical Unix `at' job scheduling command"; - license = lib.licenses.gpl2Plus; - homepage = "https://packages.qa.debian.org/at"; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + homepage = "https://tracker.debian.org/pkg/at"; + changelog = "https://salsa.debian.org/debian/at/-/raw/master/ChangeLog"; + platforms = platforms.linux; + mainProgram = "at"; }; } diff --git a/nixpkgs/pkgs/tools/system/at/install.patch b/nixpkgs/pkgs/tools/system/at/install.patch deleted file mode 100644 index 41a35a789538..000000000000 --- a/nixpkgs/pkgs/tools/system/at/install.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- at-3.1.14/Makefile.in 2013-09-08 14:43:53.000000000 +0200 -+++ at-3.1.14/Makefile.in 2014-07-27 20:42:04.017703443 +0200 -@@ -91,35 +91,28 @@ - $(CC) -c $(CFLAGS) $(DEFS) $*.c - - install: all -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir) -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) -- chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) -- touch $(IROOT)$(LFILE) -- chmod 600 $(IROOT)$(LFILE) -- chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE) -- test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/ -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(IROOT)$(bindir) -+ $(INSTALL) -m 755 -d $(IROOT)$(bindir) -+ $(INSTALL) -m 755 -d $(IROOT)$(sbindir) -+ $(INSTALL) -m 755 -d $(IROOT)$(docdir) -+ $(INSTALL) -m 755 -d $(IROOT)$(atdocdir) -+ $(INSTALL) -m 0755 at $(IROOT)$(bindir) - $(LN_S) -f at $(IROOT)$(bindir)/atq - $(LN_S) -f at $(IROOT)$(bindir)/atrm -- $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir) -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir) -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir) -- $(INSTALL) -g root -o root -m 755 atd $(IROOT)$(sbindir) -- $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir) -- $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/ -+ $(INSTALL) -m 755 batch $(IROOT)$(bindir) -+ $(INSTALL) -d -m 755 $(IROOT)$(man1dir) -+ $(INSTALL) -d -m 755 $(IROOT)$(man5dir) -+ $(INSTALL) -d -m 755 $(IROOT)$(man8dir) -+ $(INSTALL) -m 755 atd $(IROOT)$(sbindir) -+ $(INSTALL) -m 755 atrun $(IROOT)$(sbindir) -+ $(INSTALL) -m 644 at.1 $(IROOT)$(man1dir)/ - cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 -- $(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/ -+ $(INSTALL) -m 644 atd.8 $(IROOT)$(man8dir)/ - sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman -- $(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 -+ $(INSTALL) -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 - rm -f tmpman -- $(INSTALL) -g root -o root -m 644 at.allow.5 $(IROOT)$(man5dir)/ -+ $(INSTALL) -m 644 at.allow.5 $(IROOT)$(man5dir)/ - cd $(IROOT)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5 -- $(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir) -+ $(INSTALL) -m 644 $(DOCS) $(IROOT)$(atdocdir) - rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \ - $(IROOT)$(mandir)/cat1/atq.1* - rm -f $(IROOT)$(mandir)/cat1/atd.8* diff --git a/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix b/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix index ff64d0aec7eb..709558fad508 100644 --- a/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix +++ b/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.129"; + version = "1.0.130"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U6nuPzXvqIn4KqKbPNeCvTg6IbVF6EQ4hDm9SZsre70="; + sha256 = "sha256-uQg3segJamYrM8RRP5BEE7O1Jepr20ucdNUVwNllQlw="; }; - cargoHash = "sha256-2Uf78T38ot03xgv8nsoJKmHCXbbJgOE4WFhVAOdUcOA="; + cargoHash = "sha256-8DEvGRerIV9PB4uPAzFwymb67gcg9wdO8rruENR2M6Q="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock b/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock index 439161d7b4ae..d061c364b270 100644 --- a/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock +++ b/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock @@ -4,15 +4,15 @@ version = 3 [[package]] name = "ahash" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" +checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289" [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "autocfg" @@ -27,10 +27,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -44,7 +53,7 @@ version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "textwrap", "unicode-width", ] @@ -69,6 +78,16 @@ dependencies = [ ] [[package]] +name = "errno" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] name = "fasteval" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -76,24 +95,21 @@ checksum = "4f4cdac9e4065d7c48e30770f8665b8cef9a3a73a63a4056a33a5f395bc7cf75" [[package]] name = "fastrand" -version = "1.8.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fs_extra" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -110,19 +126,10 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] name = "libc" -version = "0.2.139" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "liboverdrop" @@ -134,13 +141,16 @@ dependencies = [ ] [[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memoffset" @@ -157,7 +167,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if", "libc", @@ -182,18 +192,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.50" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -230,20 +240,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", -] - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", + "bitflags 1.3.2", ] [[package]] @@ -257,10 +258,23 @@ dependencies = [ ] [[package]] +name = "rustix" +version = "0.38.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -269,16 +283,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi", + "rustix", + "windows-sys", ] [[package]] @@ -292,15 +305,15 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "wasi" @@ -309,26 +322,70 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "winapi" -version = "0.3.9" +name = "windows-sys" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows-targets", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows_x86_64_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "zram-generator" diff --git a/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix b/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix index 07bbb36327fa..a94cf3d51e63 100644 --- a/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix +++ b/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.14.0"; + version = "3.15.0"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - hash = "sha256-Yb4zORtmEgZGu9h05/t4sQ6eTljHba89JZKh7vzIp2Q="; + hash = "sha256-ky+JNRay9VNscCXeGiSOIZlLKEcKv95TW/Kx2UtD1hA="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; diff --git a/nixpkgs/pkgs/tools/text/frogmouth/default.nix b/nixpkgs/pkgs/tools/text/frogmouth/default.nix index 8e0194005308..e4347989aa1b 100644 --- a/nixpkgs/pkgs/tools/text/frogmouth/default.nix +++ b/nixpkgs/pkgs/tools/text/frogmouth/default.nix @@ -15,6 +15,13 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-TMCeIwMEoNDQV9iue4XrdYQMmwofXDvdMMLTZKILQ9Q="; }; + # Per <https://github.com/srstevenson/xdg-base-dirs/tree/6.0.0#xdg-base-dirs>, the package is + # renamed from `xdg` to `xdg_base_dirs`, but upstream isn't amenable to performing that rename. + # See <https://github.com/Textualize/frogmouth/pull/59>. So this is a minimal fix. + postUnpack = '' + sed -i -e "s,from xdg import,from xdg_base_dirs import," $sourceRoot/frogmouth/data/{config,data_directory}.py + ''; + nativeBuildInputs = [ python3.pkgs.poetry-core python3.pkgs.pythonRelaxDepsHook @@ -24,13 +31,13 @@ python3.pkgs.buildPythonApplication rec { httpx textual typing-extensions - xdg + xdg-base-dirs ]; pythonRelaxDeps = [ "httpx" "textual" - "xdg" + "xdg-base-dirs" ]; pythonImportsCheck = [ "frogmouth" ]; diff --git a/nixpkgs/pkgs/tools/text/igrep/default.nix b/nixpkgs/pkgs/tools/text/igrep/default.nix index 34f9202cfa05..db947ca2cc38 100644 --- a/nixpkgs/pkgs/tools/text/igrep/default.nix +++ b/nixpkgs/pkgs/tools/text/igrep/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { owner = "konradsz"; repo = "igrep"; rev = "v${version}"; - sha256 = "sha256-L5mHuglU0CvTi02pbR8xfezBoH8L/DS+7jgvYvb4yro="; + hash = "sha256-L5mHuglU0CvTi02pbR8xfezBoH8L/DS+7jgvYvb4yro="; }; cargoHash = "sha256-k63tu5Ffus4z0yd8vQ79q4+tokWAXD05Pvv9JByfnDg="; diff --git a/nixpkgs/pkgs/tools/text/mecab/base.nix b/nixpkgs/pkgs/tools/text/mecab/base.nix index d52d4e907730..572ec28c0750 100644 --- a/nixpkgs/pkgs/tools/text/mecab/base.nix +++ b/nixpkgs/pkgs/tools/text/mecab/base.nix @@ -1,4 +1,4 @@ -{ fetchurl }: +{ fetchurl, libiconv }: finalAttrs: { version = "0.996"; @@ -9,6 +9,8 @@ finalAttrs: { hash = "sha256-4HMyV4MTW3LmZhRceBu0j62lg9UiT7JJD7bBQDumnFk="; }; + buildInputs = [ libiconv ]; + configureFlags = [ "--with-charset=utf8" ]; diff --git a/nixpkgs/pkgs/tools/text/mecab/default.nix b/nixpkgs/pkgs/tools/text/mecab/default.nix index 58396d2aa462..3cca6776d3a9 100644 --- a/nixpkgs/pkgs/tools/text/mecab/default.nix +++ b/nixpkgs/pkgs/tools/text/mecab/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, mecab-ipadic }: +{ lib, stdenv, fetchurl, mecab-ipadic, libiconv }: let - mecab-base = import ./base.nix { inherit fetchurl; }; + mecab-base = import ./base.nix { inherit fetchurl libiconv; }; in stdenv.mkDerivation (finalAttrs: ((mecab-base finalAttrs) // { pname = "mecab"; diff --git a/nixpkgs/pkgs/tools/text/mecab/nodic.nix b/nixpkgs/pkgs/tools/text/mecab/nodic.nix index 5e33b09db145..a40e2a19698d 100644 --- a/nixpkgs/pkgs/tools/text/mecab/nodic.nix +++ b/nixpkgs/pkgs/tools/text/mecab/nodic.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, libiconv }: let - mecab-base = import ./base.nix { inherit fetchurl; }; + mecab-base = import ./base.nix { inherit fetchurl libiconv; }; in stdenv.mkDerivation (finalAttrs: ((mecab-base finalAttrs) // { pname = "mecab-nodic"; diff --git a/nixpkgs/pkgs/tools/video/go2rtc/default.nix b/nixpkgs/pkgs/tools/video/go2rtc/default.nix index 8e44cd8f9685..3fde1c8a7671 100644 --- a/nixpkgs/pkgs/tools/video/go2rtc/default.nix +++ b/nixpkgs/pkgs/tools/video/go2rtc/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go2rtc"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "go2rtc"; rev = "refs/tags/v${version}"; - hash = "sha256-6zENPF4VBNErdjg0W+UwWZKKexYC1soZ45nJa+hSD7M="; + hash = "sha256-h63Z6y0dMZQaNvnx3fzd/sA2K7cO5h6wHpMkbQVfHLA="; }; - vendorHash = "sha256-VI6OODJLKrCvehM4W96Qh3PvZoIM2GlE5cgyvSaCv+8="; + vendorHash = "sha256-GRjadpgIryeMhWfmdzSWKH694cgDp9lfD0RRjuPrYqE="; buildFlagArrays = [ "-trimpath" diff --git a/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix b/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix index edf456d3094e..72a67045f56b 100644 --- a/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix @@ -17,14 +17,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "23.3.1"; + version = "23.3.3"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = "refs/tags/${version}"; - hash = "sha256-3UxTqlhLZi/3/buWqDGto4cZN03uONbA8HEWQtaIRxU="; + hash = "sha256-49UvGrv40hyR3A2BndlQKwQqCC1ZaLm97IUKNW12sJo="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/virtualization/xva-img/default.nix b/nixpkgs/pkgs/tools/virtualization/xva-img/default.nix index 4fe2e5bbb40b..e4f75c8ad3ca 100644 --- a/nixpkgs/pkgs/tools/virtualization/xva-img/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/xva-img/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; meta = { - maintainers = with lib.maintainers; [ lheckemann willibutz globin ]; + maintainers = with lib.maintainers; [ lheckemann willibutz ]; description = "Tool for converting Xen images to raw and back"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/wayland/clipman/default.nix b/nixpkgs/pkgs/tools/wayland/clipman/default.nix index d7ff425e1a3d..cf229b3c2e72 100644 --- a/nixpkgs/pkgs/tools/wayland/clipman/default.nix +++ b/nixpkgs/pkgs/tools/wayland/clipman/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { version = "1.6.2"; src = fetchFromGitHub { - owner = "yory8"; + owner = "chmouel"; repo = pname; rev = "v${version}"; sha256 = "sha256-lahya0w1bgcTnpxANxNT2MIWu5yVUdqQl19kQzwUdAw="; @@ -32,7 +32,7 @@ buildGoModule rec { ''; meta = with lib; { - homepage = "https://github.com/yory8/clipman"; + homepage = "https://github.com/chmouel/clipman"; description = "A simple clipboard manager for Wayland"; license = licenses.gpl3Only; maintainers = with maintainers; [ ma27 ]; diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index c1d23ad8fba7..ed87a4a123a2 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -652,6 +652,7 @@ mapAliases ({ paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03 parity = openethereum; # Added 2020-08-01 pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 + pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; @@ -849,6 +850,7 @@ mapAliases ({ spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = spring-boot-cli; # added 2020-04-24 squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 + ssm-agent = amazon-ssm-agent; # Added 2023-10-17 starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 steam-run-native = steam-run; # added 2022-02-21 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 7c024fffd977..ba99dc6a5820 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -2504,9 +2504,7 @@ with pkgs; labctl = callPackage ../tools/networking/labctl { }; - lefthook = callPackage ../applications/version-management/lefthook { - buildGoModule = buildGo121Module; - }; + lefthook = callPackage ../applications/version-management/lefthook { }; legit = callPackage ../applications/version-management/legit { }; @@ -3023,7 +3021,6 @@ with pkgs; iterm2 = callPackage ../applications/terminal-emulators/iterm2 { }; kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { - go = go_1_21; harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) @@ -4651,9 +4648,7 @@ with pkgs; map-cmd = callPackage ../tools/misc/map { }; - clash = callPackage ../tools/networking/clash { - buildGoModule = buildGo121Module; - }; + clash = callPackage ../tools/networking/clash { }; clash-geoip = callPackage ../data/misc/clash-geoip { }; @@ -5048,8 +5043,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - diesel-cli-ext = callPackage ../development/tools/diesel-cli-ext { }; - refinery-cli = callPackage ../development/tools/refinery-cli { }; digitemp = callPackage ../tools/misc/digitemp { }; @@ -5994,7 +5987,7 @@ with pkgs; }; micropad = callPackage ../applications/office/micropad { - electron = electron_25; + electron = electron_27; }; midicsv = callPackage ../tools/audio/midicsv { }; @@ -6147,9 +6140,7 @@ with pkgs; onboard = callPackage ../applications/misc/onboard { }; - oneshot = callPackage ../tools/networking/oneshot { - buildGoModule = buildGo121Module; - }; + oneshot = callPackage ../tools/networking/oneshot { }; orjail = callPackage ../tools/security/orjail { }; @@ -7496,9 +7487,7 @@ with pkgs; diction = callPackage ../tools/text/diction { }; - diffoci = callPackage ../tools/misc/diffoci { - buildGoModule = buildGo121Module; - }; + diffoci = callPackage ../tools/misc/diffoci { }; diffoscope = callPackage ../tools/misc/diffoscope { jdk = jdk8; @@ -7579,8 +7568,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - doggo = callPackage ../tools/networking/doggo { }; - dq = callPackage ../tools/networking/dq { }; dool = callPackage ../tools/system/dool { }; @@ -8027,9 +8014,7 @@ with pkgs; ettercap = callPackage ../applications/networking/sniffers/ettercap { }; - evcc = callPackage ../servers/home-automation/evcc { - go = go_1_21; - }; + evcc = callPackage ../servers/home-automation/evcc { }; eventstat = callPackage ../os-specific/linux/eventstat { }; @@ -8578,7 +8563,9 @@ with pkgs; gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { }; - gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; + gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { + buildGoModule = buildGo120Module; + }; gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; @@ -8976,9 +8963,7 @@ with pkgs; gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { }; - grype = callPackage ../tools/security/grype { - buildGoModule = buildGo121Module; - }; + grype = callPackage ../tools/security/grype { }; gt5 = callPackage ../tools/system/gt5 { }; @@ -11502,9 +11487,7 @@ with pkgs; openfortivpn = callPackage ../tools/networking/openfortivpn { }; - opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { - buildGoModule = buildGo121Module; - }; + opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { }; opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { }; @@ -12664,7 +12647,7 @@ with pkgs; rewrk = callPackage ../tools/networking/rewrk { }; - inherit (callPackage ../tools/security/rekor { buildGoModule = buildGo121Module; }) + inherit (callPackage ../tools/security/rekor { }) rekor-cli rekor-server; @@ -12844,6 +12827,8 @@ with pkgs; rosenpass = callPackage ../tools/networking/rosenpass { }; + rosenpass-tools = callPackage ../tools/networking/rosenpass/tools.nix { }; + rot8 = callPackage ../tools/misc/rot8 { }; rowhammer-test = callPackage ../tools/system/rowhammer-test { }; @@ -13683,9 +13668,7 @@ with pkgs; systrayhelper = callPackage ../tools/misc/systrayhelper { }; - syft = callPackage ../tools/admin/syft { - buildGoModule = buildGo121Module; - }; + syft = callPackage ../tools/admin/syft { }; Sylk = callPackage ../applications/networking/Sylk { }; @@ -13807,7 +13790,6 @@ with pkgs; }; teleport_14 = callPackage ../servers/teleport/14 { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - buildGoModule = buildGo121Module; }; teleport = teleport_14; @@ -14061,6 +14043,7 @@ with pkgs; trezord = callPackage ../servers/trezord { inherit (darwin.apple_sdk.frameworks) AppKit; + buildGoModule = buildGo120Module; }; trezor_agent = with python3Packages; toPythonApplication trezor_agent; @@ -15411,9 +15394,7 @@ with pkgs; undistract-me = callPackage ../shells/bash/undistract-me { }; - carapace = callPackage ../shells/carapace { - buildGoModule = buildGo121Module; - }; + carapace = callPackage ../shells/carapace { }; dash = callPackage ../shells/dash { }; @@ -15832,7 +15813,7 @@ with pkgs; flasm = callPackage ../development/compilers/flasm { }; - flyctl = callPackage ../development/web/flyctl { buildGoModule = buildGo121Module; }; + flyctl = callPackage ../development/web/flyctl { }; fluidd = callPackage ../applications/misc/fluidd { }; @@ -17168,9 +17149,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreGraphics Foundation; }; - cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; cargo-profiler = callPackage ../development/tools/rust/cargo-profiler { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { @@ -17522,7 +17501,7 @@ with pkgs; zulu11 = callPackage ../development/compilers/zulu/11.nix { }; zulu17 = callPackage ../development/compilers/zulu/17.nix { }; zulu21 = callPackage ../development/compilers/zulu/21.nix { }; - zulu = zulu11; + zulu = zulu21; ### DEVELOPMENT / INTERPRETERS @@ -17737,7 +17716,9 @@ with pkgs; joker = callPackage ../development/interpreters/joker { }; - davmail = callPackage ../applications/networking/davmail { }; + davmail = callPackage ../applications/networking/davmail { + zulu = zulu11; + }; kamilalisp = callPackage ../development/interpreters/kamilalisp { }; @@ -18136,7 +18117,6 @@ with pkgs; inherit (darwin) libobjc; }; - ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; starlark = callPackage ../development/interpreters/starlark { }; @@ -18409,7 +18389,9 @@ with pkgs; glslls = callPackage ../development/tools/language-servers/glslls { }; - gopls = callPackage ../development/tools/language-servers/gopls { }; + gopls = callPackage ../development/tools/language-servers/gopls { + buildGoModule = buildGo121Module; + }; helm-ls = callPackage ../development/tools/language-servers/helm-ls { }; @@ -19014,7 +18996,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security; }; - devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo121Module; }; + devbox = callPackage ../development/tools/devbox { }; libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; @@ -20002,9 +19984,7 @@ with pkgs; withPEPatterns = true; }; - reviewdog = callPackage ../development/tools/misc/reviewdog { - buildGoModule = buildGo121Module; - }; + reviewdog = callPackage ../development/tools/misc/reviewdog { }; revive = callPackage ../development/tools/revive { }; @@ -20280,9 +20260,7 @@ with pkgs; terracognita = callPackage ../development/tools/misc/terracognita { }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; - terraform-ls = callPackage ../development/tools/misc/terraform-ls { - buildGoModule = buildGo121Module; - }; + terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; terraformer = callPackage ../development/tools/misc/terraformer { }; @@ -24514,8 +24492,6 @@ with pkgs; pdal = callPackage ../development/libraries/pdal { }; - pdf2xml = callPackage ../development/libraries/pdf2xml { }; - pdfhummus = libsForQt5.callPackage ../development/libraries/pdfhummus { }; pe-parse = callPackage ../development/libraries/pe-parse { }; @@ -24999,7 +24975,7 @@ with pkgs; simp_le = callPackage ../tools/admin/simp_le { }; - simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_3; }; + simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_4; }; sioclient = callPackage ../development/libraries/sioclient { }; @@ -26309,8 +26285,6 @@ with pkgs; clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { }; - cockpit = callPackage ../servers/monitoring/cockpit { }; - codeowners = callPackage ../development/tools/codeowners { }; couchdb3 = callPackage ../servers/http/couchdb/3.nix { }; @@ -26464,9 +26438,7 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; - grafana-agent = callPackage ../servers/monitoring/grafana-agent { - buildGoModule = buildGo121Module; - }; + grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; grafana-loki = callPackage ../servers/monitoring/loki { }; promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; @@ -27412,9 +27384,7 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { - buildGoModule = buildGo121Module; - }; + tailscale = callPackage ../servers/tailscale { }; tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; @@ -28454,9 +28424,7 @@ with pkgs; golint = callPackage ../development/tools/golint { }; - golangci-lint = callPackage ../development/tools/golangci-lint { - buildGoModule = buildGo121Module; - }; + golangci-lint = callPackage ../development/tools/golangci-lint { }; golangci-lint-langserver = callPackage ../development/tools/golangci-lint-langserver { }; @@ -29745,7 +29713,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation SystemConfiguration; }; - nordic = callPackage ../data/themes/nordic { }; + nordic = callPackage ../data/themes/nordic { + inherit (libsForQt5) breeze-icons plasma-framework plasma-workspace; + }; nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { }; @@ -29764,9 +29734,7 @@ with pkgs; nuclear = callPackage ../applications/audio/nuclear { }; - nuclei = callPackage ../tools/security/nuclei { - buildGoModule = buildGo121Module; - }; + nuclei = callPackage ../tools/security/nuclei { }; nullmailer = callPackage ../servers/mail/nullmailer { stdenv = gccStdenv; @@ -30218,8 +30186,6 @@ with pkgs; vollkorn = callPackage ../data/fonts/vollkorn { }; - whatsapp-emoji-font = callPackage ../data/fonts/whatsapp-emoji { }; - weather-icons = callPackage ../data/fonts/weather-icons { }; whitesur-cursors = callPackage ../data/icons/whitesur-cursors { }; @@ -30923,10 +30889,6 @@ with pkgs; clapper = callPackage ../applications/video/clapper { }; - ciscoPacketTracer7 = callPackage ../applications/networking/cisco-packet-tracer/7.nix { }; - - ciscoPacketTracer8 = callPackage ../applications/networking/cisco-packet-tracer/8.nix { }; - claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { }; cligh = python3Packages.callPackage ../development/tools/github/cligh { }; @@ -38421,8 +38383,6 @@ with pkgs; steamback = python311.pkgs.callPackage ../tools/games/steamback { }; - steamguard-cli = callPackage ../tools/security/steamguard-cli { }; - protontricks = python3Packages.callPackage ../tools/package-management/protontricks { inherit winetricks steam-run yad; }; @@ -41186,7 +41146,7 @@ with pkgs; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py { }; - inherit (callPackage ../applications/networking/cluster/terraform { buildGoModule = buildGo121Module; }) + inherit (callPackage ../applications/networking/cluster/terraform { }) mkTerraform terraform_1 terraform_plugins_test @@ -41266,9 +41226,7 @@ with pkgs; tusk = callPackage ../applications/office/tusk { }; - trufflehog = callPackage ../tools/security/trufflehog { - buildGoModule = buildGo121Module; - }; + trufflehog = callPackage ../tools/security/trufflehog { }; tunnelx = callPackage ../applications/gis/tunnelx { }; @@ -41294,9 +41252,7 @@ with pkgs; usb-reset = callPackage ../applications/misc/usb-reset { }; - usql = callPackage ../applications/misc/usql { - buildGoModule = buildGo121Module; - }; + usql = callPackage ../applications/misc/usql { }; utf8cpp = callPackage ../development/libraries/utf8cpp { }; diff --git a/nixpkgs/pkgs/top-level/darwin-packages.nix b/nixpkgs/pkgs/top-level/darwin-packages.nix index ed049340332c..bc35b2065697 100644 --- a/nixpkgs/pkgs/top-level/darwin-packages.nix +++ b/nixpkgs/pkgs/top-level/darwin-packages.nix @@ -233,15 +233,25 @@ impure-cmds // appleSourcePackages // chooseLibs // { ../../nixos/modules/profiles/macos-builder.nix ] ++ modules; + # If you need to override this, consider starting with the right Nixpkgs + # in the first place, ie change `pkgs` in `pkgs.darwin.linux-builder`. + # or if you're creating new wiring that's not `pkgs`-centric, perhaps use the + # macos-builder profile directly. virtualisation.host = { inherit pkgs; }; + + nixpkgs.hostPlatform = lib.mkDefault (toGuest stdenv.hostPlatform.system); }; - system = toGuest stdenv.hostPlatform.system; + system = null; }; in nixos.config.system.build.macos-builder-installer) { modules = [ ]; }; + linux-builder-x86_64 = self.linux-builder.override { + modules = [ { nixpkgs.hostPlatform = "x86_64-linux"; } ]; + }; + } // lib.optionalAttrs config.allowAliases { builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06 }); diff --git a/nixpkgs/pkgs/top-level/kodi-packages.nix b/nixpkgs/pkgs/top-level/kodi-packages.nix index edf5349f8281..c9d57a8d1470 100644 --- a/nixpkgs/pkgs/top-level/kodi-packages.nix +++ b/nixpkgs/pkgs/top-level/kodi-packages.nix @@ -164,6 +164,8 @@ let self = rec { routing = callPackage ../applications/video/kodi/addons/routing { }; + sendtokodi = callPackage ../applications/video/kodi/addons/sendtokodi { }; + signals = callPackage ../applications/video/kodi/addons/signals { }; simplejson = callPackage ../applications/video/kodi/addons/simplejson { }; diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index 872e67262a57..01010c77061b 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -742,7 +742,7 @@ let } else if lib.versionOlder "4.10.2" ocaml.version then import ../development/ocaml-modules/janestreet/0.15.nix { - inherit self; + inherit self ocaml; inherit (pkgs) bash fetchpatch fzf lib openssl zstd; } else if lib.versionOlder "4.08" ocaml.version @@ -794,6 +794,7 @@ let janeStreet = import ../development/ocaml-modules/janestreet/0.15.nix { self = self' // jsDeps; + inherit ocaml; inherit (pkgs) bash fetchpatch fzf lib openssl zstd; }; diff --git a/nixpkgs/pkgs/top-level/packages-config.nix b/nixpkgs/pkgs/top-level/packages-config.nix index 889ddccb0e1b..79be645162ea 100644 --- a/nixpkgs/pkgs/top-level/packages-config.nix +++ b/nixpkgs/pkgs/top-level/packages-config.nix @@ -45,5 +45,11 @@ haskell = super.haskell // { compiler = recurseIntoAttrs super.haskell.compiler; }; + + # minimal-bootstrap packages aren't used for anything but bootstrapping our + # stdenv. They should not be used for any other purpose and therefore not + # show up in search results or repository tracking services that consume our + # packages.json https://github.com/NixOS/nixpkgs/issues/244966 + minimal-bootstrap = { }; }; } diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index 743ccb20b6c9..5caf6881c0b5 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -98,7 +98,7 @@ with self; { hash = "sha256-6nyqFPdX3ggzEO0suimGYd3Mpd7gbsjxgEPqYlp53yA="; }; - outputs = ["out" "man"]; + outputs = [ "out" "man" ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileNext ]; @@ -278,6 +278,25 @@ with self; { }; }; + AlienFFI = buildPerlPackage { + pname = "Alien-FFI"; + version = "0.27"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-FFI-0.27.tar.gz"; + hash = "sha256-Kbsgg/P5gqOfSFIkP09qEZFpZvIObneGTpkmnRHotl4="; + }; + patches = [ ../development/perl-modules/Alien-FFI-dont-download.patch ]; + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.libffi CaptureTiny Test2Suite NetSSLeay MojoDOM58 IOSocketSSL ]; + propagatedBuildInputs = [ AlienBuild ]; + meta = { + homepage = "https://metacpan.org/pod/Alien::FFI"; + description = "Build and make available libffi"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + AlienGMP = buildPerlPackage { pname = "Alien-GMP"; version = "1.16"; @@ -992,6 +1011,61 @@ with self; { }; }; + ArchiveLibarchive = buildPerlPackage { + pname = "Archive-Libarchive"; + version = "0.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Archive-Libarchive-0.08.tar.gz"; + hash = "sha256-6ONC1U/T1uXn4xYP4IjBOgpQM8/76JSBodJHHUNyAFk="; + }; + patches = [ ../development/perl-modules/ArchiveLibarchive-set-findlib-path.patch ]; + postPatch = '' + substituteInPlace lib/Archive/Libarchive/Lib.pm --replace "@@libarchive@@" "${pkgs.libarchive.lib}/lib" + ''; + buildInputs = [ FFIC Filechdir PathTiny SubIdentify TermTable Test2Suite Test2ToolsMemoryCycle TestArchiveLibarchive TestScript ]; + propagatedBuildInputs = [ FFICStat FFICheckLib FFIPlatypus FFIPlatypusTypeEnum FFIPlatypusTypePtrObject RefUtil ]; + meta = { + homepage = "https://metacpan.org/pod/Archive::Libarchive"; + description = "Modern Perl bindings to libarchive"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + + ArchiveLibarchiveExtract = buildPerlPackage { + pname = "Archive-Libarchive-Extract"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Archive-Libarchive-Extract-0.03.tar.gz"; + hash = "sha256-yXfAR0hnIX6zJvte5pA04e9spBQUkWHjEpAblf0SwIE="; + }; + buildInputs = [ Test2Suite TestScript ]; + propagatedBuildInputs = [ ArchiveLibarchive Filechdir PathTiny RefUtil ]; + meta = { + homepage = "https://metacpan.org/pod/Archive::Libarchive::Extract"; + description = "An archive extracting mechanism (using libarchive)"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + + ArchiveLibarchivePeek = buildPerlPackage { + pname = "Archive-Libarchive-Peek"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Archive-Libarchive-Peek-0.04.tar.gz"; + hash = "sha256-DYhJ4xG2RsozWz6gGodTtAIkK5XOgAo7zNXHCC4nJPo="; + }; + buildInputs = [ Filechdir Test2Suite TestScript ]; + propagatedBuildInputs = [ ArchiveLibarchive PathTiny RefUtil ]; + meta = { + homepage = "https://metacpan.org/pod/Archive::Libarchive::Peek"; + description = "Peek into archives without extracting them"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + ArrayCompare = buildPerlModule { pname = "Array-Compare"; version = "3.0.7"; @@ -6262,13 +6336,13 @@ with self; { DateExtract = buildPerlPackage { pname = "Date-Extract"; - version = "0.06"; + version = "0.07"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AL/ALEXMV/Date-Extract-0.06.tar.gz"; - hash = "sha256-vHZY1cUMNSXsDvy1Ujal3i1dT8BvwUf6OSnI8JU82is="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Date-Extract-0.07.tar.gz"; + hash = "sha256-+geIBK3k7uwd4UcuDguwR65i5MjU1QIHAbnlBXfFuPQ="; }; - buildInputs = [ TestMockTime ]; - propagatedBuildInputs = [ DateTimeFormatNatural ]; + buildInputs = [ TestMockTimeHiRes ]; + propagatedBuildInputs = [ ClassDataInheritable DateTimeFormatNatural ]; meta = { description = "Extract probable dates from strings"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -7295,10 +7369,10 @@ with self; { DBIxSearchBuilder = buildPerlPackage { pname = "DBIx-SearchBuilder"; - version = "1.71"; + version = "1.77"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.71.tar.gz"; - hash = "sha256-5C/dpvbmSSe7h3dIPlZtaDA6iwkY0YjKD+VRo6PUQr0="; + url = "mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.77.tar.gz"; + hash = "sha256-O/il1cjF/cYK0vY/Y/c90fZJP/TYJYcoOj4iM36P4HA="; }; buildInputs = [ DBDSQLite ]; propagatedBuildInputs = [ CacheSimpleTimedExpiry ClassAccessor ClassReturnValue Clone DBIxDBSchema Want capitalization ]; @@ -9187,6 +9261,23 @@ with self; { }; }; + FFIC = buildPerlPackage { + pname = "FFI-C"; + version = "0.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-C-0.15.tar.gz"; + hash = "sha256-63BgfmZzvMsY3yf0zuRZ+23EGODak+aSzcNVX+QNL04="; + }; + buildInputs = [ CaptureTiny PathTiny Test2Suite ]; + propagatedBuildInputs = [ ClassInspector FFIPlatypus FFIPlatypusTypeEnum RefUtil SubIdentify SubInstall ]; + meta = { + homepage = "https://metacpan.org/pod/FFI::C"; + description = "C data types for FFI"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + FFICheckLib = buildPerlPackage { pname = "FFI-CheckLib"; version = "0.27"; @@ -9202,6 +9293,74 @@ with self; { }; }; + FFICStat = buildPerlPackage { + pname = "FFI-C-Stat"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-C-Stat-0.02.tar.gz"; + hash = "sha256-ThXY9vn5hAfGUtnTE7URUHcTkgGOBx18GShDrILBvlk="; + }; + buildInputs = [ Filechdir PathTiny Test2Suite TestScript ]; + propagatedBuildInputs = [ FFIPlatypus RefUtil ]; + meta = { + homepage = "https://metacpan.org/pod/FFI::C::Stat"; + description = "Object-oriented FFI interface to native stat and lstat"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + + FFIPlatypus = buildPerlPackage { + pname = "FFI-Platypus"; + version = "2.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-Platypus-2.08.tar.gz"; + hash = "sha256-EbOrEU7ZY1YxzYWzjSKXhuFEv5Sjr5rAnD17s0M2uSQ="; + }; + buildInputs = [ AlienFFI Test2Suite ]; + propagatedBuildInputs = [ CaptureTiny FFICheckLib ]; + meta = { + homepage = "https://pl.atypus.org"; + description = "Write Perl bindings to non-Perl libraries with FFI. No XS required"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + + FFIPlatypusTypePtrObject = buildPerlPackage { + pname = "FFI-Platypus-Type-PtrObject"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-Platypus-Type-PtrObject-0.03.tar.gz"; + hash = "sha256-4elJB++QtANgqabAPSlaEwR9T2ybVqyvHfK1TRcwf3Q="; + }; + buildInputs = [ Test2Suite Test2ToolsFFI ]; + propagatedBuildInputs = [ FFIPlatypus RefUtil ]; + meta = { + homepage = "https://metacpan.org/pod/FFI::Platypus::Type::PtrObject"; + description = "Platypus custom type for an object wrapped around an opaque pointer"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + + FFIPlatypusTypeEnum = buildPerlPackage { + pname = "FFI-Platypus-Type-Enum"; + version = "0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-Platypus-Type-Enum-0.06.tar.gz"; + hash = "sha256-yVSmBPfWkpYk+pQT2NDh2DtL2XfQVifKznPtU6lcd98="; + }; + buildInputs = [ FFIPlatypus Test2Suite ]; + propagatedBuildInputs = [ RefUtil ]; + meta = { + homepage = "https://metacpan.org/pod/FFI::Platypus::Type::Enum"; + description = "Custom platypus type for dealing with C enumerated types"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + FennecLite = buildPerlModule { pname = "Fennec-Lite"; version = "0.004"; @@ -9227,7 +9386,7 @@ with self; { propagatedBuildInputs = [ ModulePluggable Moo TypeTiny namespaceautoclean ]; meta = { description = "Watch for changes to files, cross-platform style"; - license = with lib.licenses; [artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -9810,6 +9969,21 @@ with self; { }; }; + FileShareDirDist = buildPerlPackage { + pname = "File-ShareDir-Dist"; + version = "0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-ShareDir-Dist-0.07.tar.gz"; + hash = "sha256-jX/l0O4iNR9B75Wtwi29VsMf+iqbLBmEMA6S/36f6G0="; + }; + meta = { + homepage = "https://metacpan.org/pod/File::ShareDir::Dist"; + description = "Locate per-dist shared files"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + FileShareDirInstall = buildPerlPackage { pname = "File-ShareDir-Install"; version = "0.13"; @@ -10256,10 +10430,10 @@ with self; { GDGraph = buildPerlPackage { pname = "GDGraph"; - version = "1.54"; + version = "1.56"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.54.tar.gz"; - hash = "sha256-uW9cELZWwX0Wq2Whd3yQgpewKNO2gV9tVLIzfwBr+k8="; + url = "mirror://cpan/authors/id/B/BP/BPS/GDGraph-1.56.tar.gz"; + hash = "sha256-b0nMTlkBVIDbnJtrGK/YxQvjCIZoe2lBFRPQbziXERM="; }; propagatedBuildInputs = [ GDText ]; buildInputs = [ CaptureTiny TestException ]; @@ -10752,7 +10926,29 @@ with self; { meta = { description = "Perl interface to the GraphViz graphing tool"; - license = with lib.licenses; [artistic2 ]; + license = with lib.licenses; [ artistic2 ]; + }; + }; + + GraphViz2 = buildPerlPackage { + pname = "GraphViz2"; + version = "2.67"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETJ/GraphViz2-2.67.tar.gz"; + hash = "sha256-h8hcbt/86k+W5rSAD2+VEq6rGeuNOzSDAachMxvLhYA="; + }; + + # XXX: It'd be nicer if `GraphViz.pm' could record the path to graphviz. + buildInputs = [ pkgs.graphviz TestPod Moo IPCRun3 TypeTiny TestSnapshot Graph ]; + propagatedBuildInputs = [ FileWhich IPCRun ParseRecDescent XMLTwig XMLXPath DataSectionSimple ]; + + # needed for fontconfig tests + HOME = "/build"; + FONTCONFIG_PATH = "${lib.getOutput "out" pkgs.fontconfig}/etc/fonts"; + + meta = { + description = "Perl interface to the GraphViz graphing tool"; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -12788,11 +12984,11 @@ with self; { ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.65"; + version = "12.68"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - hash = "sha256-YWynZES+4/MkYueeN8Y3IC7vKGb0wkANUfIKgScDJDI="; + hash = "sha256-+GM3WffmDSvDCtGcSCCw6/pqfQic9Di3Umg/i22AOYc="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -14077,6 +14273,21 @@ with self; { }; }; + LogfileRotate = buildPerlPackage { + pname = "Logfile-Rotate"; + version = "1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PA/PAULG/Logfile-Rotate-1.04.tar.gz"; + hash = "sha256-gQ+LfM2GV9Ox71PNR1glR4Rc67WCArBVObNAhjjK2j4="; + }; + meta = { + description = "Perl module to rotate logfiles"; + homepage = "https://metacpan.org/dist/Logfile-Rotate"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + Logger = buildPerlPackage { pname = "Log-ger"; version = "0.037"; @@ -15430,6 +15641,23 @@ with self; { }; }; + MinionBackendRedis = buildPerlModule { + pname = "Minion-Backend-Redis"; + version = "0.003"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DF/DFUG/Minion-Backend-Redis-0.003.tar.gz"; + hash = "sha256-zXZRIQbfHKmQF75fObSmXgSCawzZQxe3GsAWGzXzI6A="; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ Minion MojoRedis Mojolicious SortVersions ]; + meta = { + homepage = "https://github.com/Difegue/Minion-Backend-Redis"; + description = "Redis backend for Minion job queue"; + license = with lib.licenses; [ artistic2 ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + MinionBackendSQLite = buildPerlModule { pname = "Minion-Backend-SQLite"; version = "5.0.6"; @@ -16236,6 +16464,22 @@ with self; { }; }; + MojoliciousPluginRenderFile = buildPerlPackage { + pname = "Mojolicious-Plugin-RenderFile"; + version = "0.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KO/KOORCHIK/Mojolicious-Plugin-RenderFile-0.12.tar.gz"; + hash = "sha256-AT5CoswGvHBBuxPJ3ziK8kAQ5peTqN8PCrHSQKphFz8="; + }; + propagatedBuildInputs = [ Mojolicious ]; + meta = { + description = "\"render_file\" helper for Mojolicious"; + homepage = "https://github.com/koorchik/Mojolicious-Plugin-RenderFile"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + MojoliciousPluginStatus = buildPerlPackage { pname = "Mojolicious-Plugin-Status"; version = "1.17"; @@ -16268,6 +16512,23 @@ with self; { }; }; + MojoliciousPluginTemplateToolkit = buildPerlModule { + pname = "Mojolicious-Plugin-TemplateToolkit"; + version = "0.006"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojolicious-Plugin-TemplateToolkit-0.006.tar.gz"; + hash = "sha256-dBoFAmtTArtrKc+I3KICC3rv0iNHgWELpZNaqPCXNKY="; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ ClassMethodModifiers Mojolicious TemplateToolkit ]; + meta = { + homepage = "https://github.com/Grinnz/Mojolicious-Plugin-TemplateToolkit"; + description = "Template Toolkit renderer plugin for Mojolicious"; + license = with lib.licenses; [ artistic2 ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + MojoliciousPluginTextExceptions = buildPerlPackage { pname = "Mojolicious-Plugin-TextExceptions"; version = "0.02"; @@ -16834,6 +17095,22 @@ with self; { }; }; + TestArchiveLibarchive = buildPerlPackage { + pname = "Test-Archive-Libarchive"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test-Archive-Libarchive-0.02.tar.gz"; + hash = "sha256-KxkYZx4F2i2dIiwQx9kXWFpiQYb+r7j4SQhZnDRwJ1E="; + }; + propagatedBuildInputs = [ RefUtil Test2Suite ]; + meta = { + homepage = "https://metacpan.org/pod/Test::Archive::Libarchive"; + description = "Testing tools for Archive::Libarchive"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + TestPostgreSQL = buildPerlModule { pname = "Test-PostgreSQL"; version = "1.29"; @@ -17761,6 +18038,20 @@ with self; { }; }; + NetDNSNative = buildPerlPackage { + pname = "Net-DNS-Native"; + version = "0.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OL/OLEG/Net-DNS-Native-0.22.tar.gz"; + hash = "sha256-EI2d7bq5/69qDQFSVSbeGJSITpUL/YM3F+XNOJBcMNU="; + }; + meta = { + description = "Non-blocking system DNS resolver"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + NetIdent = buildPerlPackage { pname = "Net-Ident"; version = "1.25"; @@ -19203,6 +19494,22 @@ with self; { }; }; + ParallelLoops = buildPerlPackage { + pname = "Parallel-Loops"; + version = "0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PM/PMORCH/Parallel-Loops-0.10.tar.gz"; + hash = "sha256-b5Z7RuejY7FocbmZHDWeFC3Dsigc/psa85kEcEyL0qo="; + }; + propagatedBuildInputs = [ ParallelForkManager ]; + meta = { + description = "Execute loops using parallel forked subprocesses"; + homepage = "https://github.com/pmorch/perl-Parallel-Loops"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + ParallelPipes = buildPerlModule { pname = "Parallel-Pipes"; version = "0.102"; @@ -19964,10 +20271,10 @@ with self; { PerlMagick = ImageMagick; # added 2021-08-02 ImageMagick = buildPerlPackage rec { pname = "Image-Magick"; - version = "7.1.1-18"; + version = "7.1.1-20"; src = fetchurl { url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz"; - hash = "sha256-42mvGP4FkY/YfPOh/jRiUFWdDk+S2oB0Jfqv30AAlxw="; + hash = "sha256-oMAwXQBxuV2FgPHBhUi+toNFPVnRLNjZqdP2q+ki6jg="; }; buildInputs = [ pkgs.imagemagick ]; preConfigure = @@ -23106,6 +23413,21 @@ with self; { }; }; + SysCpuAffinity = buildPerlModule { + pname = "Sys-CpuAffinity"; + version = "1.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MOB/Sys-CpuAffinity-1.12.tar.gz"; + hash = "sha256-/jLAXz6wWXCMZH8ruFslBFhZHyupBR2Nhm9Uajh+6Eg="; + }; + doCheck = false; # Would run checks for all supported systems + meta = { + description = "Set CPU affinity for processes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + SysHostnameLong = buildPerlPackage { pname = "Sys-Hostname-Long"; version = "1.5"; @@ -23826,6 +24148,40 @@ with self; { }; }; + Test2ToolsFFI = buildPerlPackage { + pname = "Test2-Tools-FFI"; + version = "0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test2-Tools-FFI-0.06.tar.gz"; + hash = "sha256-MA28QKEubG+7y7lv05uQK+bZZXJtrx5qtzuKCv0lLy8="; + }; + buildInputs = [ FileShareDirInstall Test2Suite ]; + propagatedBuildInputs = [ CaptureTiny FFICheckLib FFIPlatypus FileShareDirDist ]; + meta = { + homepage = "https://metacpan.org/pod/Test2::Tools::FFI"; + description = "Tools for testing FFI"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + + Test2ToolsMemoryCycle = buildPerlPackage { + pname = "Test2-Tools-MemoryCycle"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test2-Tools-MemoryCycle-0.01.tar.gz"; + hash = "sha256-U1s9ylQqMyUVEq3ktafb6+PESNg/iA0ZjkPcEnl5aYs="; + }; + buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ DevelCycle PadWalker ]; + meta = { + homepage = "https://metacpan.org/pod/Test2::Tools::MemoryCycle"; + description = "Check for memory leaks and circular memory references"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + TestAbortable = buildPerlPackage { pname = "Test-Abortable"; version = "0.002"; @@ -24634,7 +24990,8 @@ with self; { url = "mirror://cpan/authors/id/T/TA/TARAO/Test-MockTime-HiRes-0.08.tar.gz"; hash = "sha256-X0n3rviV0yfa/fJ0TznBdsirDkuCJ9LW495omiWb3sE="; }; - buildInputs = [ AnyEvent ModuleBuildTiny TestClass TestMockTime TestRequires ]; + buildInputs = [ AnyEvent ModuleBuildTiny TestClass TestRequires ]; + propagatedBuildInputs = [ TestMockTime ]; meta = { description = "Replaces actual time with simulated high resolution time"; homepage = "https://github.com/tarao/perl5-Test-MockTime-HiRes"; diff --git a/nixpkgs/pkgs/top-level/python-aliases.nix b/nixpkgs/pkgs/top-level/python-aliases.nix index 164475b96eb8..0d7e6321d548 100644 --- a/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/nixpkgs/pkgs/top-level/python-aliases.nix @@ -351,6 +351,7 @@ mapAliases ({ PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19 pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + qds_sdk = qds-sdk; # added 2023-10-21 Quandl = quandl; # added 2023-02-19 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01 @@ -407,6 +408,7 @@ mapAliases ({ TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19 transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27 tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19 + tvdb_api = tvdb-api; # added 2023-10-20 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index a93a9a5728e1..774ffab03a2f 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -18,8 +18,6 @@ self: super: with self; { }); }; - bootstrapped-pip = toPythonModule (callPackage ../development/python-modules/bootstrapped-pip { }); - setuptools = callPackage ../development/python-modules/setuptools { }; a2wsgi = callPackage ../development/python-modules/a2wsgi { }; @@ -2887,6 +2885,9 @@ self: super: with self; { django = self.django_4; django_4 = callPackage ../development/python-modules/django/4.nix { }; + # Pre-release + django_5 = callPackage ../development/python-modules/django/5.nix { }; + django-admin-datta = callPackage ../development/python-modules/django-admin-datta { }; django-admin-sortable2 = callPackage ../development/python-modules/django-admin-sortable2 { }; @@ -5934,7 +5935,7 @@ self: super: with self; { kivy = callPackage ../development/python-modules/kivy { inherit (pkgs) mesa; - inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices AVFoundation; + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate ApplicationServices AVFoundation; }; kivy-garden = callPackage ../development/python-modules/kivy-garden { }; @@ -6139,6 +6140,8 @@ self: super: with self; { libkeepass = callPackage ../development/python-modules/libkeepass { }; + libknot = callPackage ../development/python-modules/libknot { }; + liblarch = callPackage ../development/python-modules/liblarch { }; liblzfse = callPackage ../development/python-modules/liblzfse { @@ -11852,7 +11855,7 @@ self: super: with self; { qdrant-client = callPackage ../development/python-modules/qdrant-client { }; - qds_sdk = callPackage ../development/python-modules/qds_sdk { }; + qds-sdk = callPackage ../development/python-modules/qds-sdk { }; qgrid = callPackage ../development/python-modules/qgrid { }; @@ -14173,7 +14176,7 @@ self: super: with self; { tuyaha = callPackage ../development/python-modules/tuyaha { }; - tvdb_api = callPackage ../development/python-modules/tvdb_api { }; + tvdb-api = callPackage ../development/python-modules/tvdb-api { }; tweedledum = callPackage ../development/python-modules/tweedledum { }; diff --git a/nixpkgs/pkgs/top-level/release-small.nix b/nixpkgs/pkgs/top-level/release-small.nix index 37ef0a50c260..a8ef5bc49667 100644 --- a/nixpkgs/pkgs/top-level/release-small.nix +++ b/nixpkgs/pkgs/top-level/release-small.nix @@ -107,7 +107,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; openssl = all; pan = linux; pciutils = linux; - pdf2xml = all; perl = all; pkg-config = all; pmccabe = linux; diff --git a/nixpkgs/pkgs/top-level/release.nix b/nixpkgs/pkgs/top-level/release.nix index f66179d2e90d..034dccdcd475 100644 --- a/nixpkgs/pkgs/top-level/release.nix +++ b/nixpkgs/pkgs/top-level/release.nix @@ -200,6 +200,7 @@ let jobs.vim.aarch64-darwin jobs.inkscape.aarch64-darwin jobs.qt5.qtmultimedia.aarch64-darwin + jobs.darwin.linux-builder.aarch64-darwin /* consider adding tests, as suggested above for x86_64-darwin */ ]; }; |