diff options
1699 files changed, 43916 insertions, 15582 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 32201333c37ba..06b9c10dfec6f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -565,7 +565,7 @@ Names of files and directories should be in lowercase, with dashes between words - Do not use tab characters, i.e. configure your editor to use soft tabs. For instance, use `(setq-default indent-tabs-mode nil)` in Emacs. Everybody has different tab settings so it’s asking for trouble. -- Use `lowerCamelCase` for variable names, not `UpperCamelCase`. Note, this rule does not apply to package attribute names, which instead follow the rules in [](#sec-package-naming). +- Use `lowerCamelCase` for variable names, not `UpperCamelCase`. Note, this rule does not apply to package attribute names, which instead follow the rules in [package naming](./pkgs/README.md#package-naming). - Function calls with attribute set arguments are written as diff --git a/doc/default.nix b/doc/default.nix index 18e12c1a8aca1..61bbd2ba8dc82 100644 --- a/doc/default.nix +++ b/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/doc/languages-frameworks/dart.section.md b/doc/languages-frameworks/dart.section.md index b00327b78eb29..8d9c062f4220f 100644 --- a/doc/languages-frameworks/dart.section.md +++ b/doc/languages-frameworks/dart.section.md @@ -12,6 +12,8 @@ If you are packaging a Flutter desktop application, use [`buildFlutterApplicatio If the upstream source is missing a `pubspec.lock` file, you'll have to vendor one and specify it using `pubspecLockFile`. If it is needed, one will be generated for you and printed when attempting to build the derivation. +The `depsListFile` must always be provided when packaging in Nixpkgs. It will be generated and printed if the derivation is attempted to be built without one. Alternatively, `autoDepsList` may be set to `true` only when outside of Nixpkgs, as it relies on import-from-derivation. + The `dart` commands run can be overridden through `pubGetScript` and `dartCompileCommand`, you can also add flags using `dartCompileFlags` or `dartJitFlags`. Dart supports multiple [outputs types](https://dart.dev/tools/dart-compile#types-of-output), you can choose between them using `dartOutputType` (defaults to `exe`). If you want to override the binaries path or the source path they come from, you can use `dartEntryPoints`. Outputs that require a runtime will automatically be wrapped with the relevant runtime (`dartaotruntime` for `aot-snapshot`, `dart run` for `jit-snapshot` and `kernel`, `node` for `js`), this can be overridden through `dartRuntimeCommand`. @@ -31,6 +33,7 @@ buildDartApplication rec { }; pubspecLockFile = ./pubspec.lock; + depsListFile = ./deps.json; vendorHash = "sha256-Atm7zfnDambN/BmmUf4BG0yUz/y6xWzf0reDw3Ad41s="; } ``` @@ -39,9 +42,7 @@ buildDartApplication rec { The function `buildFlutterApplication` builds Flutter applications. -The deps.json file must always be provided when packaging in Nixpkgs. It will be generated and printed if the derivation is attempted to be built without one. Alternatively, `autoDepsList` may be set to `true` when outside of Nixpkgs, as it relies on import-from-derivation. - -A `pubspec.lock` file must be available. See the [Dart documentation](#ssec-dart-applications) for more details. +See the [Dart documentation](#ssec-dart-applications) for more details on required files and arguments. ```nix { flutter, fetchFromGitHub }: diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 40236d141d3d2..cdd5c806912e1 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -12,6 +12,7 @@ | python310 | python3 | CPython 3.10 | | python311 | | CPython 3.11 | | python312 | | CPython 3.12 | +| python313 | | CPython 3.13 | | pypy27 | pypy2, pypy | PyPy2.7 | | pypy39 | pypy3 | PyPy 3.9 | diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 366c519751c05..1dfe25f02654f 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/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/lib/customisation.nix b/lib/customisation.nix index 5ef4f29e6f6ac..61bb531d2f627 100644 --- a/lib/customisation.nix +++ b/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/lib/fileset/default.nix b/lib/fileset/default.nix index 7bd701670386c..0342be3e0371e 100644 --- a/lib/fileset/default.nix +++ b/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/lib/fileset/internal.nix b/lib/fileset/internal.nix index 9892172955c36..2d52a8cb410b1 100644 --- a/lib/fileset/internal.nix +++ b/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/lib/fileset/tests.sh b/lib/fileset/tests.sh index 529f23ae8871c..d8d8dd4131894 100755 --- a/lib/fileset/tests.sh +++ b/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/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cba46849dbd14..83b0477c8a7cf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1274,6 +1274,9 @@ github = "antonmosich"; githubId = 27223336; name = "Anton Mosich"; + keys = [ { + fingerprint = "F401 287C 324F 0A1C B321 657B 9B96 97B8 FB18 7D14"; + } ]; }; antono = { email = "self@antono.info"; @@ -3874,6 +3877,12 @@ githubId = 50051176; name = "Daniel Rolls"; }; + danielsidhion = { + email = "nixpkgs@sidhion.com"; + github = "DanielSidhion"; + githubId = 160084; + name = "Daniel Sidhion"; + }; daniyalsuri6 = { email = "daniyal.suri@gmail.com"; github = "daniyalsuri6"; @@ -4511,6 +4520,12 @@ githubId = 1708810; name = "Daniel Vianna"; }; + dmytrokyrychuk = { + email = "dmytro@kyrych.uk"; + github = "dmytrokyrychuk"; + githubId = 699961; + name = "Dmytro Kyrychuk"; + }; dnr = { email = "dnr@dnr.im"; github = "dnr"; @@ -6190,6 +6205,16 @@ githubId = 45048741; name = "Alwanga Oyango"; }; + galaxy = { + email = "galaxy@dmc.chat"; + matrix = "@galaxy:mozilla.org"; + name = "The Galaxy"; + github = "ga1aksy"; + githubId = 148551648; + keys = [{ + fingerprint = "48CA 3873 9E9F CA8E 76A0 835A E3DE CF85 4212 E1EA"; + }]; + }; gal_bolle = { email = "florent.becker@ens-lyon.org"; github = "FlorentBecker"; @@ -6622,6 +6647,12 @@ githubId = 4656860; name = "Gaute Ravndal"; }; + gray-heron = { + email = "ave+nix@cezar.info"; + github = "gray-heron"; + githubId = 7032646; + name = "Cezary Siwek"; + }; graysonhead = { email = "grayson@graysonhead.net"; github = "graysonhead"; @@ -7219,6 +7250,7 @@ }; hubble = { name = "Hubble the Wolverine"; + email = "hubblethewolverine@gmail.com"; matrix = "@hubofeverything:bark.lgbt"; github = "the-furry-hubofeverything"; githubId = 53921912; @@ -10923,6 +10955,12 @@ githubId = 29855073; name = "Michael Colicchia"; }; + massimogengarelli = { + email = "massimo.gengarelli@gmail.com"; + github = "massix"; + githubId = 585424; + name = "Massimo Gengarelli"; + }; matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; @@ -11667,6 +11705,13 @@ githubId = 149558; name = "Merlin Gaillard"; }; + mirkolenz = { + name = "Mirko Lenz"; + email = "mirko@mirkolenz.com"; + matrix = "@mlenz:matrix.org"; + github = "mirkolenz"; + githubId = 5160954; + }; mirrexagon = { email = "mirrexagon@mirrexagon.com"; github = "mirrexagon"; @@ -13635,6 +13680,12 @@ githubId = 152312; name = "Periklis Tsirakidis"; }; + perstark = { + email = "perstark.se@gmail.com"; + github = "perstarkse"; + githubId = 63069986; + name = "Per Stark"; + }; petercommand = { email = "petercommand@gmail.com"; github = "petercommand"; @@ -13903,6 +13954,12 @@ githubId = 610615; name = "Chih-Mao Chen"; }; + pks = { + email = "ps@pks.im"; + github = "pks-t"; + githubId = 4056630; + name = "Patrick Steinhardt"; + }; plabadens = { name = "Pierre Labadens"; email = "labadens.pierre+nixpkgs@gmail.com"; @@ -16055,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"; @@ -17797,6 +17860,12 @@ githubId = 858790; name = "Tobias Mayer"; }; + tochiaha = { + email = "tochiahan@proton.me"; + github = "Tochiaha"; + githubId = 74688871; + name = "Tochukwu Ahanonu"; + }; tokudan = { email = "git@danielfrank.net"; github = "tokudan"; @@ -17842,6 +17911,10 @@ githubId = 13155277; name = "Tom Houle"; }; + tomkoid = { + email = "tomaszierl@outlook.com"; + name = "Tomkoid"; + }; tomodachi94 = { email = "tomodachi94+nixpkgs@protonmail.com"; matrix = "@tomodachi94:matrix.org"; @@ -17997,6 +18070,12 @@ githubId = 15064765; name = "tshaynik"; }; + tsowell = { + email = "tom@ldtlb.com"; + github = "tsowell"; + githubId = 4044033; + name = "Thomas Sowell"; + }; ttuegel = { email = "ttuegel@mailbox.org"; github = "ttuegel"; @@ -19349,6 +19428,11 @@ github = "ymeister"; githubId = 47071325; }; + ymstnt = { + name = "YMSTNT"; + github = "ymstnt"; + githubId = 21342713; + }; yoavlavi = { email = "yoav@yoavlavi.com"; github = "yoav-lavi"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 5897948a9f83d..5ad2f94315922 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -100,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/maintainers/team-list.nix b/maintainers/team-list.nix index d5705a294aafa..85a6227634f13 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -350,6 +350,7 @@ with lib.maintainers; { mic92 zowoq qbit + mfrw ]; githubTeams = [ "golang" diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index 5060dd98f58fc..3a4800742b048 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -58,7 +58,7 @@ have a predefined type and string generator already declared under and returning a set with YAML-specific attributes `type` and `generate` as specified [below](#pkgs-formats-result). -`pkgs.formats.ini` { *`listsAsDuplicateKeys`* ? false, *`listToValue`* ? null, \... } +`pkgs.formats.ini` { *`listsAsDuplicateKeys`* ? false, *`listToValue`* ? null, \.\.\. } : A function taking an attribute set with values diff --git a/nixos/doc/manual/release-notes/rl-1509.section.md b/nixos/doc/manual/release-notes/rl-1509.section.md index 1422ae4c299cd..f47d13008185e 100644 --- a/nixos/doc/manual/release-notes/rl-1509.section.md +++ b/nixos/doc/manual/release-notes/rl-1509.section.md @@ -2,7 +2,7 @@ In addition to numerous new and upgraded packages, this release has the following highlights: -- The [Haskell](http://haskell.org/) packages infrastructure has been re-designed from the ground up ("Haskell NG"). NixOS now distributes the latest version of every single package registered on [Hackage](http://hackage.haskell.org/) \-- well in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the [User's Guide to the Haskell Infrastructure](https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure). Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we distribute 51(!) additional Haskell package sets that provide every single [LTS Haskell](http://www.stackage.org/) release since version 0.0 as well as the most recent [Stackage Nightly](http://www.stackage.org/) snapshot. The announcement ["Full Stackage Support in Nixpkgs"](https://nixos.org/nix-dev/2015-September/018138.html) gives additional details. +- The [Haskell](http://haskell.org/) packages infrastructure has been re-designed from the ground up ("Haskell NG"). NixOS now distributes the latest version of every single package registered on [Hackage](http://hackage.haskell.org/) -- well in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the [User's Guide to the Haskell Infrastructure](https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure). Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we distribute 51(!) additional Haskell package sets that provide every single [LTS Haskell](http://www.stackage.org/) release since version 0.0 as well as the most recent [Stackage Nightly](http://www.stackage.org/) snapshot. The announcement ["Full Stackage Support in Nixpkgs"](https://nixos.org/nix-dev/2015-September/018138.html) gives additional details. - Nix has been updated to version 1.10, which among other improvements enables cryptographic signatures on binary caches for improved security. @@ -178,7 +178,7 @@ The new option `system.stateVersion` ensures that certain configuration changes - Nix now requires binary caches to be cryptographically signed. If you have unsigned binary caches that you want to continue to use, you should set `nix.requireSignedBinaryCaches = false`. -- Steam now doesn't need root rights to work. Instead of using `*-steam-chrootenv`, you should now just run `steam`. `steamChrootEnv` package was renamed to `steam`, and old `steam` package \-- to `steamOriginal`. +- Steam now doesn't need root rights to work. Instead of using `*-steam-chrootenv`, you should now just run `steam`. `steamChrootEnv` package was renamed to `steam`, and old `steam` package -- to `steamOriginal`. - CMPlayer has been renamed to bomi upstream. Package `cmplayer` was accordingly renamed to `bomi` diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 6780be9b58147..bc2a15124275a 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -4,6 +4,8 @@ - FoundationDB now defaults to major version 7. +- PostgreSQL now defaults to major version 15. + - Support for WiFi6 (IEEE 802.11ax) and WPA3-SAE-PK was enabled in the `hostapd` package, along with a significant rework of the hostapd module. - LXD now supports virtual machine instances to complement the existing container support @@ -24,6 +26,8 @@ - `root` and `wheel` are not given the ability to set (or preserve) arbitrary environment variables. +- [glibc](https://www.gnu.org/software/libc/) has been updated from version 2.37 to 2.38, see [the release notes](https://sourceware.org/glibc/wiki/Release/2.38) for what was changed. + [`sudo-rs`]: https://github.com/memorysafety/sudo-rs/ - All [ROCm](https://rocm.docs.amd.com/en/latest/) packages have been updated to 5.7.0. @@ -76,6 +80,8 @@ - [Jool](https://nicmx.github.io/Jool/en/index.html), a kernelspace NAT64 and SIIT implementation, providing translation between IPv4 and IPv6. Available as [networking.jool.enable](#opt-networking.jool.enable). +- [Home Assistant Satellite], a streaming audio satellite for Home Assistant voice pipelines, where you can reuse existing mic/speaker hardware. Available as [services.homeassistant-satellite](#opt-services.homeassistant-satellite.enable). + - [Apache Guacamole](https://guacamole.apache.org/), a cross-platform, clientless remote desktop gateway. Available as [services.guacamole-server](#opt-services.guacamole-server.enable) and [services.guacamole-client](#opt-services.guacamole-client.enable) services. - [pgBouncer](https://www.pgbouncer.org), a PostgreSQL connection pooler. Available as [services.pgbouncer](#opt-services.pgbouncer.enable). @@ -113,6 +119,10 @@ - [virt-manager](https://virt-manager.org/), an UI for managing virtual machines in libvirt, is now available as `programs.virt-manager`. +- [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`. @@ -254,6 +264,8 @@ - Garage has been upgraded to 0.9.x. `services.garage.package` now needs to be explicitly set, so version upgrades can be done in a controlled fashion. For this, we expose `garage_x_y` attributes which can be set here. +- `voms` and `xrootd` now moves the `$out/etc` content to the `$etc` output instead of `$out/etc.orig`, when input argument `externalEtc` is not `null`. + - The `woodpecker-*` CI packages have been updated to 1.0.0. This release is wildly incompatible with the 0.15.X versions that were previously packaged. Please read [upstream's documentation](https://woodpecker-ci.org/docs/next/migrations#100) to learn how to update your CI configurations. - The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely. @@ -303,6 +315,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. @@ -313,6 +327,8 @@ - `win-virtio` package was renamed to `virtio-win` to be consistent with the upstream package name. +- `ps3netsrv` has been replaced with the webman-mod fork, the executable has been renamed from `ps3netsrv++` to `ps3netsrv` and cli parameters have changed. + ## 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. @@ -339,6 +355,8 @@ - `jq` was updated to 1.7, its [first release in 5 years](https://github.com/jqlang/jq/releases/tag/jq-1.7). +- `zfs` was updated from 2.1.x to 2.2.0, [enabling newer kernel support and adding new features](https://github.com/openzfs/zfs/releases/tag/zfs-2.2.0). + - A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant. - DocBook option documentation is no longer supported, all module documentation now uses markdown. @@ -396,6 +414,8 @@ The module update takes care of the new config syntax and the data itself (user - Suricata was upgraded from 6.0 to 7.0 and no longer considers HTTP/2 support as experimental, see [upstream release notes](https://forum.suricata.io/t/suricata-7-0-0-released/3715) for more details. +- Cloud support in the `netdata` package is now disabled by default. To enable it use the `netdataCloud` package. + - `networking.nftables` now has the option `networking.nftables.table.<table>` to create tables and have them be updated atomically, instead of flushing the ruleset. @@ -436,6 +456,8 @@ The module update takes care of the new config syntax and the data itself (user If you use this feature, updates to CoreDNS may require updating `vendorHash` by following these steps again. +- `ffmpeg` default upgraded from `ffmpeg_5` to `ffmpeg_6`. + - `fusuma` now enables the following plugins: [appmatcher](https://github.com/iberianpig/fusuma-plugin-appmatcher), [keypress](https://github.com/iberianpig/fusuma-plugin-keypress), [sendkey](https://github.com/iberianpig/fusuma-plugin-sendkey), [tap](https://github.com/iberianpig/fusuma-plugin-tap) and [wmctrl](https://github.com/iberianpig/fusuma-plugin-wmctrl). ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals} @@ -479,3 +501,5 @@ The module update takes care of the new config syntax and the data itself (user - The `electron` packages now places its application files in `$out/libexec/electron` instead of `$out/lib/electron`. Packages using electron-builder will fail to build and need to be adjusted by changing `lib` to `libexec`. - `teleport` has been upgraded from major version 12 to major version 14. Please see upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) and release notes for versions [13](https://goteleport.com/docs/changelog/#1300-050823) and [14](https://goteleport.com/docs/changelog/#1400-092023). Note that Teleport does not officially support upgrades across more than one major version at a time. If you're running Teleport server components, it is recommended to first upgrade to an intermediate 13.x version by setting `services.teleport.package = pkgs.teleport_13`. Afterwards, this option can be removed to upgrade to the default version (14). + +- The Linux kernel module `msr` (see [`msr(4)`](https://man7.org/linux/man-pages/man4/msr.4.html)), which provides an interface to read and write the model-specific registers (MSRs) of an x86 CPU, can now be configured via `hardware.cpu.x86.msr`. diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix index b7c7078b73b1b..4b6b567399484 100644 --- a/nixos/lib/make-squashfs.nix +++ b/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/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 7ed001a1dfce4..529de41d892a9 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -19,6 +19,8 @@ from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple from test_driver.logger import rootlog +from .qmp import QMPSession + CHAR_TO_KEY = { "A": "shift-a", "N": "shift-n", @@ -144,6 +146,7 @@ class StartCommand: def cmd( self, monitor_socket_path: Path, + qmp_socket_path: Path, shell_socket_path: Path, allow_reboot: bool = False, ) -> str: @@ -167,6 +170,7 @@ class StartCommand: return ( f"{self._cmd}" + f" -qmp unix:{qmp_socket_path},server=on,wait=off" f" -monitor unix:{monitor_socket_path}" f" -chardev socket,id=shell,path={shell_socket_path}" f"{qemu_opts}" @@ -194,11 +198,14 @@ class StartCommand: state_dir: Path, shared_dir: Path, monitor_socket_path: Path, + qmp_socket_path: Path, shell_socket_path: Path, allow_reboot: bool, ) -> subprocess.Popen: return subprocess.Popen( - self.cmd(monitor_socket_path, shell_socket_path, allow_reboot), + self.cmd( + monitor_socket_path, qmp_socket_path, shell_socket_path, allow_reboot + ), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, @@ -309,6 +316,7 @@ class Machine: shared_dir: Path state_dir: Path monitor_path: Path + qmp_path: Path shell_path: Path start_command: StartCommand @@ -317,6 +325,7 @@ class Machine: process: Optional[subprocess.Popen] pid: Optional[int] monitor: Optional[socket.socket] + qmp_client: Optional[QMPSession] shell: Optional[socket.socket] serial_thread: Optional[threading.Thread] @@ -352,6 +361,7 @@ class Machine: self.state_dir = self.tmp_dir / f"vm-state-{self.name}" self.monitor_path = self.state_dir / "monitor" + self.qmp_path = self.state_dir / "qmp" self.shell_path = self.state_dir / "shell" if (not self.keep_vm_state) and self.state_dir.exists(): self.cleanup_statedir() @@ -360,6 +370,7 @@ class Machine: self.process = None self.pid = None self.monitor = None + self.qmp_client = None self.shell = None self.serial_thread = None @@ -791,6 +802,28 @@ class Machine: with self.nested(f"waiting for TCP port {port} on {addr}"): retry(port_is_open, timeout) + def wait_for_open_unix_socket( + self, addr: str, is_datagram: bool = False, timeout: int = 900 + ) -> None: + """ + Wait until a process is listening on the given UNIX-domain socket + (default to a UNIX-domain stream socket). + """ + + nc_flags = [ + "-z", + "-uU" if is_datagram else "-U", + ] + + def socket_is_open(_: Any) -> bool: + status, _ = self.execute(f"nc {' '.join(nc_flags)} {addr}") + return status == 0 + + with self.nested( + f"waiting for UNIX-domain {'datagram' if is_datagram else 'stream'} on '{addr}'" + ): + retry(socket_is_open, timeout) + def wait_for_closed_port( self, port: int, addr: str = "localhost", timeout: int = 900 ) -> None: @@ -1090,11 +1123,13 @@ class Machine: self.state_dir, self.shared_dir, self.monitor_path, + self.qmp_path, self.shell_path, allow_reboot, ) self.monitor, _ = monitor_socket.accept() self.shell, _ = shell_socket.accept() + self.qmp_client = QMPSession.from_path(self.qmp_path) # Store last serial console lines for use # of wait_for_console_text diff --git a/nixos/lib/test-driver/test_driver/qmp.py b/nixos/lib/test-driver/test_driver/qmp.py new file mode 100644 index 0000000000000..62ca6d7d5b802 --- /dev/null +++ b/nixos/lib/test-driver/test_driver/qmp.py @@ -0,0 +1,98 @@ +import json +import logging +import os +import socket +from collections.abc import Iterator +from pathlib import Path +from queue import Queue +from typing import Any + +logger = logging.getLogger(__name__) + + +class QMPAPIError(RuntimeError): + def __init__(self, message: dict[str, Any]): + assert "error" in message, "Not an error message!" + try: + self.class_name = message["class"] + self.description = message["desc"] + # NOTE: Some errors can occur before the Server is able to read the + # id member; in these cases the id member will not be part of the + # error response, even if provided by the client. + self.transaction_id = message.get("id") + except KeyError: + raise RuntimeError("Malformed QMP API error response") + + def __str__(self) -> str: + return f"<QMP API error related to transaction {self.transaction_id} [{self.class_name}]: {self.description}>" + + +class QMPSession: + def __init__(self, sock: socket.socket) -> None: + self.sock = sock + self.results: Queue[dict[str, str]] = Queue() + self.pending_events: Queue[dict[str, Any]] = Queue() + self.reader = sock.makefile("r") + self.writer = sock.makefile("w") + # Make the reader non-blocking so we can kind of select on it. + os.set_blocking(self.reader.fileno(), False) + hello = self._wait_for_new_result() + logger.debug(f"Got greeting from QMP API: {hello}") + # The greeting message format is: + # { "QMP": { "version": json-object, "capabilities": json-array } } + assert "QMP" in hello, f"Unexpected result: {hello}" + self.send("qmp_capabilities") + + @classmethod + def from_path(cls, path: Path) -> "QMPSession": + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + sock.connect(str(path)) + return cls(sock) + + def __del__(self) -> None: + self.sock.close() + + def _wait_for_new_result(self) -> dict[str, str]: + assert self.results.empty(), "Results set is not empty, missed results!" + while self.results.empty(): + self.read_pending_messages() + return self.results.get() + + def read_pending_messages(self) -> None: + line = self.reader.readline() + if not line: + return + evt_or_result = json.loads(line) + logger.debug(f"Received a message: {evt_or_result}") + + # It's a result + if "return" in evt_or_result or "QMP" in evt_or_result: + self.results.put(evt_or_result) + # It's an event + elif "event" in evt_or_result: + self.pending_events.put(evt_or_result) + else: + raise QMPAPIError(evt_or_result) + + def wait_for_event(self, timeout: int = 10) -> dict[str, Any]: + while self.pending_events.empty(): + self.read_pending_messages() + + return self.pending_events.get(timeout=timeout) + + def events(self, timeout: int = 10) -> Iterator[dict[str, Any]]: + while not self.pending_events.empty(): + yield self.pending_events.get(timeout=timeout) + + def send(self, cmd: str, args: dict[str, str] = {}) -> dict[str, str]: + self.read_pending_messages() + assert self.results.empty(), "Results set is not empty, missed results!" + data: dict[str, Any] = dict(execute=cmd) + if args != {}: + data["arguments"] = args + + logger.debug(f"Sending {data} to QMP...") + json.dump(data, self.writer) + self.writer.write("\n") + self.writer.flush() + return self._wait_for_new_result() diff --git a/nixos/modules/config/fanout.nix b/nixos/modules/config/fanout.nix new file mode 100644 index 0000000000000..60ee145f19af4 --- /dev/null +++ b/nixos/modules/config/fanout.nix @@ -0,0 +1,49 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.fanout; + mknodCmds = n: lib.lists.imap0 (i: s: + "mknod /dev/fanout${builtins.toString i} c $MAJOR ${builtins.toString i}" + ) (lib.lists.replicate n ""); +in +{ + options.services.fanout = { + enable = lib.mkEnableOption (lib.mdDoc "fanout"); + fanoutDevices = lib.mkOption { + type = lib.types.int; + default = 1; + description = "Number of /dev/fanout devices"; + }; + bufferSize = lib.mkOption { + type = lib.types.int; + default = 16384; + description = "Size of /dev/fanout buffer in bytes"; + }; + }; + + config = lib.mkIf cfg.enable { + boot.extraModulePackages = [ config.boot.kernelPackages.fanout.out ]; + + boot.kernelModules = [ "fanout" ]; + + boot.extraModprobeConfig = '' + options fanout buffersize=${builtins.toString cfg.bufferSize} + ''; + + systemd.services.fanout = { + description = "Bring up /dev/fanout devices"; + script = '' + MAJOR=$(${pkgs.gnugrep}/bin/grep fanout /proc/devices | ${pkgs.gawk}/bin/awk '{print $1}') + ${lib.strings.concatLines (mknodCmds cfg.fanoutDevices)} + ''; + + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "oneshot"; + User = "root"; + RemainAfterExit = "yes"; + Restart = "no"; + }; + }; + }; +} diff --git a/nixos/modules/hardware/cpu/x86-msr.nix b/nixos/modules/hardware/cpu/x86-msr.nix new file mode 100644 index 0000000000000..554bec1b7db15 --- /dev/null +++ b/nixos/modules/hardware/cpu/x86-msr.nix @@ -0,0 +1,91 @@ +{ lib +, config +, options +, ... +}: +let + inherit (builtins) hasAttr; + inherit (lib) mkIf mdDoc; + cfg = config.hardware.cpu.x86.msr; + opt = options.hardware.cpu.x86.msr; + defaultGroup = "msr"; + isDefaultGroup = cfg.group == defaultGroup; + set = "to set for devices of the `msr` kernel subsystem."; + + # Generates `foo=bar` parameters to pass to the kernel. + # If `module = baz` is passed, generates `baz.foo=bar`. + # Adds double quotes on demand to handle `foo="bar baz"`. + kernelParam = { module ? null }: name: value: + assert lib.asserts.assertMsg (!lib.strings.hasInfix "=" name) "kernel parameter cannot have '=' in name"; + let + key = (if module == null then "" else module + ".") + name; + valueString = lib.generators.mkValueStringDefault {} value; + quotedValueString = if lib.strings.hasInfix " " valueString + then lib.strings.escape ["\""] valueString + else valueString; + in "${key}=${quotedValueString}"; + msrKernelParam = kernelParam { module = "msr"; }; +in +{ + options.hardware.cpu.x86.msr = with lib.options; with lib.types; { + enable = mkEnableOption (mdDoc "the `msr` (Model-Specific Registers) kernel module and configure `udev` rules for its devices (usually `/dev/cpu/*/msr`)"); + owner = mkOption { + type = str; + default = "root"; + example = "nobody"; + description = mdDoc "Owner ${set}"; + }; + group = mkOption { + type = str; + default = defaultGroup; + example = "nobody"; + description = mdDoc "Group ${set}"; + }; + mode = mkOption { + type = str; + default = "0640"; + example = "0660"; + description = mdDoc "Mode ${set}"; + }; + settings = mkOption { + type = submodule { + freeformType = attrsOf (oneOf [ bool int str ]); + options.allow-writes = mkOption { + type = nullOr (enum ["on" "off"]); + default = null; + description = "Whether to allow writes to MSRs (`\"on\"`) or not (`\"off\"`)."; + }; + }; + default = {}; + description = "Parameters for the `msr` kernel module."; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = hasAttr cfg.owner config.users.users; + message = "Owner '${cfg.owner}' set in `${opt.owner}` is not configured via `${options.users.users}.\"${cfg.owner}\"`."; + } + { + assertion = isDefaultGroup || (hasAttr cfg.group config.users.groups); + message = "Group '${cfg.group}' set in `${opt.group}` is not configured via `${options.users.groups}.\"${cfg.group}\"`."; + } + ]; + + boot = { + kernelModules = [ "msr" ]; + kernelParams = lib.attrsets.mapAttrsToList msrKernelParam (lib.attrsets.filterAttrs (_: value: value != null) cfg.settings); + }; + + users.groups.${cfg.group} = mkIf isDefaultGroup { }; + + services.udev.extraRules = '' + SUBSYSTEM=="msr", OWNER="${cfg.owner}", GROUP="${cfg.group}", MODE="${cfg.mode}" + ''; + }; + + meta = with lib; { + maintainers = with maintainers; [ lorenzleutgeb ]; + }; +} diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 7d0c5898e23df..85180bf2d1b4d 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/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/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index dc59ccb357d44..5b278b5e80625 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -69,7 +69,7 @@ in #dialout = 27; # unused polkituser = 28; #utmp = 29; # unused - # ddclient = 30; # software removed + # ddclient = 30; # converted to DynamicUser = true davfs2 = 31; disnix = 33; osgi = 34; @@ -394,7 +394,7 @@ in dialout = 27; #polkituser = 28; # currently unused, polkitd doesn't need a group utmp = 29; - # ddclient = 30; # software removed + # ddclient = 30; # converted to DynamicUser = true davfs2 = 31; disnix = 33; osgi = 34; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2c06f49317256..81b7b981a4460 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -2,6 +2,7 @@ ./config/appstream.nix ./config/console.nix ./config/debug-info.nix + ./config/fanout.nix ./config/fonts/fontconfig.nix ./config/fonts/fontdir.nix ./config/fonts/ghostscript.nix @@ -54,6 +55,7 @@ ./hardware/cpu/amd-sev.nix ./hardware/cpu/intel-microcode.nix ./hardware/cpu/intel-sgx.nix + ./hardware/cpu/x86-msr.nix ./hardware/decklink.nix ./hardware/device-tree.nix ./hardware/digitalbitbox.nix @@ -518,6 +520,7 @@ ./services/hardware/hddfancontrol.nix ./services/hardware/illum.nix ./services/hardware/interception-tools.nix + ./services/hardware/iptsd.nix ./services/hardware/irqbalance.nix ./services/hardware/joycond.nix ./services/hardware/kanata.nix @@ -556,6 +559,7 @@ ./services/home-automation/esphome.nix ./services/home-automation/evcc.nix ./services/home-automation/home-assistant.nix + ./services/home-automation/homeassistant-satellite.nix ./services/home-automation/zigbee2mqtt.nix ./services/logging/SystemdJournal2Gelf.nix ./services/logging/awstats.nix @@ -722,6 +726,7 @@ ./services/misc/ripple-data-api.nix ./services/misc/rippled.nix ./services/misc/rmfakecloud.nix + ./services/misc/rkvm.nix ./services/misc/rshim.nix ./services/misc/safeeyes.nix ./services/misc/sdrplay.nix @@ -730,8 +735,10 @@ ./services/misc/signald.nix ./services/misc/siproxd.nix ./services/misc/snapper.nix + ./services/misc/soft-serve.nix ./services/misc/sonarr.nix ./services/misc/sourcehut + ./services/misc/spice-autorandr.nix ./services/misc/spice-vdagentd.nix ./services/misc/spice-webdavd.nix ./services/misc/ssm-agent.nix @@ -884,6 +891,7 @@ ./services/networking/dae.nix ./services/networking/dante.nix ./services/networking/deconz.nix + ./services/networking/ddclient.nix ./services/networking/dhcpcd.nix ./services/networking/dnscache.nix ./services/networking/dnscrypt-proxy2.nix @@ -1039,6 +1047,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 @@ -1153,6 +1162,7 @@ ./services/security/hologram-agent.nix ./services/security/hologram-server.nix ./services/security/infnoise.nix + ./services/security/jitterentropy-rngd.nix ./services/security/kanidm.nix ./services/security/munge.nix ./services/security/nginx-sso.nix diff --git a/nixos/modules/programs/browserpass.nix b/nixos/modules/programs/browserpass.nix index abd99056ff3ba..a9670a37e618c 100644 --- a/nixos/modules/programs/browserpass.nix +++ b/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/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix index 83a3edaf813ef..85f47530cf5af 100644 --- a/nixos/modules/programs/firefox.nix +++ b/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,50 +246,32 @@ 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 { - environment.systemPackages = [ - (cfg.package.override { - extraPrefs = cfg.autoConfig; - extraNativeMessagingHosts = with pkgs; optionals nmh.ff2mpv [ - ff2mpv - ] ++ optionals nmh.euwebid [ - web-eid-app - ] ++ optionals nmh.gsconnect [ - gnomeExtensions.gsconnect - ] ++ optionals nmh.jabref [ - jabref - ] ++ optionals nmh.passff [ - passff-host - ]; - cfg = let - # copy-pasted from the wrapper; TODO: figure out fix - applicationName = cfg.package.binaryName or (lib.getName cfg.package); + 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); - 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 nixpkgsConfig // optionConfig // nmhConfig; - }) + environment.systemPackages = [ + (cfg.package.override (old: { + extraPrefsFiles = old.extraPrefsFiles or [] ++ [(pkgs.writeText "firefox-autoconfig.js" cfg.autoConfig)]; + nativeMessagingHosts = old.nativeMessagingHosts or [] ++ cfg.nativeMessagingHosts.packages; + cfg = (old.cfg or {}) // cfg.wrapperConfig; + })) ]; environment.etc = diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 408c515044c80..0fbb2351f9863 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -54,7 +54,6 @@ in (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.") - (mkRemovedOptionModule [ "services" "ddclient" ] "ddclient has been removed on the request of the upstream maintainer because it is unmaintained and has bugs. Please switch to a different software like `inadyn` or `knsupdate`.") # Added 2023-07-04 (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") (mkRemovedOptionModule [ "services" "exhibitor" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.") diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 92bed172f4522..f8e17bc71ee18 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -592,7 +592,7 @@ let description = lib.mdDoc '' Key type to use for private keys. For an up to date list of supported values check the --key-type option - at <https://go-acme.github.io/lego/usage/cli/#usage>. + at <https://go-acme.github.io/lego/usage/cli/options/>. ''; }; diff --git a/nixos/modules/services/audio/wyoming/openwakeword.nix b/nixos/modules/services/audio/wyoming/openwakeword.nix index e1993407dad1e..06b7dd585fda1 100644 --- a/nixos/modules/services/audio/wyoming/openwakeword.nix +++ b/nixos/modules/services/audio/wyoming/openwakeword.nix @@ -136,7 +136,7 @@ in ProtectKernelTunables = true; ProtectControlGroups = true; ProtectProc = "invisible"; - ProcSubset = "pid"; + ProcSubset = "all"; # reads /proc/cpuinfo RestrictAddressFamilies = [ "AF_INET" "AF_INET6" diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 0acbf1b3eabba..5a75a46e5259a 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/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/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix index 72bf25c211461..ff6b4d5588b13 100644 --- a/nixos/modules/services/cluster/hadoop/default.nix +++ b/nixos/modules/services/cluster/hadoop/default.nix @@ -67,16 +67,16 @@ with lib; mapredSiteDefault = mkOption { default = { "mapreduce.framework.name" = "yarn"; - "yarn.app.mapreduce.am.env" = "HADOOP_MAPRED_HOME=${cfg.package}/lib/${cfg.package.untarDir}"; - "mapreduce.map.env" = "HADOOP_MAPRED_HOME=${cfg.package}/lib/${cfg.package.untarDir}"; - "mapreduce.reduce.env" = "HADOOP_MAPRED_HOME=${cfg.package}/lib/${cfg.package.untarDir}"; + "yarn.app.mapreduce.am.env" = "HADOOP_MAPRED_HOME=${cfg.package}"; + "mapreduce.map.env" = "HADOOP_MAPRED_HOME=${cfg.package}"; + "mapreduce.reduce.env" = "HADOOP_MAPRED_HOME=${cfg.package}"; }; defaultText = literalExpression '' { "mapreduce.framework.name" = "yarn"; - "yarn.app.mapreduce.am.env" = "HADOOP_MAPRED_HOME=''${config.${opt.package}}/lib/''${config.${opt.package}.untarDir}"; - "mapreduce.map.env" = "HADOOP_MAPRED_HOME=''${config.${opt.package}}/lib/''${config.${opt.package}.untarDir}"; - "mapreduce.reduce.env" = "HADOOP_MAPRED_HOME=''${config.${opt.package}}/lib/''${config.${opt.package}.untarDir}"; + "yarn.app.mapreduce.am.env" = "HADOOP_MAPRED_HOME=''${config.${opt.package}}"; + "mapreduce.map.env" = "HADOOP_MAPRED_HOME=''${config.${opt.package}}"; + "mapreduce.reduce.env" = "HADOOP_MAPRED_HOME=''${config.${opt.package}}"; } ''; type = types.attrsOf types.anything; @@ -154,13 +154,13 @@ with lib; }; log4jProperties = mkOption { - default = "${cfg.package}/lib/${cfg.package.untarDir}/etc/hadoop/log4j.properties"; + default = "${cfg.package}/etc/hadoop/log4j.properties"; defaultText = literalExpression '' - "''${config.${opt.package}}/lib/''${config.${opt.package}.untarDir}/etc/hadoop/log4j.properties" + "''${config.${opt.package}}/etc/hadoop/log4j.properties" ''; type = types.path; example = literalExpression '' - "''${pkgs.hadoop}/lib/''${pkgs.hadoop.untarDir}/etc/hadoop/log4j.properties"; + "''${pkgs.hadoop}/etc/hadoop/log4j.properties"; ''; description = lib.mdDoc "log4j.properties file added to HADOOP_CONF_DIR"; }; diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixos/modules/services/cluster/hadoop/yarn.nix index 26077f35fdd0d..a49aafbd1dca8 100644 --- a/nixos/modules/services/cluster/hadoop/yarn.nix +++ b/nixos/modules/services/cluster/hadoop/yarn.nix @@ -160,7 +160,7 @@ in umount /run/wrappers/yarn-nodemanager/cgroup/cpu || true rm -rf /run/wrappers/yarn-nodemanager/ || true mkdir -p /run/wrappers/yarn-nodemanager/{bin,etc/hadoop,cgroup/cpu} - cp ${cfg.package}/lib/${cfg.package.untarDir}/bin/container-executor /run/wrappers/yarn-nodemanager/bin/ + cp ${cfg.package}/bin/container-executor /run/wrappers/yarn-nodemanager/bin/ chgrp hadoop /run/wrappers/yarn-nodemanager/bin/container-executor chmod 6050 /run/wrappers/yarn-nodemanager/bin/container-executor cp ${hadoopConf}/container-executor.cfg /run/wrappers/yarn-nodemanager/etc/hadoop/ diff --git a/nixos/modules/services/databases/ferretdb.nix b/nixos/modules/services/databases/ferretdb.nix index 45f822d646910..ab55e22bf2146 100644 --- a/nixos/modules/services/databases/ferretdb.nix +++ b/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/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 7a4fa708eadf8..2d4ef05631823 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -458,7 +458,8 @@ in services.postgresql.package = let mkThrow = ver: throw "postgresql_${ver} was removed, please upgrade your postgresql version."; - base = if versionAtLeast config.system.stateVersion "22.05" then pkgs.postgresql_14 + base = if versionAtLeast config.system.stateVersion "23.11" then pkgs.postgresql_15 + else if versionAtLeast config.system.stateVersion "22.05" then pkgs.postgresql_14 else if versionAtLeast config.system.stateVersion "21.11" then pkgs.postgresql_13 else if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11 else if versionAtLeast config.system.stateVersion "17.09" then mkThrow "9_6" diff --git a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix index d18e303891e47..4f680eabbe15c 100644 --- a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix +++ b/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/nixos/modules/services/games/asf.nix b/nixos/modules/services/games/asf.nix index f15d7077d965c..432de6336ce24 100644 --- a/nixos/modules/services/games/asf.nix +++ b/nixos/modules/services/games/asf.nix @@ -187,29 +187,41 @@ in Group = "asf"; WorkingDirectory = cfg.dataDir; Type = "simple"; - ExecStart = "${cfg.package}/bin/ArchiSteamFarm --path ${cfg.dataDir} --process-required --no-restart --service --no-config-migrate"; + ExecStart = "${lib.getExe cfg.package} --no-restart --process-required --service --system-required --path ${cfg.dataDir}"; Restart = "always"; - # mostly copied from the default systemd service - PrivateTmp = true; + # copied from the default systemd service at + # https://github.com/JustArchiNET/ArchiSteamFarm/blob/main/ArchiSteamFarm/overlay/variant-base/linux/ArchiSteamFarm%40.service + CapabilityBoundingSet = ""; + DevicePolicy = "closed"; LockPersonality = true; + NoNewPrivileges = true; PrivateDevices = true; PrivateIPC = true; PrivateMounts = true; + PrivateTmp = true; # instead of rw /tmp PrivateUsers = true; + ProcSubset = "pid"; ProtectClock = true; ProtectControlGroups = true; + ProtectHome = true; ProtectHostname = true; ProtectKernelLogs = true; ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; - ProtectSystem = "full"; + ProtectSystem = "strict"; RemoveIPC = true; - RestrictAddressFamilies = "AF_INET AF_INET6"; + RestrictAddressFamilies = "AF_INET AF_INET6 AF_NETLINK AF_UNIX"; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + UMask = "0077"; + + # we luckily already have systemd v247+ + SecureBits = "noroot-locked"; + SystemCallFilter = [ "@system-service" "~@privileged" ]; } ]; diff --git a/nixos/modules/services/hardware/iptsd.nix b/nixos/modules/services/hardware/iptsd.nix new file mode 100644 index 0000000000000..8af0a6d6bbe1f --- /dev/null +++ b/nixos/modules/services/hardware/iptsd.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.iptsd; + format = pkgs.formats.ini { }; + configFile = format.generate "iptsd.conf" cfg.config; +in { + options.services.iptsd = { + enable = lib.mkEnableOption (lib.mdDoc "the userspace daemon for Intel Precise Touch & Stylus"); + + config = lib.mkOption { + default = { }; + description = lib.mdDoc '' + Configuration for IPTSD. See the + [reference configuration](https://github.com/linux-surface/iptsd/blob/master/etc/iptsd.conf) + for available options and defaults. + ''; + type = lib.types.submodule { + freeformType = format.type; + options = { + Touch = { + DisableOnPalm = lib.mkOption { + default = false; + description = lib.mdDoc "Ignore all touch inputs if a palm was registered on the display."; + type = lib.types.bool; + }; + DisableOnStylus = lib.mkOption { + default = false; + description = lib.mdDoc "Ignore all touch inputs if a stylus is in proximity."; + type = lib.types.bool; + }; + }; + Stylus = { + Disable = lib.mkOption { + default = false; + description = lib.mdDoc "Disables the stylus. No stylus data will be processed."; + type = lib.types.bool; + }; + }; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.packages = [ pkgs.iptsd ]; + environment.etc."iptsd.conf".source = configFile; + systemd.services."iptsd@".restartTriggers = [ configFile ]; + services.udev.packages = [ pkgs.iptsd ]; + }; + + meta.maintainers = with lib.maintainers; [ dotlambda ]; +} diff --git a/nixos/modules/services/hardware/throttled.nix b/nixos/modules/services/hardware/throttled.nix index afca24d976e1a..9fa4958861198 100644 --- a/nixos/modules/services/hardware/throttled.nix +++ b/nixos/modules/services/hardware/throttled.nix @@ -29,8 +29,7 @@ in { # Kernel 5.9 spams warnings whenever userspace writes to CPU MSRs. # See https://github.com/erpalma/throttled/issues/215 - boot.kernelParams = - optional (versionAtLeast config.boot.kernelPackages.kernel.version "5.9") - "msr.allow_writes=on"; + hardware.cpu.x86.msr.settings.allow-writes = + mkIf (versionAtLeast config.boot.kernelPackages.kernel.version "5.9") "on"; }; } diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index cad510e571cb2..0b7f98ab6a6da 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -47,7 +47,7 @@ in ###### implementation config = mkIf cfg.enable { - boot.kernelModules = [ "msr" ]; + hardware.cpu.x86.msr.enable = true; warnings = optional (cfg.extraConfig != "") '' Using config.services.tlp.extraConfig is deprecated and will become unsupported in a future release. Use config.services.tlp.settings instead. diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index 944777475401b..258f09bbab09f 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -159,7 +159,7 @@ in }; config = mkIf cfg.enable { - boot.kernelModules = [ "msr" ]; + hardware.cpu.x86.msr.enable = true; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/services/home-automation/esphome.nix b/nixos/modules/services/home-automation/esphome.nix index d7dbb6f0b90e3..080c8876382f9 100644 --- a/nixos/modules/services/home-automation/esphome.nix +++ b/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/nixos/modules/services/home-automation/homeassistant-satellite.nix b/nixos/modules/services/home-automation/homeassistant-satellite.nix new file mode 100644 index 0000000000000..e3f0617cf01cb --- /dev/null +++ b/nixos/modules/services/home-automation/homeassistant-satellite.nix @@ -0,0 +1,225 @@ +{ config +, lib +, pkgs +, ... +}: + +let + cfg = config.services.homeassistant-satellite; + + inherit (lib) + escapeShellArg + escapeShellArgs + mkOption + mdDoc + mkEnableOption + mkIf + mkPackageOptionMD + types + ; + + inherit (builtins) + toString + ; + + # override the package with the relevant vad dependencies + package = cfg.package.overridePythonAttrs (oldAttrs: { + propagatedBuildInputs = oldAttrs.propagatedBuildInputs + ++ lib.optional (cfg.vad == "webrtcvad") cfg.package.optional-dependencies.webrtc + ++ lib.optional (cfg.vad == "silero") cfg.package.optional-dependencies.silerovad + ++ lib.optional (cfg.pulseaudio.enable) cfg.package.optional-dependencies.pulseaudio; + }); + +in + +{ + meta.buildDocsInSandbox = false; + + options.services.homeassistant-satellite = with types; { + enable = mkEnableOption (mdDoc "Home Assistant Satellite"); + + package = mkPackageOptionMD pkgs "homeassistant-satellite" { }; + + user = mkOption { + type = str; + example = "alice"; + description = mdDoc '' + User to run homeassistant-satellite under. + ''; + }; + + group = mkOption { + type = str; + default = "users"; + description = mdDoc '' + Group to run homeassistant-satellite under. + ''; + }; + + host = mkOption { + type = str; + example = "home-assistant.local"; + description = mdDoc '' + Hostname on which your Home Assistant instance can be reached. + ''; + }; + + port = mkOption { + type = port; + example = 8123; + description = mdDoc '' + Port on which your Home Assistance can be reached. + ''; + apply = toString; + }; + + protocol = mkOption { + type = enum [ "http" "https" ]; + default = "http"; + example = "https"; + description = mdDoc '' + The transport protocol used to connect to Home Assistant. + ''; + }; + + tokenFile = mkOption { + type = path; + example = "/run/keys/hass-token"; + description = mdDoc '' + Path to a file containing a long-lived access token for your Home Assistant instance. + ''; + apply = escapeShellArg; + }; + + sounds = { + awake = mkOption { + type = nullOr str; + default = null; + description = mdDoc '' + Audio file to play when the wake word is detected. + ''; + }; + + done = mkOption { + type = nullOr str; + default = null; + description = mdDoc '' + Audio file to play when the voice command is done. + ''; + }; + }; + + vad = mkOption { + type = enum [ "disabled" "webrtcvad" "silero" ]; + default = "disabled"; + example = "silero"; + description = mdDoc '' + Voice activity detection model. With `disabled` sound will be transmitted continously. + ''; + }; + + pulseaudio = { + enable = mkEnableOption "recording/playback via PulseAudio or PipeWire"; + + socket = mkOption { + type = nullOr str; + default = null; + example = "/run/user/1000/pulse/native"; + description = mdDoc '' + Path or hostname to connect with the PulseAudio server. + ''; + }; + + duckingVolume = mkOption { + type = nullOr float; + default = null; + example = 0.4; + description = mdDoc '' + Reduce output volume (between 0 and 1) to this percentage value while recording. + ''; + }; + + echoCancellation = mkEnableOption "acoustic echo cancellation"; + }; + + extraArgs = mkOption { + type = listOf str; + default = [ ]; + description = mdDoc '' + Extra arguments to pass to the commandline. + ''; + apply = escapeShellArgs; + }; + }; + + config = mkIf cfg.enable { + systemd.services."homeassistant-satellite" = { + description = "Home Assistant Satellite"; + after = [ + "network-online.target" + ]; + wants = [ + "network-online.target" + ]; + wantedBy = [ + "multi-user.target" + ]; + path = with pkgs; [ + ffmpeg-headless + ] ++ lib.optionals (!cfg.pulseaudio.enable) [ + alsa-utils + ]; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + # https://github.com/rhasspy/hassio-addons/blob/master/assist_microphone/rootfs/etc/s6-overlay/s6-rc.d/assist_microphone/run + ExecStart = '' + ${package}/bin/homeassistant-satellite \ + --host ${cfg.host} \ + --port ${cfg.port} \ + --protocol ${cfg.protocol} \ + --token-file ${cfg.tokenFile} \ + --vad ${cfg.vad} \ + ${lib.optionalString cfg.pulseaudio.enable "--pulseaudio"}${lib.optionalString (cfg.pulseaudio.socket != null) "=${cfg.pulseaudio.socket}"} \ + ${lib.optionalString (cfg.pulseaudio.enable && cfg.pulseaudio.duckingVolume != null) "--ducking-volume=${toString cfg.pulseaudio.duckingVolume}"} \ + ${lib.optionalString (cfg.pulseaudio.enable && cfg.pulseaudio.echoCancellation) "--echo-cancel"} \ + ${lib.optionalString (cfg.sounds.awake != null) "--awake-sound=${toString cfg.sounds.awake}"} \ + ${lib.optionalString (cfg.sounds.done != null) "--done-sound=${toString cfg.sounds.done}"} \ + ${cfg.extraArgs} + ''; + CapabilityBoundingSet = ""; + DeviceAllow = ""; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = false; # onnxruntime/capi/onnxruntime_pybind11_state.so: cannot enable executable stack as shared object requires: Operation not permitted + PrivateDevices = true; + PrivateUsers = true; + ProtectHome = false; # Would deny access to local pulse/pipewire server + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectProc = "invisible"; + ProcSubset = "all"; # Error in cpuinfo: failed to parse processor information from /proc/cpuinfo + Restart = "always"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SupplementaryGroups = [ + "audio" + ]; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + UMask = "0077"; + }; + }; + }; +} diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 9cc1ade3f41e8..a7e8aee1f2a26 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -592,7 +592,7 @@ in { # Since the mailman-web settings.py obstinately creates a logs # dir in the cwd, change to the (writable) runtime directory before # starting uwsgi. - ExecStart = "${pkgs.coreutils}/bin/env -C $RUNTIME_DIRECTORY ${pkgs.uwsgi.override { plugins = ["python3"]; }}/bin/uwsgi --json ${uwsgiConfigFile}"; + ExecStart = "${pkgs.coreutils}/bin/env -C $RUNTIME_DIRECTORY ${pkgs.uwsgi.override { plugins = ["python3"]; python3 = webEnv.python; }}/bin/uwsgi --json ${uwsgiConfigFile}"; User = cfg.webUser; Group = "mailman"; RuntimeDirectory = "mailman-uwsgi"; diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index b38b35361cf02..12e27ef26ff3e 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/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/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix index 17c1be57ccbcd..17c1be57ccbcd 100755..100644 --- a/nixos/modules/services/misc/confd.nix +++ b/nixos/modules/services/misc/confd.nix diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix index f26658b7bcb44..b2920981efbda 100644 --- a/nixos/modules/services/misc/forgejo.nix +++ b/nixos/modules/services/misc/forgejo.nix @@ -428,6 +428,17 @@ in ]; }; + # Work around 'pq: permission denied for schema public' with postgres v15, until a + # solution for `services.postgresql.ensureUsers` is found. + # See https://github.com/NixOS/nixpkgs/issues/216989 + systemd.services.postgresql.postStart = lib.mkIf ( + usePostgresql + && cfg.database.createDatabase + && lib.strings.versionAtLeast config.services.postgresql.package.version "15.0" + ) (lib.mkAfter '' + $PSQL -tAc 'ALTER DATABASE "${cfg.database.name}" OWNER TO "${cfg.database.user}";' + ''); + services.mysql = optionalAttrs (useMysql && cfg.database.createDatabase) { enable = mkDefault true; package = mkDefault pkgs.mariadb; diff --git a/nixos/modules/services/misc/rkvm.nix b/nixos/modules/services/misc/rkvm.nix new file mode 100644 index 0000000000000..582e8511ed96e --- /dev/null +++ b/nixos/modules/services/misc/rkvm.nix @@ -0,0 +1,164 @@ +{ options, config, pkgs, lib, ... }: + +with lib; +let + opt = options.services.rkvm; + cfg = config.services.rkvm; + toml = pkgs.formats.toml { }; +in +{ + meta.maintainers = with maintainers; [ ckie ]; + + options.services.rkvm = { + enable = mkOption { + default = cfg.server.enable || cfg.client.enable; + defaultText = literalExpression "config.${opt.server.enable} || config.${opt.client.enable}"; + type = types.bool; + description = mdDoc '' + Whether to enable rkvm, a Virtual KVM switch for Linux machines. + ''; + }; + + package = mkPackageOption pkgs "rkvm" { }; + + server = { + enable = mkEnableOption "the rkvm server daemon (input transmitter)"; + + settings = mkOption { + type = types.submodule + { + freeformType = toml.type; + options = { + listen = mkOption { + type = types.str; + default = "0.0.0.0:5258"; + description = mdDoc '' + An internet socket address to listen on, either IPv4 or IPv6. + ''; + }; + + switch-keys = mkOption { + type = types.listOf types.str; + default = [ "left-alt" "left-ctrl" ]; + description = mdDoc '' + A key list specifying a host switch combination. + + _A list of key names is available in <https://github.com/htrefil/rkvm/blob/master/switch-keys.md>._ + ''; + }; + + certificate = mkOption { + type = types.path; + default = "/etc/rkvm/certificate.pem"; + description = mdDoc '' + TLS certificate path. + + ::: {.note} + This should be generated with {command}`rkvm-certificate-gen`. + ::: + ''; + }; + + key = mkOption { + type = types.path; + default = "/etc/rkvm/key.pem"; + description = mdDoc '' + TLS key path. + + ::: {.note} + This should be generated with {command}`rkvm-certificate-gen`. + ::: + ''; + }; + + password = mkOption { + type = types.str; + description = mdDoc '' + Shared secret token to authenticate the client. + Make sure this matches your client's config. + ''; + }; + }; + }; + + default = { }; + description = mdDoc "Structured server daemon configuration"; + }; + }; + + client = { + enable = mkEnableOption "the rkvm client daemon (input receiver)"; + + settings = mkOption { + type = types.submodule + { + freeformType = toml.type; + options = { + server = mkOption { + type = types.str; + example = "192.168.0.123:5258"; + description = mdDoc '' + An RKVM server's internet socket address, either IPv4 or IPv6. + ''; + }; + + certificate = mkOption { + type = types.path; + default = "/etc/rkvm/certificate.pem"; + description = mdDoc '' + TLS ceritficate path. + + ::: {.note} + This should be generated with {command}`rkvm-certificate-gen`. + ::: + ''; + }; + + password = mkOption { + type = types.str; + description = mdDoc '' + Shared secret token to authenticate the client. + Make sure this matches your server's config. + ''; + }; + }; + }; + + default = {}; + description = mdDoc "Structured client daemon configuration"; + }; + }; + + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.services = + let + mkBase = component: { + description = "RKVM ${component}"; + wantedBy = [ "multi-user.target" ]; + after = { + server = [ "network.target" ]; + client = [ "network-online.target" ]; + }.${component}; + wants = { + server = [ ]; + client = [ "network-online.target" ]; + }.${component}; + serviceConfig = { + ExecStart = "${cfg.package}/bin/rkvm-${component} ${toml.generate "rkvm-${component}.toml" cfg.${component}.settings}"; + Restart = "always"; + RestartSec = 5; + Type = "simple"; + }; + }; + in + { + rkvm-server = mkIf cfg.server.enable (mkBase "server"); + rkvm-client = mkIf cfg.client.enable (mkBase "client"); + }; + }; + +} diff --git a/nixos/modules/services/misc/soft-serve.nix b/nixos/modules/services/misc/soft-serve.nix new file mode 100644 index 0000000000000..0f246493880b9 --- /dev/null +++ b/nixos/modules/services/misc/soft-serve.nix @@ -0,0 +1,99 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.soft-serve; + configFile = format.generate "config.yaml" cfg.settings; + format = pkgs.formats.yaml { }; + docUrl = "https://charm.sh/blog/self-hosted-soft-serve/"; + stateDir = "/var/lib/soft-serve"; +in +{ + options = { + services.soft-serve = { + enable = mkEnableOption "Enable soft-serve service"; + + package = mkPackageOption pkgs "soft-serve" { }; + + settings = mkOption { + type = format.type; + default = { }; + description = mdDoc '' + The contents of the configuration file. + + See <${docUrl}>. + ''; + example = literalExpression '' + { + name = "dadada's repos"; + log_format = "text"; + ssh = { + listen_addr = ":23231"; + public_url = "ssh://localhost:23231"; + max_timeout = 30; + idle_timeout = 120; + }; + stats.listen_addr = ":23233"; + } + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + systemd.tmpfiles.rules = [ + # The config file has to be inside the state dir + "L+ ${stateDir}/config.yaml - - - - ${configFile}" + ]; + + systemd.services.soft-serve = { + description = "Soft Serve git server"; + documentation = [ docUrl ]; + requires = [ "network-online.target" ]; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment.SOFT_SERVE_DATA_PATH = stateDir; + + serviceConfig = { + Type = "simple"; + DynamicUser = true; + Restart = "always"; + ExecStart = "${getExe cfg.package} serve"; + StateDirectory = "soft-serve"; + WorkingDirectory = stateDir; + RuntimeDirectory = "soft-serve"; + RuntimeDirectoryMode = "0750"; + ProcSubset = "pid"; + ProtectProc = "invisible"; + UMask = "0027"; + CapabilityBoundingSet = ""; + ProtectHome = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RemoveIPC = true; + PrivateMounts = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@cpu-emulation @debug @keyring @module @mount @obsolete @privileged @raw-io @reboot @setuid @swap" + ]; + }; + }; + }; + + meta.maintainers = [ maintainers.dadada ]; +} diff --git a/nixos/modules/services/misc/spice-autorandr.nix b/nixos/modules/services/misc/spice-autorandr.nix new file mode 100644 index 0000000000000..8437441c752a4 --- /dev/null +++ b/nixos/modules/services/misc/spice-autorandr.nix @@ -0,0 +1,26 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.services.spice-autorandr; +in +{ + options = { + services.spice-autorandr = { + enable = lib.mkEnableOption (lib.mdDoc "spice-autorandr service that will automatically resize display to match SPICE client window size."); + package = lib.mkPackageOptionMD pkgs "spice-autorandr" { }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.user.services.spice-autorandr = { + wantedBy = [ "default.target" ]; + after = [ "spice-vdagentd.service" ]; + serviceConfig = { + ExecStart = "${cfg.package}/bin/spice-autorandr"; + Restart = "on-failure"; + }; + }; + }; +} diff --git a/nixos/modules/services/misc/xmrig.nix b/nixos/modules/services/misc/xmrig.nix index d2aa3df45d53d..05e63c773205a 100644 --- a/nixos/modules/services/misc/xmrig.nix +++ b/nixos/modules/services/misc/xmrig.nix @@ -52,7 +52,7 @@ with lib; }; config = mkIf cfg.enable { - boot.kernelModules = [ "msr" ]; + hardware.cpu.x86.msr.enable = true; systemd.services.xmrig = { wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/knot.nix b/nixos/modules/services/monitoring/prometheus/exporters/knot.nix index a73425b37da71..7758487508033 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/knot.nix +++ b/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/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix new file mode 100644 index 0000000000000..8f4fb0bc78d4e --- /dev/null +++ b/nixos/modules/services/networking/ddclient.nix @@ -0,0 +1,234 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.services.ddclient; + boolToStr = bool: if bool then "yes" else "no"; + dataDir = "/var/lib/ddclient"; + StateDirectory = builtins.baseNameOf dataDir; + RuntimeDirectory = StateDirectory; + + configFile' = pkgs.writeText "ddclient.conf" '' + # This file can be used as a template for configFile or is automatically generated by Nix options. + cache=${dataDir}/ddclient.cache + foreground=YES + use=${cfg.use} + login=${cfg.username} + password=${if cfg.protocol == "nsupdate" then "/run/${RuntimeDirectory}/ddclient.key" else "@password_placeholder@"} + protocol=${cfg.protocol} + ${lib.optionalString (cfg.script != "") "script=${cfg.script}"} + ${lib.optionalString (cfg.server != "") "server=${cfg.server}"} + ${lib.optionalString (cfg.zone != "") "zone=${cfg.zone}"} + ssl=${boolToStr cfg.ssl} + wildcard=YES + quiet=${boolToStr cfg.quiet} + verbose=${boolToStr cfg.verbose} + ${cfg.extraConfig} + ${lib.concatStringsSep "," cfg.domains} + ''; + configFile = if (cfg.configFile != null) then cfg.configFile else configFile'; + + preStart = '' + install --mode=600 --owner=$USER ${configFile} /run/${RuntimeDirectory}/ddclient.conf + ${lib.optionalString (cfg.configFile == null) (if (cfg.protocol == "nsupdate") then '' + install --mode=600 --owner=$USER ${cfg.passwordFile} /run/${RuntimeDirectory}/ddclient.key + '' else if (cfg.passwordFile != null) then '' + "${pkgs.replace-secret}/bin/replace-secret" "@password_placeholder@" "${cfg.passwordFile}" "/run/${RuntimeDirectory}/ddclient.conf" + '' else '' + sed -i '/^password=@password_placeholder@$/d' /run/${RuntimeDirectory}/ddclient.conf + '')} + ''; + +in + +with lib; + +{ + + imports = [ + (mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ] + (config: + let value = getAttrFromPath [ "services" "ddclient" "domain" ] config; + in optional (value != "") value)) + (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "") + (mkRemovedOptionModule [ "services" "ddclient" "password" ] "Use services.ddclient.passwordFile instead.") + (mkRemovedOptionModule [ "services" "ddclient" "ipv6" ] "") + ]; + + ###### interface + + options = { + + services.ddclient = with lib.types; { + + enable = mkOption { + default = false; + type = bool; + description = lib.mdDoc '' + Whether to synchronise your machine's IP address with a dynamic DNS provider (e.g. dyndns.org). + ''; + }; + + package = mkOption { + type = package; + default = pkgs.ddclient; + defaultText = lib.literalExpression "pkgs.ddclient"; + description = lib.mdDoc '' + The ddclient executable package run by the service. + ''; + }; + + domains = mkOption { + default = [ "" ]; + type = listOf str; + description = lib.mdDoc '' + Domain name(s) to synchronize. + ''; + }; + + username = mkOption { + # For `nsupdate` username contains the path to the nsupdate executable + default = lib.optionalString (config.services.ddclient.protocol == "nsupdate") "${pkgs.bind.dnsutils}/bin/nsupdate"; + defaultText = ""; + type = str; + description = lib.mdDoc '' + User name. + ''; + }; + + passwordFile = mkOption { + default = null; + type = nullOr str; + description = lib.mdDoc '' + A file containing the password or a TSIG key in named format when using the nsupdate protocol. + ''; + }; + + interval = mkOption { + default = "10min"; + type = str; + description = lib.mdDoc '' + The interval at which to run the check and update. + See {command}`man 7 systemd.time` for the format. + ''; + }; + + configFile = mkOption { + default = null; + type = nullOr path; + description = lib.mdDoc '' + Path to configuration file. + When set this overrides the generated configuration from module options. + ''; + example = "/root/nixos/secrets/ddclient.conf"; + }; + + protocol = mkOption { + default = "dyndns2"; + type = str; + description = lib.mdDoc '' + Protocol to use with dynamic DNS provider (see https://sourceforge.net/p/ddclient/wiki/protocols). + ''; + }; + + server = mkOption { + default = ""; + type = str; + description = lib.mdDoc '' + Server address. + ''; + }; + + ssl = mkOption { + default = true; + type = bool; + description = lib.mdDoc '' + Whether to use SSL/TLS to connect to dynamic DNS provider. + ''; + }; + + quiet = mkOption { + default = false; + type = bool; + description = lib.mdDoc '' + Print no messages for unnecessary updates. + ''; + }; + + script = mkOption { + default = ""; + type = str; + description = lib.mdDoc '' + script as required by some providers. + ''; + }; + + use = mkOption { + default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '"; + type = str; + description = lib.mdDoc '' + Method to determine the IP address to send to the dynamic DNS provider. + ''; + }; + + verbose = mkOption { + default = false; + type = bool; + description = lib.mdDoc '' + Print verbose information. + ''; + }; + + zone = mkOption { + default = ""; + type = str; + description = lib.mdDoc '' + zone as required by some providers. + ''; + }; + + extraConfig = mkOption { + default = ""; + type = lines; + description = lib.mdDoc '' + Extra configuration. Contents will be added verbatim to the configuration file. + + ::: {.note} + `daemon` should not be added here because it does not work great with the systemd-timer approach the service uses. + ::: + ''; + }; + }; + }; + + + ###### implementation + + config = mkIf config.services.ddclient.enable { + systemd.services.ddclient = { + description = "Dynamic DNS Client"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + restartTriggers = optional (cfg.configFile != null) cfg.configFile; + path = lib.optional (lib.hasPrefix "if," cfg.use) pkgs.iproute2; + + serviceConfig = { + DynamicUser = true; + RuntimeDirectoryMode = "0700"; + inherit RuntimeDirectory; + inherit StateDirectory; + Type = "oneshot"; + ExecStartPre = "!${pkgs.writeShellScript "ddclient-prestart" preStart}"; + ExecStart = "${lib.getExe cfg.package} -file /run/${RuntimeDirectory}/ddclient.conf"; + }; + }; + + systemd.timers.ddclient = { + description = "Run ddclient"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = cfg.interval; + OnUnitInactiveSec = cfg.interval; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 53c847ee3ca28..d32712c8243d7 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.networking.networkmanager; + ini = pkgs.formats.ini { }; delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != [ ]; @@ -379,6 +380,74 @@ in https://modemmanager.org/docs/modemmanager/fcc-unlock/#integration-with-third-party-fcc-unlock-tools. ''; }; + ensureProfiles = { + profiles = with lib.types; mkOption { + type = attrsOf (submodule { + freeformType = ini.type; + + options = { + connection = { + id = lib.mkOption { + type = str; + description = "This is the name that will be displayed by NetworkManager and GUIs."; + }; + type = lib.mkOption { + type = str; + description = "The connection type defines the connection kind, like vpn, wireguard, gsm, wifi and more."; + example = "vpn"; + }; + }; + }; + }); + apply = (lib.filterAttrsRecursive (n: v: v != { })); + default = { }; + example = { + home-wifi = { + connection = { + id = "home-wifi"; + type = "wifi"; + permissions = ""; + }; + wifi = { + mac-address-blacklist = ""; + mode = "infrastructure"; + ssid = "Home Wi-Fi"; + }; + wifi-security = { + auth-alg = "open"; + key-mgmt = "wpa-psk"; + psk = "$HOME_WIFI_PASSWORD"; + }; + ipv4 = { + dns-search = ""; + method = "auto"; + }; + ipv6 = { + addr-gen-mode = "stable-privacy"; + dns-search = ""; + method = "auto"; + }; + }; + }; + description = lib.mdDoc '' + Declaratively define NetworkManager profiles. You can find information about the generated file format [here](https://networkmanager.dev/docs/api/latest/nm-settings-keyfile.html) and [here](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/configuring_and_managing_networking/assembly_networkmanager-connection-profiles-in-keyfile-format_configuring-and-managing-networking). + You current profiles which are most likely stored in `/etc/NetworkManager/system-connections` and there is [a tool](https://github.com/janik-haag/nm2nix) to convert them to the needed nix code. + If you add a new ad-hoc connection via a GUI or nmtui or anything similar it should just work together with the declarative ones. + And if you edit a declarative profile NetworkManager will move it to the persistent storage and treat it like a ad-hoc one, + but there will be two profiles as soon as the systemd unit from this option runs again which can be confusing since NetworkManager tools will start displaying two profiles with the same name and probably a bit different settings depending on what you edited. + A profile won't be deleted even if it's removed from the config until the system reboots because that's when NetworkManager clears it's temp directory. + ''; + }; + environmentFiles = mkOption { + default = []; + type = types.listOf types.path; + example = [ "/run/secrets/network-manager.env" ]; + description = lib.mdDoc '' + Files to load as environment file. Environment variables from this file + will be substituted into the static configuration file using [envsubst](https://github.com/a8m/envsubst). + ''; + }; + }; }; }; @@ -507,6 +576,30 @@ in aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ]; }; + systemd.services.NetworkManager-ensure-profiles = mkIf (cfg.ensureProfiles.profiles != { }) { + description = "Ensure that NetworkManager declarative profiles are created"; + wantedBy = [ "multi-user.target" ]; + before = [ "network-online.target" ]; + script = let + path = id: "/run/NetworkManager/system-connections/${id}.nmconnection"; + in '' + mkdir -p /run/NetworkManager/system-connections + '' + lib.concatMapStringsSep "\n" + (profile: '' + ${pkgs.envsubst}/bin/envsubst -i ${ini.generate (lib.escapeShellArg profile.n) profile.v} > ${path (lib.escapeShellArg profile.n)} + '') (lib.mapAttrsToList (n: v: { inherit n v; }) cfg.ensureProfiles.profiles) + + '' + if systemctl is-active --quiet NetworkManager; then + ${pkgs.networkmanager}/bin/nmcli connection reload + fi + ''; + serviceConfig = { + EnvironmentFile = cfg.ensureProfiles.environmentFiles; + UMask = "0177"; + Type = "oneshot"; + }; + }; + # Turn off NixOS' network management when networking is managed entirely by NetworkManager networking = mkMerge [ (mkIf (!delegateWireless) { diff --git a/nixos/modules/services/networking/rosenpass.nix b/nixos/modules/services/networking/rosenpass.nix new file mode 100644 index 0000000000000..d2a264b83d677 --- /dev/null +++ b/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/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index 7059284850a50..235f29ab8a6a2 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -103,9 +103,9 @@ in }; bantime = mkOption { - default = null; - type = types.nullOr types.str; - example = "10m"; + default = "10m"; + type = types.str; + example = "1h"; description = lib.mdDoc "Number of seconds that a host is banned."; }; diff --git a/nixos/modules/services/security/jitterentropy-rngd.nix b/nixos/modules/services/security/jitterentropy-rngd.nix new file mode 100644 index 0000000000000..7bfacb5ddc5de --- /dev/null +++ b/nixos/modules/services/security/jitterentropy-rngd.nix @@ -0,0 +1,18 @@ +{ lib, config, pkgs, ... }: +let + cfg = config.services.jitterentropy-rngd; +in +{ + options.services.jitterentropy-rngd = { + enable = + lib.mkEnableOption (lib.mdDoc "jitterentropy-rngd service configuration"); + package = lib.mkPackageOptionMD pkgs "jitterentropy-rngd" { }; + }; + + config = lib.mkIf cfg.enable { + systemd.packages = [ cfg.package ]; + systemd.services."jitterentropy".wantedBy = [ "basic.target" ]; + }; + + meta.maintainers = with lib.maintainers; [ thillux ]; +} diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 955d6e19064ef..9eebd18855c77 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -329,7 +329,7 @@ let listenString = { addr, port, ssl, proxyProtocol ? false, extraParameters ? [], ... }: # UDP listener for QUIC transport protocol. (optionalString (ssl && vhost.quic) (" - listen ${addr}:${toString port} quic " + listen ${addr}${optionalString (port != null) ":${toString port}"} quic " + optionalString vhost.default "default_server " + optionalString vhost.reuseport "reuseport " + optionalString (extraParameters != []) (concatStringsSep " " @@ -338,7 +338,7 @@ let in filter isCompatibleParameter extraParameters)) + ";")) + " - listen ${addr}:${toString port} " + listen ${addr}${optionalString (port != null) ":${toString port}"} " + optionalString (ssl && vhost.http2 && oldHTTP2) "http2 " + optionalString ssl "ssl " + optionalString vhost.default "default_server " diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 7636c1b26115f..9db4c8e23025b 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -31,12 +31,15 @@ with lib; options = { addr = mkOption { type = str; - description = lib.mdDoc "IP address."; + description = lib.mdDoc "Listen address."; }; port = mkOption { - type = port; - description = lib.mdDoc "Port number."; - default = 80; + type = types.nullOr port; + 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 { type = bool; @@ -60,6 +63,7 @@ with lib; example = [ { addr = "195.154.1.1"; port = 443; ssl = true; } { addr = "192.154.1.1"; port = 80; } + { addr = "unix:/var/run/nginx.sock"; } ]; description = lib.mdDoc '' Listen addresses and ports for this virtual host. diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 285d0a1819317..fc32870457101 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/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/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix index 1d95742face34..5bf38b6fa200b 100644 --- a/nixos/modules/system/boot/initrd-network.nix +++ b/nixos/modules/system/boot/initrd-network.nix @@ -80,7 +80,7 @@ in }; boot.initrd.network.udhcpc.enable = mkOption { - default = config.networking.useDHCP; + default = config.networking.useDHCP && !config.boot.initrd.systemd.enable; defaultText = "networking.useDHCP"; type = types.bool; description = lib.mdDoc '' diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 64c8ab74bba6a..6f0a62d0ea899 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/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/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index cbb521f0b0377..4be040927540a 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -2985,10 +2985,10 @@ in stage2Config (mkIf config.boot.initrd.systemd.enable { assertions = [{ - assertion = config.boot.initrd.network.udhcpc.extraArgs == []; + assertion = !config.boot.initrd.network.udhcpc.enable && config.boot.initrd.network.udhcpc.extraArgs == []; message = '' - boot.initrd.network.udhcpc.extraArgs is not supported when - boot.initrd.systemd.enable is enabled + systemd stage 1 networking does not support 'boot.initrd.network.udhcpc'. Configure + DHCP with 'networking.*' options or with 'boot.initrd.systemd.network' options. ''; }]; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 8e38072b4c6db..68a8c1f37ed5a 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -575,7 +575,7 @@ in system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET" "SYSFS" "PROC_FS" "FHANDLE" "CRYPTO_USER_API_HASH" "CRYPTO_HMAC" - "CRYPTO_SHA256" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL" + "CRYPTO_SHA256" "DMIID" "AUTOFS_FS" "TMPFS_POSIX_ACL" "TMPFS_XATTR" "SECCOMP" ]; diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 61af2768e2959..175e757cbbb6c 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -358,7 +358,7 @@ in { ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb"; boot.initrd.systemd = { - initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package] ++ config.system.fsPackages; + initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package]; extraBin = { less = "${pkgs.less}/bin/less"; mount = "${cfg.package.util-linux}/bin/mount"; diff --git a/nixos/modules/system/boot/systemd/repart.nix b/nixos/modules/system/boot/systemd/repart.nix index 2431c68ea17b8..5ac2ace56ba02 100644 --- a/nixos/modules/system/boot/systemd/repart.nix +++ b/nixos/modules/system/boot/systemd/repart.nix @@ -74,6 +74,15 @@ in }; config = lib.mkIf (cfg.enable || initrdCfg.enable) { + assertions = [ + { + assertion = initrdCfg.enable -> config.boot.initrd.systemd.enable; + message = '' + 'boot.initrd.systemd.repart.enable' requires 'boot.initrd.systemd.enable' to be enabled. + ''; + } + ]; + boot.initrd.systemd = lib.mkIf initrdCfg.enable { additionalUpstreamUnits = [ "systemd-repart.service" diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix index 82fdd60587106..87fe326c09740 100644 --- a/nixos/modules/tasks/filesystems/btrfs.nix +++ b/nixos/modules/tasks/filesystems/btrfs.nix @@ -52,34 +52,37 @@ in config = mkMerge [ (mkIf enableBtrfs { system.fsPackages = [ pkgs.btrfs-progs ]; + }) - boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" ]; - boot.initrd.availableKernelModules = mkIf inInitrd ( + (mkIf inInitrd { + boot.initrd.kernelModules = [ "btrfs" ]; + boot.initrd.availableKernelModules = [ "crc32c" ] ++ optionals (config.boot.kernelPackages.kernel.kernelAtLeast "5.5") [ # Needed for mounting filesystems with new checksums "xxhash_generic" "blake2b_generic" "sha256_generic" # Should be baked into our kernel, just to be sure - ] - ); + ]; - boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) + boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfs ln -sv btrfs $out/bin/btrfsck ln -sv btrfsck $out/bin/fsck.btrfs ''; - boot.initrd.extraUtilsCommandsTest = mkIf (inInitrd && !config.boot.initrd.systemd.enable) + boot.initrd.extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable) '' $out/bin/btrfs --version ''; - boot.initrd.postDeviceCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) + boot.initrd.postDeviceCommands = mkIf (!config.boot.initrd.systemd.enable) '' btrfs device scan ''; + + boot.initrd.systemd.initrdBin = [ pkgs.btrfs-progs ]; }) (mkIf enableAutoScrub { diff --git a/nixos/modules/tasks/filesystems/cifs.nix b/nixos/modules/tasks/filesystems/cifs.nix index 0de292a692082..837b9e19bfb9d 100644 --- a/nixos/modules/tasks/filesystems/cifs.nix +++ b/nixos/modules/tasks/filesystems/cifs.nix @@ -21,5 +21,7 @@ in copy_bin_and_libs ${pkgs.cifs-utils}/sbin/mount.cifs ''; + boot.initrd.systemd.extraBin."mount.cifs" = mkIf inInitrd "${pkgs.cifs-utils}/sbin/mount.cifs"; + }; } diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix index edc0efc552136..1c34ee2c70356 100644 --- a/nixos/modules/tasks/filesystems/ext.nix +++ b/nixos/modules/tasks/filesystems/ext.nix @@ -25,5 +25,7 @@ in ln -sv e2fsck $out/bin/fsck.ext4 ''; + boot.initrd.systemd.initrdBin = lib.mkIf inInitrd [ pkgs.e2fsprogs ]; + }; } diff --git a/nixos/modules/tasks/filesystems/f2fs.nix b/nixos/modules/tasks/filesystems/f2fs.nix index 035784f43df83..4f99f9a57fa6d 100644 --- a/nixos/modules/tasks/filesystems/f2fs.nix +++ b/nixos/modules/tasks/filesystems/f2fs.nix @@ -16,5 +16,7 @@ in boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/fsck.f2fs ''; + + boot.initrd.systemd.initrdBin = mkIf inInitrd [ pkgs.f2fs-tools ]; }; } diff --git a/nixos/modules/tasks/filesystems/jfs.nix b/nixos/modules/tasks/filesystems/jfs.nix index 6d80c4c657da6..b5132b4caa334 100644 --- a/nixos/modules/tasks/filesystems/jfs.nix +++ b/nixos/modules/tasks/filesystems/jfs.nix @@ -15,5 +15,7 @@ in boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.jfsutils}/sbin/fsck.jfs ''; + + boot.initrd.systemd.initrdBin = mkIf inInitrd [ pkgs.jfsutils ]; }; } diff --git a/nixos/modules/tasks/filesystems/reiserfs.nix b/nixos/modules/tasks/filesystems/reiserfs.nix index 7b017a83db848..3c6a0f0cd917f 100644 --- a/nixos/modules/tasks/filesystems/reiserfs.nix +++ b/nixos/modules/tasks/filesystems/reiserfs.nix @@ -21,5 +21,7 @@ in ln -s reiserfsck $out/bin/fsck.reiserfs ''; + boot.initrd.systemd.initrdBin = mkIf inInitrd [ pkgs.reiserfsprogs ]; + }; } diff --git a/nixos/modules/tasks/filesystems/vfat.nix b/nixos/modules/tasks/filesystems/vfat.nix index 5421b617b43b9..e535e97759b22 100644 --- a/nixos/modules/tasks/filesystems/vfat.nix +++ b/nixos/modules/tasks/filesystems/vfat.nix @@ -21,5 +21,7 @@ in ln -sv dosfsck $out/bin/fsck.vfat ''; + boot.initrd.systemd.extraBin = mkIf inInitrd [ pkgs.dosfstools ]; + }; } diff --git a/nixos/modules/tasks/filesystems/xfs.nix b/nixos/modules/tasks/filesystems/xfs.nix index f81f586465519..76f31e660ad3d 100644 --- a/nixos/modules/tasks/filesystems/xfs.nix +++ b/nixos/modules/tasks/filesystems/xfs.nix @@ -26,5 +26,7 @@ in '' sed -i -e 's,^#!.*,#!'$out/bin/sh, $out/bin/fsck.xfs ''; + + boot.initrd.systemd.initrdBin = mkIf inInitrd [ pkgs.xfsprogs.bin ]; }; } diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 5cf863c87f27c..082634ec9d010 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -90,12 +90,17 @@ let getPoolMounts = prefix: pool: let + poolFSes = getPoolFilesystems pool; + # Remove the "/" suffix because even though most mountpoints # won't have it, the "/" mountpoint will, and we can't have the # trailing slash in "/sysroot/" in stage 1. mountPoint = fs: escapeSystemdPath (prefix + (lib.removeSuffix "/" fs.mountPoint)); + + hasUsr = lib.any (fs: fs.mountPoint == "/usr") poolFSes; in - map (x: "${mountPoint x}.mount") (getPoolFilesystems pool); + map (x: "${mountPoint x}.mount") poolFSes + ++ lib.optional hasUsr "sysusr-usr.mount"; getKeyLocations = pool: if isBool cfgZfs.requestEncryptionCredentials then { hasKeys = cfgZfs.requestEncryptionCredentials; @@ -632,7 +637,8 @@ in targets.zfs-import.wantedBy = [ "zfs.target" ]; targets.zfs.wantedBy = [ "initrd.target" ]; extraBin = { - # zpool and zfs are already in thanks to fsPackages + zpool = "${cfgZfs.package}/sbin/zpool"; + zfs = "${cfgZfs.package}/sbin/zfs"; awk = "${pkgs.gawk}/bin/awk"; }; }; diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index c40c7bee18866..61d7c4cb73fe6 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/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,9 +63,26 @@ 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} - ln -fs "$1/init" /sbin/init + ${pkgs.coreutils}/bin/ln -fs "$1/init" /sbin/init ''; systemd.additionalUpstreamSystemUnits = lib.mkIf cfg.nestedContainer ["systemd-udev-trigger.service"]; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index e0004df6f6b2f..55d23b6fb8b5d 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/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"} @@ -267,6 +300,7 @@ let }; storeImage = import ../../lib/make-disk-image.nix { + name = "nix-store-image"; inherit pkgs config lib; additionalPaths = [ regInfo ]; format = "qcow2"; @@ -862,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; @@ -1027,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 ]; @@ -1098,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/nixos/release-combined.nix b/nixos/release-combined.nix index 6c5c98afa4d02..149a924de4d09 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -79,6 +79,7 @@ in rec { (onFullSupported "nixos.tests.firewall") (onFullSupported "nixos.tests.fontconfig-default-fonts") + (onFullSupported "nixos.tests.gitlab") (onFullSupported "nixos.tests.gnome") (onFullSupported "nixos.tests.gnome-xorg") (onSystems ["x86_64-linux"] "nixos.tests.hibernate") @@ -96,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") @@ -162,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/nixos/release.nix b/nixos/release.nix index abaa7ef9a7113..60f4cc94399c5 100644 --- a/nixos/release.nix +++ b/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/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 33f8abf6ccd44..89e850d573762 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -272,6 +272,7 @@ in { fail2ban = handleTest ./fail2ban.nix { }; fakeroute = handleTest ./fakeroute.nix {}; fancontrol = handleTest ./fancontrol.nix {}; + fanout = handleTest ./fanout.nix {}; fcitx5 = handleTest ./fcitx5 {}; fenics = handleTest ./fenics.nix {}; ferm = handleTest ./ferm.nix {}; @@ -559,6 +560,7 @@ in { nginx-sso = handleTest ./nginx-sso.nix {}; nginx-status-page = handleTest ./nginx-status-page.nix {}; nginx-tmpdir = handleTest ./nginx-tmpdir.nix {}; + nginx-unix-socket = handleTest ./nginx-unix-socket.nix {}; nginx-variants = handleTest ./nginx-variants.nix {}; nifi = handleTestOn ["x86_64-linux"] ./web-apps/nifi.nix {}; nitter = handleTest ./nitter.nix {}; @@ -567,7 +569,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 {}; @@ -697,8 +700,10 @@ in { restartByActivationScript = handleTest ./restart-by-activation-script.nix {}; restic = handleTest ./restic.nix {}; retroarch = handleTest ./retroarch.nix {}; + 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 {}; @@ -732,6 +737,7 @@ in { snapper = handleTest ./snapper.nix {}; snipe-it = runTest ./web-apps/snipe-it.nix; soapui = handleTest ./soapui.nix {}; + soft-serve = handleTest ./soft-serve.nix {}; sogo = handleTest ./sogo.nix {}; solanum = handleTest ./solanum.nix {}; sonarr = handleTest ./sonarr.nix {}; diff --git a/nixos/tests/cockpit.nix b/nixos/tests/cockpit.nix index 6f86d1e2c464c..e7165b9790141 100644 --- a/nixos/tests/cockpit.nix +++ b/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/nixos/tests/fanout.nix b/nixos/tests/fanout.nix new file mode 100644 index 0000000000000..c36d34dcce0be --- /dev/null +++ b/nixos/tests/fanout.nix @@ -0,0 +1,30 @@ +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../.. { inherit system config; } +}: +import ./make-test-python.nix ({lib, pkgs, ...}: { + name = "fanout"; + meta.maintainers = [ lib.maintainers.therishidesai ]; + + nodes = let + cfg = { ... }: { + services.fanout = { + enable = true; + fanoutDevices = 2; + bufferSize = 8192; + }; + }; + in { + machine = cfg; + }; + + testScript = '' + start_all() + + # mDNS. + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -c /dev/fanout0") + machine.succeed("test -c /dev/fanout1") + ''; +}) diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 3f9cea6662fbe..fbea95dc75235 100644 --- a/nixos/tests/firefox.nix +++ b/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/nixos/tests/hadoop/hadoop.nix b/nixos/tests/hadoop/hadoop.nix index b132f4fa58b01..0de2366b1864c 100644 --- a/nixos/tests/hadoop/hadoop.nix +++ b/nixos/tests/hadoop/hadoop.nix @@ -249,7 +249,7 @@ import ../make-test-python.nix ({ package, ... }: { assert "standby" in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") - assert "Estimated value of Pi is" in client.succeed("HADOOP_USER_NAME=hdfs yarn jar $(readlink $(which yarn) | sed -r 's~bin/yarn~lib/hadoop-*/share/hadoop/mapreduce/hadoop-mapreduce-examples-*.jar~g') pi 2 10") + assert "Estimated value of Pi is" in client.succeed("HADOOP_USER_NAME=hdfs yarn jar $(readlink $(which yarn) | sed -r 's~bin/yarn~share/hadoop/mapreduce/hadoop-mapreduce-examples-*.jar~g') pi 2 10") assert "SUCCEEDED" in client.succeed("yarn application -list -appStates FINISHED") ''; }) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 3268a16967d75..9ff1d8f5d039e 100644 --- a/nixos/tests/installer.nix +++ b/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,17 +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/nixos/tests/lxd/container.nix b/nixos/tests/lxd/container.nix index bdaaebfc00281..0ebe73d872f2b 100644 --- a/nixos/tests/lxd/container.nix +++ b/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/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix index 8eca4f2592251..c0980b23e78fd 100644 --- a/nixos/tests/mosquitto.nix +++ b/nixos/tests/mosquitto.nix @@ -4,7 +4,6 @@ let port = 1888; tlsPort = 1889; anonPort = 1890; - bindTestPort = 18910; password = "VERY_secret"; hashedPassword = "$7$101$/WJc4Mp+I+uYE9sR$o7z9rD1EYXHPwEP5GqQj6A7k4W1yVbePlb8TqNcuOLV9WNCiDgwHOB0JHC1WCtdkssqTBduBNUnUGd6kmZvDSw=="; topic = "test/foo"; @@ -127,10 +126,6 @@ in { }; }; } - { - settings.bind_interface = "eth0"; - port = bindTestPort; - } ]; }; }; @@ -140,8 +135,6 @@ in { }; testScript = '' - import json - def mosquitto_cmd(binary, user, topic, port): return ( "mosquitto_{} " @@ -174,27 +167,6 @@ in { start_all() server.wait_for_unit("mosquitto.service") - with subtest("bind_interface"): - addrs = dict() - for iface in json.loads(server.succeed("ip -json address show")): - for addr in iface['addr_info']: - # don't want to deal with multihoming here - assert addr['local'] not in addrs - addrs[addr['local']] = (iface['ifname'], addr['family']) - - # mosquitto grabs *one* random address per type for bind_interface - (has4, has6) = (False, False) - for line in server.succeed("ss -HlptnO sport = ${toString bindTestPort}").splitlines(): - items = line.split() - if "mosquitto" not in items[5]: continue - listener = items[3].rsplit(':', maxsplit=1)[0].strip('[]') - assert listener in addrs - assert addrs[listener][0] == "eth0" - has4 |= addrs[listener][1] == 'inet' - has6 |= addrs[listener][1] == 'inet6' - assert has4 - assert has6 - with subtest("check passwords"): client1.succeed(publish("-m test", "password_store")) client1.succeed(publish("-m test", "password_file")) diff --git a/nixos/tests/nginx-unix-socket.nix b/nixos/tests/nginx-unix-socket.nix new file mode 100644 index 0000000000000..4640eaa171bdf --- /dev/null +++ b/nixos/tests/nginx-unix-socket.nix @@ -0,0 +1,27 @@ +import ./make-test-python.nix ({ pkgs, ... }: +let + nginxSocketPath = "/var/run/nginx/test.sock"; +in +{ + name = "nginx-unix-socket"; + + nodes = { + webserver = { pkgs, lib, ... }: { + services.nginx = { + enable = true; + virtualHosts.localhost = { + serverName = "localhost"; + listen = [{ addr = "unix:${nginxSocketPath}"; }]; + locations."/test".return = "200 'foo'"; + }; + }; + }; + }; + + testScript = '' + webserver.wait_for_unit("nginx") + webserver.wait_for_open_unix_socket("${nginxSocketPath}") + + webserver.succeed("curl --fail --silent --unix-socket '${nginxSocketPath}' http://localhost/test | grep '^foo$'") + ''; +}) diff --git a/nixos/tests/nixos-rebuild-install-bootloader.nix b/nixos/tests/nixos-rebuild-install-bootloader.nix new file mode 100644 index 0000000000000..3ade90ea24a74 --- /dev/null +++ b/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/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 8369d6a497ac1..d42a9e3039962 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -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/nixos/tests/rkvm/cert.pem b/nixos/tests/rkvm/cert.pem new file mode 100644 index 0000000000000..933efe520578b --- /dev/null +++ b/nixos/tests/rkvm/cert.pem @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC3jCCAcagAwIBAgIUWW1hb9xdRtxAhA42jkS89goW9LUwDQYJKoZIhvcNAQEL +BQAwDzENMAsGA1UEAwwEcmt2bTAeFw0yMzA4MjIxOTI1NDlaFw0zMzA4MTkxOTI1 +NDlaMA8xDTALBgNVBAMMBHJrdm0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQCuBsh0+LDXN4b2o/PJjzuiZ9Yv9Pz1Oho9WRiXtNIuHTRdBCcht/iu3PGF +ICIX+H3dqQOziGSCTAQGJD2p+1ik8d+boJbpa0oxXuHuomsMAT3mib3GpipQoBLP +KaEbWEsvQbr3RMx8WOtG4dmRQFzSVVtmAXyM0pNyisd4eUCplyIl9gsRJIvsO/0M +OkgOZW9XLfKiAWlZoyXEkBmPAshg3EkwQtmwxPA/NgWbAOW3zJKSChxnnGYiuIIu +R/wJ8OQXHP6boQLQGUhCWBKa1uK1gEBmV3Pj6uK8RzTkQq6/47F5sPa6VfqQYdyl +TCs9bSqHXZjqMBoiSp22uH6+Lh9RAgMBAAGjMjAwMA8GA1UdEQQIMAaHBAoAAAEw +HQYDVR0OBBYEFEh9HEsnY3dfNKVyPWDbwfR0qHopMA0GCSqGSIb3DQEBCwUAA4IB +AQB/r+K20JqegUZ/kepPxIU95YY81aUUoxvLbu4EAgh8o46Fgm75qrTZPg4TaIZa +wtVejekrF+p3QVf0ErUblh/iCjTZPSzCmKHZt8cc9OwTH7bt3bx7heknzLDyIa5z +szAL+6241UggQ5n5NUGn5+xZHA7TMe47xAZPaRMlCQ/tp5pWFjH6WSSQSP5t4Ag9 +ObhY+uudFjmWi3QIBTr3iIscbWx7tD8cjus7PzM7+kszSDRV04xb6Ox8JzW9MKIN +GwgwVgs3zCuyqBmTGnR1og3aMk6VtlyZUYE78uuc+fMBxqoBZ0mykeOp0Tbzgtf7 +gPkYcQ6vonoQhuTXYj/NrY+b +-----END CERTIFICATE----- diff --git a/nixos/tests/rkvm/default.nix b/nixos/tests/rkvm/default.nix new file mode 100644 index 0000000000000..22425948d8bf9 --- /dev/null +++ b/nixos/tests/rkvm/default.nix @@ -0,0 +1,104 @@ +import ../make-test-python.nix ({ pkgs, ... }: +let + # Generated with + # + # nix shell .#rkvm --command "rkvm-certificate-gen --ip-addresses 10.0.0.1 cert.pem key.pem" + # + snakeoil-cert = ./cert.pem; + snakeoil-key = ./key.pem; +in +{ + name = "rkvm"; + + nodes = { + server = { pkgs, ... }: { + imports = [ ../common/user-account.nix ]; + + virtualisation.vlans = [ 1 ]; + + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + }; + + systemd.network.networks."01-eth1" = { + name = "eth1"; + networkConfig.Address = "10.0.0.1/24"; + }; + + services.getty.autologinUser = "alice"; + + services.rkvm.server = { + enable = true; + settings = { + certificate = snakeoil-cert; + key = snakeoil-key; + password = "snakeoil"; + switch-keys = [ "left-alt" "right-alt" ]; + }; + }; + }; + + client = { pkgs, ... }: { + imports = [ ../common/user-account.nix ]; + + virtualisation.vlans = [ 1 ]; + + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + }; + + systemd.network.networks."01-eth1" = { + name = "eth1"; + networkConfig.Address = "10.0.0.2/24"; + }; + + services.getty.autologinUser = "alice"; + + services.rkvm.client = { + enable = true; + settings = { + server = "10.0.0.1:5258"; + certificate = snakeoil-cert; + key = snakeoil-key; + password = "snakeoil"; + }; + }; + }; + }; + + testScript = '' + server.wait_for_unit("getty@tty1.service") + server.wait_until_succeeds("pgrep -f 'agetty.*tty1'") + server.wait_for_unit("rkvm-server") + server.wait_for_open_port(5258) + + client.wait_for_unit("getty@tty1.service") + client.wait_until_succeeds("pgrep -f 'agetty.*tty1'") + client.wait_for_unit("rkvm-client") + + server.sleep(1) + + # Switch to client + server.send_key("alt-alt_r", delay=0.2) + server.send_chars("echo 'hello client' > /tmp/test.txt\n") + + # Switch to server + server.send_key("alt-alt_r", delay=0.2) + server.send_chars("echo 'hello server' > /tmp/test.txt\n") + + server.sleep(1) + + client.systemctl("stop rkvm-client.service") + server.systemctl("stop rkvm-server.service") + + server_file = server.succeed("cat /tmp/test.txt") + assert server_file.strip() == "hello server" + + client_file = client.succeed("cat /tmp/test.txt") + assert client_file.strip() == "hello client" + ''; +}) diff --git a/nixos/tests/rkvm/key.pem b/nixos/tests/rkvm/key.pem new file mode 100644 index 0000000000000..7197decff8d3d --- /dev/null +++ b/nixos/tests/rkvm/key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCuBsh0+LDXN4b2 +o/PJjzuiZ9Yv9Pz1Oho9WRiXtNIuHTRdBCcht/iu3PGFICIX+H3dqQOziGSCTAQG +JD2p+1ik8d+boJbpa0oxXuHuomsMAT3mib3GpipQoBLPKaEbWEsvQbr3RMx8WOtG +4dmRQFzSVVtmAXyM0pNyisd4eUCplyIl9gsRJIvsO/0MOkgOZW9XLfKiAWlZoyXE +kBmPAshg3EkwQtmwxPA/NgWbAOW3zJKSChxnnGYiuIIuR/wJ8OQXHP6boQLQGUhC +WBKa1uK1gEBmV3Pj6uK8RzTkQq6/47F5sPa6VfqQYdylTCs9bSqHXZjqMBoiSp22 +uH6+Lh9RAgMBAAECggEABo2V1dBu5E51zsAiFCMdypdLZEyUNphvWC5h3oXowONz +pH8ICYfXyEnkma/kk2+ALy0dSRDn6/94dVIUX7Fpx0hJCcoJyhSysK+TJWfIonqX +ffYOMeFG8vicIgs+GFKs/hoPtB5LREbFkUqRj/EoWE6Y3aX3roaCwTZC8vaUk0OK +54gExcNXRwQtFmfM9BiPT76F2J641NVsddgKumrryMi605CgZ57OFfSYEena6T3t +JbQ1TKB3SH1LvSQIspyp56E3bjh8bcwSh72g88YxWZI9yarOesmyU+fXnmVqcBc+ +CiJDX3Te1C2GIkBiH3HZJo4P88aXrkJ7J8nub/812QKBgQDfCHjBy5uWzzbDnqZc +cllIyUqMHq1iY2/btdZQbz83maZhQhH2UL4Zvoa7qgMX7Ou5jn1xpDaMeXNaajGK +Fz66nmqQEUFX1i+2md2J8TeKD37yUJRdlrMiAc+RNp5wiOH9EI18g2m6h/nj3s/P +MdNyxsz+wqOiJT0sZatarKiFhQKBgQDHv+lPy4OPH1MeSv5vmv3Pa41O/CeiPy+T +gi6nEZayVRVog3zF9T6gNIHrZ1fdIppWPiPXv9fmC3s/IVEftLG6YC+MAfigYhiz +Iceoal0iJJ8DglzOhlKgHEnxEwENCz8aJxjpvbxHHcpvgXdBSEVfHvVqDkAFTsvF +JA5YTmqGXQKBgQCL6uqm2S7gq1o12p+PO4VbrjwAL3aiVLNl6Gtsxn2oSdIhDavr +FLhNukMYFA4gwlcXb5au5k/6TG7bd+dgNDj8Jkm/27NcgVgpe9mJojQvfo0rQvXw +yIvUd8JZ3SQEgTsU4X+Bb4eyp39TPwKrfxyh0qnj4QN6w1XfNmELX2nRaQKBgEq6 +a0ik9JTovSnKGKIcM/QTYow4HYO/a8cdnuJ13BDfb+DnwBg3BbTdr/UndmGOfnrh +SHuAk/7GMNePWVApQ4xcS61vV1p5GJB7hLxm/my1kp+3d4z0B5lKvAbqeywsFvFr +yxA3IWbhqEhLARh1Ny684EdLCXxy3Bzmvk8fFw8pAoGAGkt9pJC2wkk9fnJIHq+f +h/WnEO0YrGzYnVA+RyCNKrimRd+GylGHJ/Ev6PRZvMwyGE7RCB+fHVrrEcEJAcxL +SaOg5NA8cwrG+UpTQqi4gt6tCW87afVCyL6dC/E8giJlzI0LY9DnFGoVqYL0qJvm +Sj4SU0fyLsW/csOLd5T+Bf8= +-----END PRIVATE KEY----- diff --git a/nixos/tests/rosenpass.nix b/nixos/tests/rosenpass.nix new file mode 100644 index 0000000000000..ec4046c8c035b --- /dev/null +++ b/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/nixos/tests/soft-serve.nix b/nixos/tests/soft-serve.nix new file mode 100644 index 0000000000000..1c4cb4c95819e --- /dev/null +++ b/nixos/tests/soft-serve.nix @@ -0,0 +1,102 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: +let + inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; + sshPort = 8231; + httpPort = 8232; + statsPort = 8233; + gitPort = 8418; +in +{ + name = "soft-serve"; + meta.maintainers = with lib.maintainers; [ dadada ]; + nodes = { + client = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ + curl + git + openssh + ]; + environment.etc.sshKey = { + source = snakeOilPrivateKey; + mode = "0600"; + }; + }; + + server = + { config, ... }: + { + services.soft-serve = { + enable = true; + settings = { + name = "TestServer"; + ssh.listen_addr = ":${toString sshPort}"; + git.listen_addr = ":${toString gitPort}"; + http.listen_addr = ":${toString httpPort}"; + stats.listen_addr = ":${toString statsPort}"; + initial_admin_keys = [ snakeOilPublicKey ]; + }; + }; + networking.firewall.allowedTCPPorts = [ sshPort httpPort statsPort ]; + }; + }; + + testScript = + { ... }: + '' + SSH_PORT = ${toString sshPort} + HTTP_PORT = ${toString httpPort} + STATS_PORT = ${toString statsPort} + KEY = "${snakeOilPublicKey}" + SSH_KEY = "/etc/sshKey" + SSH_COMMAND = f"ssh -p {SSH_PORT} -i {SSH_KEY} -o StrictHostKeyChecking=no" + TEST_DIR = "/tmp/test" + GIT = f"git -C {TEST_DIR}" + + for machine in client, server: + machine.wait_for_unit("network.target") + + server.wait_for_unit("soft-serve.service") + server.wait_for_open_port(SSH_PORT) + + with subtest("Get info"): + status, test = client.execute(f"{SSH_COMMAND} server info") + if status != 0: + raise Exception("Failed to get SSH info") + key = " ".join(KEY.split(" ")[0:2]) + if not key in test: + raise Exception("Admin key must be configured correctly") + + with subtest("Create user"): + client.succeed(f"{SSH_COMMAND} server user create beatrice") + client.succeed(f"{SSH_COMMAND} server user info beatrice") + + with subtest("Create repo"): + client.succeed(f"git init {TEST_DIR}") + client.succeed(f"{GIT} config --global user.email you@example.com") + client.succeed(f"touch {TEST_DIR}/foo") + client.succeed(f"{GIT} add foo") + client.succeed(f"{GIT} commit --allow-empty -m test") + client.succeed(f"{GIT} remote add origin git@server:test") + client.succeed(f"GIT_SSH_COMMAND='{SSH_COMMAND}' {GIT} push -u origin master") + client.execute("rm -r /tmp/test") + + server.wait_for_open_port(HTTP_PORT) + + with subtest("Clone over HTTP"): + client.succeed(f"curl --connect-timeout 10 http://server:{HTTP_PORT}/") + client.succeed(f"git clone http://server:{HTTP_PORT}/test /tmp/test") + client.execute("rm -r /tmp/test") + + with subtest("Clone over SSH"): + client.succeed(f"GIT_SSH_COMMAND='{SSH_COMMAND}' git clone git@server:test /tmp/test") + client.execute("rm -r /tmp/test") + + with subtest("Get stats over HTTP"): + server.wait_for_open_port(STATS_PORT) + status, test = client.execute(f"curl --connect-timeout 10 http://server:{STATS_PORT}/metrics") + if status != 0: + raise Exception("Failed to get metrics from status port") + if not "go_gc_duration_seconds_count" in test: + raise Exception("Metrics did not contain key 'go_gc_duration_seconds_count'") + ''; +}) diff --git a/nixos/tests/systemd-credentials-tpm2.nix b/nixos/tests/systemd-credentials-tpm2.nix index d2dc1fd7b615b..bf74183122368 100644 --- a/nixos/tests/systemd-credentials-tpm2.nix +++ b/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/nixos/tests/systemd-cryptenroll.nix b/nixos/tests/systemd-cryptenroll.nix index 055ae7d1681f2..034aae1d5e955 100644 --- a/nixos/tests/systemd-cryptenroll.nix +++ b/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/nixos/tests/systemd-initrd-luks-tpm2.nix b/nixos/tests/systemd-initrd-luks-tpm2.nix index d9dd9118a3a24..e292acfd1c5f9 100644 --- a/nixos/tests/systemd-initrd-luks-tpm2.nix +++ b/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/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index 5fb7ba53ad844..1a39cc73c8868 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -76,6 +76,17 @@ import ./make-test-python.nix ({ pkgs, ... }: { # wait for user services machine.wait_for_unit("default.target", "alice") + with subtest("systemctl edit suggests --runtime"): + # --runtime is suggested when using `systemctl edit` + ret, out = machine.execute("systemctl edit testservice1.service 2>&1") + assert ret == 1 + assert out.rstrip("\n") == "The unit-directory '/etc/systemd/system' is read-only on NixOS, so it's not possible to edit system-units directly. Use 'systemctl edit --runtime' instead." + # editing w/o `--runtime` is possible for user-services, however + # it's not possible because we're not in a tty when grepping + # (i.e. hacky way to ensure that the error from above doesn't appear here). + _, out = machine.execute("systemctl --user edit testservice2.service 2>&1") + assert out.rstrip("\n") == "Cannot edit units if not on a tty." + # Regression test for https://github.com/NixOS/nixpkgs/issues/105049 with subtest("systemd reads timezone database in /etc/zoneinfo"): timer = machine.succeed("TZ=UTC systemctl show --property=TimersCalendar oncalendar-test.timer") diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 800f5e43cd15c..3454fbaf78fe5 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -113,8 +113,6 @@ let }; testScript = '' - # TODO: Remove this when upgrading stable to zfs 2.2.0 - unstable = ${if enableUnstable then "True" else "False"}; machine.wait_for_unit("multi-user.target") machine.succeed( "zpool status", @@ -136,8 +134,6 @@ let machine.crash() machine.wait_for_unit("multi-user.target") machine.succeed("zfs set sharesmb=on rpool/shared_smb") - if not unstable: - machine.succeed("zfs share rpool/shared_smb") machine.succeed( "smbclient -gNL localhost | grep rpool_shared_smb", "umount /tmp/mnt", diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 88956a190c4a4..3d3589de5485c 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; + postPatch = '' + # U was removed in python 3.11 because it had no effect + substituteInPlace waflib/*.py \ + --replace "m='rU" "m='r" + ''; + meta = with lib; { description = "An LV2 port of the internal modules found in Alsa Modular Synth"; homepage = "https://github.com/blablack/ams-lv2"; diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix index 679062fccf201..fcfafbdb4bbfc 100644 --- a/pkgs/applications/audio/mamba/default.nix +++ b/pkgs/applications/audio/mamba/default.nix @@ -37,5 +37,8 @@ stdenv.mkDerivation rec { license = licenses.bsd0; maintainers = with maintainers; [ magnetophon orivej ]; platforms = platforms.linux; + # 2023-08-19, `-Werror=format-security` fails for xputty + # reported as https://github.com/brummer10/libxputty/issues/12 + broken = true; }; } diff --git a/pkgs/applications/audio/mbrola/default.nix b/pkgs/applications/audio/mbrola/default.nix index afe3961bfa479..6cc20269dcf31 100644 --- a/pkgs/applications/audio/mbrola/default.nix +++ b/pkgs/applications/audio/mbrola/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvNoCC, lib, symlinkJoin, fetchFromGitHub }: +{ stdenv, lib, fetchFromGitHub, runCommandLocal }: let pname = "mbrola"; @@ -12,26 +12,14 @@ let homepage = "https://github.com/numediart/MBROLA"; }; - voices = stdenvNoCC.mkDerivation { - pname = "${pname}-voices"; - inherit version; - - src = fetchFromGitHub { - owner = "numediart"; - repo = "MBROLA-voices"; - rev = "fe05a0ccef6a941207fd6aaad0b31294a1f93a51"; # using latest commit - sha256 = "1w0y2xjp9rndwdjagp2wxh656mdm3d6w9cs411g27rjyfy1205a0"; - }; - - dontBuild = true; - installPhase = '' - runHook preInstall - install -d $out/share/mbrola/voices - cp -R $src/data/* $out/share/mbrola/voices/ - runHook postInstall - ''; - dontFixup = true; + # Very big (0.65 G) so kept as a fixed-output derivation to limit "duplicates". + voices = fetchFromGitHub { + owner = "numediart"; + repo = "MBROLA-voices"; + rev = "fe05a0ccef6a941207fd6aaad0b31294a1f93a51"; # using latest commit + sha256 = "1w0y2xjp9rndwdjagp2wxh656mdm3d6w9cs411g27rjyfy1205a0"; + name = "${pname}-voices-${version}"; meta = meta // { description = "Speech synthesizer based on the concatenation of diphones (voice files)"; homepage = "https://github.com/numediart/MBROLA-voices"; @@ -65,8 +53,14 @@ let }; in -symlinkJoin { - inherit pname version meta; - name = "${pname}-${version}"; - paths = [ bin voices ]; -} + runCommandLocal + "${pname}-${version}" + { + inherit pname version meta; + } + '' + mkdir -p "$out/share/mbrola" + ln -s '${voices}/data' "$out/share/mbrola/voices" + ln -s '${bin}/bin' "$out/" + '' + diff --git a/pkgs/applications/audio/soundwireserver/default.nix b/pkgs/applications/audio/soundwireserver/default.nix index b296ebdad602a..b296ebdad602a 100755..100644 --- a/pkgs/applications/audio/soundwireserver/default.nix +++ b/pkgs/applications/audio/soundwireserver/default.nix diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 239d032682458..16b3e7bdd5de4 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/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/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index 82a5220d7dda2..3d6917b58dfe7 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/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/pkgs/applications/blockchains/atomic-swap/default.nix b/pkgs/applications/blockchains/atomic-swap/default.nix index 45909b6b46952..ed5869f2fc495 100644 --- a/pkgs/applications/blockchains/atomic-swap/default.nix +++ b/pkgs/applications/blockchains/atomic-swap/default.nix @@ -1,7 +1,9 @@ -{ lib, buildGoModule, fetchFromGitHub, nix-update-script, makeWrapper, monero-cli }: +{ lib, buildGo120Module, fetchFromGitHub, nix-update-script, makeWrapper, monero-cli }: + let pname = "atomic-swap"; version = "0.4.2"; + buildGoModule = buildGo120Module; in buildGoModule { inherit pname version; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 2d778a059f28c..9311ba4c544c5 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/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/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix index 080cc4b5c108f..000c1ace4a4ce 100644 --- a/pkgs/applications/blockchains/snarkos/default.nix +++ b/pkgs/applications/blockchains/snarkos/default.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "snarkos"; - version = "2.1.7"; + version = "2.2.1"; src = fetchFromGitHub { owner = "AleoHQ"; repo = "snarkOS"; rev = "v${version}"; - sha256 = "sha256-kW41SNbl2vckgUth+BZ6/aM03aT6MFeY4Hwi9OVWtTI="; + sha256 = "sha256-vEoEnjVjxVnjZ3Lya1qO2kOypNu07aYSlrSya5NJZzs="; }; - cargoHash = "sha256-znEAb4q9H0Doc+XYCf27hV/z2t74kjQUffl/aJzW6tI="; + cargoHash = "sha256-CVHvBqfcTqWBtLFcEcs9y/LmQ4gXjX+dfqqZSxN+33A="; # buildAndTestSubdir = "cli"; diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index c56e6da52f0f3..e5f8963e921c6 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "23.4.2"; + version = "23.10.1"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-+dcogzj0mENWSAVKqUG/xyF+TD/nKpA3UiNyI2M7iiCaW+tpwO5Y0uUmzb1rFRtDsKMflDPZNWe8qMJmrtaIrA=="; - x86_64-linux = "sha512-8UyPa3hDmALiYGao451ZBQLxv9H9OLbzzHiANp4zgvjBLGNhZnPFBIYM6KGyKkgRJJiTcgd7VHCgEhPpfm0qzg=="; + aarch64-linux = "sha512-MR9BYg6R+Oof3zh02KSh48V2m6J7JpsrYpi6gj5kTvKuCU5Ci5AwPEAvnTjHAR6xlappvoNQmeA5nCEoTWaL7A=="; + x86_64-linux = "sha512-BqdfhYLG4z+9B7KbJGWGPml7U2fl/RQ1nZK0vdeA/cKhG0SjH0K8er9bemg60RPBXj0AeuK80v/6vMbDtyEnRQ=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index c9fc93be049ec..467d51df9d427 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/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/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 8a0b0558e111c..2e3016f1a73fc 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/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/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index ae7eb76ee7193..2ddd3e0bda3f4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -5,7 +5,6 @@ , substituteAll , acm , markdown-mode -, posframe , git , go , gopls @@ -17,23 +16,25 @@ }: let - rev = "6f93deb32ebb3799dfedd896a17a0428a9b461bb"; + rev = "0b30d95c6de95b150d93ecee325b95e04ff09e46"; python = python3.withPackages (ps: with ps; [ epc orjson + paramiko + rapidfuzz sexpdata six ]); in melpaBuild { pname = "lsp-bridge"; - version = "20230607.135"; # 1:35 UTC + version = "20231021.309"; # 3:09 UTC src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-4AKKsU+yuLA9qv6mhYPpjBJ8wrbGPMuzN98JXcVPAHg="; + hash = "sha256-hR7bZh0ElJ8F9ToJ4dkazF19T8PE01MTcxKrjeaEp4o="; }; commit = rev; @@ -50,7 +51,6 @@ melpaBuild { packageRequires = [ acm markdown-mode - posframe ]; checkInputs = [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/hardcode-dependencies.patch b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/hardcode-dependencies.patch index 765a6c7177705..2fa57207ec38a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/hardcode-dependencies.patch +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/hardcode-dependencies.patch @@ -1,18 +1,24 @@ diff --git a/lsp-bridge.el b/lsp-bridge.el -index 3a7ff0b..ea5e496 100644 +index 278c27e..f0c67c2 100644 --- a/lsp-bridge.el +++ b/lsp-bridge.el -@@ -326,13 +326,7 @@ Setting this to nil or 0 will turn off the indicator." +@@ -340,19 +340,7 @@ Setting this to nil or 0 will turn off the indicator." "Name of LSP-Bridge buffer." :type 'string) -(defcustom lsp-bridge-python-command (cond ((memq system-type '(cygwin windows-nt ms-dos)) -- (if (executable-find "pypy3.exe") -- "pypy3.exe" -- "python3.exe")) -- (t (if (executable-find "pypy3") -- "pypy3" -- "python3"))) +- (cond ((executable-find "pypy3.exe") +- "pypy3.exe") +- ((executable-find "python3.exe") +- "python3.exe") +- ((executable-find "python.exe") +- "python.exe"))) +- (t (cond ((executable-find "pypy3") +- "pypy3") +- ((executable-find "python3") +- "python3") +- ((executable-find "python") +- "python")))) +(defcustom lsp-bridge-python-command "@python@" "The Python interpreter used to run lsp_bridge.py." :type 'string) diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index c9f36d4e49dc8..063e4cac1f561 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/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/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 7da2af7a8387e..955c3a07519cb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/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/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index d93a243b0a375..353d4a5d4b0b8 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -22,10 +22,10 @@ "232.10072.21": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", "232.10072.27": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", "232.10072.28": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", "232.9921.42": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", "232.9921.83": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9921.89": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", "233.8264.22": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip" }, "name": "ideavim" @@ -61,10 +61,10 @@ "232.10072.21": null, "232.10072.27": null, "232.10072.28": null, + "232.10072.31": null, + "232.10072.32": null, "232.9921.42": null, - "232.9921.55": null, "232.9921.83": null, - "232.9921.89": null, "233.8264.22": null }, "name": "kotlin" @@ -87,14 +87,14 @@ ], "builds": { "223.8836.1185": null, - "232.10072.15": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", - "232.10072.21": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", - "232.10072.28": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", "232.9921.42": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", "232.9921.83": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", - "232.9921.89": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", "233.8264.22": "https://plugins.jetbrains.com/files/6981/407738/ini-233.8264.9.zip" }, "name": "ini" @@ -105,8 +105,8 @@ "phpstorm" ], "builds": { - "232.10072.27": "https://plugins.jetbrains.com/files/7219/408569/Symfony_Plugin-2022.1.258.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/7219/408569/Symfony_Plugin-2022.1.258.zip" + "232.10072.27": "https://plugins.jetbrains.com/files/7219/419684/Symfony_Plugin-2022.1.259.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/7219/419684/Symfony_Plugin-2022.1.259.zip" }, "name": "symfony-support" }, @@ -117,7 +117,7 @@ ], "builds": { "232.10072.27": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" + "232.10072.32": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" }, "name": "php-annotations" }, @@ -158,10 +158,10 @@ "232.10072.21": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", "232.10072.27": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", "232.10072.28": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", "232.9921.42": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9921.83": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9921.89": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip" + "232.9921.83": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip" }, "name": "-deprecated-rust" }, @@ -186,10 +186,10 @@ "232.10072.21": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", "232.10072.27": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", "232.10072.28": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", "232.9921.42": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9921.83": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9921.89": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" + "232.9921.83": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" }, "name": "-deprecated-rust-beta" }, @@ -207,7 +207,7 @@ "232.10072.21": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", "232.10072.27": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", "232.10072.28": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", - "232.9921.89": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip" + "232.10072.31": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip" }, "name": "ide-features-trainer" }, @@ -233,10 +233,10 @@ "232.10072.21": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", "232.10072.27": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", "232.10072.28": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", "232.9921.42": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", "232.9921.83": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9921.89": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", "233.8264.22": null }, "name": "nixidea" @@ -267,16 +267,16 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip", - "232.10072.15": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.10072.21": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.10072.28": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.42": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.83": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.89": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "233.8264.22": "https://plugins.jetbrains.com/files/10037/243092/CSV-2.21.0.zip" + "223.8836.1185": "https://plugins.jetbrains.com/files/10037/417700/CSVEditor-3.2.2-223.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/10037/417702/CSVEditor-3.2.2-233.zip" }, "name": "csv-editor" }, @@ -302,10 +302,10 @@ "232.10072.21": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "232.10072.27": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "232.10072.28": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "232.9921.42": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "232.9921.83": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9921.89": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "233.8264.22": "https://plugins.jetbrains.com/files/12062/405118/keymap-vscode-233.8264.3.zip" }, "name": "vscode-keymap" @@ -332,10 +332,10 @@ "232.10072.21": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "232.10072.27": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "232.10072.28": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "232.9921.42": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "232.9921.83": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9921.89": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "233.8264.22": "https://plugins.jetbrains.com/files/12559/405631/keymap-eclipse-233.8264.9.zip" }, "name": "eclipse-keymap" @@ -362,10 +362,10 @@ "232.10072.21": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "232.10072.27": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "232.10072.28": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "232.9921.42": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "232.9921.83": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9921.89": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "233.8264.22": "https://plugins.jetbrains.com/files/13017/405636/keymap-visualStudio-233.8264.9.zip" }, "name": "visual-studio-keymap" @@ -392,10 +392,10 @@ "232.10072.21": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.10072.27": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.10072.28": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.10072.31": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.10072.32": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.9921.42": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9921.55": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.9921.83": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9921.89": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "233.8264.22": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" @@ -422,10 +422,10 @@ "232.10072.21": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", "232.10072.27": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", "232.10072.28": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", "232.9921.42": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", "232.9921.83": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", - "232.9921.89": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", "233.8264.22": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip" }, "name": "github-copilot" @@ -452,10 +452,10 @@ "232.10072.21": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.10072.27": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.10072.28": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.9921.42": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.9921.83": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9921.89": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "233.8264.22": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" @@ -475,9 +475,9 @@ } }, "files": { - "https://plugins.jetbrains.com/files/10037/243092/CSV-2.21.0.zip": "sha256-Mfo8z2pjn+Gk1uumw5xpZQwpkqLRVqAu2Z07zjn2N1M=", - "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip": "sha256-l8xq7XXQheZYcP+kdnLXAO7FhfPJYwIh+ZffbttBI9s=", - "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip": "sha256-m9ocJSFWparZLrX1MQA0IlSH5LHodmzzVmGZ6eHml24=", + "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip": "sha256-3bHSRhzvVO07mvuD6tpkiKFXTF66zCK/wpXFVb8IkfY=", + "https://plugins.jetbrains.com/files/10037/417700/CSVEditor-3.2.2-223.zip": "sha256-4Y/DZpCWKljaslJFsaqItq1DVJVVRlQjWpM6GLRo8QA=", + "https://plugins.jetbrains.com/files/10037/417702/CSVEditor-3.2.2-233.zip": "sha256-n4psF9fFFU8ohtbOndRx6i20EntjEzL3BvMObAZyOOw=", "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip": "sha256-q5i1eAANK+6uBYrtioKLzvJf5ALUB0K4d31Ut0vT/lE=", "https://plugins.jetbrains.com/files/12062/405118/keymap-vscode-233.8264.3.zip": "sha256-cB3DTeWhDgAwHlxwYogd0/DuYBzo5DqaRtBvEC/p8I4=", "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip": "sha256-eRCsivZbDNrc+kesa9jVsOoMFFz+WpYfSMXxPCCjWjw=", @@ -495,7 +495,8 @@ "https://plugins.jetbrains.com/files/6954/381727/kotlin-plugin-223-1.9.10-release-459-IJ8836.35.zip": "sha256-gHkNQyWh6jtY1986aI7Qo6ZNrniPy+Yq4XLLA0pKJkA=", "https://plugins.jetbrains.com/files/6981/407738/ini-233.8264.9.zip": "sha256-E3xWjwTxtLkOtm9748BbkKGaS4l8SlZOkj3w6VgqlFQ=", "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip": "sha256-XIdhTQMxl/nJnntfQlHLlcyA79IS3hnGEGrXhKBFgY0=", - "https://plugins.jetbrains.com/files/7219/408569/Symfony_Plugin-2022.1.258.zip": "sha256-O4ARifSoeL5kXnFQTs6YoLcJvdg5VHks5LIgnwwUAeQ=", + "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip": "sha256-eC5Zs6ph/4C3Xf6e07DfyqhBmsG3bAFLnvae1JiFzpE=", + "https://plugins.jetbrains.com/files/7219/419684/Symfony_Plugin-2022.1.259.zip": "sha256-3UxSPvEXXhAf3zYg2H/jja4F5fuDFWQ6SWFRvcWJ0Iw=", "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=", "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip": "sha256-cr4LxSz8xVzC+Zm+6LnWGLbF6aGBVLW56crCIQOawhc=", "https://plugins.jetbrains.com/files/7322/405773/python-ce-233.8264.8.zip": "sha256-LjN0BkcnX8mVHh2dPULddVwooi9fcABkrRVhTPA7XSo=", diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index c95feebdb674a..5bbbd9dfc7b66 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -67,27 +67,27 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "5e3dd021b82dcad0f51bded677aa87680dcc3f5d843951c48848a9191141bf1d", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2.tar.gz", - "build_number": "232.9921.55", + "version": "2023.2.3", + "sha256": "dd8d771508b277ab2a713b8f546c2ec6dbb261ba8c23072e46ec6ce2ea9ab2a0", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3.tar.gz", + "build_number": "232.10072.32", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "2bb4f73d041b818a7b631feb3fee77036de764543c669efe9cf6766510a68e3f", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.2.tar.gz", - "build_number": "232.9921.89" + "version": "2023.2.3", + "sha256": "d59dd88c1eb51cdd756433d415588c573ca944ebf6f08844b8ac8cd2e3d9937b", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3.tar.gz", + "build_number": "232.10072.31" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "f7263b17e2456efcb5efab1eac53aafb6a0be1a7f9fbf25a419c9d7b447f6ded", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.2.tar.gz", - "build_number": "232.9921.89" + "version": "2023.2.3", + "sha256": "e625fea80b72c9e12f986a8eb918425c6ef1d3f7b31117b40d122e3ce76046b1", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3.tar.gz", + "build_number": "232.10072.31" }, "rider": { "update-channel": "Rider RELEASE", @@ -190,27 +190,27 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2023.2.2", - "sha256": "b3067ffa32fab0880ffce8dff000d463b86bef9b30f53fc4d41f5d4e518c7528", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2-aarch64.tar.gz", - "build_number": "232.9921.55", + "version": "2023.2.3", + "sha256": "577bea15c1208e0b842bcdb2ff0f0205144a8800fcadf87f873af7c067e0ce73", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.32", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2023.2.2", - "sha256": "7d15908f9261ee7905b61d83d4a048fee1e3a2fea9465ada1fc459b2ea0e4d5f", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.2-aarch64.tar.gz", - "build_number": "232.9921.89" + "version": "2023.2.3", + "sha256": "6fdc5238ffa4767834b11b52b650107f1c64d6a53d0e2bbc23581b6c90b67ab5", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.31" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2023.2.2", - "sha256": "2cf259859847f7a979565f31faa60148d571206c78c9309dcdf867b76c16ef25", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.2-aarch64.tar.gz", - "build_number": "232.9921.89" + "version": "2023.2.3", + "sha256": "578ecbd059ccb010682cf602e959454b296ec2e741202f236fbdb38897b296dd", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.31" }, "rider": { "update-channel": "Rider RELEASE", @@ -313,27 +313,27 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2023.2.2", - "sha256": "99a9bb313a5c141ecd1810306deaca3cf52d338edf206362b3f9d9337a27890e", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2.dmg", - "build_number": "232.9921.55", + "version": "2023.2.3", + "sha256": "7ce4ff6b344ff8ce18ef8a821ba3fd1d222f9222a9b3e65744a796379d92417e", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3.dmg", + "build_number": "232.10072.32", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2023.2.2", - "sha256": "f482b6d451efec897764487b116f7bf09d507a5ebfb841c33e2abd2441c3b3a7", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.2.dmg", - "build_number": "232.9921.89" + "version": "2023.2.3", + "sha256": "b914bd3c0018f951bef5da9c04907355a88546ce983dcf4115bbf11556015ec7", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3.dmg", + "build_number": "232.10072.31" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2023.2.2", - "sha256": "830f590d63199b389bbaa955c8602fa027bc1eb25bd8ce5636474eec72745b58", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.2.dmg", - "build_number": "232.9921.89" + "version": "2023.2.3", + "sha256": "b33bbd30222363cdc3091aee923ed1c309edba799616a3a681cd9a1ca94e822a", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3.dmg", + "build_number": "232.10072.31" }, "rider": { "update-channel": "Rider RELEASE", @@ -436,27 +436,27 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "a31daeddae532324436b2d11acbd5fb657721883f17c7ef4457ac76a51bd4189", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2-aarch64.dmg", - "build_number": "232.9921.55", + "version": "2023.2.3", + "sha256": "68d543fb2a79cd0b07ddb94a4c00d8c0c1aca7f604bc838ac92e232e763489b3", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3-aarch64.dmg", + "build_number": "232.10072.32", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "2bcddf3e58902578745dd1803f17ebd18f4c98dc76bf48b0945afbc7bae45832", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.2-aarch64.dmg", - "build_number": "232.9921.89" + "version": "2023.2.3", + "sha256": "08c45adbb0dca219955f511993ca8150dcca235bdba3ac24c67ae035c68ba992", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3-aarch64.dmg", + "build_number": "232.10072.31" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "5d4292dd0e40db35199ebcd6472d4b46c505d3357d2324690338758355e0f092", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.2-aarch64.dmg", - "build_number": "232.9921.89" + "version": "2023.2.3", + "sha256": "63d68b20963575f76937ca0ce18a8150639c47b8cf8f3d6e96fa3306191cd076", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3-aarch64.dmg", + "build_number": "232.10072.31" }, "rider": { "update-channel": "Rider RELEASE", diff --git a/pkgs/applications/editors/neovim/neovim-gtk.nix b/pkgs/applications/editors/neovim/neovim-gtk.nix index eebb980f85cb5..eebb980f85cb5 100755..100644 --- a/pkgs/applications/editors/neovim/neovim-gtk.nix +++ b/pkgs/applications/editors/neovim/neovim-gtk.nix diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/applications/editors/neovim/neovim-qt.nix index b9d0ab4ec23ef..a8483f0db348e 100644 --- a/pkgs/applications/editors/neovim/neovim-qt.nix +++ b/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/pkgs/applications/editors/pulsar/default.nix b/pkgs/applications/editors/pulsar/default.nix index d2162dc9c9ef1..ef08ac9352dde 100644 --- a/pkgs/applications/editors/pulsar/default.nix +++ b/pkgs/applications/editors/pulsar/default.nix @@ -209,5 +209,14 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ colamaroro ]; + knownVulnerabilities = [ + "CVE-2023-5217" + "CVE-2022-21718" + "CVE-2022-29247" + "CVE-2022-29257" + "CVE-2022-36077" + "CVE-2023-29198" + "CVE-2023-39956" + ]; }; } diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 427d0aa3ace80..00372c1cab8b7 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -1,5 +1,5 @@ -{ lib, mkDerivation, callPackage, fetchurl, - guile_1_8, qtbase, xmodmap, which, freetype, +{ lib, stdenv, callPackage, fetchurl, + guile_1_8, xmodmap, which, freetype, libjpeg, sqlite, tex ? null, @@ -8,6 +8,11 @@ python3 ? null, cmake, pkg-config, + wrapQtAppsHook, + xdg-utils, + qtbase, + qtsvg, + qtmacextras, ghostscriptX ? null, extraFonts ? false, chineseFonts ? false, @@ -15,32 +20,49 @@ koreanFonts ? false }: let - pname = "TeXmacs"; - version = "2.1"; + pname = "texmacs"; + version = "2.1.2"; common = callPackage ./common.nix { inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; in -mkDerivation { +stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - sha256 = "1gl6k1bwrk1y7hjyl4xvlqvmk5crl4jvsk8wrfp7ynbdin6n2i48"; + hash = "sha256-Ds9gxOwMYSttEWrawgxLHGxHyMBvt8WmyPIwBP2g/CM="; }; - nativeBuildInputs = [ cmake pkg-config ]; + postPatch = common.postPatch + '' + substituteInPlace configure \ + --replace "-mfpmath=sse -msse2" "" + ''; + + nativeBuildInputs = [ + guile_1_8 + pkg-config + wrapQtAppsHook + xdg-utils + ] ++ lib.optionals (!stdenv.isDarwin) [ + cmake + ]; + buildInputs = [ guile_1_8 qtbase + qtsvg ghostscriptX freetype libjpeg sqlite git python3 + ] ++ lib.optionals stdenv.isDarwin [ + qtmacextras ]; - NIX_LDFLAGS = "-lz"; + + env.NIX_LDFLAGS = "-lz"; qtWrapperArgs = [ "--suffix" "PATH" ":" (lib.makeBinPath [ @@ -58,10 +80,8 @@ mkDerivation { wrapQtApp $out/bin/texmacs ''; - inherit (common) postPatch; - meta = common.meta // { maintainers = [ lib.maintainers.roconnor ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 5332e0b5d05bb..936cc9f7bb87d 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/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/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ecd22ae6102bf..e63b4601ebaed 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/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/"; }; @@ -3408,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/"; }; @@ -3624,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/"; }; @@ -3720,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/"; }; @@ -3792,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/"; }; @@ -3852,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/"; }; @@ -4032,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/"; }; @@ -4067,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/"; }; @@ -4246,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/"; }; @@ -4342,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/"; }; @@ -4414,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/"; }; @@ -4775,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/"; }; @@ -4799,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/"; }; @@ -4835,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/"; }; @@ -4895,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/"; }; @@ -5183,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/"; }; @@ -5254,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/"; }; @@ -5290,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/"; @@ -5387,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/"; }; @@ -5411,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/"; }; @@ -5459,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/"; }; @@ -5507,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/"; }; @@ -5531,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/"; }; @@ -5567,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/"; }; @@ -5591,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/"; }; @@ -5615,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/"; }; @@ -5651,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/"; }; @@ -5915,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/"; }; @@ -5939,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/"; }; @@ -5963,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/"; }; @@ -5999,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/"; }; @@ -6071,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/"; }; @@ -6143,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/"; }; @@ -6216,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/"; }; @@ -6396,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/"; }; @@ -6564,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/"; }; @@ -6672,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/"; }; @@ -6696,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/"; }; @@ -6720,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/"; }; @@ -6792,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/"; }; @@ -6816,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/"; }; @@ -6912,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/"; }; @@ -7163,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/"; }; @@ -7199,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/"; }; @@ -7259,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/"; }; @@ -7451,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/"; }; @@ -7499,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/"; }; @@ -7547,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/"; }; @@ -7619,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/"; }; @@ -7690,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/"; }; @@ -7714,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/"; }; @@ -7834,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/"; @@ -7871,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/"; }; @@ -7895,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/"; }; @@ -7919,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/"; }; @@ -7979,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/"; }; @@ -8003,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/"; @@ -8418,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/"; }; @@ -8486,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"; }; @@ -8569,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/"; }; @@ -8735,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"; @@ -8893,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/"; }; @@ -8966,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/"; }; @@ -9920,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/"; }; @@ -10173,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/"; }; @@ -10245,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/"; }; @@ -10305,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/"; }; @@ -10341,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/"; }; @@ -10953,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/"; }; @@ -12045,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/"; }; @@ -12839,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/"; }; @@ -15530,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/"; }; @@ -15650,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/"; }; @@ -15891,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/"; }; @@ -15975,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/"; }; @@ -16083,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/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 9990af5145d64..bb004e8bca1f7 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/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/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b597fbeb6e98c..dcb2eea0130ec 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/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/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ab353da48e241..514eda395c4ee 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/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/,, @@ -733,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/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c0d3415713fce..fb6e709bba202 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -326,8 +326,8 @@ let mktplcRef = { name = "astro-vscode"; publisher = "astro-build"; - version = "2.1.1"; - sha256 = "sha256-UVZOpkOHbLiwA4VfTgXxuIU8EtJLnqRa5zUVha6xQJY="; + version = "2.3.3"; + sha256 = "sha256-A7+7lnCPAtSWUfHLNKbYqKuTxi2Nx05Qdh5HCkT1dnM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog"; diff --git a/pkgs/applications/emulators/blink/default.nix b/pkgs/applications/emulators/blink/default.nix index e522546078cff..bdaf36bf6615d 100644 --- a/pkgs/applications/emulators/blink/default.nix +++ b/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/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 892e6faaa94c4..f4fe6f467abf8 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -28,13 +28,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.1044"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.1053"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "7afae8c69947f7a5fa9a55cee36381aef372dfba"; - sha256 = "1kf95sbb4p50b6bah75sd95660kk2a7cbjwgvqv4c4cal6c126g7"; + rev = "28dd7d80af56701887dbb538b56aa58edaf39d91"; + sha256 = "09h4423z18q8r8fqcd5kv34iwmy9gkmpgw8an8myrhhvkmxi3zwg"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix index fddef8deef128..25f0511c476c2 100644 --- a/pkgs/applications/emulators/xemu/default.nix +++ b/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/pkgs/applications/emulators/yuzu/generic.nix b/pkgs/applications/emulators/yuzu/generic.nix index 3fdd6db84661a..a24ded8525310 100644 --- a/pkgs/applications/emulators/yuzu/generic.nix +++ b/pkgs/applications/emulators/yuzu/generic.nix @@ -49,10 +49,10 @@ }: let - tzinfoVersion = "220816"; + tzinfoVersion = "221202"; tzinfo = fetchurl { url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${tzinfoVersion}/${tzinfoVersion}.zip"; - hash = "sha256-yv8ykEYPu9upeXovei0u16iqQ7NasH6873KnQy4+KwI="; + hash = "sha256-mRzW+iIwrU1zsxHmf+0RArU8BShAoEMvCz+McXFFK3c="; }; in stdenv.mkDerivation { pname = "yuzu-${branch}"; diff --git a/pkgs/applications/emulators/yuzu/sources.nix b/pkgs/applications/emulators/yuzu/sources.nix index fc6d1813afb51..3371bf15c5c99 100644 --- a/pkgs/applications/emulators/yuzu/sources.nix +++ b/pkgs/applications/emulators/yuzu/sources.nix @@ -1,19 +1,19 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2023-10-07 +# Last updated: 2023-10-20 { compatList = { - rev = "156a0a80efc47069ba3360f8a1b268a1c6f2f505"; + rev = "9d17cbd71408476c6a28cbf0fa8177155c511681"; hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; }; mainline = { - version = "1579"; - hash = "sha256:0689w42as1di8xbh8kq2p0cws8gdwq64zdj3i8wq612nkw0q5s60"; + version = "1595"; + hash = "sha256:09b0w6z4w9z4ms2pvik2vrmklfcx25jxcgs61bff3nflilnw9m97"; }; ea = { - version = "3911"; - distHash = "sha256:0xj642kjhj0gp9l15b3ysj3gmyy47rcvzw9amghsfl13bg5ffnwh"; - fullHash = "sha256:13rd6kwnhpvjzp67k6pqgl9fsqzwy5d8043hv6kd93gg8jbxkp38"; + version = "3940"; + distHash = "sha256:0g0vv274sh3iy56n7s324km87g302005ahi9zh2qhwkiirbnc811"; + fullHash = "sha256:0ywppc4z5d4b1zl1cr8yfnba58hgi0z2szficwpinapai7q0pyid"; }; } diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index b0b7c34127b38..eeab22eaac7cc 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "kyoheiu"; repo = "felix"; rev = "v${version}"; - hash = "sha256-RDCX5+Viq/VRb0SXUYxCtWF+aVahI5WGhp9/Vn+uHqI="; + hash = "sha256-bTe8fPFVWuAATXdeyUvtdK3P4vDpGXX+H4TQ+h9bqUI="; }; - cargoHash = "sha256-kgI+afly+/Ag0witToM95L9b3yQXP5Gskwl4Lf4SusY="; + cargoHash = "sha256-q86NiJPtr1X9D9ym8iLN1ed1FMmEb217Jx3Ei4Bn5y0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/file-managers/yazi/default.nix b/pkgs/applications/file-managers/yazi/default.nix index 7757a1322b15a..cd0476c1e00d6 100644 --- a/pkgs/applications/file-managers/yazi/default.nix +++ b/pkgs/applications/file-managers/yazi/default.nix @@ -3,6 +3,7 @@ , lib , makeWrapper +, installShellFiles , stdenv , Foundation @@ -30,18 +31,18 @@ rustPlatform.buildRustPackage rec { pname = "yazi"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "sxyazi"; repo = pname; rev = "v${version}"; - hash = "sha256-ARpludMVQlZtCRAfW0cNYVmT3m9t9lunMIW24peYX6Y="; + hash = "sha256-FhKrq4N32uJRHGc0qRl+CIVNRW597jACcTFEgj8hiSE="; }; - cargoHash = "sha256-dhdk5aGKv6tY8x7MmA0hWcmJBiXOXC92DlQTd/1AKtQ="; + cargoHash = "sha256-YUymZhDp1Pjm+W6m8Vmh2AgMCdaNt6TQQpiJwSg/gPw="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; postInstall = with lib; @@ -60,6 +61,10 @@ rustPlatform.buildRustPackage rec { '' wrapProgram $out/bin/yazi \ --prefix PATH : "${makeBinPath runtimePaths}" + installShellCompletion --cmd yazi \ + --bash ./config/completions/yazi.bash \ + --fish ./config/completions/yazi.fish \ + --zsh ./config/completions/_yazi ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c6d3a83e0c287..139bb1110922d 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -48,13 +48,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-19"; + version = "7.1.1-20"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-SxvaodAjSlOvmGPnD0AcXHrE5dTX2eX1sDM/441rP64="; + hash = "sha256-ZVyHvx1UvKjTaErxenuNb8FKwkD4Q3chGtwVmfGoMeM="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/structorizer/default.nix b/pkgs/applications/graphics/structorizer/default.nix index d1f796e42fee1..d1f796e42fee1 100755..100644 --- a/pkgs/applications/graphics/structorizer/default.nix +++ b/pkgs/applications/graphics/structorizer/default.nix diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index aa7f17b20c280..46e83d77ca9a8 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/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/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 60b835c719b57..1a0e90546bec7 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "5.4.9.3"; + version = "5.4.12.5"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-Yp8hnMIeV+ZHY6yISJdFd1yAQipQsU5vcXgxFDvkGnA="; + hash = "sha256-iIYA9BnHUfsB4J7VbSLKaRdJHMW/xULJxKfv8atfAd8="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; @@ -77,6 +77,7 @@ buildDotnetModule rec { homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; license = licenses.asl20; platforms = [ "x86_64-linux" "aarch64-linux" ]; + mainProgram = "ArchiSteamFarm"; maintainers = with maintainers; [ SuperSandro2000 lom ]; }; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 5d353bfdf6b89..6154d1ca6e2d9 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -57,11 +57,11 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0"; sha256 = "0nx7nrzbg9gk9skdc9x330cbr5xbsly6z9gzxm46vywf55yp8vaj"; }) - (fetchNuGet { pname = "Markdig.Signed"; version = "0.32.0"; sha256 = "0rc1d8pwypq44pr15wn8g52zbqz70swdrdmjlzccf6zvwy1vyqkc"; }) + (fetchNuGet { pname = "Markdig.Signed"; version = "0.33.0"; sha256 = "0816lmn0varxwhdklhh5hdqp0xnfz3nlrvaf2wpkk5v1mq86216h"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.7.0"; sha256 = "12m9fay2d7jvj00hfpws37vflpqvz4dy4gcm25bjycg1zyfpzvly"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.7.2"; sha256 = "09mf5kpxn1a1m8ciwklhh6ascx0yqpcs5r2hvmfj80j44n3qrwhm"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) @@ -71,11 +71,15 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.7.0"; sha256 = "1srhqqmnf9pxdbpffr7dh0bihhf09d0iq5g6gh8ql7brfrh99lvb"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.0.3"; sha256 = "0njmg2lygnirnfjv9gck2f5lq4ly5rgws9cpf8qj3kwcwxfp0b9s"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.0.3"; sha256 = "1ayh85xqdq8rqjk2iqcn7iaczcl7d8qg6bxk0b4rgx59fmsmbqj7"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.0.3"; sha256 = "13cjqmf59k895q6gkd5ycl89mnpalckda7rhsdl11jdyr32hsfnv"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.0.3"; sha256 = "1pmhd0imh9wlhvbvvwjrpjsqvzagi2ly22nddwr4r0pi234khyz1"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.7.2"; sha256 = "08g9dpp766racnh90s1sy3ncl291majgq6v2604hfw1f6zkmbjqh"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.0"; sha256 = "1sqmk99644fx66zk2qa2ims1zl6741i3wl4rjh4z6jakd4xbc28i"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.7.0"; sha256 = "1s8ap0ljqssbqp1ilgsidjr948b9szf1cbl3fgl6smxig9im4zrl"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.2"; sha256 = "0xdjkdnrvnaxqgg38y5w1l3jbppigg68cc8q9jn0p21vn48bgrxq"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.7.2"; sha256 = "1szsg1iy77f0caxzkk0ihpp4ifbfnbdbn8k0wbbhbdprxj8pr356"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.1.1"; sha256 = "0y3ic8jv5jhld6gan2qfa2wyk4z57f7y4y5a47njr0jvxxnarg2c"; }) (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.1.1"; sha256 = "1lbgkrbrkmw4c54g61cwbmwc4zl8hyqmp283ymvj93lq7chbxasn"; }) @@ -86,9 +90,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.2.3"; sha256 = "0srai3s2kk9y2jimdvw1xw86nch38q6nza598dpr81dghx3s6j6w"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.3"; sha256 = "0j19fljxbcc0bysmj7i0fmiax6sp5kjapf2llkimv7dh63rj9ckg"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.3"; sha256 = "0rhha2lwrzwlx0q1a8w9ph9xwayl3kmmy200ygsghcd02srlazkj"; }) + (fetchNuGet { pname = "NLog"; version = "5.2.5"; sha256 = "02fybqi9d7czz3jmhmgb8wia2hpjj5hmcnij6zsgs69rkv6hf9j0"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.5"; sha256 = "0jzfqa12l5vvxd2j684cnm29w19v386cpm11pw8h6prpf57affaj"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.5"; sha256 = "0li0sw04w0a4zms5jjv1ga45wxiqlcvaw8gi0wbhiifrdzz5yckb"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.16"; sha256 = "0pwlqlq2p8my2sr8b0cvdav5cm8wpwf3s4gy7s1ba701ac2zyb9y"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.16"; sha256 = "00znhikq7valr3jaxg66cwli9hf75wkmmpf6rf8p790hf8lxq0c5"; }) @@ -108,6 +112,7 @@ (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; sha256 = "1p9xpqzx42s8cdizv6nh15hcjvl2km0rwby66nfkj4cb472l339s"; }) (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; sha256 = "0syz7y6wgnxxgjvfqgymn9mnaa5fjy1qp06qnsvh3agr9mvcv779"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.0.3"; sha256 = "1fls88ffq34j1gr6zay1crm27v3sjs5fa4mvj9akqjq05bxanlhk"; }) (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/update.sh b/pkgs/applications/misc/ArchiSteamFarm/update.sh index 9af9acb69835b..53d3ee6641912 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/update.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts nix-prefetch prefetch-npm-deps +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -14,7 +14,7 @@ if [[ "$new_version" == "$old_version" ]]; then fi asf_path=$PWD -pushd ../../../.. +cd ../../../.. if [[ "${1:-}" != "--deps-only" ]]; then update-source-version ArchiSteamFarm "$new_version" @@ -22,5 +22,5 @@ fi $(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) -popd -"$asf_path/web-ui/update.sh" +cd "$asf_path/web-ui" +./update.sh diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/.gitignore b/pkgs/applications/misc/ArchiSteamFarm/web-ui/.gitignore new file mode 100644 index 0000000000000..d8b83df9cdb66 --- /dev/null +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/.gitignore @@ -0,0 +1 @@ +package-lock.json diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 77f4e9c6e299b..4dad0b1f5b6b5 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -1,19 +1,19 @@ -{ lib, fetchFromGitHub, buildNpmPackage, nodePackages, ArchiSteamFarm }: +{ lib, fetchFromGitHub, buildNpmPackage, ArchiSteamFarm }: -buildNpmPackage { +buildNpmPackage rec { pname = "asf-ui"; - inherit (ArchiSteamFarm) version; + version = "fceb2fb828cfa420c77dc5cde433fd519a6717d4"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "0b812a7ab0d2f01a675d27f80008ad7b6972b4aa"; - hash = "sha256-ut0x/qT3DyDASW4QbNT+BF6eXHCIbTol5E+3+tirFDA="; + rev = version; + hash = "sha256-gMQWly7HN5rIV9r72Qa+gHuBuQMs9sh09od4ja4sRGU="; }; - npmDepsHash = "sha256-HpBEoAIGejpHJnUciz4iWILcXdgpw7X1xFuXmx9Z9dw="; + npmDepsHash = "sha256-UDCQTRpcPDcuvPzlqTu315EkGr5G0+z7qMSsPgYQacA="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh index 7f026383383df..6fa8e67a1217a 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh @@ -1,23 +1,19 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix gnused jq curl +#! nix-shell -I nixpkgs=../../../../.. -i bash -p curl gnused jq common-updater-scripts prefetch-npm-deps set -eou pipefail -cd "$(dirname "$0")" -pushd ../../../../.. +cd "$(dirname "$0")"/../../../../.. version=$(nix-instantiate --strict --eval -A ArchiSteamFarm.version | jq -r) -popd -pushd "$(dirname "$0")" +cd - ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=$version" | jq -r .sha) curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package-lock.json" -o package-lock.json -# update-source-version doesn't work for some reason -sed -i "s/rev\\s*=\\s*.*/rev = \"$ui\";/" default.nix -sed -i "s/hash\\s*=\\s*.*/hash = \"$(nix-prefetch fetchurl --url "https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz")\";/" default.nix +cd - +update-source-version ArchiSteamFarm.ui "$ui" +cd - npmDepsHash=$(prefetch-npm-deps ./package-lock.json) sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i default.nix rm package-lock.json - -popd diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index a9008283dd285..ceb74f7b0a323 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -10,6 +10,7 @@ , qtscxml , qtsvg , qtdeclarative +, qtwayland , qt5compat , wrapQtAppsHook , nix-update-script @@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { qtscxml qtsvg qtdeclarative + qtwayland qt5compat ] ++ (with python3Packages; [ python pybind11 ]); diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 00bbcdafff13f..8e7fde6d9c299 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "blender"; - version = "3.6.4"; + version = "3.6.5"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-zFL0GRWAtNC3C+SAspWZmGa8US92EiYQgVfiOsCJRx4="; + hash = "sha256-QAHA/pn22HLsfH6VX4Sp7r25raFxAPS1Gergjez38kM="; }; patches = [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0c71b642fa2c0..7bc7b4dc5cc51 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "6.28.1"; + version = "6.29.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-ZoJN8weAXUQkxalRtVtEaychc30+l2kfzG9Tm5jZh9g="; + hash = "sha256-w9mvMKm76w5sDfW0OYxhZuhIOYKdUH3tpiGlpKNC2kM="; }; patches = [ diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 9c0a000bab0d3..0771737eb266e 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/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/pkgs/applications/misc/darkman/default.nix b/pkgs/applications/misc/darkman/default.nix index 89678b7d0fa85..1b33b9fac3ed8 100644 --- a/pkgs/applications/misc/darkman/default.nix +++ b/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/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 04804732edc49..07069dce1ac3b 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dasel"; - version = "2.3.6"; + version = "2.4.1"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-k+I4n05IbQT7tGzkJ0aPW6kLT1mGqwQOwoKDyal8L3w="; + hash = "sha256-zxTT/CkSbH40R7itXAx0zD+haHOoMep/W4KfalJQ/8w="; }; - vendorHash = "sha256-Gueo8aZS5N1rLqZweXjXv7BLrtShxGDSGfbkYXhy4DQ="; + vendorHash = "sha256-CbR0uHtha2OoHW9mcB1I2lGJbjerbZARVN/mTstv/Y0="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" diff --git a/pkgs/applications/misc/diebahn/default.nix b/pkgs/applications/misc/diebahn/default.nix index a90dddb3162f0..ea74034642187 100644 --- a/pkgs/applications/misc/diebahn/default.nix +++ b/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/pkgs/applications/misc/fluxboxlauncher/default.nix b/pkgs/applications/misc/fluxboxlauncher/default.nix index 4794e14b4698e..4794e14b4698e 100755..100644 --- a/pkgs/applications/misc/fluxboxlauncher/default.nix +++ b/pkgs/applications/misc/fluxboxlauncher/default.nix diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 49da3ac99a83a..e1c289dfabfed 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.26.0"; + version = "1.26.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-+g4tfr7RF9rrimQcXhcz3o/Cx9xLNrTDV1Fx7XSxh7I="; + sha256 = "sha256-SJshEdvmPDQZ5mqiQfJpWcQ43WGXUxPvMMJiY/4Cxsc="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 2483cc000f01d..fe33a7df75690 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -11,13 +11,13 @@ perlPackages.buildPerlPackage rec { pname = "get_iplayer"; - version = "3.31"; + version = "3.33"; src = fetchFromGitHub { owner = "get-iplayer"; repo = "get_iplayer"; rev = "v${version}"; - sha256 = "+ChCF27nmPKbqaZVxsZ6TlbzSdEz6RfMs87NE8xaSRw="; + hash = "sha256-cX+ydMvpQNFfQICRVKyhnB5gZkVnOMLPbGgdFymzmeA="; }; nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; @@ -32,10 +32,12 @@ perlPackages.buildPerlPackage rec { installPhase = '' runHook preInstall + mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 + runHook postInstall ''; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index fb3489893be3a..d5ea27c9d50b9 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, fetchPypi, python3 }: let @@ -18,7 +18,8 @@ let # Use click 7 click = super.click.overridePythonAttrs (old: rec { version = "7.1.2"; - src = old.src.override { + src = fetchPypi { + pname = "click"; inherit version; hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index 91256c8027f62..d1b873eae8cd5 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/pkgs/applications/misc/iptsd/default.nix @@ -49,8 +49,11 @@ stdenv.mkDerivation rec { substituteInPlace etc/meson.build \ --replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \ --replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'" + substituteInPlace etc/systemd/iptsd-find-service \ + --replace "iptsd-find-hidraw" "$out/bin/iptsd-find-hidraw" \ + --replace "systemd-escape" "${lib.getExe' systemd "systemd-escape"}" substituteInPlace etc/udev/50-iptsd.rules.in \ - --replace "/bin/systemd-escape" "${systemd}/bin/systemd-escape" + --replace "/bin/systemd-escape" "${lib.getExe' systemd "systemd-escape"}" ''; mesonFlags = [ diff --git a/pkgs/applications/misc/moonlight-qt/darwin.diff b/pkgs/applications/misc/moonlight-qt/darwin.diff index f5406087ae0a6..0c137fa0774c2 100644 --- a/pkgs/applications/misc/moonlight-qt/darwin.diff +++ b/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/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix index cbbbdc4d75986..178265aeb733c 100644 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ b/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/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/applications/misc/nwg-displays/default.nix index f0fc2b1bb368d..18ba079088af7 100644 --- a/pkgs/applications/misc/nwg-displays/default.nix +++ b/pkgs/applications/misc/nwg-displays/default.nix @@ -14,13 +14,13 @@ python310Packages.buildPythonApplication rec { pname = "nwg-displays"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-displays"; rev = "v${version}"; - hash = "sha256-Y405ZeOSpc1aPKEzFdvlgJgpGAi9HUR+Hvx63uYdp88="; + hash = "sha256-9v5TQTliUEnynoGDf1UXsQ9Ym7x2gPmx4QiRJH5BId4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index a4d333e594c31..90864dee69ba4 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.13"; + version = "0.9.14"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - hash = "sha256-dP/FbMrjPextwedQeLJHM6f/a+EuZ+hQSLrH/rF2XOg="; + hash = "sha256-ThcB/BhnJbBHUoRh120iqN6LMGOnkekzALTTgd8uUx4="; }; # No tests diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 78967c55a5d72..43ea198d62c9b 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.4.14"; + version = "1.4.16"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-5cVKlZJDtXOkil+RohijCcqyJVTrysmqyTvJR0dDAuc=" else "sha256-qFSQer37Nkh3A3oVAFP/0qXzPWJ7SqY2GYA6b1iaYmE="; + hash = if stdenv.isDarwin then "sha256-ydLWr+Snkza9G+R7HbPuUdoZsL25Uj+KDos67Mq/urY=" else "sha256-PBKLGs3MZyarSMiWnjqY7d9bQrKu2uLAvLUufpHLxcw="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index bac74b0ffe1dd..2e22cdbd1b3a3 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/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/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index cb92304e509a6..b670bcabf6106 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = "pueue"; rev = "v${version}"; - hash = "sha256-Fk31k0JIe1KJW7UviA8yikjfwlcdRD92wehNbuEoH2w="; + hash = "sha256-X6q8ePaADv1+n/WmCp4SOhVm9lnc14qGhLSCxtc/ONw="; }; - cargoHash = "sha256-eVJuebau0Y9oelniCzvOk9riMMZ9cS7E/G6KinbQa6k="; + cargoHash = "sha256-lfWuOkKNNDQ0b6oncuCC3KOAgtQGvLptIbmdyY8vy6o="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index 42d5535f5535d..5ffc383f14f88 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "remnote"; - version = "1.12.43"; + version = "1.12.64"; src = fetchurl { url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; - hash = "sha256-3GNp+0ZUZbUcBkE8DbIEDRYlWfG3HDTTS6wK3u42jJg="; + hash = "sha256-Pvz3bBpv4wN2NXxuKNNraCuOqvvtYOyg5PTSwMpL3cw="; }; appexec = appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index 6e9d2e6cc1bbb..23f736e9f038e 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/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/pkgs/applications/misc/tumpa/default.nix b/pkgs/applications/misc/tumpa/default.nix index f7dfdd95d5db1..cc73b7fa6901e 100644 --- a/pkgs/applications/misc/tumpa/default.nix +++ b/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/pkgs/applications/misc/wttrbar/default.nix b/pkgs/applications/misc/wttrbar/default.nix index 54775719a2e5d..7e2f72e31ded0 100644 --- a/pkgs/applications/misc/wttrbar/default.nix +++ b/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/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 8466850808cb3..c3495160029f2 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -92,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.59.117"; + version = "1.59.120"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-yckxTKAgglk6YRXist9RZufZdI22iitecmb01NmYPGQ="; + sha256 = "sha256-fkIU6XuydF6Bo8V0uS4NObh2fRuKxOWMqVft81uUs9Q="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 22d71e8975f80..2a686f87d1640 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -67,16 +67,16 @@ let ]); clangFormatPython3 = fetchurl { url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT"; - sha256 = "0ic3hn65dimgfhakli1cyf9j3cxcqsf1qib706ihfhmlzxf7256l"; + hash = "sha256-1BRxXP+0QgejAWdFHJzGrLMhk/MsRDoVdK/GVoyFg0U="; }; # The additional attributes for creating derivations based on the chromium # source tree. extraAttrs = buildFun base; - githubPatch = { commit, sha256, revert ? false }: fetchpatch { + githubPatch = { commit, hash, revert ? false }: fetchpatch { url = "https://github.com/chromium/chromium/commit/${commit}.patch"; - inherit sha256 revert; + inherit hash revert; }; mkGnFlags = @@ -118,7 +118,7 @@ let libExecPath = "$out/libexec/${packageName}"; ungoogler = ungoogled-chromium { - inherit (upstream-info.deps.ungoogled-patches) rev sha256; + inherit (upstream-info.deps.ungoogled-patches) rev hash; }; # There currently isn't a (much) more concise way to get a stdenv @@ -148,10 +148,10 @@ let else throw "no chromium Rosetta Stone entry for os: ${platform.config}"; }; - recompressTarball = { version, sha256 ? "" }: fetchzip { + recompressTarball = { version, hash ? "" }: fetchzip { name = "chromium-${version}.tar.zstd"; url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - inherit sha256; + inherit hash; nativeBuildInputs = [ zstd ]; @@ -180,7 +180,7 @@ let inherit (upstream-info) version; inherit packageName buildType buildPath; - src = recompressTarball { inherit version; inherit (upstream-info) sha256; }; + src = recompressTarball { inherit version; inherit (upstream-info) hash; }; nativeBuildInputs = [ ninja pkg-config @@ -250,7 +250,7 @@ let (githubPatch { # Reland [clang] Disable autoupgrading debug info in ThinLTO builds commit = "54969766fd2029c506befc46e9ce14d67c7ed02a"; - sha256 = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M="; + hash = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M="; revert = true; }) ]; @@ -315,9 +315,6 @@ let sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ device/udev_linux/udev?_loader.cc '' + '' - sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ - gpu/config/gpu_info_collector_linux.cc - # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc @@ -479,9 +476,10 @@ let postFixup = '' # Make sure that libGLESv2 and libvulkan are found by dlopen. + # libpci (from pciutils) is needed by dlopen in angle/src/gpu_info_util/SystemInfo_libpci.cpp chromiumBinary="$libExecPath/$packageName" origRpath="$(patchelf --print-rpath "$chromiumBinary")" - patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader ]}:$origRpath" "$chromiumBinary" + patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader pciutils ]}:$origRpath" "$chromiumBinary" ''; passthru = { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 5677bc37e8441..7c2c75e749741 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -57,7 +57,7 @@ let gnChromium = buildPackages.gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; src = fetchgit { - inherit (upstream-info.deps.gn) url rev sha256; + inherit (upstream-info.deps.gn) url rev hash; }; }); }); @@ -80,12 +80,12 @@ let chromeSrc = let # Use the latest stable Chrome version if necessary: - version = if chromium.upstream-info.sha256bin64 != null + version = if chromium.upstream-info.hash_deb_amd64 != null then chromium.upstream-info.version else (import ./upstream-info.nix).stable.version; - sha256 = if chromium.upstream-info.sha256bin64 != null - then chromium.upstream-info.sha256bin64 - else (import ./upstream-info.nix).stable.sha256bin64; + hash = if chromium.upstream-info.hash_deb_amd64 != null + then chromium.upstream-info.hash_deb_amd64 + else (import ./upstream-info.nix).stable.hash_deb_amd64; in fetchurl { urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ "https://dl.google.com/linux/chrome/deb/pool/main/g" @@ -93,7 +93,7 @@ let "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" "http://repo.fdzh.org/chrome/deb/pool/main/g" ]; - inherit sha256; + inherit hash; }; mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled.nix b/pkgs/applications/networking/browsers/chromium/ungoogled.nix index 549d2853776f9..cf3d0a7d73ad2 100644 --- a/pkgs/applications/networking/browsers/chromium/ungoogled.nix +++ b/pkgs/applications/networking/browsers/chromium/ungoogled.nix @@ -6,10 +6,10 @@ }: { rev -, sha256 +, hash }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ungoogled-chromium"; version = rev; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ungoogled-software"; repo = "ungoogled-chromium"; - inherit rev sha256; + inherit rev hash; }; dontBuild = true; diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index fd8f367784059..60267331cc275 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -59,9 +59,9 @@ def prefetch_src_sri_hash(attr_path, version): def nix_prefetch_url(url, algo='sha256'): """Prefetches the content of the given URL.""" - print(f'nix-prefetch-url {url}') - out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) - return out.decode('utf-8').rstrip() + print(f'nix store prefetch-file {url}') + out = subprocess.check_output(['nix', 'store', 'prefetch-file', '--json', '--hash-type', algo, url]) + return json.loads(out)['hash'] def nix_prefetch_git(url, rev): @@ -96,9 +96,9 @@ def get_chromedriver(channel): return { 'version': channel['version'], - 'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')), - 'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac-x64')), - 'sha256_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac-arm64')) + 'hash_linux': nix_prefetch_url(get_chromedriver_url('linux64')), + 'hash_darwin': nix_prefetch_url(get_chromedriver_url('mac-x64')), + 'hash_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac-arm64')) } @@ -113,7 +113,7 @@ def get_channel_dependencies(version): 'version': datetime.fromisoformat(gn['date']).date().isoformat(), 'url': gn['url'], 'rev': gn['rev'], - 'sha256': gn['sha256'] + 'hash': gn['hash'] } } @@ -222,11 +222,11 @@ with urlopen(RELEASES_URL) as resp: google_chrome_suffix = channel_name try: - channel['sha256'] = prefetch_src_sri_hash( + channel['hash'] = prefetch_src_sri_hash( channel_name_to_attr_name(channel_name), release["version"] ) - channel['sha256bin64'] = nix_prefetch_url( + channel['hash_deb_amd64'] = nix_prefetch_url( f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' + f'google-chrome-{google_chrome_suffix}_{release["version"]}-1_amd64.deb') except subprocess.CalledProcessError: @@ -241,7 +241,7 @@ with urlopen(RELEASES_URL) as resp: ungoogled_repo_url = 'https://github.com/ungoogled-software/ungoogled-chromium.git' channel['deps']['ungoogled-patches'] = { 'rev': release['ungoogled_tag'], - 'sha256': nix_prefetch_git(ungoogled_repo_url, release['ungoogled_tag'])['sha256'] + 'hash': nix_prefetch_git(ungoogled_repo_url, release['ungoogled_tag'])['hash'] } with open(UNGOOGLED_FLAGS_PATH, 'w') as out: out.write(get_ungoogled_chromium_gn_flags(release['ungoogled_tag'])) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index b8004a7d4b390..29a15907cb36a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -3,63 +3,63 @@ deps = { gn = { rev = "811d332bd90551342c5cbd39e133aa276022d7f8"; - sha256 = "0jlg3d31p346na6a3yk0x29pm6b7q03ck423n5n6mi8nv4ybwajq"; + hash = "sha256-WCq+PNkWxWpssUOQyQbAZ5l6k+hg+qGMsoaMG0Ybj0o="; url = "https://gn.googlesource.com/gn"; version = "2023-08-01"; }; }; - sha256 = "0c3adrrgpnhm8g1546ask9pf17qj1sjgb950mj0rv4snxvddi75j"; - sha256bin64 = "11w1di146mjb9ql30df9yk9x4b9amc6514jzyfbf09mqsrw88dvr"; + hash = "sha256-spzY2u5Wk52BrKCk9aQOEp/gbppaGVLCQxXa+3JuajA="; + hash_deb_amd64 = "sha256-eTeEeNa4JuCW81+SUAyrKi3S0/TJNTAoTktWQ0JsgYc="; version = "117.0.5938.22"; }; dev = { deps = { gn = { rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4"; - sha256 = "1ly7z48v147bfdb1kqkbc98myxpgqq3g6vgr8bjx1ikrk17l82ab"; + hash = "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M="; url = "https://gn.googlesource.com/gn"; version = "2023-08-10"; }; }; - sha256 = "16dq27lsywrn2xlgr5g46gdv15p30sihfamli4vkv3zxzfxdjisv"; - sha256bin64 = "11y09hsy7y1vg65xfilq44ffsmn15dqy80fa57psj1kin4a52v2x"; + hash = "sha256-W0fZuvv9jz03ibQqB6MG45aw2zPklfxoFzZzr+kRuJk="; + hash_deb_amd64 = "sha256-XWxRFLFxBqnvKcoB5HErwVbtHCGYRteLeTv44zVMwIc="; version = "118.0.5966.0"; }; stable = { chromedriver = { - sha256_darwin = "0y973bs4dbdrl152bfiq5avsp6h27j3v1kwgcgxk1d0g293322xs"; - sha256_darwin_aarch64 = - "04qrhr52qc9rhmslgsh2yymsix9cv32g39xbpf8576scihfdngv8"; - sha256_linux = "1hy3s6j20h03ria033kfxd3rq259davvpjny4gpvznzklns71vi1"; + hash_darwin = "sha256-ugsxRhIPtDD7Y4/PsIc8Apqrtyo4uiVKoLmtRvQaJ3k="; + hash_darwin_aarch64 = + "sha256-aD/bHIxMm1OQu6un8cTYLPWoq/cC6kd1hTkxLEqGGRM="; + hash_linux = "sha256-Ie5wtKXz27/vI97Ku7dqqQicR+tujgFUzANAIKTRw8M="; version = "118.0.5993.70"; }; deps = { gn = { rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4"; - sha256 = "1ly7z48v147bfdb1kqkbc98myxpgqq3g6vgr8bjx1ikrk17l82ab"; + hash = "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M="; url = "https://gn.googlesource.com/gn"; version = "2023-08-10"; }; }; - sha256 = "sha256-CTkw92TiRD2tkYu5a5dy8fjpR2MMOMCvcbxXhJ36Bp8="; - sha256bin64 = "06rbsjh4khhl408181ns5nsdwasklb277fdjfajdv5h1j9a190k3"; + hash = "sha256-CTkw92TiRD2tkYu5a5dy8fjpR2MMOMCvcbxXhJ36Bp8="; + hash_deb_amd64 = "sha256-Y4IUVJIBlt2kcrK5c8SiUyvetC3aBhQQIBTCSaDUKxs="; version = "118.0.5993.88"; }; ungoogled-chromium = { deps = { gn = { rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4"; - sha256 = "1ly7z48v147bfdb1kqkbc98myxpgqq3g6vgr8bjx1ikrk17l82ab"; + hash = "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M="; url = "https://gn.googlesource.com/gn"; version = "2023-08-10"; }; ungoogled-patches = { rev = "118.0.5993.88-1"; - sha256 = "17j47d64l97ascp85h8cnfnr5wr4va3bdk95wmagqss7ym5c7zsf"; + hash = "sha256-Tv/DSvVHa/xU5SXNtobaJPOSrbMMwYIu0+okSkw7RJ4="; }; }; - sha256 = "sha256-CTkw92TiRD2tkYu5a5dy8fjpR2MMOMCvcbxXhJ36Bp8="; - sha256bin64 = "06rbsjh4khhl408181ns5nsdwasklb277fdjfajdv5h1j9a190k3"; + hash = "sha256-CTkw92TiRD2tkYu5a5dy8fjpR2MMOMCvcbxXhJ36Bp8="; + hash_deb_amd64 = "sha256-Y4IUVJIBlt2kcrK5c8SiUyvetC3aBhQQIBTCSaDUKxs="; version = "118.0.5993.88"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index e3a9a01af6dd5..5ac761db99db9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/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/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 6d7e0198829f1..e58ee63d08c6b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/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 = { @@ -30,11 +30,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "119.0b4"; + version = "119.0b9"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "7c067d759602608e527d032f7a3772df827a5b5c4270992c05abda726fcd665f4f2c5380e684623ed108364ace4afaed8b5959f75a4b0540edd5ae30422b0e54"; + sha512 = "11d07474e3ca72a4e2f60053882e09a215e0d29d6830d0cd41447bb67370118356090af7adcbacd7703ad9fcdda83c9f909419c86b8f3bf2eacd9ca3d3aa3f54"; }; meta = { @@ -58,12 +58,12 @@ firefox-devedition = (buildMozillaMach rec { pname = "firefox-devedition"; - version = "119.0b4"; + version = "119.0b9"; applicationName = "Mozilla Firefox Developer Edition"; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "ded00bc1e090bdca5f32160d980cec47590bb952a6c7f1dc8f4df30fa452cad8c47a3c6d20cf3e8345fd5811777b475354d71d704c866fb49396a83c8a795bcb"; + sha512 = "ce3e2adb3171aa05c7af3b7a4ea25eaafbc109c522b90e26aad577192a0902000fb7d705fa5707a9a7d0be2ab1c0cddc5a98abbe6549e1377c0a1d765bda62eb"; }; 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/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 28e97bcaa41e8..ed1ec5692a0c5 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/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/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 1f898ed879867..a7f3e136668c2 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -26,7 +26,7 @@ let }; pname = "qutebrowser"; - version = "3.0.0"; + version = "3.0.2"; in assert withMediaPlayback -> gst_all_1 != null; @@ -39,7 +39,7 @@ 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 diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 0371e8c813bdf..2204a9405027a 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.7.3"; + version = "8.7.4"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-2ABsxoGRRUfa09tVPmn1IXDR2IXIewg/b/fmQnaKLoY="; + sha256 = "sha256-W4+2ugRSSP3HgmyQJKGCPMX7cmE7Fk3iovBOgBen+q8="; }; - vendorHash = "sha256-k2NI9zyeQM4PJo2wE3WkG5sntJGISwmz4xqQVChu8WQ="; + vendorHash = "sha256-klbKL/c7L7kHPadDa/FkpuAgHYQmuLQK6yFhph52KsU="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/pkgs/applications/networking/cluster/eks-node-viewer/default.nix index b4f9ce722e79e..80538f0f111c4 100644 --- a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix +++ b/pkgs/applications/networking/cluster/eks-node-viewer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eks-node-viewer"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-570wOLUtKKzDDLLDrAOPAnAUpZeAqrwKsQWoHCBjKKk="; + sha256 = "sha256-kfX9BzARDWUOBIu67j60K38uwkRELxd/gXtEHOHAXS8="; }; - vendorHash = "sha256-kRRUaA/psQDmcM1ZhzdZE3eyw8DWZpesJVA2zVfORGk="; + vendorHash = "sha256-7axI7R8cTntc1IcOwVPmPj8MHeIvhbnkYKQdqu5fZOU="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index f0547dcf56097..70c70d9ead43c 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${jre}/bin cat <<EOF >> $out/opt/flink/conf/flink-conf.yaml - env.java.home: ${jre}" + env.java.home: ${jre} env.log.dir: /tmp/flink-logs EOF ''; diff --git a/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix b/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix new file mode 100644 index 0000000000000..7d5d2918e9b9f --- /dev/null +++ b/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix @@ -0,0 +1,37 @@ +{ version, stdenv, fetchurl, lib, cmake, openssl, platformAttrs, ... }: + +stdenv.mkDerivation (finalAttrs: { + pname = "hadoop-yarn-containerexecutor"; + inherit version; + + src = fetchurl { + url = "mirror://apache/hadoop/common/hadoop-${finalAttrs.version}/hadoop-${finalAttrs.version}-src.tar.gz"; + hash = platformAttrs.${stdenv.system}.srcHash; + }; + sourceRoot = "hadoop-${finalAttrs.version}-src/hadoop-yarn-project/hadoop-yarn/" + +"hadoop-yarn-server/hadoop-yarn-server-nodemanager/src"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl ]; + cmakeFlags = [ "-DHADOOP_CONF_DIR=/run/wrappers/yarn-nodemanager/etc/hadoop" ]; + + installPhase = '' + mkdir $out + mv target/var/empty/local/bin $out/ + ''; + + meta = with lib; { + homepage = "https://hadoop.apache.org/"; + description = "Framework for distributed processing of large data sets across clusters of computers"; + license = licenses.asl20; + + longDescription = '' + The Hadoop YARN Container Executor is a native component responsible for managing the lifecycle of containers + on individual nodes in a Hadoop YARN cluster. It launches, monitors, and terminates containers, ensuring that + resources like CPU and memory are allocated according to the policies defined in the ResourceManager. + ''; + + maintainers = with maintainers; [ illustris ]; + platforms = filter (strings.hasSuffix "linux") (attrNames platformAttrs); + }; +}) diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 65512de2031b9..d5bae9ad885b7 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -19,6 +19,8 @@ , nixosTests , sparkSupport ? true , spark +, libtirpc +, callPackage }: with lib; @@ -26,40 +28,75 @@ with lib; assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; let - common = { pname, platformAttrs, untarDir ? "${pname}-${version}", jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }: - stdenv.mkDerivation rec { - inherit pname jdk libPatches untarDir openssl; + common = { pname, platformAttrs, jdk, tests }: + stdenv.mkDerivation (finalAttrs: { + inherit pname jdk; version = platformAttrs.${stdenv.system}.version or (throw "Unsupported system: ${stdenv.system}"); src = fetchurl { - url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; + url = "mirror://apache/hadoop/common/hadoop-${finalAttrs.version}/hadoop-${finalAttrs.version}" + + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; inherit (platformAttrs.${stdenv.system}) hash; }; doCheck = true; + # Build the container executor binary from source + # InstallPhase is not lazily evaluating containerExecutor for some reason + containerExecutor = if stdenv.isLinux then (callPackage ./containerExecutor.nix { + inherit (finalAttrs) version; + inherit platformAttrs; + }) else ""; + nativeBuildInputs = [ makeWrapper ] - ++ optionals (stdenv.isLinux && (nativeLibs != [ ] || libPatches != "")) [ autoPatchelfHook ]; - buildInputs = [ openssl ] ++ nativeLibs; + ++ optionals stdenv.isLinux [ autoPatchelfHook ]; + buildInputs = optionals stdenv.isLinux [ stdenv.cc.cc.lib openssl protobuf zlib snappy libtirpc ]; installPhase = '' - mkdir -p $out/{lib/${untarDir}/conf,bin,lib} - mv * $out/lib/${untarDir} + mkdir $out + mv * $out/ '' + optionalString stdenv.isLinux '' - # All versions need container-executor, but some versions can't use autoPatchelf because of broken SSL versions - patchelf --set-interpreter ${glibc.out}/lib64/ld-linux-x86-64.so.2 $out/lib/${untarDir}/bin/container-executor + for n in $(find ${finalAttrs.containerExecutor}/bin -type f); do + ln -sf "$n" $out/bin + done + + # these libraries are loaded at runtime by the JVM + ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/native/libsasl2.so.2 + ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/native/ + ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/native/ + ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/native/ + ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/native/ + ln -s ${getLib snappy}/lib/libsnappy.so.1 $out/lib/native/ + + # libjvm.so is in different paths for java 8 and 11 + # libnativetask.so in hadooop 3 and libhdfs.so in hadoop 2 depend on it + find $out/lib/native/ -name 'libnativetask.so*' -o -name 'libhdfs.so*' | \ + xargs -n1 patchelf --add-rpath $(dirname $(find ${finalAttrs.jdk.home} -name libjvm.so | head -n1)) + + # NixOS/nixpkgs#193370 + # This workaround is needed to use protobuf 3.19 + # hadoop 3.3+ depends on protobuf 3.18, 3.2 depends on 3.8 + find $out/lib/native -name 'libhdfspp.so*' | \ + xargs -r -n1 patchelf --replace-needed libprotobuf.so.${ + if (versionAtLeast finalAttrs.version "3.3") then "18" + else "8" + } libprotobuf.so + + patchelf --replace-needed libcrypto.so.1.1 libcrypto.so \ + $out/lib/native/{libhdfs{pp,}.so*,examples/{pipes-sort,wordcount-nopipe,wordcount-part,wordcount-simple}} + '' + '' - for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do - makeWrapper "$n" "$out/bin/$(basename $n)"\ - --set-default JAVA_HOME ${jdk.home}\ - --set-default HADOOP_HOME $out/lib/${untarDir}\ + for n in $(find $out/bin -type f ! -name "*.*"); do + wrapProgram "$n"\ + --set-default JAVA_HOME ${finalAttrs.jdk.home}\ + --set-default HADOOP_HOME $out/\ --run "test -d /etc/hadoop-conf && export HADOOP_CONF_DIR=\''${HADOOP_CONF_DIR-'/etc/hadoop-conf/'}"\ - --set-default HADOOP_CONF_DIR $out/lib/${untarDir}/etc/hadoop/\ + --set-default HADOOP_CONF_DIR $out/etc/hadoop/\ --prefix PATH : "${makeBinPath [ bash coreutils which]}"\ - --prefix JAVA_LIBRARY_PATH : "${makeLibraryPath buildInputs}" + --prefix JAVA_LIBRARY_PATH : "${makeLibraryPath finalAttrs.buildInputs}" done - '' + optionalString sparkSupport '' + '' + (optionalString sparkSupport '' # Add the spark shuffle service jar to YARN - cp ${spark.src}/yarn/spark-${spark.version}-yarn-shuffle.jar $out/lib/${untarDir}/share/hadoop/yarn/ - '' + libPatches; + cp ${spark.src}/yarn/spark-${spark.version}-yarn-shuffle.jar $out/share/hadoop/yarn/ + ''); passthru = { inherit tests; }; @@ -83,7 +120,7 @@ let maintainers = with maintainers; [ illustris ]; platforms = attrNames platformAttrs; } (attrByPath [ stdenv.system "meta" ] {} platformAttrs); - }; + }); in { # Different version of hadoop support different java runtime versions @@ -91,48 +128,29 @@ in hadoop_3_3 = common rec { pname = "hadoop"; platformAttrs = rec { - x86_64-linux = { - version = "3.3.5"; - hash = "sha256-RG4FypL6I6YGF6ixeUbe3kcoGvFQQEFhfLfV9i50JSo="; - }; - x86_64-darwin = x86_64-linux; - aarch64-linux = { - version = "3.3.5"; - hash = "sha256-qcKjbE881isauWBxIv+NY0UFbYit704/Re8Kdl6x1LA="; - }; - aarch64-darwin = aarch64-linux; + x86_64-linux = { + version = "3.3.6"; + hash = "sha256-9RlQWcDUECrap//xf3sqhd+Qa8tuGZSHFjGfmXhkGgQ="; + srcHash = "sha256-4OEsVhBNV9CJ+PN4FgCduUCVA9/el5yezSCZ6ko3+bU="; + }; + x86_64-darwin = x86_64-linux; + aarch64-linux = x86_64-linux // { + hash = "sha256-5Lv2uA72BJEva5v2yncyPe5gKNCNOPNsoHffVt6KXQ0="; + }; + aarch64-darwin = aarch64-linux; }; - untarDir = "${pname}-${platformAttrs.${stdenv.system}.version}"; jdk = jdk11_headless; - inherit openssl; # TODO: Package and add Intel Storage Acceleration Library - nativeLibs = [ stdenv.cc.cc.lib protobuf zlib snappy ]; - libPatches = '' - ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/${untarDir}/lib/native/libsasl2.so.2 - ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/${untarDir}/lib/native/ - ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/${untarDir}/lib/native/ - ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/${untarDir}/lib/native/ - ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/${untarDir}/lib/native/ - '' + optionalString stdenv.isLinux '' - # libjvm.so for Java >=11 - patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 - # Java 8 has libjvm.so at a different path - patchelf --add-rpath ${jdk.home}/jre/lib/amd64/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 - # NixOS/nixpkgs#193370 - # This workaround is needed to use protobuf 3.19 - patchelf --replace-needed libprotobuf.so.18 libprotobuf.so $out/lib/${untarDir}/lib/native/libhdfspp.so - ''; tests = nixosTests.hadoop; }; - hadoop_3_2 = common rec { + hadoop_3_2 = common { pname = "hadoop"; platformAttrs.x86_64-linux = { version = "3.2.4"; hash = "sha256-qt2gpMr+NHuiVR+/zFRzRyRKG725/ZNBIM69z9J9wNw="; + srcHash = "sha256-F9nGD3mZZ1eJf3Ec3AJGE9YBcL/HiagskcdKQhCn/sw="; }; jdk = jdk8_headless; - # not using native libs because of broken openssl_1_0_2 dependency - # can be manually overridden tests = nixosTests.hadoop_3_2; }; hadoop2 = common rec { @@ -140,6 +158,7 @@ in platformAttrs.x86_64-linux = { version = "2.10.2"; hash = "sha256-xhA4zxqIRGNhIeBnJO9dLKf/gx/Bq+uIyyZwsIafEyo="; + srcHash = "sha256-ucxCyXiJo8aL6aNMhZgKEbn8sGKOoMPVREbMGSfSdAI="; }; jdk = jdk8_headless; tests = nixosTests.hadoop2; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index b70ecd725eab6..9e0470c70e824 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/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/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/applications/networking/cluster/ocm/default.nix index ac44c8efffdb0..95646c800abaf 100644 --- a/pkgs/applications/networking/cluster/ocm/default.nix +++ b/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/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index 126a083b5b347..ea6166475065a 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/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/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 32f29dea87cab..b0c4515b29094 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -953,14 +953,23 @@ "vendorHash": null }, "project": { - "hash": "sha256-D+UBv6JEbJKGfwTJU7/W5N6otOLW2lq6+euUKpoJ+To=", + "hash": "sha256-UO9GBBoOzA1stMq8naXWtxomme6CVdlngVCLQlbZDv0=", "homepage": "https://registry.terraform.io/providers/jfrog/project", "owner": "jfrog", "repo": "terraform-provider-project", - "rev": "v1.3.2", + "rev": "v1.3.3", "spdx": "Apache-2.0", "vendorHash": "sha256-Tj+NefCIacwpPS9rNPPxV2lLeKsXJMZhf9Xo+Rzz6gI=" }, + "proxmox": { + "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", + "homepage": "https://registry.terraform.io/providers/Telmate/proxmox", + "owner": "Telmate", + "repo": "terraform-provider-proxmox", + "rev": "v2.9.14", + "spdx": "MIT", + "vendorHash": "sha256-um4iOwYO6ASv9wpu5Jua9anUZBKly4yVgI224Fk2dOM=" + }, "rabbitmq": { "hash": "sha256-ArteHTNNUxgiBJamnR1bJFDrvNnqjbJ6D3mj1XlpVUA=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/rabbitmq", @@ -1279,11 +1288,11 @@ "vendorHash": "sha256-4ulRYzb4bzk0TztT04CwqlnMGw8tp7YnoCm2/NqGN7Y=" }, "vultr": { - "hash": "sha256-65QWogqHR5RYUXBYjM50PNQSuVWYGtqtULTGNy1ivag=", + "hash": "sha256-8pj+udTNTjT/tXggOaIOThRQkYoI3v68rEssSUojM2A=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.16.3", + "rev": "v2.16.4", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 1e6c86915acd4..65cddcbc34d4b 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.52.1"; + version = "0.52.3"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-t1GAcOZAYdfrI0lsyKUEBbnJaGzuFP0+Mz3Yrv4Bmik="; + hash = "sha256-o/4L7TBdFFHuPOKAO/wP0IBixQtZHGr1GSNlsEpq710="; }; - vendorHash = "sha256-NSrZVLQ3Qbnp94qCV7NbrEav/7LCRbTov+B2vzbuvdM="; + vendorHash = "sha256-RmzSKt5qt9Qb4GDrfs4dJEhGQW/jFbXPn+AOLzEyo6c="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/tf-summarize/default.nix b/pkgs/applications/networking/cluster/tf-summarize/default.nix index 7267e3fc064a7..1381ba664222e 100644 --- a/pkgs/applications/networking/cluster/tf-summarize/default.nix +++ b/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/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index f574daedde033..10f8e7a9f5776 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/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/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 3b165ab6fa6db..0d58e54bcb423 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/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/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/applications/networking/gopher/sacc/default.nix index 9944238703983..686f671e13a52 100644 --- a/pkgs/applications/networking/gopher/sacc/default.nix +++ b/pkgs/applications/networking/gopher/sacc/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "sacc"; - version = "1.06"; + version = "1.07"; src = fetchurl { url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tar.gz"; - hash = "sha512-eoleQy4dKLfZsrsqUybKMjUIdqLIDTncbBnnU0fXKkhH8apP8R8H6Kmt6hTqcbhNcIkNzBcP9s4Ld54dZYa0+g=="; + hash = "sha256-LdEeZH+JWb7iEEzikAXaxG0N5GMPxjgTId4THLgdU2w="; }; inherit patches; diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index e8e5f01206631..9b16c05241c84 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -20,7 +20,6 @@ , glib , gtk3 , libappindicator-gtk3 -, libdbusmenu , libdrm , libnotify , libpulseaudio @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { pname = "armcord"; - version = "3.2.4-libwebp"; + version = "3.2.5"; src = let @@ -47,12 +46,12 @@ stdenv.mkDerivation rec { in { x86_64-linux = fetchurl { - url = "${base}/v${version}/ArmCord_${builtins.head (lib.splitString "-" version)}_amd64.deb"; - hash = "sha256-WeHgai9vTaN04zMdAXmhemKroKH+kwHuOr/E85mfurE="; + 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"; - hash = "sha256-4/vGdWXv8wrbF/EhMK6kJPjta0EOGH6C3kUyM0OTB8M="; + url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; + hash = "sha256-HJu1lRa3zOTohsPMe23puHxg1VMWNR2aOjDQJqc4TqE="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 7de11d9431010..bd5b0d904cc75 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -11,11 +11,11 @@ }: let pname = "beeper"; - version = "3.80.17"; + version = "3.82.8"; name = "${pname}-${version}"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.80.17-build-231010czwkkgnej.AppImage"; - hash = "sha256-cfzfeM1czhZKz0HbbJw2PD3laJFg9JWppA2fKUb5szU="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.82.8-build-231019pq0po3woq.AppImage"; + hash = "sha256-tXPmTpbzWU+sUJHhyP2lexcAb33YmJnRaxX08G4CTaE="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index 336d045b6c168..ae8bc922bb468 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/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/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix index caf6669e120b5..0b2be12ad0b34 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix @@ -1,8 +1,12 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib +, python3Packages +, fetchFromGitHub +}: python3Packages.buildPythonApplication rec { pname = "matrix-dl"; version = "unstable-2020-07-14"; + format = "pyproject"; src = fetchFromGitHub { owner = "rubo77"; @@ -11,6 +15,10 @@ python3Packages.buildPythonApplication rec { sha256 = "1l8nh8z7kz24v0wcy3ll3w6in2yxwa1yz8lyc3x0blz37d8ss4ql"; }; + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + propagatedBuildInputs = with python3Packages; [ matrix-client ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 7ae6a8a11abe0..d6118db16f3c5 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.32.0"; - hash = "sha256-FZ2wG3nkgIndeoUfXag/9jftXGDSY/MNpT8mqSZpJzA="; + version = "6.34.1"; + hash = "sha256-1kffRXPQmtxIsLZVOgPXDnxUmY59q+1umy25cditRhw="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.33.0-beta.1"; - hash = "sha256-FLCZvRYUysiE8BLMJVnn0hOkA3km0z383AjN6JvOyWI="; + version = "6.35.0-beta.2"; + hash = "sha256-TgzqKGt3ojkjq+mIu0EtqXfnnZ/xulWjiuS5/0dlwIM="; }; } diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index 157df8ca9a651..2307c4db01e30 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -19,18 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "teams-for-linux"; - version = "1.3.13"; + version = "1.3.14"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-WF2jWP6utopAMZPP/ZWOhqVGZJmACwHyLLE+HQaHJjg="; + hash = "sha256-2H7j8e2wPMd4cHXDKxSmyC2Ng/B3jb3/tGVTpUOU3XM="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-vgjPGO5qa4IYfW1svClJ+wP/KtIFFd3P02T2sht69C8="; + hash = "sha256-zB6H14VAf13pAHQmsWC51d/qqyfRmAEbltyLD5ucG4Y="; }; nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ]; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 8136324770e64..23bfb324c1ae7 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/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/pkgs/applications/networking/irc/weechat/gettext-intl.patch b/pkgs/applications/networking/irc/weechat/gettext-intl.patch new file mode 100644 index 0000000000000..7b95472c06fa5 --- /dev/null +++ b/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/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index da599367af3a2..3ae60816b5a00 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -34,10 +34,19 @@ in buildPythonPackage { hash = "sha256-o4kgneszVLENG167nWnk2FxM+PsMzi+PSyMUMIktZcc="; }; - patches = fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/poljar/weechat-matrix/pull/309.patch"; - sha256 = "sha256-Grdht+TOFvCYRpL7uhPivqL7YzLoNVF3iQNHgbv1Te0="; - }; + patches = [ + # server: remove set_npn_protocols() + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/poljar/weechat-matrix/pull/309.patch"; + hash = "sha256-Grdht+TOFvCYRpL7uhPivqL7YzLoNVF3iQNHgbv1Te0="; + }) + # Fix compatibility with matrix-nio 0.21 + (fetchpatch { + url = "https://github.com/poljar/weechat-matrix/commit/feae9fda26ea9de98da9cd6733980a203115537e.patch"; + hash = "sha256-MAfxJ85dqz5PNwp/GJdHA2VvXVdWh+Ayx5g0oHiw9rs="; + includes = ["matrix/config.py"]; + }) + ]; propagatedBuildInputs = [ pyopenssl diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index c7ec5525681c8..6b164969a3981 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -44,13 +44,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.3.2"; + version = "115.3.3"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "e94bdb940327296754324d8fcb055813247a79d377399b84184e0ff80123240d923aa3745c3076d37f06296c8cc49373db2d8e8a6ac4edeaf63cd56ca4652e35"; + sha512 = "631042a3cdbcbae91d93eb71c0d4f6a1122e8bc7000d75fcc7d3cbdd0e82a4b31abac590c75771e77ab08d5700582b6dedacf62ce8e21a91e9ea81aedf1bbeaa"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/mullvad/Cargo.lock b/pkgs/applications/networking/mullvad/Cargo.lock index 87bef3c513fe2..49d3e0f812b7a 100644 --- a/pkgs/applications/networking/mullvad/Cargo.lock +++ b/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/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index 754109c5ccf75..71a53aa3344bd 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/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/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index ce9476807465a..37932a3a4b2b7 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.10.0"; + version = "3.10.1"; outputs = [ "out" "dev" ]; @@ -33,7 +33,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-BNqMKL888DKuRiM537V7CBuCabg5YmGYGpWARtvs7go="; + sha256 = "sha256-PtWg9IMwZU0HG2pVHdRKgPQH8i2e72Fbs+q5wCwBsfo="; }; patches = [ diff --git a/pkgs/applications/networking/p2p/tremotesf/default.nix b/pkgs/applications/networking/p2p/tremotesf/default.nix index 6880d8472167d..4cd7358d2b77c 100644 --- a/pkgs/applications/networking/p2p/tremotesf/default.nix +++ b/pkgs/applications/networking/p2p/tremotesf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tremotesf"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "equeim"; repo = "tremotesf2"; rev = finalAttrs.version; - hash = "sha256-TKtBgMpCWIUl1bohAKCbTcZX2uaPmzeWut/OeNs/rME="; + hash = "sha256-mxk2BRUuet3XSNaKt2Dnnxe5dliazd1ArRSnKyoAp1s="; # We need this for src/libtremotesf fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index b9b8ee29b1807..931b788156d38 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -8,7 +8,7 @@ , alsa-lib , faac , faad2 -, ffmpeg +, ffmpeg_5 # Depends on deprecated libav features , glib , openh264 , openssl @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { cairo cups faad2 - ffmpeg + ffmpeg_5 glib gst-plugins-base gst-plugins-good diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 2e6dd8fa7fde5..a86d80d9ae672 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/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="; @@ -41,6 +41,10 @@ buildGoModule rec { ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell installShellCompletion rclone.$shell done + + # filesystem helpers + ln -s $out/bin/rclone $out/bin/rclonefs + ln -s $out/bin/rclone $out/bin/mount.rclone '' + lib.optionalString (enableCmount && !stdenv.isDarwin) # use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount, # as the setuid wrapper is required as non-root on NixOS. diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix index 6c6dddee1735e..7424a3da049a3 100644 --- a/pkgs/applications/networking/sync/wdt/default.nix +++ b/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/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index c6570414040bc..7c5a3dc932760 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , buildNpmPackage , nixosTests , gettext @@ -19,13 +20,13 @@ }: let - version = "1.17.2"; + version = "1.17.4"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-/0Ml3NRTghqNykB1RZfqDW9TtENnSRM7wqG7Vn4Kl04="; + hash = "sha256-Kl8AUfHfEiEy40qeDI8x2rxdXcj01mpitw7T/96ibQQ="; }; # Use specific package versions required by paperless-ngx @@ -51,7 +52,7 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-6EvC9Ka8gl0eRgJtHooB3yQNVGYzuH/WRga4AtzQ0EY="; + npmDepsHash = "sha256-5Q9NtIO7k/6AiF9Er10HhmEBFyQOP9CiTkTZglUeChg="; nativeBuildInputs = [ python3 @@ -91,6 +92,16 @@ python.pkgs.buildPythonApplication rec { inherit version src; + patches = [ + # https://github.com/paperless-ngx/paperless-ngx/pull/4146 + (fetchpatch { + name = "fix-tests-for-python311.patch"; + url = "https://github.com/paperless-ngx/paperless-ngx/commit/73f6c0a056e3859061339e295f57213fd4239b2d.patch"; + hash = "sha256-sZcRug5T4cw5ppKpGYrrfz9RxtYxnkeNOlXcMgdWT0E="; + }) + ]; + + nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 813c29e1ef50e..56c2219af67d0 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/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/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 9be6994d6a0d4..506b934d77c98 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/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/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix index 6ce255675b14f..21b80fcf51dd6 100644 --- a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix +++ b/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/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index e5af2fc0206a4..321e78ce9138d 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -8,6 +8,7 @@ , hamlib , hamlibSupport ? true , perl +, portaudio , python3 , espeak , udev @@ -25,11 +26,14 @@ stdenv.mkDerivation rec { sha256 = "0xmz64m02knbrpasfij4rrq53ksxna5idxwgabcw4n2b1ig7pyx5"; }; + patches = [ ./fix-strlcpy-usage.patch ]; + nativeBuildInputs = [ cmake ]; 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/pkgs/applications/radio/direwolf/fix-strlcpy-usage.patch b/pkgs/applications/radio/direwolf/fix-strlcpy-usage.patch new file mode 100644 index 0000000000000..9f43415114cbe --- /dev/null +++ b/pkgs/applications/radio/direwolf/fix-strlcpy-usage.patch @@ -0,0 +1,89 @@ +strlcpy is now part of glibc, so there's absolutely no reason for a custom implementation, especially +one with printf debugging. Hence, removing all of that. + +See also https://hydra.nixos.org/build/230546596 +See glibc commit 454a20c8756c9c1d55419153255fc7692b3d2199 + +diff --git a/external/misc/strlcpy.c b/external/misc/strlcpy.c +index ff18800..b1cb443 100644 +--- a/external/misc/strlcpy.c ++++ b/external/misc/strlcpy.c +@@ -56,65 +56,3 @@ + + #include "textcolor.h" + +-/* +- * Copy src to string dst of size siz. At most siz-1 characters +- * will be copied. Always NUL terminates (unless siz == 0). +- * Returns strlen(src); if retval >= siz, truncation occurred. +- */ +- +-#if DEBUG_STRL +-size_t strlcpy_debug(char *__restrict__ dst, const char *__restrict__ src, size_t siz, const char *file, const char *func, int line) +-#else +-size_t strlcpy_debug(char *__restrict__ dst, const char *__restrict__ src, size_t siz) +-#endif +-{ +- char *d = dst; +- const char *s = src; +- size_t n = siz; +- size_t retval; +- +-#if DEBUG_STRL +- if (dst == NULL) { +- text_color_set (DW_COLOR_ERROR); +- dw_printf ("ERROR: strlcpy dst is NULL. (%s %s %d)\n", file, func, line); +- return (0); +- } +- if (src == NULL) { +- text_color_set (DW_COLOR_ERROR); +- dw_printf ("ERROR: strlcpy src is NULL. (%s %s %d)\n", file, func, line); +- return (0); +- } +- if (siz == 1 || siz == 4) { +- text_color_set (DW_COLOR_ERROR); +- dw_printf ("Suspicious strlcpy siz. Is it using sizeof a pointer variable? (%s %s %d)\n", file, func, line); +- } +-#endif +- +- /* Copy as many bytes as will fit */ +- if (n != 0 && --n != 0) { +- do { +- if ((*d++ = *s++) == 0) +- break; +- } while (--n != 0); +- } +- +- /* Not enough room in dst, add NUL and traverse rest of src */ +- if (n == 0) { +- if (siz != 0) +- *d = '\0'; /* NUL-terminate dst */ +- while (*s++) +- ; +- } +- +- retval = s - src - 1; /* count does not include NUL */ +- +-#if DEBUG_STRL +- if (retval >= siz) { +- text_color_set (DW_COLOR_ERROR); +- dw_printf ("WARNING: strlcpy result length %d exceeds maximum length %d. (%s %s %d)\n", +- (int)retval, (int)(siz-1), file, func, line); +- } +-#endif +- return (retval); +-} +- +diff --git a/src/direwolf.h b/src/direwolf.h +index efc329b..22eb748 100644 +--- a/src/direwolf.h ++++ b/src/direwolf.h +@@ -294,7 +294,7 @@ char *strcasestr(const char *S, const char *FIND); + #define HAVE_STRLCPY 1 + + +-#define DEBUG_STRL 1 ++#define DEBUG_STRL 0 + + #if DEBUG_STRL + diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix index 440c1c955ab05..ed3fa1715f75c 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/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/pkgs/applications/science/astronomy/gnuastro/default.nix b/pkgs/applications/science/astronomy/gnuastro/default.nix index 69f4011f2737e..a1fef6404e460 100644 --- a/pkgs/applications/science/astronomy/gnuastro/default.nix +++ b/pkgs/applications/science/astronomy/gnuastro/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnuastro"; - version = "0.20"; + version = "0.21"; src = fetchurl { url = "mirror://gnu/gnuastro/gnuastro-${version}.tar.gz"; - sha256 = "sha256-kkuLtqwc0VFj3a3Dqb/bi4jKx7UJnV+CHs7bw/Cwac0="; + sha256 = "sha256-L7qZPYQiORUXtV9+tRF4iUbXqIaqFYSYT9Rni90nU38="; }; nativeBuildInputs = [ libtool ]; diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index e5c9c28642251..356e90555f8d8 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -1,26 +1,62 @@ -{ lib, stdenv, fetchFromGitHub, cmake, tbb, zlib, python3, perl }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, perl +, python3 +, tbb +, zlib +, runCommand +, bowtie2 +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bowtie2"; version = "2.5.2"; src = fetchFromGitHub { owner = "BenLangmead"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Bem4SHY/74suZPDbw/rwKMLBn3bRq5ooHbBoVnKuYk0="; + repo = "bowtie2"; + rev = "refs/tags/v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-rWeopeYuCk9ZhJX2SFCcxZWcjXjjTiVRiwkzLQcIgd0="; }; + # because of this flag, gcc on aarch64 cannot find the Threads + # Could NOT find Threads (missing: Threads_FOUND) + # TODO: check with other distros and report upstream + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "-m64" "" + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ tbb zlib python3 perl ]; + cmakeFlags = lib.optional (!stdenv.hostPlatform.isx86) ["-DCMAKE_CXX_FLAGS=-I${finalAttrs.src}/third_party"]; + + # ctest fails because of missing dependencies between tests + doCheck = false; + + passthru.tests = { + ctest = runCommand "${finalAttrs.pname}-test" { } '' + mkdir $out + ${lib.getExe bowtie2} -x ${finalAttrs.src}/example/index/lambda_virus ${finalAttrs.src}/example/reads/longreads.fq -u 10 + ${bowtie2}/bin/bowtie2-build-s -c GGGCGGCGACCTCGCGGGTTTTCGCTA $out/small + ${bowtie2}/bin/bowtie2-inspect-s $out/small + ${bowtie2}/bin/bowtie2-build-l -c GGGCGGCGACCTCGCGGGTTTTCGCTA $out/large + ${bowtie2}/bin/bowtie2-inspect-l $out/large + ''; + }; + meta = with lib; { description = "An ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; - license = licenses.gpl3; + license = licenses.gpl3Plus; homepage = "http://bowtie-bio.sf.net/bowtie2"; + changelog = "https://github.com/BenLangmead/bowtie2/releases/tag/${finalAttrs.src.rev}"; maintainers = with maintainers; [ rybern ]; platforms = platforms.all; - broken = stdenv.isAarch64; # only x86 is supported + mainProgram = "bowtie2"; }; -} +}) diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix index efbedf9a121a0..efbedf9a121a0 100755..100644 --- a/pkgs/applications/science/biology/poretools/default.nix +++ b/pkgs/applications/science/biology/poretools/default.nix diff --git a/pkgs/applications/science/biology/trimal/default.nix b/pkgs/applications/science/biology/trimal/default.nix index b27a63a2135ae..b27a63a2135ae 100755..100644 --- a/pkgs/applications/science/biology/trimal/default.nix +++ b/pkgs/applications/science/biology/trimal/default.nix diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index a4ec84d4d5060..a4ec84d4d5060 100755..100644 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix diff --git a/pkgs/applications/science/chemistry/apbs/default.nix b/pkgs/applications/science/chemistry/apbs/default.nix index 2a892dd562530..f4a2bab4243d6 100644 --- a/pkgs/applications/science/chemistry/apbs/default.nix +++ b/pkgs/applications/science/chemistry/apbs/default.nix @@ -65,6 +65,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace CMakeLists.txt \ --replace "include(ImportFETK)" "" \ --replace 'import_fetk(''${FETK_VERSION})' "" + + # U was removed in python 3.11 because it had no effect + substituteInPlace tools/manip/inputgen.py \ + --replace '"rU"' '"r"' ''; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 775bae9813392..160928633a3cc 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/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/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 90601651e5109..86d6716eaeb75 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/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/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix index 57220aa523cf8..5cd0e5ff9e39f 100644 --- a/pkgs/applications/science/logic/proverif/default.nix +++ b/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/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 4cfc4fb182b8b..86ec445d9b3e4 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/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/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 9fe07603fe7d2..8064a965bd1f6 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -110,6 +110,13 @@ stdenv.mkDerivation rec { url = "https://github.com/sagemath/sage/commit/d88bc3815c0901bfdeaa3e4a31107c084199f614.diff"; sha256 = "sha256-dXaEwk2wXxmx02sCw4Vu9mF0ZrydhFD4LRwNAiQsPgM="; }) + + # https://github.com/sagemath/sage/pull/36279, landed in 10.2.beta4 + (fetchpatch { + name = "matplotlib-3.8-upgrade.patch"; + url = "https://github.com/sagemath/sage/commit/0fcf88935908440930c5f79202155aca4ad57518.diff"; + sha256 = "sha256-mvqAHaTCXsxPv901L8HSTnrfghfXYdq0wfLoP/cYQZI="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index d8d5586e21938..f8beabaac1ffa 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -78,6 +78,7 @@ , sphinx , sympy , typing-extensions +, nbclassic }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -181,6 +182,8 @@ buildPythonPackage rec { sphinx sympy typing-extensions + + nbclassic ]; preBuild = '' diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 6dc630181be2b..a03709c1437d1 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -2,6 +2,7 @@ , lib , callPackage , fetchurl +, fetchpatch , makeWrapper , cmake , coreutils @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.28.06"; + version = "6.28.08"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-rztnO5rKOTpcmuG/huqyZyqvGEG2WMXG56MKuTxYZTM="; + hash = "sha256-o+ZLTAH4fNm75X5h75a0FibkmwRGCVBw1B2b+6NSaGI="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -109,6 +110,18 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch + # glibc >=2.38 already has strlcat implemented. + # merged upstream, remove on next package bump. + (fetchpatch { + url = "https://github.com/root-project/root/commit/8fb0e35446ed67c9d56639b4708c8f05459b7f84.patch"; + hash = "sha256-7EabmYanqlQsYSQsi+S9eWs1v1pY6MncopL420Y3D4w="; + }) + ] ++ lib.optionals (python.pkgs.pythonAtLeast "3.11") [ + # Fix build against Python 3.11 + (fetchpatch { + url = "https://github.com/root-project/root/commit/484deb056dacf768aba4954073b41105c431bffc.patch"; + hash = "sha256-4qur2e3SxMIPgOg4IjlvuULR2BObuP7xdvs+LmNT2/s="; + }) ]; preConfigure = '' diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index a57aec030139d..9f88fe58e3c47 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "qgroundcontrol"; version = "4.2.8"; - qtInputs = [ + propagatedBuildInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 qtgraphicaleffects qtspeech qtx11extras ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { wayland ]; - buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; + buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs; nativeBuildInputs = [ pkg-config qmake qttools wrapQtAppsHook ]; preConfigure = '' diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 22edc08e65554..aee1b2dab070e 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.36.0"; + version = "2.37.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-ya+Iuhe+vXNqt6mfpZ3h8jq++82AGMj+Zd4ozGFjuqY="; + hash = "sha256-EAvBPUm2U31gzpfyjEPClT1lbBYiITXpdc+T3nUMOeg="; }; - vendorHash = "sha256-tJDn3pyX5iTIa61OQXbErdBprqxu1N2LXqyJtpDQnBE="; + vendorHash = "sha256-G3cpR5S+upk3js5anZHXxcRayTEGMqnBpmtp4HO0pjQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index f53f021a80c0e..1da2437822df0 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.162"; + version = "5.12.164"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-qwnzq1CKo7kJXITpPjKAhk1dbGSj6TXat7ioP7o3ifg="; + hash = "sha256-egK/C4pSNOS1vvn+HkgWVyNbQONiBYA5AZWP4/CT9Q0="; }; - cargoHash = "sha256-AGE+zA5DHabqgzCC/T1DDG9bGPciSdl1euZbbCeKPzQ="; + cargoHash = "sha256-NyRvYkvswfwCHnvLw21EhnY6pkCIBMImZPRtNYnT5c4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index a5f6820342d3a..52aef7a8af618 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.37"; + version = "2.38"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-6OAubRkNXIm1HaiDq4jzBPUhgbwQowSZXSqAzAe7Rv0="; + hash = "sha256-o3uNFGnccFU3ZSc8BZLh8JTc8517bho/qX6otC5oC5s="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 0cbbe9d469ef8..9082bffce0f9d 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/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/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 1270fbae33d25..90081d4e59083 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -1,55 +1,32 @@ { lib -, fetchFromGitHub , fetchPypi +, fetchpatch , python3 }: -let - py = python3.override { - packageOverrides = self: super: { - # Upstream is pinning releases incl. dependencies of their dependencies - zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec { - version = "0.31.0"; - src = fetchFromGitHub { - owner = "jstasiak"; - repo = "python-zeroconf"; - rev = version; - hash = "sha256-8pYbIkPsg16VelwqpYSzqfAJaCU37lun+XZ/crzCDZU="; - }; - }); - - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "7.1.2"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; - }; - disabledTests = [ "test_bytes_args" ]; # https://github.com/pallets/click/commit/6e05e1fa1c2804 - }); - - pychromecast = super.pychromecast.overridePythonAttrs (oldAttrs: rec { - version = "9.2.0"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-bTRZNXXPd1Zd9Hr0x13UfGplgx7BiowQtTZ7LxwXLwo="; - }; - }); - }; - }; -in -with py.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "catt"; - version = "0.12.7"; - format = "setuptools"; + version = "0.12.11"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Q9ePWRLwuuTG+oPKFg7xn1gj4uAVlXUxegWdyH3Yd90="; + hash = "sha256-0bqYYfWwF7yYoAbjZPhi/f4CLcL89imWGYaMi5Bwhtc="; }; - propagatedBuildInputs = [ + patches = [ + (fetchpatch { + # set explicit build-system + url = "https://github.com/skorokithakis/catt/commit/08e7870a239e85badd30982556adc2aa8a8e4fc1.patch"; + hash = "sha256-QH5uN3zQNVPP6Th2LHdDBF53WxwMhoyhhQUAZOeHh4k="; + }) + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ click ifaddr pychromecast diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 1e8e2ae2f4d46..61e5147be3601 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -10,13 +10,13 @@ in buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "20.3.9"; + version = "20.3.13"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-Z5p/lw7qg6aacJ0eSqswaiwTOsUmuDbNlRRs51LdjRw="; + sha256 = "sha256-xvU+DcVEaQ/1sm6o21/6N1znCtzrct0qDhMxXGFZjL4="; }; extraCMakeFlags = [ diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix index ab034c13755e0..3352ae4c63d30 100644 --- a/pkgs/applications/video/kodi/addons/netflix/default.nix +++ b/pkgs/applications/video/kodi/addons/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.20.2"; + version = "1.22.3"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "sha256-k2O8a0P+TzQVoFQJkzmdqmkKh3Aj7OlsnuhJfUwxOmI="; + sha256 = "sha256-8NGj8n1p8euqYYdPDSeFh2ZE9lly5ThSmg69yXY3Te8="; }; propagatedBuildInputs = [ @@ -24,6 +24,6 @@ buildKodiAddon rec { homepage = "https://github.com/CastagnaIT/plugin.video.netflix"; description = "Netflix VOD Services Add-on"; license = licenses.mit; - maintainers = teams.kodi.members; + maintainers = teams.kodi.members ++ [ maintainers.pks ]; }; } diff --git a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix new file mode 100644 index 0000000000000..f6946842ded41 --- /dev/null +++ b/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/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-deps.patch b/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-deps.patch new file mode 100644 index 0000000000000..abfea58a7ceb8 --- /dev/null +++ b/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/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index bdc4be3a23faa..3d3683ed87760 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -1,13 +1,15 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, requests, infotagger, inputstreamhelper }: +{ lib, buildKodiAddon, fetchFromGitHub, six, requests, infotagger, inputstreamhelper }: buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.1"; + version = "7.0.2.2"; - src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-Wdju7d2kFX0V1J1TB75qEVq0UWN2xYYFNlD8UTt1New="; + src = fetchFromGitHub { + owner = "anxdpanic"; + repo = "plugin.video.youtube"; + rev = "v${version}"; + hash = "sha256-BUeE/8oQYBiq4XgIp4nv0hjEQz3nnkDWCnAf4kpptwk="; }; propagatedBuildInputs = [ @@ -19,9 +21,6 @@ buildKodiAddon rec { passthru = { pythonPath = "resources/lib"; - updateScript = addonUpdateScript { - attrPath = "kodi.packages.youtube"; - }; }; meta = with lib; { diff --git a/pkgs/applications/video/manim/conftest- b/pkgs/applications/video/manim/conftest- new file mode 100644 index 0000000000000..e69de29bb2d1d --- /dev/null +++ b/pkgs/applications/video/manim/conftest- diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index c4443af00dbe7..9c7b0edb3bdf1 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -68,27 +68,29 @@ let in python.pkgs.buildPythonApplication rec { pname = "manim"; - format = "pyproject"; - version = "0.16.0.post0"; + pyproject = true; + version = "0.17.3"; disabled = python3.pythonOlder "3.8"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-iXiPnI6lTP51P1X3iLp75ArRP66o8WAANBLoStPrz4M="; + sha256 = "sha256-TU/b5nwk5Xc9wmFKAIMeBwC4YBy7HauGeGV9/n4Y64c="; }; nativeBuildInputs = with python.pkgs; [ poetry-core ]; + patches = [ + ./pytest-report-header.patch + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "--no-cov-on-fail --cov=manim --cov-report xml --cov-report term" "" \ --replace 'cloup = "^0.13.0"' 'cloup = "*"' \ - --replace 'mapbox-earcut = "^0.12.10"' 'mapbox-earcut = "*"' \ - --replace 'click = ">=7.2<=9.0"' 'click = ">=7.2,<=9.0"' # https://github.com/ManimCommunity/manim/pull/2954 ''; buildInputs = [ cairo ]; @@ -119,6 +121,7 @@ in python.pkgs.buildPythonApplication rec { screeninfo skia-pathops srt + svgelements tqdm watchdog ]; diff --git a/pkgs/applications/video/manim/pytest-report-header.patch b/pkgs/applications/video/manim/pytest-report-header.patch new file mode 100644 index 0000000000000..953ede5dde94d --- /dev/null +++ b/pkgs/applications/video/manim/pytest-report-header.patch @@ -0,0 +1,21 @@ +diff --git a/conftest.py b/conftest.py +index da37e19b..d9f850d8 100644 +--- a/conftest.py ++++ b/conftest.py +@@ -32,16 +32,3 @@ def temp_media_dir(tmpdir, monkeypatch, request): + with tempconfig({"media_dir": str(tmpdir)}): + assert config.media_dir == str(tmpdir) + yield tmpdir +- +- +-def pytest_report_header(config): +- ctx = moderngl.create_standalone_context() +- info = ctx.info +- ctx.release() +- return ( +- "\nOpenGL information", +- "------------------", +- f"vendor: {info['GL_VENDOR'].strip()}", +- f"renderer: {info['GL_RENDERER'].strip()}", +- f"version: {info['GL_VERSION'].strip()}\n", +- ) diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 36d941ec94f42..6db16f1aec066 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/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/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix index 60b392a6aa277..291db71dc75f3 100644 --- a/pkgs/applications/video/mpv/scripts/thumbnail.nix +++ b/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/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 8b3866d624bff..fee8325bf6d5a 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/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/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix index 59da5b3244254..777a1ce0c7f19 100644 --- a/pkgs/applications/video/ustreamer/default.nix +++ b/pkgs/applications/video/ustreamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ustreamer"; - version = "5.41"; + version = "5.42"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - hash = "sha256-N70wBKiKfOhlAR9qOSkc6dlO44lJXHWiUYb8nwXMKxo="; + hash = "sha256-V4ScXzZwh3fWCWmeGeb1hce+INYBmf3wtemwNch5FjY="; }; buildInputs = [ libbsd libevent libjpeg ]; diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index 3ced362b946d2..23f966544e8b1 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -19,12 +19,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.3.3"; + version = "3.3.5"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-wU8hfNss0Lxvf9CqFhDAPOxIVaG/9vNR620xpEJkxWI="; + sha256 = "sha256-5D4nlGZfmPaNaLx2PoqLRqlbcukpM6DHpCtqmee+cww="; rev = "V${version}"; }; diff --git a/pkgs/applications/video/w_scan2/default.nix b/pkgs/applications/video/w_scan2/default.nix index 56000407fce63..26202ee18bc23 100644 --- a/pkgs/applications/video/w_scan2/default.nix +++ b/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/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index e33b860ddc9ae..74fa6e225638a 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/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/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/applications/virtualization/kvmtool/default.nix index e7429f3312dac..9aeb21e3f06a9 100644 --- a/pkgs/applications/virtualization/kvmtool/default.nix +++ b/pkgs/applications/virtualization/kvmtool/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { sha256 = "sha256-wpc5DfHnui0lBVH4uOq6a7pXVUZStjNLRvauu6QpRvE="; }; + patches = [ ./strlcpy-glibc-2.38-fix.patch ]; + buildInputs = lib.optionals stdenv.hostPlatform.isAarch64 [ dtc ]; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/kvmtool/strlcpy-glibc-2.38-fix.patch b/pkgs/applications/virtualization/kvmtool/strlcpy-glibc-2.38-fix.patch new file mode 100644 index 0000000000000..457f8e3cff587 --- /dev/null +++ b/pkgs/applications/virtualization/kvmtool/strlcpy-glibc-2.38-fix.patch @@ -0,0 +1,25 @@ +Manually tell the compiler that strlcpy exists. The `try-build` function seems +somewhat broken, i.e. any code that I try to pass to it doesn't link because of an +"undefined reference to main" error (and some more quoting issues with newlines being +swalloed). + +Because both musl and glibc seemt o support strlcpy nowadays, I decided to just skip the +possibly broken feature-check and hardcode that it exists. + +diff --git a/Makefile b/Makefile +index ed2414b..37be9cd 100644 +--- a/Makefile ++++ b/Makefile +@@ -239,10 +239,8 @@ endif + # On a given system, some libs may link statically, some may not; so, check + # both and only build those that link! + +-ifeq ($(call try-build,$(SOURCE_STRLCPY),$(CFLAGS),$(LDFLAGS)),y) +- CFLAGS_DYNOPT += -DHAVE_STRLCPY +- CFLAGS_STATOPT += -DHAVE_STRLCPY +-endif ++CFLAGS_DYNOPT += -DHAVE_STRLCPY ++CFLAGS_STATOPT += -DHAVE_STRLCPY + + ifeq ($(call try-build,$(SOURCE_BFD),$(CFLAGS),$(LDFLAGS) -lbfd -static),y) + CFLAGS_STATOPT += -DCONFIG_HAS_BFD diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix index 8fe79b6e237cb..8fe79b6e237cb 100755..100644 --- a/pkgs/applications/virtualization/vmware-workstation/default.nix +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix diff --git a/pkgs/applications/window-managers/cosmic/applets/Cargo.lock b/pkgs/applications/window-managers/cosmic/applets/Cargo.lock new file mode 100644 index 0000000000000..6d478ac6a0af1 --- /dev/null +++ b/pkgs/applications/window-managers/cosmic/applets/Cargo.lock @@ -0,0 +1,5838 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "accesskit" +version = "0.11.0" +source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" + +[[package]] +name = "accesskit_consumer" +version = "0.15.0" +source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_unix" +version = "0.4.0" +source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" +dependencies = [ + "accesskit", + "accesskit_consumer", + "async-channel", + "atspi", + "futures-lite", + "log", + "serde", + "zbus", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +dependencies = [ + "memchr", +] + +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "apply" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7370b58af1d7e96df3ca0f454b57e69acf9aa42ed2d7337bd206923bae0d5754" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "once_cell", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "wayland-backend", + "wayland-client 0.30.2", + "wayland-protocols 0.30.1", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 1.9.0", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix 0.37.23", + "slab", + "socket2 0.4.9", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-process" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +dependencies = [ + "async-io", + "async-lock", + "autocfg", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix 0.37.23", + "signal-hook", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "async-trait" +version = "0.1.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "atomic-waker" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" + +[[package]] +name = "atomicwrites" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1163d9d7c51de51a2b79d6df5e8888d11e9df17c752ce4a285fb6ca1580734e" +dependencies = [ + "rustix 0.37.23", + "tempfile", + "windows-sys 0.48.0", +] + +[[package]] +name = "atspi" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e7a3376837b2e7d12d34d58ac47073c491dc3bf6f71a7adaf687d4d817faa" +dependencies = [ + "async-recursion", + "async-trait", + "atspi-macros", + "enumflags2", + "futures-lite", + "serde", + "tracing", + "zbus", + "zbus_names", +] + +[[package]] +name = "atspi-macros" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb4870a32c0eaa17e35bca0e6b16020635157121fb7d45593d242c295bc768" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +dependencies = [ + "serde", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand 1.9.0", + "futures-lite", + "log", +] + +[[package]] +name = "bluer" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d76ba39a871348200bbbf7dbff9fbaec30f0b988420f7391bfd9fdc5f8b5144" +dependencies = [ + "custom_debug", + "dbus", + "dbus-crossroads", + "dbus-tokio", + "displaydoc", + "futures", + "hex", + "lazy_static", + "libc", + "log", + "macaddr", + "nix 0.26.2", + "num-derive", + "num-traits", + "pin-project", + "serde", + "serde_json", + "strum", + "tokio", + "tokio-stream", + "uuid", +] + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "calloop" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" +dependencies = [ + "bitflags 1.3.2", + "log", + "nix 0.25.1", + "slotmap", + "thiserror", + "vec_map", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cfg-expr" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "time 0.1.45", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", + "objc", +] + +[[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 = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cosmic-app-list" +version = "0.1.0" +dependencies = [ + "anyhow", + "cosmic-client-toolkit", + "cosmic-protocols", + "freedesktop-desktop-entry", + "freedesktop-icons", + "futures", + "futures-util", + "i18n-embed", + "i18n-embed-fl", + "itertools 0.11.0", + "libcosmic", + "log", + "nix 0.26.2", + "once_cell", + "pretty_env_logger 0.5.0", + "rand", + "ron", + "rust-embed", + "rust-embed-utils", + "serde", + "shlex", + "tokio", + "url", + "xdg", +] + +[[package]] +name = "cosmic-applet-audio" +version = "0.1.0" +dependencies = [ + "cosmic-time", + "i18n-embed", + "i18n-embed-fl", + "icon-loader", + "libcosmic", + "libpulse-binding", + "libpulse-glib-binding", + "log", + "pretty_env_logger 0.4.0", + "rust-embed", + "rust-embed-utils", + "tokio", +] + +[[package]] +name = "cosmic-applet-battery" +version = "0.1.0" +dependencies = [ + "cosmic-time", + "futures", + "i18n-embed", + "i18n-embed-fl", + "libcosmic", + "log", + "once_cell", + "pretty_env_logger 0.5.0", + "rust-embed", + "tokio", + "zbus", +] + +[[package]] +name = "cosmic-applet-bluetooth" +version = "0.1.0" +dependencies = [ + "anyhow", + "bluer", + "futures", + "futures-util", + "i18n-embed", + "i18n-embed-fl", + "itertools 0.10.5", + "libcosmic", + "log", + "once_cell", + "pretty_env_logger 0.5.0", + "rand", + "rust-embed", + "slotmap", + "tokio", +] + +[[package]] +name = "cosmic-applet-graphics" +version = "0.1.0" +dependencies = [ + "i18n-embed", + "i18n-embed-fl", + "libcosmic", + "once_cell", + "rust-embed", + "tracing", + "zbus", +] + +[[package]] +name = "cosmic-applet-network" +version = "0.1.0" +dependencies = [ + "anyhow", + "cosmic-dbus-networkmanager", + "cosmic-time", + "futures", + "futures-util", + "i18n-embed", + "i18n-embed-fl", + "itertools 0.10.5", + "libcosmic", + "log", + "pretty_env_logger 0.5.0", + "rust-embed", + "rust-embed-utils", + "slotmap", + "tokio", + "zbus", +] + +[[package]] +name = "cosmic-applet-notifications" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytemuck", + "cosmic-notifications-config", + "cosmic-notifications-util", + "cosmic-time", + "i18n-embed", + "i18n-embed-fl", + "libcosmic", + "nix 0.26.2", + "ron", + "rust-embed", + "rust-embed-utils", + "sendfd", + "tokio", + "tracing", + "tracing-subscriber", + "url", + "zbus", +] + +[[package]] +name = "cosmic-applet-power" +version = "0.1.0" +dependencies = [ + "i18n-embed", + "i18n-embed-fl", + "icon-loader", + "libcosmic", + "libpulse-binding", + "libpulse-glib-binding", + "logind-zbus", + "nix 0.26.2", + "once_cell", + "rust-embed", + "rust-embed-utils", + "tokio", + "zbus", +] + +[[package]] +name = "cosmic-applet-status-area" +version = "0.1.0" +dependencies = [ + "futures", + "libcosmic", + "serde", + "tokio", + "zbus", +] + +[[package]] +name = "cosmic-applet-time" +version = "0.1.0" +dependencies = [ + "chrono", + "icon-loader", + "libcosmic", + "nix 0.26.2", +] + +[[package]] +name = "cosmic-applet-workspaces" +version = "0.1.0" +dependencies = [ + "anyhow", + "cosmic-client-toolkit", + "cosmic-protocols", + "futures", + "i18n-embed", + "i18n-embed-fl", + "libcosmic", + "log", + "nix 0.26.2", + "once_cell", + "pretty_env_logger 0.5.0", + "rust-embed", + "xdg", +] + +[[package]] +name = "cosmic-client-toolkit" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=e39748e#e39748e1312d74ab8b4c26f4813b858413500b59" +dependencies = [ + "cosmic-protocols", + "smithay-client-toolkit 0.17.0", + "wayland-client 0.30.2", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "atomicwrites", + "cosmic-config-derive", + "dirs 5.0.1", + "iced_futures", + "notify", + "ron", + "serde", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-dbus-networkmanager" +version = "0.1.0" +source = "git+https://github.com/pop-os/dbus-settings-bindings?branch=main#dd3d4935a9e10eac592a974b561c71030ac40c3b" +dependencies = [ + "bitflags 1.3.2", + "derive_builder", + "procfs", + "time 0.3.27", + "zbus", + "zvariant", +] + +[[package]] +name = "cosmic-notifications-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-notifications#35fd49d2b8147859d8b08d68b346096c356a8d15" +dependencies = [ + "cosmic-config", + "serde", +] + +[[package]] +name = "cosmic-notifications-util" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-notifications#35fd49d2b8147859d8b08d68b346096c356a8d15" +dependencies = [ + "bytemuck", + "fast_image_resize", + "serde", + "tracing", + "url", + "zbus", +] + +[[package]] +name = "cosmic-panel-button" +version = "0.1.0" +dependencies = [ + "freedesktop-desktop-entry", + "libcosmic", +] + +[[package]] +name = "cosmic-panel-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-panel#edfd24ed3b712de397057906924e4f7e8b6252c4" +dependencies = [ + "anyhow", + "cosmic-config", + "ron", + "serde", + "tracing", + "wayland-protocols-wlr", + "xdg-shell-wrapper-config", +] + +[[package]] +name = "cosmic-protocols" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=e39748e#e39748e1312d74ab8b4c26f4813b858413500b59" +dependencies = [ + "bitflags 1.3.2", + "wayland-backend", + "wayland-client 0.30.2", + "wayland-protocols 0.30.1", + "wayland-scanner 0.30.1", + "wayland-server", +] + +[[package]] +name = "cosmic-text" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9" +dependencies = [ + "aliasable", + "fontdb", + "libm", + "log", + "rangemap", + "rustybuzz 0.8.0", + "swash", + "sys-locale", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "lazy_static", + "palette", + "ron", + "serde", +] + +[[package]] +name = "cosmic-time" +version = "0.3.0" +source = "git+https://github.com/pop-os/cosmic-time#4013946f9bd9d2e53bf44310b7db783fc8105b79" +dependencies = [ + "float-cmp", + "libcosmic", + "once_cell", +] + +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[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-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "cursor-icon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740bb192a8e2d1350119916954f4409ee7f62f149b536911eeb78ba5a20526bf" + +[[package]] +name = "custom_debug" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89e0ae2c2a42be29595d05c50e3ce6096c0698a97e021c3289790f0750cc8e2" +dependencies = [ + "custom_debug_derive", +] + +[[package]] +name = "custom_debug_derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a9f3941234c9f62ceaa2782974827749de9b0a8a6487275a278da068e1baf7" +dependencies = [ + "proc-macro2", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "d3d12" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +dependencies = [ + "bitflags 1.3.2", + "libloading 0.7.4", + "winapi", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core 0.20.3", + "darling_macro 0.20.3", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 1.0.109", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.29", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core 0.14.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core 0.20.3", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "dashmap" +version = "5.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28" +dependencies = [ + "cfg-if", + "hashbrown 0.14.0", + "lock_api", + "once_cell", + "parking_lot_core 0.9.8", +] + +[[package]] +name = "data-url" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" + +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "futures-channel", + "futures-util", + "libc", + "libdbus-sys", + "winapi", +] + +[[package]] +name = "dbus-crossroads" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a4c83437187544ba5142427746835061b330446ca8902eabd70e4afb8f76de0" +dependencies = [ + "dbus", +] + +[[package]] +name = "dbus-tokio" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "007688d459bc677131c063a3a77fb899526e17b7980f390b69644bdbc41fad13" +dependencies = [ + "dbus", + "libc", + "tokio", +] + +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + +[[package]] +name = "derive_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling 0.20.3", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.0", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "enum-repr" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "enumflags2" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", + "humantime 1.3.0", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime 2.1.0", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +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 = "etagere" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf22f748754352918e082e0039335ee92454a5d62bcaf69b5e8daf5907d9644" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "exr" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[package]] +name = "fast_image_resize" +version = "2.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc789a40040e11bbe4ba31ca319406805a12fe3f8d71314bbc4bd076602ad55a" +dependencies = [ + "num-traits", + "thiserror", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "flate2" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "fluent" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +dependencies = [ + "thiserror", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fontconfig-parser" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.6.2", + "slotmap", + "tinyvec", + "ttf-parser 0.19.1", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fraction" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "freedesktop-desktop-entry" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45157175a725e81f3f594382430b6b78af5f8f72db9bd51b94f0785f80fc6d29" +dependencies = [ + "dirs 3.0.2", + "gettext-rs", + "memchr", + "thiserror", + "xdg", +] + +[[package]] +name = "freedesktop-icons" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9d46a9ae065c46efb83854bb10315de6d333bb6f4526ebe320c004dab7857e" +dependencies = [ + "dirs 4.0.0", + "once_cell", + "rust-ini", + "thiserror", + "xdg", +] + +[[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.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + +[[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]] +name = "gettext-rs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "glam" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226" + +[[package]] +name = "glib" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" +dependencies = [ + "bitflags 2.4.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "glib-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "glow" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glyphon" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e87caa7459145f5e5f167bf34db4532901404c679e62339fb712a0e3ccf722a" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gobject-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gpu-alloc" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +dependencies = [ + "bitflags 1.3.2", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi", + "windows 0.44.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" +dependencies = [ + "bitflags 1.3.2", + "gpu-descriptor-types", + "hashbrown 0.12.3", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ + "quick-error", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "i18n-config" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b987084cadad6e2f2b1e6ea62c44123591a3c044793a1beabf71a8356ea768d5" +dependencies = [ + "log", + "serde", + "serde_derive", + "thiserror", + "toml 0.7.6", + "unic-langid", +] + +[[package]] +name = "i18n-embed" +version = "0.13.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot 0.12.1", + "rust-embed", + "thiserror", + "unic-langid", + "walkdir", +] + +[[package]] +name = "i18n-embed-fl" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.29", + "unic-langid", +] + +[[package]] +name = "i18n-embed-impl" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9a95d065e6be4499e50159172395559a388d20cf13c84c77e4a1e341786f219" +dependencies = [ + "find-crate", + "i18n-config", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows 0.48.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "iced" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_sctk", + "iced_widget", + "image", + "thiserror", +] + +[[package]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "accesskit", + "accesskit_unix", +] + +[[package]] +name = "iced_core" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "bitflags 1.3.2", + "iced_accessibility", + "instant", + "log", + "palette", + "smithay-client-toolkit 0.17.0", + "thiserror", + "twox-hash", +] + +[[package]] +name = "iced_futures" +version = "0.7.0" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "futures", + "iced_core", + "log", + "tokio", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "glam", + "half", + "iced_core", + "image", + "kamadak-exif", + "log", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_renderer" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.1.1" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "smithay-client-toolkit 0.17.0", + "thiserror", +] + +[[package]] +name = "iced_sctk" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "enum-repr", + "float-cmp", + "futures", + "iced_futures", + "iced_graphics", + "iced_runtime", + "iced_style", + "itertools 0.10.5", + "raw-window-handle", + "smithay-client-toolkit 0.17.0", + "smithay-clipboard", + "thiserror", + "tracing", + "wayland-backend", + "wayland-protocols 0.30.1", +] + +[[package]] +name = "iced_style" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo", + "log", + "raw-window-handle", + "resvg", + "rustc-hash", + "softbuffer", + "tiny-skia", + "twox-hash", +] + +[[package]] +name = "iced_wgpu" +version = "0.11.1" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "once_cell", + "raw-window-handle", + "resvg", + "rustc-hash", + "twox-hash", + "wgpu", +] + +[[package]] +name = "iced_widget" +version = "0.1.3" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "smithay-client-toolkit 0.17.0", + "thiserror", + "unicode-segmentation", +] + +[[package]] +name = "icon-loader" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4a8c09d5f0ce32daff2039f6f1830a4920f5eb23f00e62412bfb5f878a1be2e" +dependencies = [ + "dashmap", + "rust-ini", + "xdg", +] + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[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 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi 0.3.2", + "rustix 0.38.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[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" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kamadak-exif" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "khronos-egl" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +dependencies = [ + "libc", + "libloading 0.7.4", + "pkg-config", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +dependencies = [ + "apply", + "ashpd", + "cosmic-config", + "cosmic-panel-config", + "cosmic-theme", + "derive_setters", + "fraction", + "freedesktop-icons", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_sctk", + "iced_style", + "iced_tiny_skia", + "iced_widget", + "lazy_static", + "palette", + "ron", + "slotmap", + "smithay-client-toolkit 0.17.0", + "thiserror", + "tokio", + "tracing", + "unicode-segmentation", + "url", +] + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + +[[package]] +name = "libpulse-binding" +version = "2.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3557a2dfc380c8f061189a01c6ae7348354e0c9886038dc6c171219c08eaff" +dependencies = [ + "bitflags 1.3.2", + "libc", + "libpulse-sys", + "num-derive", + "num-traits", + "winapi", +] + +[[package]] +name = "libpulse-glib-binding" +version = "2.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72bb604d4f32d4c60e02581a67f9d9fd7500cb963ad984cee032013edeaf6bee" +dependencies = [ + "glib", + "glib-sys", + "libpulse-binding", + "libpulse-mainloop-glib-sys", +] + +[[package]] +name = "libpulse-mainloop-glib-sys" +version = "1.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00f9e6fbee0a60ac3f5751e3cc68eeaf9bff9d2687502df17b5c726220217531" +dependencies = [ + "glib-sys", + "libpulse-sys", + "pkg-config", +] + +[[package]] +name = "libpulse-sys" +version = "1.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc19e110fbf42c17260d30f6d3dc545f58491c7830d38ecb9aaca96e26067a9b" +dependencies = [ + "libc", + "num-derive", + "num-traits", + "pkg-config", + "winapi", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "logind-zbus" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07a2542f6e91ea92780158654852190edb2ba0b232d9d00d649d0c691cb7eb3" +dependencies = [ + "serde", + "zbus", +] + +[[package]] +name = "lru" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5" +dependencies = [ + "hashbrown 0.14.0", +] + +[[package]] +name = "macaddr" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[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.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +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", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" +dependencies = [ + "bit-set", + "bitflags 1.3.2", + "codespan-reporting", + "hexf-parse", + "indexmap 1.9.3", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[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" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.2", + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "palette" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.8", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_env_logger" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" +dependencies = [ + "env_logger 0.7.1", + "log", +] + +[[package]] +name = "pretty_env_logger" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" +dependencies = [ + "env_logger 0.10.0", + "log", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "procfs" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "hex", + "lazy_static", + "rustix 0.36.15", +] + +[[package]] +name = "profiling" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46b2164ebdb1dfeec5e337be164292351e11daf63a05174c6776b2f47460f0c9" + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[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", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9283c6b06096b47afc7109834fdedab891175bb5241ee5d4f7d2546549f263" + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +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", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + +[[package]] +name = "resvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" +dependencies = [ + "gif", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rgb" +version = "0.8.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.4.0", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "rust-embed" +version = "6.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "6.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 2.0.29", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "7.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.36.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "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", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rustybuzz" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "smallvec", + "ttf-parser 0.18.1", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82eea22c8f56965eeaf3a209b3d24508256c7b920fb3b6211b8ba0f7c0583250" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.19.1", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "self_cell" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" + +[[package]] +name = "sendfd" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" +dependencies = [ + "libc", + "tokio", +] + +[[package]] +name = "serde" +version = "1.0.185" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.185" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "serde_json" +version = "1.0.105" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "smithay-client-toolkit" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" +dependencies = [ + "bitflags 1.3.2", + "dlib", + "lazy_static", + "log", + "memmap2 0.5.10", + "nix 0.24.3", + "pkg-config", + "wayland-client 0.29.5", + "wayland-cursor 0.29.5", + "wayland-protocols 0.29.5", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.17.0" +source = "git+https://github.com/smithay/client-toolkit?rev=c9940f4#c9940f4167f0d81cc26f77b7eeef6a34068a90a5" +dependencies = [ + "bitflags 1.3.2", + "calloop", + "cursor-icon", + "dlib", + "log", + "memmap2 0.5.10", + "nix 0.26.2", + "pkg-config", + "thiserror", + "wayland-backend", + "wayland-client 0.30.2", + "wayland-csd-frame", + "wayland-cursor 0.30.0", + "wayland-protocols 0.30.1", + "wayland-protocols-wlr", + "wayland-scanner 0.30.1", + "xkbcommon", +] + +[[package]] +name = "smithay-clipboard" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" +dependencies = [ + "smithay-client-toolkit 0.16.0", + "wayland-client 0.29.5", +] + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "softbuffer" +version = "0.2.0" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-2.0-old#ece901a9f60dc89ca740dc3bd11f3c909e801723" +dependencies = [ + "bytemuck", + "cfg_aliases", + "cocoa", + "core-graphics", + "fastrand 1.9.0", + "foreign-types", + "log", + "nix 0.26.2", + "objc", + "raw-window-handle", + "redox_syscall 0.3.5", + "thiserror", + "wasm-bindgen", + "wayland-backend", + "wayland-client 0.30.2", + "wayland-sys 0.30.1", + "web-sys", + "windows-sys 0.42.0", + "x11-dl", + "x11rb", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "svg_fmt" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" + +[[package]] +name = "svgtypes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +dependencies = [ + "kurbo", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" +dependencies = [ + "yazi", + "zeno", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + +[[package]] +name = "sys-locale" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0b9eefabb91675082b41eb94c3ecd91af7656caee3fb4961a07c0ec8c7ca6f" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "system-deps" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml 0.7.6", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" + +[[package]] +name = "temp-dir" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" + +[[package]] +name = "tempfile" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +dependencies = [ + "cfg-if", + "fastrand 2.0.0", + "redox_syscall 0.3.5", + "rustix 0.38.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[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" +dependencies = [ + "deranged", + "serde", + "time-core", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "tiny-skia" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinystr" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot 0.12.1", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.3", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "ttf-parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" + +[[package]] +name = "ttf-parser" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "rand", + "static_assertions", +] + +[[package]] +name = "type-map" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +dependencies = [ + "rustc-hash", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] + +[[package]] +name = "unic-langid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +dependencies = [ + "serde", + "tinystr", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-general-category" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" + +[[package]] +name = "unicode-ident" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "usvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" +dependencies = [ + "base64", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" +dependencies = [ + "fontdb", + "kurbo", + "log", + "rustybuzz 0.7.0", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" +dependencies = [ + "rctree", + "strict-num", + "svgtypes", + "tiny-skia-path", +] + +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "walkdir" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +dependencies = [ + "same-file", + "winapi-util", +] + +[[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" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.29", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +dependencies = [ + "cc", + "downcast-rs", + "io-lifetimes", + "nix 0.26.2", + "scoped-tls", + "smallvec", + "wayland-sys 0.30.1", +] + +[[package]] +name = "wayland-client" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +dependencies = [ + "bitflags 1.3.2", + "downcast-rs", + "libc", + "nix 0.24.3", + "scoped-tls", + "wayland-commons", + "wayland-scanner 0.29.5", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-client" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +dependencies = [ + "bitflags 1.3.2", + "calloop", + "nix 0.26.2", + "wayland-backend", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-commons" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +dependencies = [ + "nix 0.24.3", + "once_cell", + "smallvec", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72191e30290b83491325d32c1327be7f45459c97263d9d48494c81efc9328116" +dependencies = [ + "bitflags 2.4.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +dependencies = [ + "nix 0.24.3", + "wayland-client 0.29.5", + "xcursor", +] + +[[package]] +name = "wayland-cursor" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0c3a0d5b4b688b07b0442362d3ed6bf04724fcc16cd69ab6285b90dbc487aa" +dependencies = [ + "nix 0.26.2", + "wayland-client 0.30.2", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +dependencies = [ + "bitflags 1.3.2", + "wayland-client 0.29.5", + "wayland-commons", + "wayland-scanner 0.29.5", +] + +[[package]] +name = "wayland-protocols" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b28101e5ca94f70461a6c2d610f76d85ad223d042dd76585ab23d3422dd9b4d" +dependencies = [ + "bitflags 1.3.2", + "wayland-backend", + "wayland-client 0.30.2", + "wayland-scanner 0.30.1", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fce991093320e4a6a525876e6b629ab24da25f9baef0c2e0080ad173ec89588a" +dependencies = [ + "bitflags 1.3.2", + "wayland-backend", + "wayland-client 0.30.2", + "wayland-protocols 0.30.1", + "wayland-scanner 0.30.1", + "wayland-server", +] + +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", +] + +[[package]] +name = "wayland-scanner" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-server" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c43c28096fe1d49fff7d1079404fdd0f669cd1a5b00c615bdfe71bb1884d23a" +dependencies = [ + "bitflags 1.3.2", + "downcast-rs", + "io-lifetimes", + "nix 0.26.2", + "wayland-backend", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-sys" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +dependencies = [ + "dlib", + "lazy_static", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "lazy_static", + "log", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "wgpu" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" +dependencies = [ + "arrayvec", + "cfg-if", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.0", + "codespan-reporting", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.0", + "block", + "core-graphics-types", + "d3d12", + "foreign-types", + "glow", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.0", + "log", + "metal", + "naga", + "objc", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" +dependencies = [ + "bitflags 2.4.0", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[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-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "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-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "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.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" +dependencies = [ + "memchr", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf3c79412dd91bae7a7366b8ad1565a85e35dd049affc3a6a2c549e97419617" +dependencies = [ + "gethostname", + "libc", + "libloading 0.7.4", + "nix 0.25.1", + "once_cell", + "winapi", + "winapi-wsapoll", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0b1513b141123073ce54d5bb1d33f801f17508fbd61e02060b1214e96d39c56" +dependencies = [ + "nix 0.25.1", +] + +[[package]] +name = "xcursor" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" +dependencies = [ + "nom", +] + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix 0.26.2", + "winapi", +] + +[[package]] +name = "xdg-shell-wrapper-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/xdg-shell-wrapper#9ae1c4c838fe58e887b62d2a990d73ab2f6cb629" +dependencies = [ + "serde", + "wayland-protocols-wlr", +] + +[[package]] +name = "xkbcommon" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88" +dependencies = [ + "libc", + "memmap2 0.7.1", +] + +[[package]] +name = "xml-rs" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" + +[[package]] +name = "xmlparser" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.2", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zeno" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c110ba09c9b3a43edd4803d570df0da2414fed6e822e22b976a4e3ef50860701" + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/applications/window-managers/cosmic/applets/default.nix b/pkgs/applications/window-managers/cosmic/applets/default.nix new file mode 100644 index 0000000000000..f64f6b31247c2 --- /dev/null +++ b/pkgs/applications/window-managers/cosmic/applets/default.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, fetchFromGitHub, rust, rustPlatform +, cargo, just, pkg-config, util-linuxMinimal +, dbus, glib, libxkbcommon, pulseaudio, wayland +}: + +rustPlatform.buildRustPackage { + pname = "cosmic-applets"; + version = "unstable-2023-10-04"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-applets"; + rev = "fefaea9b63548b1baa5e64521b860234ee46339a"; + hash = "sha256-I+18NCKLH/3QajYpZRPYmCUxkbptAjuEHfKtnZVOlH4="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.11.0" = "sha256-/6KUCH1CwMHd5YEMOpAdVeAxpjl9JvrzDA4Xnbd1D9k="; + "cosmic-client-toolkit-0.1.0" = "sha256-pVWK+dODQxNej5jWyb5wX/insoiXkX8NFBDkDEejVV0="; + "cosmic-config-0.1.0" = "sha256-pUDuRHX46fbcPw19s5DEsPyJdb/Bem/lJg+3NEO/WX0="; + "cosmic-dbus-networkmanager-0.1.0" = "sha256-eWqB+zRCfJYdrcPE8Ey+WgzPBJltN0zRiutzgdtWsDA="; + "cosmic-notifications-config-0.1.0" = "sha256-KnPQdrMpzA05v4bt0Fz9fbcKdC0cSU60Hv7wqrthIaw="; + "cosmic-panel-config-0.1.0" = "sha256-H3QuiP7Og69wm9yCX/uoSG0aQ3B/61q9Sdj+rW4KZMU="; + "cosmic-time-0.3.0" = "sha256-JiTwbJSml8azelBr6b3cBvJsuAL1hmHtuHx2TJupEzE="; + "smithay-client-toolkit-0.17.0" = "sha256-v3FxzDypxSfbEU50+oDoqrGWPm+S+kDZQq//3Q4DDRU="; + "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY="; + "xdg-shell-wrapper-config-0.1.0" = "sha256-Otxp8D5dNZl70K1ZIBswGj6K5soGVbVim7gutUHkBvw="; + }; + }; + + postPatch = '' + substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" + ''; + + nativeBuildInputs = [ just pkg-config util-linuxMinimal ]; + buildInputs = [ dbus glib libxkbcommon pulseaudio wayland ]; + + dontUseJustBuild = true; + + justFlags = [ + "--set" "prefix" (placeholder "out") + "--set" "target" "${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release" + ]; + + # Force linking to libwayland-client, which is always dlopen()ed. + "CARGO_TARGET_${rust.toRustTargetForUseInEnvVars stdenv.hostPlatform}_RUSTFLAGS" = + map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lwayland-client" + "-Wl,--pop-state" + ]; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-applets"; + description = "Applets for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/cosmic/comp/Cargo.lock b/pkgs/applications/window-managers/cosmic/comp/Cargo.lock new file mode 100644 index 0000000000000..a7b36a1de449f --- /dev/null +++ b/pkgs/applications/window-managers/cosmic/comp/Cargo.lock @@ -0,0 +1,5606 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1061f3ff92c2f65800df1f12fc7b4ff44ee14783104187dd04dfee6f11b0fd2" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accesskit" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" +dependencies = [ + "enumn", + "serde", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "once_cell", + "serde", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +dependencies = [ + "memchr", +] + +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[package]] +name = "android-activity" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" +dependencies = [ + "android-properties", + "bitflags 1.3.2", + "cc", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum 0.6.1", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +dependencies = [ + "backtrace", +] + +[[package]] +name = "appendlist" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e149dc73cd30538307e7ffa2acd3d2221148eaeed4871f246657b1c3eaa1cbd2" + +[[package]] +name = "apply" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" + +[[package]] +name = "approx" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" +dependencies = [ + "num-traits", +] + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "async-task" +version = "4.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" + +[[package]] +name = "atomicwrites" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1163d9d7c51de51a2b79d6df5e8888d11e9df17c752ce4a285fb6ca1580734e" +dependencies = [ + "rustix 0.37.24", + "tempfile", + "windows-sys 0.48.0", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +dependencies = [ + "serde", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-sys" +version = "0.1.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +dependencies = [ + "block-sys", + "objc2-encode", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "calloop" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" +dependencies = [ + "bitflags 1.3.2", + "log", + "nix 0.25.1", + "slotmap", + "thiserror", + "vec_map", +] + +[[package]] +name = "calloop" +version = "0.12.2" +source = "git+https://github.com/Smithay/calloop?branch=zombies#9a4fd9d85b35e03213983f727e6fe49367abab51" +dependencies = [ + "async-task", + "bitflags 2.4.0", + "log", + "polling", + "rustix 0.38.17", + "slab", + "thiserror", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cgmath" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317" +dependencies = [ + "approx 0.4.0", + "num-traits", +] + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[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 = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] +name = "concurrent-queue" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cosmic-comp" +version = "0.1.0" +dependencies = [ + "anyhow", + "bitflags 2.4.0", + "bytemuck", + "calloop 0.12.2", + "cosmic-comp-config", + "cosmic-config", + "cosmic-protocols", + "edid-rs", + "egui", + "egui_plot", + "glow", + "i18n-embed", + "i18n-embed-fl", + "iced_tiny_skia", + "id_tree", + "indexmap 2.0.2", + "keyframe", + "lazy_static", + "libcosmic", + "libsystemd", + "log-panics", + "once_cell", + "ordered-float", + "png", + "puffin", + "puffin_egui", + "regex", + "renderdoc", + "ron", + "rust-embed", + "sendfd", + "serde", + "serde_json", + "smithay", + "smithay-egui", + "thiserror", + "tiny-skia 0.10.0", + "tracing", + "tracing-journald", + "tracing-subscriber", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", + "xcursor", + "xdg", + "xkbcommon 0.7.0", +] + +[[package]] +name = "cosmic-comp-config" +version = "0.1.0" +dependencies = [ + "input", + "serde", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +dependencies = [ + "atomicwrites", + "calloop 0.12.2", + "cosmic-config-derive", + "dirs 5.0.1", + "iced_futures", + "notify", + "ron", + "serde", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-protocols" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?branch=main#5c03417a08ef04755ad7bc2285d07968d89d69f8" +dependencies = [ + "bitflags 2.4.0", + "wayland-backend 0.3.2", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "cosmic-text" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9" +dependencies = [ + "aliasable", + "fontdb", + "libm", + "log", + "rangemap", + "rustybuzz 0.8.0", + "swash", + "sys-locale", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "lazy_static", + "palette", + "ron", + "serde", +] + +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[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-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "css-color" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d101c65424c856131a3cb818da2ddde03500dc3656972269cdf79f018ef77eb4" + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "d3d12" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +dependencies = [ + "bitflags 1.3.2", + "libloading 0.7.4", + "winapi", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.37", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.1", + "lock_api", + "once_cell", + "parking_lot_core 0.9.8", +] + +[[package]] +name = "data-url" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" + +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + +[[package]] +name = "derive_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.1", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "drm" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb1b703ffbc7ebd216eba7900008049a56ace55580ecb2ee7fa801e8d8be87" +dependencies = [ + "bitflags 2.4.0", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "nix 0.27.1", +] + +[[package]] +name = "drm-ffi" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba7d1c19c4b6270e89d59fb27dc6d02a317c658a8a54e54781e1db9b5947595d" +dependencies = [ + "drm-sys", + "nix 0.27.1", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a4f1c0468062a56cd5705f1e3b5409eb286d5596a2028ec8e947595d7e715ae" + +[[package]] +name = "ecolor" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af" +dependencies = [ + "bytemuck", + "serde", +] + +[[package]] +name = "edid-rs" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab5fa33485cd85ac354df485819a63360fefa312fe04cffe65e6f175be1522c" + +[[package]] +name = "egui" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7" +dependencies = [ + "accesskit", + "ahash 0.8.3", + "epaint", + "nohash-hasher", + "serde", +] + +[[package]] +name = "egui_extras" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ffe3fe5c00295f91c2a61a74ee271c32f74049c94ba0b1cea8f26eb478bc07" +dependencies = [ + "egui", + "enum-map", + "log", + "mime_guess", + "resvg 0.28.0", + "serde", + "tiny-skia 0.8.4", + "usvg 0.28.0", +] + +[[package]] +name = "egui_glow" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6726c08798822280038bbad2e32f4fc3cbed800cd51c6e34e99cd2d60cc1bc" +dependencies = [ + "bytemuck", + "egui", + "glow", + "log", + "memoffset 0.6.5", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "egui_plot" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f33a00fe8eb1ba56535b3dbacdecc7a1365a328908a97c5f3c81bb466be72b" +dependencies = [ + "egui", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "emath" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0" +dependencies = [ + "bytemuck", + "serde", +] + +[[package]] +name = "encoding" +version = "0.2.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" +dependencies = [ + "encoding-index-japanese", + "encoding-index-korean", + "encoding-index-simpchinese", + "encoding-index-singlebyte", + "encoding-index-tradchinese", +] + +[[package]] +name = "encoding-index-japanese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-korean" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-simpchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-singlebyte" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-tradchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding_index_tests" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" + +[[package]] +name = "enum-map" +version = "2.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5" +dependencies = [ + "enum-map-derive", + "serde", +] + +[[package]] +name = "enum-map-derive" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "enumn" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "epaint" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e" +dependencies = [ + "ab_glyph", + "ahash 0.8.3", + "bytemuck", + "ecolor", + "emath", + "nohash-hasher", + "parking_lot 0.12.1", + "serde", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" +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 = "etagere" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf22f748754352918e082e0039335ee92454a5d62bcaf69b5e8daf5907d9644" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[package]] +name = "exr" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "flate2" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float_next_after" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fc612c5837986b7104a87a0df74a5460931f1c5274be12f8d0f40aa2f30d632" +dependencies = [ + "num-traits", +] + +[[package]] +name = "fluent" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +dependencies = [ + "thiserror", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fontconfig-parser" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +dependencies = [ + "roxmltree 0.18.1", +] + +[[package]] +name = "fontdb" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.6.2", + "slotmap", + "tinyvec", + "ttf-parser 0.19.2", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fraction" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "freedesktop-icons" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9d46a9ae065c46efb83854bb10315de6d333bb6f4526ebe320c004dab7857e" +dependencies = [ + "dirs 4.0.0", + "once_cell", + "rust-ini", + "thiserror", + "xdg", +] + +[[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.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gbm" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c97c1672f2d951da311cd20b148794c4157a8879c7650e65f76c7826e2b1c1" +dependencies = [ + "bitflags 1.3.2", + "drm", + "drm-fourcc", + "gbm-sys", + "libc", + "wayland-backend 0.3.2", + "wayland-server", +] + +[[package]] +name = "gbm-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b63eba9b9b7a231514482deb08759301c9f9f049ac6869403f381834ebfeaf67" +dependencies = [ + "libc", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "gethostname" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" +dependencies = [ + "libc", + "winapi", +] + +[[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", + "wasm-bindgen", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[package]] +name = "glow" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glyphon" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e87caa7459145f5e5f167bf34db4532901404c679e62339fb712a0e3ccf722a" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gpu-alloc" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +dependencies = [ + "bitflags 1.3.2", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi", + "windows", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.0", + "gpu-descriptor-types", + "hashbrown 0.14.1", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.4.0", +] + +[[package]] +name = "grid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "i18n-config" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" +dependencies = [ + "log", + "serde", + "serde_derive", + "thiserror", + "toml 0.8.2", + "unic-langid", +] + +[[package]] +name = "i18n-embed" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot 0.12.1", + "rust-embed", + "thiserror", + "unic-langid", + "walkdir", +] + +[[package]] +name = "i18n-embed-fl" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc1f8715195dffc4caddcf1cf3128da15fe5d8a137606ea8856c9300047d5a2" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.37", + "unic-langid", +] + +[[package]] +name = "i18n-embed-impl" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a4d5bff745c9a6e1459c490059281b353a4ab0a4e1e58b3eeeaef71f97d07b" +dependencies = [ + "find-crate", + "i18n-config", + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "iced" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +dependencies = [ + "iced_core", + "iced_futures", + "iced_renderer", + "iced_widget", + "image", + "thiserror", +] + +[[package]] +name = "iced_core" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +dependencies = [ + "bitflags 1.3.2", + "instant", + "log", + "palette", + "thiserror", + "twox-hash", +] + +[[package]] +name = "iced_futures" +version = "0.7.0" +source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +dependencies = [ + "futures", + "iced_core", + "log", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "glam", + "half", + "iced_core", + "image", + "kamadak-exif", + "log", + "lyon_path", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_renderer" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.1.1" +source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +dependencies = [ + "iced_core", + "iced_futures", + "thiserror", +] + +[[package]] +name = "iced_style" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo 0.9.5", + "log", + "raw-window-handle", + "resvg 0.35.0", + "rustc-hash", + "softbuffer", + "tiny-skia 0.10.0", + "twox-hash", +] + +[[package]] +name = "iced_wgpu" +version = "0.11.1" +source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "once_cell", + "raw-window-handle", + "resvg 0.35.0", + "rustc-hash", + "twox-hash", + "wgpu", +] + +[[package]] +name = "iced_widget" +version = "0.1.3" +source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +dependencies = [ + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "thiserror", + "unicode-segmentation", +] + +[[package]] +name = "id_tree" +version = "1.8.0" +source = "git+https://github.com/Drakulix/id-tree.git?branch=feature/copy_clone#632a57d6d49160e18d7300fa7edae52281ec5482" +dependencies = [ + "snowflake", +] + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imagesize" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df19da1e92fbfec043ca97d622955381b1f3ee72a180ec999912df31b1ccd951" + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown 0.14.1", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "input" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e74cd82cedcd66db78742a8337bdc48f188c4d2c12742cbc5cd85113f0b059" +dependencies = [ + "bitflags 1.3.2", + "input-sys", + "io-lifetimes 1.0.11", + "libc", + "log", + "udev 0.7.0", +] + +[[package]] +name = "input-sys" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f6c2a17e8aba7217660e32863af87b0febad811d4b8620ef76b386603fddc2" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "io-lifetimes" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c" + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kamadak-exif" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "keyframe" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60708bf7981518d09095d6f5673ce5cf6a64f1e0d9708b554f670e6d9d2bd9a9" +dependencies = [ + "mint", + "num-traits", +] + +[[package]] +name = "khronos-egl" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +dependencies = [ + "libc", + "libloading 0.7.4", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "kurbo" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.148" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" + +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +dependencies = [ + "apply", + "cosmic-config", + "cosmic-theme", + "css-color", + "derive_setters", + "fraction", + "freedesktop-icons", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_style", + "iced_tiny_skia", + "iced_widget", + "lazy_static", + "palette", + "slotmap", + "taffy", + "thiserror", + "tracing", + "unicode-segmentation", + "url", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + +[[package]] +name = "libseat" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a0adf8d8607a73a5b74cbe4132f57cb349e4bf860103cd089461bbcbc9907e" +dependencies = [ + "errno", + "libseat-sys", + "log", +] + +[[package]] +name = "libseat-sys" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3671cb5e03871f1d6bf0b3b5daa9275549e348fa6359e0f9adb910ca163d4c34" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libsystemd" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b9597a67aa1c81a6624603e6bd0bcefb9e0f94c9c54970ec53771082104b4e" +dependencies = [ + "hmac", + "libc", + "log", + "nix 0.26.4", + "nom", + "once_cell", + "serde", + "sha2", + "thiserror", + "uuid", +] + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "log-panics" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" +dependencies = [ + "backtrace", + "log", +] + +[[package]] +name = "lru" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +dependencies = [ + "hashbrown 0.14.1", +] + +[[package]] +name = "lyon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" +dependencies = [ + "lyon_algorithms", + "lyon_tessellation", +] + +[[package]] +name = "lyon_algorithms" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_geom" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d2124218d5428149f9e09520b9acc024334a607e671f032d06567b61008977c" +dependencies = [ + "float_next_after", + "lyon_path", + "thiserror", +] + +[[package]] +name = "lz4_flex" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[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 = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[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.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +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", + "simd-adler32", +] + +[[package]] +name = "mint" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" +dependencies = [ + "bit-set", + "bitflags 1.3.2", + "codespan-reporting", + "hexf-parse", + "indexmap 1.9.3", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "natord" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" + +[[package]] +name = "ndk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys", + "num_enum 0.5.11", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.4.1+23.1.7779620" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.0", + "cfg-if", + "libc", + "memoffset 0.9.0", +] + +[[package]] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[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" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +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.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +dependencies = [ + "num_enum_derive 0.6.1", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num_enum_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.2.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" + +[[package]] +name = "objc2" +version = "0.3.0-beta.3.patch-leaks.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +dependencies = [ + "block2", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "orbclient" +version = "0.3.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" +dependencies = [ + "redox_syscall 0.3.5", +] + +[[package]] +name = "ordered-float" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a540f3e3b3d7929c884e46d093d344e4e5bdeed54d08bf007df50c93cc85d5" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + +[[package]] +name = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" +dependencies = [ + "ttf-parser 0.19.2", +] + +[[package]] +name = "palette" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx 0.5.1", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.8", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62a79e457c9898100b4298d57d69ec53d06f9a6ed352431ce5f377e082d2e846" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.17", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb156a45b6b9fe8027497422179fb65afc84d36707a7ca98297bf06bccb8d43f" +dependencies = [ + "quote", + "syn 2.0.37", +] + +[[package]] +name = "puffin" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39009d69b9d547c3ffa974a20648fa02f447c05bd0a664012b1ba5a5b06fb14e" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "cfg-if", + "lz4_flex", + "once_cell", + "parking_lot 0.12.1", + "serde", +] + +[[package]] +name = "puffin_egui" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5af236782d21bdd5a6eb2f8cc9a91f8d601c073b7f7d568c95c26604cc12b87" +dependencies = [ + "egui", + "indexmap 1.9.3", + "natord", + "once_cell", + "puffin", + "time", + "vec1", + "web-time", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[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", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +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", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.3.9", + "regex-syntax 0.7.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.5", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "renderdoc" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "272da9ec1e28b0ef17df4dcefad820b13f098ebe9c82697111fc57ccff621e12" +dependencies = [ + "bitflags 1.3.2", + "float-cmp", + "libloading 0.7.4", + "once_cell", + "renderdoc-sys", + "winapi", + "wio", +] + +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + +[[package]] +name = "resvg" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c115863f2d3621999cf187e318bc92b16402dfeff6a48c74df700d77381394c1" +dependencies = [ + "log", + "pico-args", + "rgb", + "svgtypes 0.8.2", + "tiny-skia 0.8.4", + "usvg 0.28.0", +] + +[[package]] +name = "resvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" +dependencies = [ + "gif", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes 0.11.0", + "tiny-skia 0.10.0", + "usvg 0.35.0", +] + +[[package]] +name = "rgb" +version = "0.8.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64 0.21.4", + "bitflags 2.4.0", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b9de9831a129b122e7e61f242db509fa9d0838008bf0b29bb0624669edfe48a" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "roxmltree" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "rust-embed" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 2.0.37", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.37.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes 1.0.11", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustybuzz" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "smallvec", + "ttf-parser 0.18.1", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82eea22c8f56965eeaf3a209b3d24508256c7b920fb3b6211b8ba0f7c0583250" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.19.2", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scan_fmt" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b53b0a5db882a8e2fdaae0a43f7b39e7e9082389e978398bdf223a55b581248" + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "self_cell" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" + +[[package]] +name = "sendfd" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" +dependencies = [ + "libc", +] + +[[package]] +name = "serde" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "serde_json" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "smithay" +version = "0.3.0" +source = "git+https://github.com/smithay//smithay?rev=74ef59a3f#74ef59a3f8b6a1f86a74388590f2f852040354e4" +dependencies = [ + "appendlist", + "ash", + "bitflags 2.4.0", + "calloop 0.12.2", + "cc", + "cgmath", + "downcast-rs", + "drm", + "drm-ffi", + "drm-fourcc", + "encoding", + "gbm", + "gl_generator", + "glow", + "indexmap 2.0.2", + "input", + "lazy_static", + "libc", + "libloading 0.8.1", + "libseat", + "nix 0.27.1", + "once_cell", + "pkg-config", + "profiling", + "rand", + "scan_fmt", + "scopeguard", + "smallvec", + "tempfile", + "thiserror", + "tracing", + "udev 0.8.0", + "wayland-backend 0.3.2", + "wayland-egl", + "wayland-protocols 0.31.0", + "wayland-protocols-misc", + "wayland-protocols-wlr", + "wayland-server", + "wayland-sys 0.31.1", + "winit", + "x11rb 0.12.0", + "xkbcommon 0.6.0", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" +dependencies = [ + "bitflags 1.3.2", + "calloop 0.10.6", + "dlib", + "lazy_static", + "log", + "memmap2 0.5.10", + "nix 0.24.3", + "pkg-config", + "wayland-client 0.29.5", + "wayland-cursor", + "wayland-protocols 0.29.5", +] + +[[package]] +name = "smithay-egui" +version = "0.1.0" +source = "git+https://github.com/Smithay/smithay-egui.git?rev=cdc652e0#cdc652e0d4823b16a5bd9badd288e38512789dc5" +dependencies = [ + "cgmath", + "egui", + "egui_extras", + "egui_glow", + "image", + "log", + "memoffset 0.9.0", + "smithay", + "xkbcommon 0.7.0", +] + +[[package]] +name = "snowflake" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27207bb65232eda1f588cf46db2fee75c0808d557f6b3cf19a75f5d6d7c94df1" + +[[package]] +name = "softbuffer" +version = "0.2.0" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-2.0-old#ece901a9f60dc89ca740dc3bd11f3c909e801723" +dependencies = [ + "bytemuck", + "cfg_aliases", + "cocoa", + "core-graphics", + "fastrand 1.9.0", + "foreign-types", + "log", + "nix 0.26.4", + "objc", + "raw-window-handle", + "redox_syscall 0.3.5", + "thiserror", + "wasm-bindgen", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-sys 0.30.1", + "web-sys", + "windows-sys 0.42.0", + "x11-dl", + "x11rb 0.11.1", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "svg_fmt" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" + +[[package]] +name = "svgtypes" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22975e8a2bac6a76bb54f898a6b18764633b00e780330f0b689f65afb3975564" +dependencies = [ + "siphasher", +] + +[[package]] +name = "svgtypes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +dependencies = [ + "kurbo 0.9.5", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" +dependencies = [ + "yazi", + "zeno", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy#120bb7a2e501822b324fd48de955450ebbba1c1a" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "tempfile" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall 0.3.5", + "rustix 0.38.17", + "windows-sys 0.48.0", +] + +[[package]] +name = "termcolor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "time" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +dependencies = [ + "deranged", + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +dependencies = [ + "time-core", +] + +[[package]] +name = "tiny-skia" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "png", + "tiny-skia-path 0.8.4", +] + +[[package]] +name = "tiny-skia" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path 0.10.0", +] + +[[package]] +name = "tiny-skia-path" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-skia-path" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinystr" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.2", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.0.2", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.0.2", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-journald" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba316a74e8fc3c3896a850dba2375928a9fa171b085ecddfc7c054d39970f3fd" +dependencies = [ + "libc", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "ttf-parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" + +[[package]] +name = "ttf-parser" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "rand", + "static_assertions", +] + +[[package]] +name = "type-map" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +dependencies = [ + "rustc-hash", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "udev" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a" +dependencies = [ + "libc", + "libudev-sys", + "pkg-config", +] + +[[package]] +name = "udev" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1" +dependencies = [ + "io-lifetimes 1.0.11", + "libc", + "libudev-sys", + "pkg-config", +] + +[[package]] +name = "unic-langid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +dependencies = [ + "serde", + "tinystr", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-general-category" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.11" +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 = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "usvg" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b5b7c2b30845b3348c067ca3d09e20cc6e327c288f0ca4c48698712abf432e9" +dependencies = [ + "base64 0.13.1", + "data-url", + "flate2", + "imagesize 0.10.1", + "kurbo 0.8.3", + "log", + "rctree", + "roxmltree 0.15.1", + "simplecss", + "siphasher", + "strict-num", + "svgtypes 0.8.2", +] + +[[package]] +name = "usvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" +dependencies = [ + "base64 0.21.4", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" +dependencies = [ + "data-url", + "flate2", + "imagesize 0.12.0", + "kurbo 0.9.5", + "log", + "roxmltree 0.18.1", + "simplecss", + "siphasher", + "svgtypes 0.11.0", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" +dependencies = [ + "fontdb", + "kurbo 0.9.5", + "log", + "rustybuzz 0.7.0", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" +dependencies = [ + "rctree", + "strict-num", + "svgtypes 0.11.0", + "tiny-skia-path 0.10.0", +] + +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vec1" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.37", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +dependencies = [ + "cc", + "downcast-rs", + "io-lifetimes 1.0.11", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.30.1", +] + +[[package]] +name = "wayland-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +dependencies = [ + "cc", + "downcast-rs", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.1", +] + +[[package]] +name = "wayland-client" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +dependencies = [ + "bitflags 1.3.2", + "downcast-rs", + "libc", + "nix 0.24.3", + "scoped-tls", + "wayland-commons", + "wayland-scanner 0.29.5", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-client" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +dependencies = [ + "bitflags 1.3.2", + "nix 0.26.4", + "wayland-backend 0.1.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-commons" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +dependencies = [ + "nix 0.24.3", + "once_cell", + "smallvec", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-cursor" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +dependencies = [ + "nix 0.24.3", + "wayland-client 0.29.5", + "xcursor", +] + +[[package]] +name = "wayland-egl" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "355f652e5a24ae02d2ad536c8fc2d3dcc6c2bd635027cd6103a193e7d75eeda2" +dependencies = [ + "wayland-backend 0.3.2", + "wayland-sys 0.31.1", +] + +[[package]] +name = "wayland-protocols" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +dependencies = [ + "bitflags 1.3.2", + "wayland-client 0.29.5", + "wayland-commons", + "wayland-scanner 0.29.5", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.0", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-misc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e" +dependencies = [ + "bitflags 2.4.0", + "wayland-backend 0.3.2", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.0", + "wayland-backend 0.3.2", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", +] + +[[package]] +name = "wayland-scanner" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +dependencies = [ + "proc-macro2", + "quick-xml 0.28.2", + "quote", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +dependencies = [ + "proc-macro2", + "quick-xml 0.30.0", + "quote", +] + +[[package]] +name = "wayland-server" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce" +dependencies = [ + "bitflags 2.4.0", + "downcast-rs", + "io-lifetimes 2.0.2", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-sys" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +dependencies = [ + "dlib", + "lazy_static", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "lazy_static", + "log", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "libc", + "log", + "memoffset 0.9.0", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19353897b48e2c4d849a2d73cb0aeb16dc2be4e00c565abfc11eb65a806e47de" +dependencies = [ + "js-sys", + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "wgpu" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" +dependencies = [ + "arrayvec", + "cfg-if", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.0", + "codespan-reporting", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.0", + "block", + "core-graphics-types", + "d3d12", + "foreign-types", + "glow", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" +dependencies = [ + "bitflags 2.4.0", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[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-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "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-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "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.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winit" +version = "0.28.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" +dependencies = [ + "android-activity", + "bitflags 1.3.2", + "cfg_aliases", + "core-foundation", + "core-graphics", + "dispatch", + "instant", + "libc", + "log", + "mio", + "ndk", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle", + "redox_syscall 0.3.5", + "smithay-client-toolkit", + "wasm-bindgen", + "wayland-client 0.29.5", + "wayland-commons", + "wayland-protocols 0.29.5", + "wayland-scanner 0.29.5", + "web-sys", + "windows-sys 0.45.0", + "x11-dl", +] + +[[package]] +name = "winnow" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +dependencies = [ + "memchr", +] + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf3c79412dd91bae7a7366b8ad1565a85e35dd049affc3a6a2c549e97419617" +dependencies = [ + "gethostname 0.2.3", + "libc", + "libloading 0.7.4", + "nix 0.25.1", + "once_cell", + "winapi", + "winapi-wsapoll", + "x11rb-protocol 0.11.1", +] + +[[package]] +name = "x11rb" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" +dependencies = [ + "gethostname 0.3.0", + "nix 0.26.4", + "winapi", + "winapi-wsapoll", + "x11rb-protocol 0.12.0", +] + +[[package]] +name = "x11rb-protocol" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0b1513b141123073ce54d5bb1d33f801f17508fbd61e02060b1214e96d39c56" +dependencies = [ + "nix 0.25.1", +] + +[[package]] +name = "x11rb-protocol" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" +dependencies = [ + "nix 0.26.4", +] + +[[package]] +name = "xcursor" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" +dependencies = [ + "nom", +] + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xkbcommon" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c286371c44b3572d19b09196c129a8fff47d7704d6494daefb44fec10f0278ab" +dependencies = [ + "libc", + "memmap2 0.7.1", + "xkeysym", +] + +[[package]] +name = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/pkgs/applications/window-managers/cosmic/comp/default.nix b/pkgs/applications/window-managers/cosmic/comp/default.nix new file mode 100644 index 0000000000000..5a483649701f6 --- /dev/null +++ b/pkgs/applications/window-managers/cosmic/comp/default.nix @@ -0,0 +1,61 @@ +{ lib, rustPlatform, fetchFromGitHub, makeBinaryWrapper, pkg-config +, libinput, libglvnd, libxkbcommon, mesa, seatd, udev, wayland, xorg +}: + +rustPlatform.buildRustPackage { + pname = "cosmic-comp"; + version = "unstable-2023-10-04"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-comp"; + rev = "a3ac6c42b6913193b76e481d9a60f775f67aa858"; + hash = "sha256-nPQx3Pkd9WAq9ooLs8K8UI1rCHYwJlu88SP2PbC/avU="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "calloop-0.12.2" = "sha256-d/LB65l1DEC/5Kk8yvenTQYfIFBs99XqXn4tAM2mfHI="; + "cosmic-config-0.1.0" = "sha256-0HKv0/UHZMpSGF54aCip9PbwfWiWMSMHZpiipM6Qrf0="; + "cosmic-protocols-0.1.0" = "sha256-oBE/69A4haCN6Etih6B8SlbSnKg1bEocI6Rvf9IegLE="; + "id_tree-1.8.0" = "sha256-uKdKHRfPGt3vagOjhnri3aYY5ar7O3rp2/ivTfM2jT0="; + "smithay-0.3.0" = "sha256-7oOVAoEl+X09e0+V1eR5GviodntMbineEO8Igk2+BM0="; + "smithay-egui-0.1.0" = "sha256-FcSoKCwYk3okwQURiQlDUcfk9m/Ne6pSblGAzHDaVHg="; + "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY="; + "taffy-0.3.11" = "sha256-Py9D8+L9G+sBkHPtlenOdugH5nQKTXa+XdKArOg5+qU="; + }; + }; + + separateDebugInfo = true; + + nativeBuildInputs = [ makeBinaryWrapper pkg-config ]; + buildInputs = [ libglvnd libinput libxkbcommon mesa seatd udev wayland ]; + + # Force linking to libEGL, which is always dlopen()ed, and to + # libwayland-client, which is always dlopen()ed except by the + # obscure winit backend. + RUSTFLAGS = map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lEGL" + "-lwayland-client" + "-Wl,--pop-state" + ]; + + # These libraries are only used by the X11 backend, which will not + # be the common case, so just make them available, don't link them. + postInstall = '' + wrapProgram $out/bin/cosmic-comp \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ + xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr + ]} + ''; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-comp"; + description = "Compositor for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/cosmic/panel/Cargo.lock b/pkgs/applications/window-managers/cosmic/panel/Cargo.lock new file mode 100644 index 0000000000000..168aa6b6f062f --- /dev/null +++ b/pkgs/applications/window-managers/cosmic/panel/Cargo.lock @@ -0,0 +1,3165 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +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.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f2135563fb5c609d2b2b87c1e8ce7bc41b0b45430fa9661f457981503dd5bf0" +dependencies = [ + "memchr", +] + +[[package]] +name = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "appendlist" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e149dc73cd30538307e7ffa2acd3d2221148eaeed4871f246657b1c3eaa1cbd2" + +[[package]] +name = "approx" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" +dependencies = [ + "num-traits", +] + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 1.9.0", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix 0.37.23", + "slab", + "socket2 0.4.9", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-process" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +dependencies = [ + "async-io", + "async-lock", + "autocfg", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix 0.37.23", + "signal-hook", + "windows-sys", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "async-trait" +version = "0.1.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "atomic-waker" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" + +[[package]] +name = "atomicwrites" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1163d9d7c51de51a2b79d6df5e8888d11e9df17c752ce4a285fb6ca1580734e" +dependencies = [ + "rustix 0.37.23", + "tempfile", + "windows-sys", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +dependencies = [ + "serde", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand 1.9.0", + "futures-lite", + "log", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calloop" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" +dependencies = [ + "bitflags 1.3.2", + "log", + "nix 0.25.1", + "slotmap", + "thiserror", + "vec_map", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cgmath" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317" +dependencies = [ + "approx 0.4.0", + "num-traits", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "cosmic-client-toolkit" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols#e39748e1312d74ab8b4c26f4813b858413500b59" +dependencies = [ + "cosmic-protocols", + "smithay-client-toolkit", + "wayland-client", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#5454a01461bf5e394b6e0dcf6a4cc206c1156141" +dependencies = [ + "atomicwrites", + "cosmic-config-derive", + "dirs 5.0.1", + "iced_futures", + "notify", + "ron", + "serde", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#5454a01461bf5e394b6e0dcf6a4cc206c1156141" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-notifications-util" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-notifications#e42d4a0e3ef00dbe2d1478d7563cbe326f6b8311" +dependencies = [ + "bytemuck", + "serde", + "tracing", + "url", +] + +[[package]] +name = "cosmic-panel-bin" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytemuck", + "cosmic-client-toolkit", + "cosmic-config", + "cosmic-notifications-util", + "cosmic-panel-config", + "cosmic-theme", + "csscolorparser", + "freedesktop-desktop-entry", + "image", + "itertools", + "launch-pad", + "libc", + "log-panics", + "notify", + "ron", + "sendfd", + "serde", + "shlex", + "smithay", + "smithay-client-toolkit", + "tokio", + "tracing", + "tracing-futures", + "tracing-journald", + "tracing-subscriber", + "transpose", + "wayland-egl", + "wayland-protocols", + "wayland-protocols-wlr", + "xdg", + "xdg-shell-wrapper", + "xdg-shell-wrapper-config", + "zbus", +] + +[[package]] +name = "cosmic-panel-config" +version = "0.1.0" +dependencies = [ + "anyhow", + "cosmic-config", + "ron", + "serde", + "tracing", + "wayland-protocols-wlr", + "xdg-shell-wrapper-config", +] + +[[package]] +name = "cosmic-protocols" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols#e39748e1312d74ab8b4c26f4813b858413500b59" +dependencies = [ + "bitflags 1.3.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#5454a01461bf5e394b6e0dcf6a4cc206c1156141" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "lazy_static", + "palette", + "ron", + "serde", +] + +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[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-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "cursor-icon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740bb192a8e2d1350119916954f4409ee7f62f149b536911eeb78ba5a20526bf" + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading", +] + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "drm" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edf9159ef4bcecd0c5e4cbeb573b8d0037493403d542780dba5d840bbf9df56f" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "nix 0.26.4", +] + +[[package]] +name = "drm-ffi" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1352481b7b90e27a8a1bf8ef6b33cf18b98dba7c410e75c24bb3eef2f0d8d525" +dependencies = [ + "drm-sys", + "nix 0.26.4", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1369f1679d6b706d234c4c1e0613c415c2c74b598a09ad28080ba2474b72e42d" +dependencies = [ + "libc", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys", +] + +[[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 = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "exr" +version = "1.71.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "windows-sys", +] + +[[package]] +name = "flate2" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "freedesktop-desktop-entry" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45157175a725e81f3f594382430b6b78af5f8f72db9bd51b94f0785f80fc6d29" +dependencies = [ + "dirs 3.0.2", + "gettext-rs", + "memchr", + "thiserror", + "xdg", +] + +[[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.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gbm" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ec389cda876966cf824111bf6e533fb934c711d473498279964a990853b3c6" +dependencies = [ + "bitflags 1.3.2", + "drm", + "drm-fourcc", + "gbm-sys", + "libc", + "wayland-backend", + "wayland-server", +] + +[[package]] +name = "gbm-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b63eba9b9b7a231514482deb08759301c9f9f049ac6869403f381834ebfeaf67" +dependencies = [ + "libc", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gettext-rs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "half" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "iced_core" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#5454a01461bf5e394b6e0dcf6a4cc206c1156141" +dependencies = [ + "bitflags 1.3.2", + "instant", + "log", + "thiserror", + "twox-hash", +] + +[[package]] +name = "iced_futures" +version = "0.7.0" +source = "git+https://github.com/pop-os/libcosmic#5454a01461bf5e394b6e0dcf6a4cc206c1156141" +dependencies = [ + "futures", + "iced_core", + "log", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "launch-pad" +version = "0.1.0" +source = "git+https://github.com/pop-os/launch-pad.git#13e3b6931c9759acdf58b45eb85379d1e8b43da9" +dependencies = [ + "log", + "nix 0.26.4", + "rand", + "slotmap", + "thiserror", + "tokio", + "tokio-util", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.148" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" + +[[package]] +name = "libloading" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +dependencies = [ + "cfg-if", + "windows-sys", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "log-panics" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" +dependencies = [ + "backtrace", + "log", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[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 = "memchr" +version = "2.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" + +[[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[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.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +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", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys", +] + +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys", +] + +[[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-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "palette" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx 0.5.1", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb156a45b6b9fe8027497422179fb65afc84d36707a7ca98297bf06bccb8d43f" +dependencies = [ + "quote", + "syn 2.0.37", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[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", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +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", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.3.8", + "regex-syntax 0.7.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.5", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.4.0", + "serde", + "serde_derive", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[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", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[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", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scan_fmt" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b53b0a5db882a8e2fdaae0a43f7b39e7e9082389e978398bdf223a55b581248" + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sendfd" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" +dependencies = [ + "libc", +] + +[[package]] +name = "serde" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "serde_repr" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "smithay" +version = "0.3.0" +source = "git+https://github.com/smithay/smithay#d8600f204907e622d8dd002c3c8a4892282d2454" +dependencies = [ + "appendlist", + "bitflags 2.4.0", + "calloop", + "cgmath", + "downcast-rs", + "drm", + "drm-ffi", + "drm-fourcc", + "gbm", + "gl_generator", + "indexmap 1.9.3", + "lazy_static", + "libc", + "libloading", + "nix 0.26.4", + "once_cell", + "profiling", + "rand", + "scan_fmt", + "tempfile", + "thiserror", + "tracing", + "wayland-backend", + "wayland-protocols", + "wayland-protocols-misc", + "wayland-protocols-wlr", + "wayland-server", + "wayland-sys", + "xkbcommon", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.17.0" +source = "git+https://github.com/smithay/client-toolkit//#a85f9779fc5126e43bbd4d7fc86f177707157678" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "calloop", + "cursor-icon", + "dlib", + "log", + "memmap2", + "nix 0.26.4", + "pkg-config", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkbcommon", + "xkeysym", +] + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[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.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strength_reduce" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "temp-dir" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" + +[[package]] +name = "tempfile" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +dependencies = [ + "cfg-if", + "fastrand 2.0.0", + "redox_syscall 0.3.5", + "rustix 0.38.13", + "windows-sys", +] + +[[package]] +name = "thiserror" +version = "1.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.4", + "tokio-macros", + "tracing", + "windows-sys", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "tokio-util" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.0.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "tracing-journald" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba316a74e8fc3c3896a850dba2375928a9fa171b085ecddfc7c054d39970f3fd" +dependencies = [ + "libc", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "transpose" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23" +dependencies = [ + "num-integer", + "strength_reduce", +] + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.37", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +dependencies = [ + "cc", + "downcast-rs", + "io-lifetimes", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +dependencies = [ + "bitflags 1.3.2", + "calloop", + "nix 0.26.4", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7146581cd54ec2ef3a68e0d0e3501c9cefa8d4894da4007b715ecced5a289a1c" +dependencies = [ + "bitflags 2.4.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0c3a0d5b4b688b07b0442362d3ed6bf04724fcc16cd69ab6285b90dbc487aa" +dependencies = [ + "nix 0.26.4", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-egl" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1187695fe81c3153c3163f9d2953149f638c5d7dbc6fe988914ca3f4961e28ed" +dependencies = [ + "wayland-backend", + "wayland-sys", +] + +[[package]] +name = "wayland-protocols" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b28101e5ca94f70461a6c2d610f76d85ad223d042dd76585ab23d3422dd9b4d" +dependencies = [ + "bitflags 1.3.2", + "wayland-backend", + "wayland-client", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-misc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897d4e99645e1ed9245e9e6b5efa78828d2b23b661016d63d55251243d812f8b" +dependencies = [ + "bitflags 1.3.2", + "wayland-backend", + "wayland-protocols", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fce991093320e4a6a525876e6b629ab24da25f9baef0c2e0080ad173ec89588a" +dependencies = [ + "bitflags 1.3.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "wayland-scanner" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-server" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c43c28096fe1d49fff7d1079404fdd0f669cd1a5b00c615bdfe71bb1884d23a" +dependencies = [ + "bitflags 1.3.2", + "downcast-rs", + "io-lifetimes", + "nix 0.26.4", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "libc", + "log", + "memoffset 0.7.1", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[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-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +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 = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +dependencies = [ + "memchr", +] + +[[package]] +name = "xcursor" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" +dependencies = [ + "nom", +] + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix 0.26.4", + "winapi", +] + +[[package]] +name = "xdg-shell-wrapper" +version = "0.1.0" +source = "git+https://github.com/pop-os/xdg-shell-wrapper#652888ce7a591fb6b03b4d9f215e5bf0a1c8e629" +dependencies = [ + "anyhow", + "cosmic-client-toolkit", + "itertools", + "libc", + "once_cell", + "ron", + "serde", + "shlex", + "smithay", + "smithay-client-toolkit", + "tempfile", + "tracing", + "wayland-backend", + "wayland-egl", + "wayland-protocols", + "xdg-shell-wrapper-config", +] + +[[package]] +name = "xdg-shell-wrapper-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/xdg-shell-wrapper#652888ce7a591fb6b03b4d9f215e5bf0a1c8e629" +dependencies = [ + "serde", + "wayland-protocols-wlr", +] + +[[package]] +name = "xkbcommon" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88" +dependencies = [ + "libc", + "memmap2", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "xml-rs" +version = "0.8.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab77e97b50aee93da431f2cee7cd0f43b4d1da3c408042f2d7d164187774f0a" + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/applications/window-managers/cosmic/panel/default.nix b/pkgs/applications/window-managers/cosmic/panel/default.nix new file mode 100644 index 0000000000000..7908eeb305771 --- /dev/null +++ b/pkgs/applications/window-managers/cosmic/panel/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchFromGitHub, cargo, just, pkg-config, rust, rustPlatform +, libglvnd, libxkbcommon, wayland +}: + +rustPlatform.buildRustPackage { + pname = "cosmic-panel"; + version = "unstable-2023-09-22"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-panel"; + rev = "df55f44f504c1cee9377cb331c1fb9d95ca83967"; + hash = "sha256-qf1ITvP6PPATZ6jvlc0UuCes1UYMseY4Wr57/5xRZPE="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "cosmic-client-toolkit-0.1.0" = "sha256-pVWK+dODQxNej5jWyb5wX/insoiXkX8NFBDkDEejVV0="; + "cosmic-config-0.1.0" = "sha256-XsFfQzR1gn8Je5lbd6PmSgz/T7XAFTVnR1G6pUY+eX4="; + "cosmic-notifications-util-0.1.0" = "sha256-wRUPovWJucsrKGhjHXku/4UoZf9ih9+Wpbs0sLN+oCI="; + "launch-pad-0.1.0" = "sha256-gFtUtrD/cUVpLxPvg6iLxxAK97LTlvI4uLxo06UYIU4="; + "smithay-0.3.0" = "sha256-hulj6zr4h8A9RElQyrJBy3lvYMd7COe3uDaFMMaWNrM="; + "smithay-client-toolkit-0.17.0" = "sha256-13fXDYqO/701tzoOk8ujHtzgzzz1N6GGbcHUrsNhQ0U="; + "xdg-shell-wrapper-0.1.0" = "sha256-VCiDjvcCsb02LMo7UpEROV6lzX2DYf4Ix9zfEDO2pUg="; + }; + }; + + nativeBuildInputs = [ just pkg-config ]; + buildInputs = [ libglvnd libxkbcommon wayland ]; + + dontUseJustBuild = true; + + justFlags = [ + "--set" "prefix" (placeholder "out") + "--set" "bin-src" "target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-panel" + ]; + + # Force linking to libEGL, which is always dlopen()ed. + "CARGO_TARGET_${rust.toRustTargetForUseInEnvVars stdenv.hostPlatform}_RUSTFLAGS" = + map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lEGL" + "-Wl,--pop-state" + ]; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-panel"; + description = "Panel for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index 94b75af3ea5c5..ac5353daeb23d 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/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/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 9dcd29c644316..6c43f8cbfa6d2 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -31,7 +31,6 @@ cxxLibrary=1 cInclude=1 expandResponseParams "$@" -linkType=$(checkLinkType "${params[@]}") declare -ag positionalArgs=() declare -i n=0 @@ -175,6 +174,7 @@ extraAfter=(${hardeningCFlagsAfter[@]+"${hardeningCFlagsAfter[@]}"} $NIX_CFLAGS_ extraBefore=(${hardeningCFlagsBefore[@]+"${hardeningCFlagsBefore[@]}"} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@) if [ "$dontLink" != 1 ]; then + linkType=$(checkLinkType $NIX_LDFLAGS_BEFORE_@suffixSalt@ "${params[@]}" ${NIX_CFLAGS_LINK_@suffixSalt@:-} $NIX_LDFLAGS_@suffixSalt@) # Add the flags that should only be passed to the compiler when # linking. diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index e1da3ceb5bc9e..8ac11436c5f7b 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/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" @@ -469,6 +527,7 @@ stdenv.mkDerivation { '' + optionalString (libcxx.isLLVM or false) '' echo "-isystem ${lib.getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags + echo "-isystem ${lib.getDev libcxx.cxxabi}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags echo "-l${libcxx.cxxabi.libName}" >> $out/nix-support/libcxx-ldflags '' @@ -558,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/pkgs/build-support/dart/build-dart-application/default.nix b/pkgs/build-support/dart/build-dart-application/default.nix index be1fd72776711..76328e5645f6b 100644 --- a/pkgs/build-support/dart/build-dart-application/default.nix +++ b/pkgs/build-support/dart/build-dart-application/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, fetchDartDeps, runCommand, writeText, dartHooks, makeWrapper, dart, cacert, nodejs, darwin }: +{ lib, stdenv, callPackage, fetchDartDeps, runCommand, writeText, dartHooks, makeWrapper, dart, cacert, nodejs, darwin, jq }: -{ pubGetScript ? "dart pub get" +{ sdkSetupScript ? "" +, pubGetScript ? "dart pub get" # Output type to produce. Can be any kind supported by dart # https://dart.dev/tools/dart-compile#types-of-output @@ -18,12 +19,16 @@ , dartEntryPoints ? null # Used when wrapping aot, jit, kernel, and js builds. # Set to null to disable wrapping. -, dartRuntimeCommand ? - if dartOutputType == "aot-snapshot" then "${dart}/bin/dartaotruntime" - else if (dartOutputType == "jit-snapshot" || dartOutputType == "kernel") then "${dart}/bin/dart" - else if dartOutputType == "js" then "${nodejs}/bin/node" - else null +, dartRuntimeCommand ? if dartOutputType == "aot-snapshot" then "${dart}/bin/dartaotruntime" + else if (dartOutputType == "jit-snapshot" || dartOutputType == "kernel") then "${dart}/bin/dart" + else if dartOutputType == "js" then "${nodejs}/bin/node" + else null +, runtimeDependencies ? [ ] +, extraWrapProgramArgs ? "" +, customPackageOverrides ? { } +, autoDepsList ? false +, depsListFile ? null , pubspecLockFile ? null , vendorHash ? "" , ... @@ -38,37 +43,81 @@ let ''; }) { buildDrvArgs = args; - inherit pubGetScript vendorHash pubspecLockFile; + inherit sdkSetupScript pubGetScript vendorHash pubspecLockFile; }; - inherit (dartHooks.override { inherit dart; }) dartConfigHook dartBuildHook dartInstallHook; -in -assert !(builtins.isString dartOutputType && dartOutputType != "") -> - throw "dartOutputType must be a non-empty string"; -stdenv.mkDerivation (args // { - inherit pubGetScript dartCompileCommand dartOutputType dartRuntimeCommand - dartCompileFlags dartJitFlags; + inherit (dartHooks.override { inherit dart; }) dartConfigHook dartBuildHook dartInstallHook dartFixupHook; + + baseDerivation = stdenv.mkDerivation (finalAttrs: args // { + inherit sdkSetupScript pubGetScript dartCompileCommand dartOutputType + dartRuntimeCommand dartCompileFlags dartJitFlags runtimeDependencies; dartEntryPoints = if (dartEntryPoints != null) then writeText "entrypoints.json" (builtins.toJSON dartEntryPoints) else null; - nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ - dart - dartDeps - dartConfigHook - dartBuildHook - dartInstallHook - makeWrapper - ] ++ lib.optionals stdenv.isDarwin [ - darwin.sigtool - ]; + runtimeDependencyLibraryPath = lib.makeLibraryPath finalAttrs.runtimeDependencies; - # When stripping, it seems some ELF information is lost and the dart VM cli - # runs instead of the expected program. Don't strip if it's an exe output. - dontStrip = args.dontStrip or (dartOutputType == "exe"); + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ + dart + dartDeps + dartConfigHook + dartBuildHook + dartInstallHook + dartFixupHook + makeWrapper + jq + ] ++ lib.optionals stdenv.isDarwin [ + darwin.sigtool + ]; + + preUnpack = '' + ${lib.optionalString (!autoDepsList) '' + if ! { [ '${lib.boolToString (depsListFile != null)}' = 'true' ] ${lib.optionalString (depsListFile != null) "&& cmp -s <(jq -Sc . '${depsListFile}') <(jq -Sc . '${finalAttrs.passthru.dartDeps.depsListFile}')"}; }; then + echo 1>&2 -e '\nThe dependency list file was either not given or differs from the expected result.' \ + '\nPlease choose one of the following solutions:' \ + '\n - Duplicate the following file and pass it to the depsListFile argument.' \ + '\n ${finalAttrs.passthru.dartDeps.depsListFile}' \ + '\n - Set autoDepsList to true (not supported by Hydra or permitted in Nixpkgs)'. + exit 1 + fi + ''} + ${args.preUnpack or ""} + ''; - passthru = { inherit dartDeps; } // (args.passthru or { }); + # When stripping, it seems some ELF information is lost and the dart VM cli + # runs instead of the expected program. Don't strip if it's an exe output. + dontStrip = args.dontStrip or (dartOutputType == "exe"); - meta = (args.meta or { }) // { platforms = args.meta.platforms or dart.meta.platforms; }; -}) + passthru = { inherit dartDeps; } // (args.passthru or { }); + + meta = (args.meta or { }) // { platforms = args.meta.platforms or dart.meta.platforms; }; + }); + + packageOverrideRepository = (callPackage ../../../development/compilers/dart/package-overrides { }) // customPackageOverrides; + productPackages = builtins.filter (package: package.kind != "dev") + (if autoDepsList + then lib.importJSON dartDeps.depsListFile + else + if depsListFile == null + then [ ] + else lib.importJSON depsListFile); +in +assert !(builtins.isString dartOutputType && dartOutputType != "") -> +throw "dartOutputType must be a non-empty string"; +builtins.foldl' + (prev: package: + if packageOverrideRepository ? ${package.name} + then + prev.overrideAttrs + (packageOverrideRepository.${package.name} { + inherit (package) + name + version + kind + source + dependencies; + }) + else prev) + baseDerivation + productPackages diff --git a/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh b/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh index 3e901995237d9..f22d7d2ce64d4 100644 --- a/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh +++ b/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh @@ -3,6 +3,9 @@ dartConfigHook() { echo "Executing dartConfigHook" + echo "Setting up SDK" + eval "$sdkSetupScript" + echo "Installing dependencies" eval doPubGet "$pubGetScript" --offline diff --git a/pkgs/build-support/dart/build-dart-application/hooks/dart-fixup-hook.sh b/pkgs/build-support/dart/build-dart-application/hooks/dart-fixup-hook.sh new file mode 100644 index 0000000000000..c5a9bedd0665a --- /dev/null +++ b/pkgs/build-support/dart/build-dart-application/hooks/dart-fixup-hook.sh @@ -0,0 +1,32 @@ +# shellcheck shell=bash + +dartFixupHook() { + echo "Executing dartFixupHook" + + declare -a wrapProgramArgs + + # Add runtime library dependencies to the LD_LIBRARY_PATH. + # For some reason, the RUNPATH of the executable is not used to load dynamic libraries in dart:ffi with DynamicLibrary.open(). + # + # This could alternatively be fixed with patchelf --add-needed, but this would cause all the libraries to be opened immediately, + # which is not what application authors expect. + echo "$runtimeDependencyLibraryPath" + if [[ ! -z "$runtimeDependencyLibraryPath" ]]; then + wrapProgramArgs+=(--suffix LD_LIBRARY_PATH : \"$runtimeDependencyLibraryPath\") + fi + + if [[ ! -z "$extraWrapProgramArgs" ]]; then + wrapProgramArgs+=("$extraWrapProgramArgs") + fi + + if [ ${#wrapProgramArgs[@]} -ne 0 ]; then + for f in "$out"/bin/*; do + echo "Wrapping $f..." + eval "wrapProgram \"$f\" ${wrapProgramArgs[@]}" + done + fi + + echo "Finished dartFixupHook" +} + +postFixupHooks+=(dartFixupHook) diff --git a/pkgs/build-support/dart/build-dart-application/hooks/default.nix b/pkgs/build-support/dart/build-dart-application/hooks/default.nix index 463061c54a8dd..134989426d96b 100644 --- a/pkgs/build-support/dart/build-dart-application/hooks/default.nix +++ b/pkgs/build-support/dart/build-dart-application/hooks/default.nix @@ -12,4 +12,7 @@ dartInstallHook = makeSetupHook { name = "dart-install-hook"; } ./dart-install-hook.sh; + dartFixupHook = makeSetupHook { + name = "dart-fixup-hook"; + } ./dart-fixup-hook.sh; } diff --git a/pkgs/build-support/dart/fetch-dart-deps/default.nix b/pkgs/build-support/dart/fetch-dart-deps/default.nix index e523b60797eb1..51052cae18f48 100644 --- a/pkgs/build-support/dart/fetch-dart-deps/default.nix +++ b/pkgs/build-support/dart/fetch-dart-deps/default.nix @@ -169,6 +169,8 @@ let dart pub deps --json | jq .packages > $out runHook postBuild ''; + + dontInstall = true; } // (removeAttrs buildDrvInheritArgs [ "name" "pname" ])); # As of Dart 3.0.0, Pub checks the revision of cached Git-sourced packages. diff --git a/pkgs/build-support/expand-response-params/default.nix b/pkgs/build-support/expand-response-params/default.nix index 9371b77023626..7ce15e98c8d99 100644 --- a/pkgs/build-support/expand-response-params/default.nix +++ b/pkgs/build-support/expand-response-params/default.nix @@ -1,5 +1,12 @@ { stdenv }: +# A "response file" is a sequence of arguments that is passed via a +# file, rather than via argv[]. + +# For more information see: +# https://gcc.gnu.org/wiki/Response_Files +# https://www.intel.com/content/www/us/en/docs/dpcpp-cpp-compiler/developer-guide-reference/2023-0/use-response-files.html + stdenv.mkDerivation { name = "expand-response-params"; src = ./expand-response-params.c; diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix index da19848326840..f8a229ccb6bb1 100644 --- a/pkgs/build-support/fetchdocker/credentials.nix +++ b/pkgs/build-support/fetchdocker/credentials.nix @@ -1,3 +1,4 @@ +{ lib }: # We provide three paths to get the credentials into the builder's # environment: # diff --git a/pkgs/build-support/fetchdocker/generic-fetcher.nix b/pkgs/build-support/fetchdocker/generic-fetcher.nix index 6a7b977db29f8..95b193490a82d 100644 --- a/pkgs/build-support/fetchdocker/generic-fetcher.nix +++ b/pkgs/build-support/fetchdocker/generic-fetcher.nix @@ -1,7 +1,7 @@ { stdenv, lib, haskellPackages, writeText, gawk }: let awk = "${gawk}/bin/awk"; - dockerCredentialsFile = import ./credentials.nix; + dockerCredentialsFile = import ./credentials.nix { inherit lib; }; in { fetcher , name diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index a0ed1211ed812..3e136211655b8 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -1,34 +1,28 @@ { lib , callPackage -, stdenvNoCC , runCommand , makeWrapper , wrapGAppsHook -, llvmPackages_13 +, fetchDartDeps +, buildDartApplication , cacert , glib , flutter -, jq }: # absolutely no mac support for now { pubGetScript ? "flutter pub get" , flutterBuildFlags ? [ ] -, runtimeDependencies ? [ ] -, customPackageOverrides ? { } -, autoDepsList ? false -, depsListFile ? null -, vendorHash ? "" -, pubspecLockFile ? null -, nativeBuildInputs ? [ ] -, preUnpack ? "" -, postFixup ? "" , extraWrapProgramArgs ? "" , ... }@args: -let - flutterSetupScript = '' + +(buildDartApplication.override { + dart = flutter; + fetchDartDeps = fetchDartDeps.override { dart = flutter; }; +}) (args // { + sdkSetupScript = '' # Pub needs SSL certificates. Dart normally looks in a hardcoded path. # https://github.com/dart-lang/sdk/blob/3.1.0/runtime/bin/security_context_linux.cc#L48 # @@ -54,136 +48,56 @@ let flutter config --enable-linux-desktop >/dev/null ''; - deps = callPackage ../dart/fetch-dart-deps { dart = flutter; } { - sdkSetupScript = flutterSetupScript; - inherit pubGetScript vendorHash pubspecLockFile; - buildDrvArgs = args; - }; - - baseDerivation = llvmPackages_13.stdenv.mkDerivation (finalAttrs: args // { - inherit flutterBuildFlags runtimeDependencies; - - outputs = [ "out" "debug" ]; - - nativeBuildInputs = [ - makeWrapper - deps - flutter - jq - glib - wrapGAppsHook - ] ++ nativeBuildInputs; - - dontWrapGApps = true; - - preUnpack = '' - ${lib.optionalString (!autoDepsList) '' - if ! { [ '${lib.boolToString (depsListFile != null)}' = 'true' ] ${lib.optionalString (depsListFile != null) "&& cmp -s <(jq -Sc . '${depsListFile}') <(jq -Sc . '${finalAttrs.passthru.depsListFile}')"}; }; then - echo 1>&2 -e '\nThe dependency list file was either not given or differs from the expected result.' \ - '\nPlease choose one of the following solutions:' \ - '\n - Duplicate the following file and pass it to the depsListFile argument.' \ - '\n ${finalAttrs.passthru.depsListFile}' \ - '\n - Set autoDepsList to true (not supported by Hydra or permitted in Nixpkgs)'. - exit 1 - fi - ''} - - ${preUnpack} - ''; - - configurePhase = '' - runHook preConfigure - - ${flutterSetupScript} - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - mkdir -p build/flutter_assets/fonts - - doPubGet flutter pub get --offline -v - flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") finalAttrs.flutterBuildFlags)} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - built=build/linux/*/release/bundle - - mkdir -p $out/bin - mv $built $out/app - - for f in $(find $out/app -iname "*.desktop" -type f); do - install -D $f $out/share/applications/$(basename $f) - done - - for f in $(find $out/app -maxdepth 1 -type f); do - ln -s $f $out/bin/$(basename $f) - done - - # make *.so executable - find $out/app -iname "*.so" -type f -exec chmod +x {} + - - # remove stuff like /build/source/packages/ubuntu_desktop_installer/linux/flutter/ephemeral - for f in $(find $out/app -executable -type f); do - if patchelf --print-rpath "$f" | grep /build; then # this ignores static libs (e,g. libapp.so) also - echo "strip RPath of $f" - newrp=$(patchelf --print-rpath $f | sed -r "s|/build.*ephemeral:||g" | sed -r "s|/build.*profile:||g") - patchelf --set-rpath "$newrp" "$f" - fi - done - - runHook postInstall - ''; - - postFixup = '' - # Add runtime library dependencies to the LD_LIBRARY_PATH. - # For some reason, the RUNPATH of the executable is not used to load dynamic libraries in dart:ffi with DynamicLibrary.open(). - # - # This could alternatively be fixed with patchelf --add-needed, but this would cause all the libraries to be opened immediately, - # which is not what application authors expect. - for f in "$out"/bin/*; do - wrapProgram "$f" \ - --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath finalAttrs.runtimeDependencies}' \ - ''${gappsWrapperArgs[@]} \ - ${extraWrapProgramArgs} - done - - ${postFixup} - ''; - - passthru = (args.passthru or {}) // { - inherit (deps) depsListFile; - }; - }); - - packageOverrideRepository = (callPackage ../../development/compilers/flutter/package-overrides { }) // customPackageOverrides; - productPackages = builtins.filter (package: package.kind != "dev") - (if autoDepsList - then lib.importJSON deps.depsListFile - else - if depsListFile == null - then [ ] - else lib.importJSON depsListFile); -in -builtins.foldl' - (prev: package: - if packageOverrideRepository ? ${package.name} - then - prev.overrideAttrs - (packageOverrideRepository.${package.name} { - inherit (package) - name - version - kind - source - dependencies; - }) - else prev) - baseDerivation - productPackages + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ wrapGAppsHook ]; + buildInputs = (args.buildInputs or [ ]) ++ [ glib ]; + + dontDartBuild = true; + buildPhase = args.buildPhase or '' + runHook preBuild + + mkdir -p build/flutter_assets/fonts + + doPubGet flutter pub get --offline -v + flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") flutterBuildFlags)} + + runHook postBuild + ''; + + dontDartInstall = true; + installPhase = args.installPhase or '' + runHook preInstall + + built=build/linux/*/release/bundle + + mkdir -p $out/bin + mv $built $out/app + + for f in $(find $out/app -iname "*.desktop" -type f); do + install -D $f $out/share/applications/$(basename $f) + done + + for f in $(find $out/app -maxdepth 1 -type f); do + ln -s $f $out/bin/$(basename $f) + done + + # make *.so executable + find $out/app -iname "*.so" -type f -exec chmod +x {} + + + # remove stuff like /build/source/packages/ubuntu_desktop_installer/linux/flutter/ephemeral + for f in $(find $out/app -executable -type f); do + if patchelf --print-rpath "$f" | grep /build; then # this ignores static libs (e,g. libapp.so) also + echo "strip RPath of $f" + newrp=$(patchelf --print-rpath $f | sed -r "s|/build.*ephemeral:||g" | sed -r "s|/build.*profile:||g") + patchelf --set-rpath "$newrp" "$f" + fi + done + + runHook postInstall + ''; + + dontWrapGApps = true; + extraWrapProgramArgs = '' + ''${gappsWrapperArgs[@]} \ + ${extraWrapProgramArgs} + ''; +}) diff --git a/pkgs/build-support/kernel/make-initrd-ng/src/main.rs b/pkgs/build-support/kernel/make-initrd-ng/src/main.rs index 53096a842329c..daa688976c6c8 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/src/main.rs +++ b/pkgs/build-support/kernel/make-initrd-ng/src/main.rs @@ -195,7 +195,7 @@ fn handle_path( .wrap_err_with(|| format!("failed to resolve symlink of {:?}", source))?; // Create the link, then push its target to the queue - if !target.exists() { + if !target.exists() && !target.is_symlink() { unix::fs::symlink(&link_target, &target).wrap_err_with(|| { format!("failed to symlink {:?} to {:?}", link_target, target) })?; diff --git a/pkgs/build-support/php/build-composer-project.nix b/pkgs/build-support/php/build-composer-project.nix index d614ca01eb71c..778aa35fa6a51 100644 --- a/pkgs/build-support/php/build-composer-project.nix +++ b/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/pkgs/build-support/php/build-composer-repository.nix b/pkgs/build-support/php/build-composer-repository.nix index 9487b61e16cb8..5b31f86e61cfa 100644 --- a/pkgs/build-support/php/build-composer-repository.nix +++ b/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/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/hooks/composer-install-hook.sh index ab7756aef4f12..6fe1c4e5f7dde 100644 --- a/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/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/pkgs/build-support/php/hooks/composer-repository-hook.sh b/pkgs/build-support/php/hooks/composer-repository-hook.sh index 2c35b11b73b4f..03783d9d639c6 100644 --- a/pkgs/build-support/php/hooks/composer-repository-hook.sh +++ b/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/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 4e3e2045e8ec4..d977fb9f7c27e 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/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/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 9b2e62fc240a6..18d8ca56fd1fc 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -62,7 +62,6 @@ assert cargoVendorDir == null && cargoLock == null -> !(args ? cargoSha256 && args.cargoSha256 != null) && !(args ? cargoHash && args.cargoHash != null) -> throw "cargoSha256, cargoHash, cargoVendorDir, or cargoLock must be set"; -assert buildType == "release" || buildType == "debug"; let @@ -83,14 +82,9 @@ let targetIsJSON = lib.hasSuffix ".json" target; useSysroot = targetIsJSON && !__internal_dontAddSysroot; - # see https://github.com/rust-lang/cargo/blob/964a16a28e234a3d397b2a7031d4ab4a428b1391/src/cargo/core/compiler/compile_kind.rs#L151-L168 - # the "${}" is needed to transform the path into a /nix/store path before baseNameOf - shortTarget = if targetIsJSON then - (lib.removeSuffix ".json" (builtins.baseNameOf "${target}")) - else target; - sysroot = callPackage ./sysroot { } { - inherit target shortTarget; + inherit target; + shortTarget = rust.lib.toRustTargetSpecShort stdenv.hostPlatform; RUSTFLAGS = args.RUSTFLAGS or ""; originalCargoToml = src + /Cargo.toml; # profile info is later extracted }; @@ -167,5 +161,9 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg "x86_64-redox" "wasm32-wasi" ]; + badPlatforms = [ + # Rust is currently unable to target the n32 ABI + lib.systems.inspect.patterns.isMips64n32 + ]; } // meta; }) diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh index af94e02e38ae7..ed982c7ff30a3 100644 --- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -17,7 +17,7 @@ cargoBuildHook() { fi if [ "${cargoBuildType}" != "debug" ]; then - cargoBuildProfileFlag="--${cargoBuildType}" + cargoBuildProfileFlag="--profile ${cargoBuildType}" fi if [ -n "${cargoBuildNoDefaultFeatures-}" ]; then @@ -30,13 +30,8 @@ cargoBuildHook() { ( set -x - env \ - "CC_@rustBuildPlatform@=@ccForBuild@" \ - "CXX_@rustBuildPlatform@=@cxxForBuild@" \ - "CC_@rustTargetPlatform@=@ccForHost@" \ - "CXX_@rustTargetPlatform@=@cxxForHost@" \ - cargo build -j $NIX_BUILD_CORES \ - --target @rustTargetPlatformSpec@ \ + @setEnv@ cargo build -j $NIX_BUILD_CORES \ + --target @rustHostPlatformSpec@ \ --frozen \ ${cargoBuildProfileFlag} \ ${cargoBuildNoDefaultFeaturesFlag} \ diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index 57fc2779cfe96..971a140ec178f 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -17,7 +17,7 @@ cargoCheckHook() { fi if [ "${cargoCheckType}" != "debug" ]; then - cargoCheckProfileFlag="--${cargoCheckType}" + cargoCheckProfileFlag="--profile ${cargoCheckType}" fi if [ -n "${cargoCheckNoDefaultFeatures-}" ]; then @@ -29,7 +29,7 @@ cargoCheckHook() { fi argstr="${cargoCheckProfileFlag} ${cargoCheckNoDefaultFeaturesFlag} ${cargoCheckFeaturesFlag} - --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}" + --target @rustHostPlatformSpec@ --frozen ${cargoTestFlags}" ( set -x diff --git a/pkgs/build-support/rust/hooks/cargo-install-hook.sh b/pkgs/build-support/rust/hooks/cargo-install-hook.sh index 69ce726693665..24a6e6fa9eb3f 100644 --- a/pkgs/build-support/rust/hooks/cargo-install-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-install-hook.sh @@ -1,7 +1,7 @@ cargoInstallPostBuildHook() { echo "Executing cargoInstallPostBuildHook" - releaseDir=target/@shortTarget@/$cargoBuildType + releaseDir=target/@targetSubdirectory@/$cargoBuildType tmpDir="${releaseDir}-tmp"; mkdir -p $tmpDir @@ -21,7 +21,7 @@ cargoInstallHook() { # rename the output dir to a architecture independent one - releaseDir=target/@shortTarget@/$cargoBuildType + releaseDir=target/@targetSubdirectory@/$cargoBuildType tmpDir="${releaseDir}-tmp"; mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep "${tmpDir}$") diff --git a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh index de85683ead2ac..29ba18a6a1e3f 100644 --- a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh @@ -17,7 +17,7 @@ cargoNextestHook() { fi if [ "${cargoCheckType}" != "debug" ]; then - cargoCheckProfileFlag="--${cargoCheckType}" + cargoCheckProfileFlag="--cargo-profile ${cargoCheckType}" fi if [ -n "${cargoCheckNoDefaultFeatures-}" ]; then @@ -29,7 +29,7 @@ cargoNextestHook() { fi argstr="${cargoCheckProfileFlag} ${cargoCheckNoDefaultFeaturesFlag} ${cargoCheckFeaturesFlag} - --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}" + --target @rustHostPlatformSpec@ --frozen ${cargoTestFlags}" ( set -x diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 2eb388fe07ba8..205d085d3507c 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -9,32 +9,20 @@ , rust , rustc , stdenv -, target ? rust.toRustTargetSpec stdenv.hostPlatform -}: -let - targetIsJSON = lib.hasSuffix ".json" target; +# This confusingly-named parameter indicates the *subdirectory of +# `target/` from which to copy the build artifacts. It is derived +# from a stdenv platform (or a JSON file). +, target ? rust.lib.toRustTargetSpecShort stdenv.hostPlatform +}: - # see https://github.com/rust-lang/cargo/blob/964a16a28e234a3d397b2a7031d4ab4a428b1391/src/cargo/core/compiler/compile_kind.rs#L151-L168 - # the "${}" is needed to transform the path into a /nix/store path before baseNameOf - shortTarget = if targetIsJSON then - (lib.removeSuffix ".json" (builtins.baseNameOf "${target}")) - else target; - ccForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; - cxxForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; - ccForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; - cxxForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; - rustBuildPlatform = rust.toRustTarget stdenv.buildPlatform; - rustTargetPlatform = rust.toRustTarget stdenv.hostPlatform; - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; -in { +{ cargoBuildHook = callPackage ({ }: makeSetupHook { name = "cargo-build-hook.sh"; propagatedBuildInputs = [ cargo ]; substitutions = { - inherit ccForBuild ccForHost cxxForBuild cxxForHost - rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec; + inherit (rust.envVars) rustHostPlatformSpec setEnv; }; } ./cargo-build-hook.sh) {}; @@ -43,7 +31,7 @@ in { name = "cargo-check-hook.sh"; propagatedBuildInputs = [ cargo ]; substitutions = { - inherit rustTargetPlatformSpec; + inherit (rust.envVars) rustHostPlatformSpec; }; } ./cargo-check-hook.sh) {}; @@ -52,7 +40,7 @@ in { name = "cargo-install-hook.sh"; propagatedBuildInputs = [ ]; substitutions = { - inherit shortTarget; + targetSubdirectory = target; }; } ./cargo-install-hook.sh) {}; @@ -61,7 +49,7 @@ in { name = "cargo-nextest-hook.sh"; propagatedBuildInputs = [ cargo cargo-nextest ]; substitutions = { - inherit rustTargetPlatformSpec; + inherit (rust.envVars) rustHostPlatformSpec; }; } ./cargo-nextest-hook.sh) {}; @@ -78,23 +66,26 @@ in { cargoConfig = '' [target."${rust.toRustTarget stdenv.buildPlatform}"] - "linker" = "${ccForBuild}" + "linker" = "${rust.envVars.ccForBuild}" ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' - [target."${shortTarget}"] - "linker" = "${ccForHost}" + [target."${rust.toRustTarget stdenv.hostPlatform}"] + "linker" = "${rust.envVars.ccForHost}" ''} "rustflags" = [ "-C", "target-feature=${if stdenv.hostPlatform.isStatic then "+" else "-"}crt-static" ] ''; }; } ./cargo-setup-hook.sh) {}; - maturinBuildHook = callPackage ({ }: + maturinBuildHook = callPackage ({ pkgsHostTarget }: makeSetupHook { name = "maturin-build-hook.sh"; - propagatedBuildInputs = [ cargo maturin rustc ]; + propagatedBuildInputs = [ + pkgsHostTarget.maturin + pkgsHostTarget.cargo + pkgsHostTarget.rustc + ]; substitutions = { - inherit ccForBuild ccForHost cxxForBuild cxxForHost - rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec; + inherit (rust.envVars) rustTargetPlatformSpec setEnv; }; } ./maturin-build-hook.sh) {}; diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 62d5619660c67..d5ff069290ba5 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -9,12 +9,7 @@ maturinBuildHook() { ( set -x - env \ - "CC_@rustBuildPlatform@=@ccForBuild@" \ - "CXX_@rustBuildPlatform@=@cxxForBuild@" \ - "CC_@rustTargetPlatform@=@ccForHost@" \ - "CXX_@rustTargetPlatform@=@cxxForHost@" \ - maturin build \ + @setEnv@ maturin build \ --jobs=$NIX_BUILD_CORES \ --frozen \ --target @rustTargetPlatformSpec@ \ diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index aa5ba14c1397b..ceca7323176cd 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -1,4 +1,8 @@ -{ lib }: +{ lib +, stdenv +, buildPackages +, targetPackages +}: rec { # https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch @@ -59,8 +63,88 @@ rec { then builtins.toFile (toRustTarget platform + ".json") (builtins.toJSON platform.rustc.platform) else toRustTarget platform; + # Returns the name of the rust target if it is standard, or the + # basename of the file containing the custom target spec, without + # the .json extension. + # + # This is the name used by Cargo for target subdirectories. + toRustTargetSpecShort = platform: + lib.removeSuffix ".json" + (baseNameOf "${toRustTargetSpec platform}"); + + # When used as part of an environment variable name, triples are + # uppercased and have all hyphens replaced by underscores: + # + # https://github.com/rust-lang/cargo/pull/9169 + # https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431 + # + toRustTargetForUseInEnvVars = platform: + lib.strings.replaceStrings ["-"] ["_"] + (lib.strings.toUpper + (toRustTargetSpecShort platform)); + # Returns true if the target is no_std # https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421 IsNoStdTarget = platform: let rustTarget = toRustTarget platform; in builtins.any (t: lib.hasInfix t rustTarget) ["-none" "nvptx" "switch" "-uefi"]; + + # These environment variables must be set when using `cargo-c` and + # several other tools which do not deal well with cross + # compilation. The symptom of the problem they fix is errors due + # to buildPlatform CFLAGS being passed to the + # hostPlatform-targeted compiler -- for example, `-m64` being + # passed on a build=x86_64/host=aarch64 compilation. + envVars = let + ccForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; + cxxForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; + ccForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + cxxForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; + + # Unfortunately we must use the dangerous `targetPackages` here + # because hooks are artificially phase-shifted one slot earlier + # (they go in nativeBuildInputs, so the hostPlatform looks like + # a targetPlatform to them). + ccForTarget = "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc"; + cxxForTarget = "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++"; + + rustBuildPlatform = toRustTarget stdenv.buildPlatform; + rustBuildPlatformSpec = toRustTargetSpec stdenv.buildPlatform; + rustHostPlatform = toRustTarget stdenv.hostPlatform; + rustHostPlatformSpec = toRustTargetSpec stdenv.hostPlatform; + rustTargetPlatform = toRustTarget stdenv.targetPlatform; + rustTargetPlatformSpec = toRustTargetSpec stdenv.targetPlatform; + in { + inherit + ccForBuild cxxForBuild rustBuildPlatform rustBuildPlatformSpec + ccForHost cxxForHost rustHostPlatform rustHostPlatformSpec + ccForTarget cxxForTarget rustTargetPlatform rustTargetPlatformSpec; + + # Prefix this onto a command invocation in order to set the + # variables needed by cargo. + # + setEnv = '' + env \ + '' + # Due to a bug in how splicing and targetPackages works, in + # situations where targetPackages is irrelevant + # targetPackages.stdenv.cc is often simply wrong. We must omit + # the following lines when rustTargetPlatform collides with + # rustHostPlatform. + + lib.optionalString (rustTargetPlatform != rustHostPlatform) '' + "CC_${toRustTargetForUseInEnvVars stdenv.targetPlatform}=${ccForTarget}" \ + "CXX_${toRustTargetForUseInEnvVars stdenv.targetPlatform}=${cxxForTarget}" \ + "CARGO_TARGET_${toRustTargetForUseInEnvVars stdenv.targetPlatform}_LINKER=${ccForTarget}" \ + '' + '' + "CC_${toRustTargetForUseInEnvVars stdenv.hostPlatform}=${ccForHost}" \ + "CXX_${toRustTargetForUseInEnvVars stdenv.hostPlatform}=${cxxForHost}" \ + "CARGO_TARGET_${toRustTargetForUseInEnvVars stdenv.hostPlatform}_LINKER=${ccForHost}" \ + '' + '' + "CC_${toRustTargetForUseInEnvVars stdenv.buildPlatform}=${ccForBuild}" \ + "CXX_${toRustTargetForUseInEnvVars stdenv.buildPlatform}=${cxxForBuild}" \ + "CARGO_TARGET_${toRustTargetForUseInEnvVars stdenv.buildPlatform}_LINKER=${ccForBuild}" \ + "CARGO_BUILD_TARGET=${rustBuildPlatform}" \ + "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" \ + "HOST_CXX=${buildPackages.stdenv.cc}/bin/c++" \ + ''; + }; } diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh b/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh index 88a50befd7328..6cd01f6bf6307 100644 --- a/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh @@ -193,8 +193,23 @@ makeCWrapper() { addFlags() { local n flag before after var + + # Disable file globbing, since bash will otherwise try to find + # filenames matching the the value to be prefixed/suffixed if + # it contains characters considered wildcards, such as `?` and + # `*`. We want the value as is, except we also want to split + # it on on the separator; hence we can't quote it. + local reenableGlob=0 + if [[ ! -o noglob ]]; then + reenableGlob=1 + fi + set -o noglob # shellcheck disable=SC2086 before=($1) after=($2) + if (( reenableGlob )); then + set +o noglob + fi + var="argv_tmp" printf '%s\n' "char **$var = calloc(${#before[@]} + argc + ${#after[@]} + 1, sizeof(*$var));" printf '%s\n' "assert($var != NULL);" diff --git a/pkgs/by-name/al/alpine-make-rootfs/package.nix b/pkgs/by-name/al/alpine-make-rootfs/package.nix new file mode 100644 index 0000000000000..1fcfc23710a5a --- /dev/null +++ b/pkgs/by-name/al/alpine-make-rootfs/package.nix @@ -0,0 +1,33 @@ +{ stdenvNoCC, lib, fetchFromGitHub, makeWrapper, apk-tools, coreutils, findutils, gnugrep, gnused, gnutar, gzip, rsync, util-linux, wget +}: +stdenvNoCC.mkDerivation rec { + pname = "alpine-make-rootfs"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "alpinelinux"; + repo = "alpine-make-rootfs"; + rev = "v${version}"; + hash = "sha256-B5qYQ6ah4hFZfb3S5vwgevh7aEHI3YGLoA+IyipaDck="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/alpine-make-rootfs --set PATH ${lib.makeBinPath [ + apk-tools coreutils findutils gnugrep gnused gnutar gzip rsync util-linux wget + ]} + ''; + + meta = with lib; { + homepage = "https://github.com/alpinelinux/alpine-make-rootfs"; + description = "Make customized Alpine Linux rootfs (base image) for containers"; + mainProgram = "alpine-make-rootfs"; + maintainers = with maintainers; [ danielsidhion ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/argagg/default.nix b/pkgs/by-name/ar/argagg/package.nix index 7ff9eaac1e3e6..bb8507abbe977 100644 --- a/pkgs/development/libraries/argagg/default.nix +++ b/pkgs/by-name/ar/argagg/package.nix @@ -4,27 +4,22 @@ , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "argagg"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "vietjtnguyen"; - repo = pname; - rev = version; - hash = "sha256-MCtlAPfwdJpgfS8IH+zlcgaaxZ5AsP4hJvbZAFtOa4o="; + repo = "argagg"; + rev = finalAttrs.version; + hash = "sha256-G0PzoKpUyb1MaziLvHgasq98jPODUu4EgPzywRjuIN8="; }; - patches = [ - # Fix compilation of macro catch statement - ./0001-catch.diff - ]; - nativeBuildInputs = [ cmake ]; - meta = with lib; { + meta = { homepage = "https://github.com/vietjtnguyen/argagg"; description = "Argument Aggregator"; longDescription = '' @@ -38,9 +33,9 @@ stdenv.mkDerivation rec { types until you access them, so the result structures end up just being pointers into the original command line argument C-strings. ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; badPlatforms = [ "aarch64-darwin" ]; }; -} +}) diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/by-name/ar/argtable/package.nix index 9752b9600397c..18206202691c7 100644 --- a/pkgs/development/libraries/argtable/default.nix +++ b/pkgs/by-name/ar/argtable/package.nix @@ -4,29 +4,29 @@ , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "argtable"; - version = "3.2.1"; - srcVersion = "v${version}.52f24e5"; + version = "3.2.2"; + srcVersion = "v${finalAttrs.version}.f25c624"; src = fetchFromGitHub { owner = "argtable"; repo = "argtable3"; - rev = srcVersion; - hash = "sha256-HFsk91uJXQ0wpvAQxP4/yZwRQx9kLH7KgB3Y/+zcZC0="; + rev = finalAttrs.srcVersion; + hash = "sha256-X89xFLDs6NEgjzzwy8kplvTgukQd/CV3Xa9A3JXecf4="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" + (lib.cmakeBool "BUILD_SHARED_LIBS" true) ]; postPatch = '' patchShebangs tools/build ''; - meta = with lib; { + meta = { homepage = "https://github.com/argtable/argtable3"; description = "A single-file, ANSI C command-line parsing library"; longDescription = '' @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { handling logic and textual descriptions of the command line syntax, which are essential but tedious to implement for a robust CLI program. ''; - license = with licenses; bsd3; - maintainers = with maintainers; [ AndersonTorres artuuge ]; - platforms = with platforms; all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ AndersonTorres artuuge ]; + platforms = lib.platforms.all; }; -} +}) # TODO: a NixOS test suite # TODO: multiple outputs # TODO: documentation diff --git a/pkgs/by-name/ba/bashly/Gemfile b/pkgs/by-name/ba/bashly/Gemfile new file mode 100644 index 0000000000000..b5d29f5f4c593 --- /dev/null +++ b/pkgs/by-name/ba/bashly/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'bashly' diff --git a/pkgs/by-name/ba/bashly/Gemfile.lock b/pkgs/by-name/ba/bashly/Gemfile.lock new file mode 100644 index 0000000000000..0021014b37284 --- /dev/null +++ b/pkgs/by-name/ba/bashly/Gemfile.lock @@ -0,0 +1,59 @@ +GEM + remote: https://rubygems.org/ + specs: + bashly (1.1.1) + colsole (>= 0.8.1, < 2) + completely (~> 0.6.1) + filewatcher (~> 2.0) + gtx (~> 0.1) + lp (~> 0.2) + mister_bin (~> 0.7) + psych (>= 3.3.2, < 7) + tty-markdown (~> 0.7) + colsole (1.0.0) + completely (0.6.1) + colsole (>= 0.8.1, < 2) + mister_bin (~> 0.7) + docopt_ng (0.7.1) + filewatcher (2.1.0) + module_methods (~> 0.1.0) + gtx (0.1.0) + kramdown (2.4.0) + rexml + lp (0.2.1) + mister_bin (0.7.6) + colsole (>= 0.8.1, < 2) + docopt_ng (~> 0.7, >= 0.7.1) + module_methods (0.1.0) + pastel (0.8.0) + tty-color (~> 0.5) + psych (5.1.1.1) + stringio + rexml (3.2.6) + rouge (4.1.3) + stringio (3.0.8) + strings (0.2.1) + strings-ansi (~> 0.2) + unicode-display_width (>= 1.5, < 3.0) + unicode_utils (~> 1.4) + strings-ansi (0.2.0) + tty-color (0.6.0) + tty-markdown (0.7.2) + kramdown (>= 1.16.2, < 3.0) + pastel (~> 0.8) + rouge (>= 3.14, < 5.0) + strings (~> 0.2.0) + tty-color (~> 0.5) + tty-screen (~> 0.8) + tty-screen (0.8.1) + unicode-display_width (2.5.0) + unicode_utils (1.4.0) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + bashly + +BUNDLED WITH + 2.3.26 diff --git a/pkgs/by-name/ba/bashly/gemset.nix b/pkgs/by-name/ba/bashly/gemset.nix new file mode 100644 index 0000000000000..e24c0b3483d76 --- /dev/null +++ b/pkgs/by-name/ba/bashly/gemset.nix @@ -0,0 +1,231 @@ +{ + bashly = { + dependencies = ["colsole" "completely" "filewatcher" "gtx" "lp" "mister_bin" "psych" "tty-markdown"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rhzbpv8j5qcm5a84m4vzrryb0j8z90q6djbpid4ay2fr492kvkq"; + type = "gem"; + }; + version = "1.1.1"; + }; + colsole = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvf6dz2wsvjk7q24z0dm8lajq3p2l6i5ywf3mxj683rmhwq49bg"; + type = "gem"; + }; + version = "1.0.0"; + }; + completely = { + dependencies = ["colsole" "mister_bin"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01nk1cigb09z6rjy41qrhqf58cgpqm43xwjdkz33mfmwrnz04cw1"; + type = "gem"; + }; + version = "0.6.1"; + }; + docopt_ng = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rsnl5s7k2s1gl4n4dg68ssg577kf11sl4a4l2lb2fpswj718950"; + type = "gem"; + }; + version = "0.7.1"; + }; + filewatcher = { + dependencies = ["module_methods"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03f9v57c5zag09mi10yjhdx7y0vv2w5wrnwzbij9hhkwh43rk077"; + type = "gem"; + }; + version = "2.1.0"; + }; + gtx = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10hfhicvv371gy1i16x6vry1xglvxl0zh7qr6f14pqsx32qih6ff"; + type = "gem"; + }; + version = "0.1.0"; + }; + kramdown = { + dependencies = ["rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; + type = "gem"; + }; + version = "2.4.0"; + }; + lp = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ns1aza32n929w7smg1dsn4g6qlfi7k1jrvssyn35cicmwn0gyyr"; + type = "gem"; + }; + version = "0.2.1"; + }; + mister_bin = { + dependencies = ["colsole" "docopt_ng"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xx8cxvzcn47zsnshcllf477x4rbssrchvp76929qnsg5k9q7fas"; + type = "gem"; + }; + version = "0.7.6"; + }; + module_methods = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1886wjscfripgzlmyvcd0jmlzwr6hxvklm2a5rm32dw5bf7bvjki"; + type = "gem"; + }; + version = "0.1.0"; + }; + pastel = { + dependencies = ["tty-color"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8"; + type = "gem"; + }; + version = "0.8.0"; + }; + psych = { + dependencies = ["stringio"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wjzrkssjfjpynij5dpycyflhqbjvi1gc2j73xgq3b196s1d3c24"; + type = "gem"; + }; + version = "5.1.1.1"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + type = "gem"; + }; + version = "3.2.6"; + }; + rouge = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19drl3x8fw65v3mpy7fk3cf3dfrywz5alv98n2rm4pp04vdn71lw"; + type = "gem"; + }; + version = "4.1.3"; + }; + stringio = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ix96dxbjqlpymdigb4diwrifr0bq7qhsrng95fkkp18av326nqk"; + type = "gem"; + }; + version = "3.0.8"; + }; + strings = { + dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yynb0qhhhplmpzavfrrlwdnd1rh7rkwzcs4xf0mpy2wr6rr6clk"; + type = "gem"; + }; + version = "0.2.1"; + }; + strings-ansi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh"; + type = "gem"; + }; + version = "0.2.0"; + }; + tty-color = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g"; + type = "gem"; + }; + version = "0.6.0"; + }; + tty-markdown = { + dependencies = ["kramdown" "pastel" "rouge" "strings" "tty-color" "tty-screen"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04f599zn5rfndq4d9l0acllfpc041bzdkkz2h6x0dl18f2wivn0y"; + type = "gem"; + }; + version = "0.7.2"; + }; + tty-screen = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; + type = "gem"; + }; + version = "0.8.1"; + }; + unicode-display_width = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + type = "gem"; + }; + version = "2.5.0"; + }; + unicode_utils = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; + type = "gem"; + }; + version = "1.4.0"; + }; +} diff --git a/pkgs/by-name/ba/bashly/package.nix b/pkgs/by-name/ba/bashly/package.nix new file mode 100644 index 0000000000000..5a3d6661caa2d --- /dev/null +++ b/pkgs/by-name/ba/bashly/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenvNoCC +, bundlerApp +}: + +let + bashlyBundlerApp = bundlerApp { + pname = "bashly"; + gemdir = ./.; + exes = [ "bashly" ]; + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + name = "bashly"; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir $out; + cd $out; + + mkdir bin; pushd bin; + ln -vs ${bashlyBundlerApp}/bin/bashly; + + runHook postInstall + ''; + + meta = { + description = "Bash command line framework and CLI generator"; + homepage = "https://github.com/DannyBen/bashly"; + license = lib.licenses.mit; + mainProgram = "bashly"; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 4dfa1375ef7a2..b058449ea2244 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/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/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix new file mode 100644 index 0000000000000..36d60fb509de0 --- /dev/null +++ b/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/pkgs/by-name/ci/cidr-merger/package.nix b/pkgs/by-name/ci/cidr-merger/package.nix new file mode 100644 index 0000000000000..3d06120716095 --- /dev/null +++ b/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/pkgs/applications/networking/cisco-packet-tracer/7.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix index 620e7420439b2..620e7420439b2 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/7.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix diff --git a/pkgs/applications/networking/cisco-packet-tracer/8.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index 5784c156e956d..5784c156e956d 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/8.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix diff --git a/pkgs/servers/monitoring/cockpit/default.nix b/pkgs/by-name/co/cockpit/package.nix index f73f391f71b97..48bcff3f32a92 100644 --- a/pkgs/servers/monitoring/cockpit/default.nix +++ b/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/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix new file mode 100644 index 0000000000000..2e834111c9d9e --- /dev/null +++ b/pkgs/by-name/db/dbus-cpp/package.nix @@ -0,0 +1,127 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, testers +, boost +, cmake +, dbus +, doxygen +, graphviz +, gtest +, libxml2 +, lomiri +, pkg-config +, process-cpp +, properties-cpp +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dbus-cpp"; + version = "5.0.3"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lib-cpp/dbus-cpp"; + rev = finalAttrs.version; + hash = "sha256-t8SzPRUuKeEchT8vAsITf8MwbgHA+mR5C9CnkdVyX7s="; + }; + + outputs = [ + "out" + "dev" + "doc" + "examples" + ]; + + patches = [ + # Handle already-stolen dbus call better + # Remove when version > 5.0.3 + (fetchpatch { + name = "0001-dbus-cpp-src-Dont-steal-a-pending-dbus-call-more-then-once.patch"; + url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/9f3d1ff2b1c6c732285949c3dbb35e40cf55ea92.patch"; + hash = "sha256-xzOCIJVsK2J+X9RsV930R9uw6h4UxqwSaNOgv8v4qQU="; + }) + + # Fix GCC13 compilation + # Remove when version > 5.0.3 + (fetchpatch { + name = "0002-dbus-cpp-Add-missing-headers-for-GCC13.patch"; + url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/c761b1eec084962dbe64d35d7f7b86dcbe57a3f7.patch"; + hash = "sha256-/tKe3iHWxP9jWtpdgwwRynj8565u9LxCt4WXJDXzgX4="; + }) + ]; + + postPatch = '' + substituteInPlace doc/CMakeLists.txt \ + --replace 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}' + + # Warning on aarch64-linux breaks build due to -Werror + substituteInPlace CMakeLists.txt \ + --replace '-Werror' "" + + # pkg-config output patching hook expects prefix variable here + substituteInPlace data/dbus-cpp.pc.in \ + --replace 'includedir=''${exec_prefix}' 'includedir=''${prefix}' + '' + lib.optionalString (!finalAttrs.doCheck) '' + sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + pkg-config + ]; + + buildInputs = [ + boost + lomiri.cmake-extras + dbus + libxml2 + process-cpp + properties-cpp + ]; + + nativeCheckInputs = [ + dbus + ]; + + checkInputs = [ + gtest + ]; + + cmakeFlags = [ + "-DDBUS_CPP_ENABLE_DOC_GENERATION=ON" + ]; + + # Too flaky on ARM CI & for some amd64 users + doCheck = false; + + # DBus, parallelism messes with communication + enableParallelChecking = false; + + preFixup = '' + moveToOutput libexec/examples $examples + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "A dbus-binding leveraging C++-11"; + homepage = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + mainProgram = "dbus-cppc"; + platforms = platforms.linux; + pkgConfigModules = [ + "dbus-cpp" + ]; + }; +}) diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix new file mode 100644 index 0000000000000..84c08eaaa38d2 --- /dev/null +++ b/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/pkgs/tools/networking/doggo/default.nix b/pkgs/by-name/do/doggo/package.nix index ebebb1fcca05a..cdd19bc37b906 100644 --- a/pkgs/tools/networking/doggo/default.nix +++ b/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/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix new file mode 100644 index 0000000000000..c698e6edef6ca --- /dev/null +++ b/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/pkgs/by-name/fi/firewalk/package.nix b/pkgs/by-name/fi/firewalk/package.nix new file mode 100644 index 0000000000000..8909a61062c77 --- /dev/null +++ b/pkgs/by-name/fi/firewalk/package.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchurl +, libnet +, libpcap +, libdnet +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "firewalk"; + version = "5.0"; + + src = fetchurl { + url = "https://salsa.debian.org/pkg-security-team/firewalk/-/archive/upstream/${finalAttrs.version}/firewalk-upstream-${finalAttrs.version}.tar.gz"; + hash = "sha256-f0sHzcH3faeg7epfpWXbgaHrRWaWBKMEqLdy38+svGo="; + }; + + buildInputs = [ libnet libpcap libdnet ]; + + meta = with lib; { + description = "Gateway ACL scanner"; + homepage = "http://packetfactory.openwall.net/projects/firewalk/"; + license = licenses.bsd2; + maintainers = with maintainers; [ tochiaha ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/fl/flip/package.nix b/pkgs/by-name/fl/flip/package.nix new file mode 100644 index 0000000000000..f7957c0990b00 --- /dev/null +++ b/pkgs/by-name/fl/flip/package.nix @@ -0,0 +1,32 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake +}: + +stdenv.mkDerivation { + pname = "flip"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "NVlabs"; + repo = "flip"; + rev = "8303adb2060d69423d040453995f4ad1a030a1cc"; + hash = "sha256-jSB79qOtnW/cjApIDcLRqGabnzCIwS7saA+aF1TcyV0="; + }; + + nativeBuildInputs = [ + cmake + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "A tool for visualizing and communicating the errors in rendered images."; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ zmitchell ]; + mainProgram = "flip"; + }; +} diff --git a/pkgs/by-name/gr/grun/package.nix b/pkgs/by-name/gr/grun/package.nix new file mode 100644 index 0000000000000..aef41add611de --- /dev/null +++ b/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/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix new file mode 100644 index 0000000000000..bf2bda5100dcd --- /dev/null +++ b/pkgs/by-name/hi/hifile/package.nix @@ -0,0 +1,41 @@ +{ lib, appimageTools, fetchurl }: + +let + version = "0.9.9.5"; + pname = "hifile"; + + src = fetchurl { + url = "https://www.hifile.app/files/HiFile-${version}.AppImage"; + hash = "sha256-Ks/NLPm5loo9q8pT0LdtfcrC38203beNE74sbEpyuJM="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; + +in +appimageTools.wrapType2 rec { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/HiFile.desktop $out/share/applications/HiFile.desktop + install -m 444 -D ${appimageContents}/HiFile.png $out/share/icons/hicolor/512x512/apps/HiFile.png + substituteInPlace $out/share/applications/HiFile.desktop \ + --replace 'Exec=HiFile' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "Dual-pane graphical file manager for Windows, macOS and Linux"; + longDescription = '' + HiFile is the next evolution of file managers. Its mission is to increase your productivity whenever you work with files or folders. It aims to be better in every way - more convenient, more versatile, more efficient, more elegant, more customizable, and more fun. + ''; + homepage = "https://www.hifile.app/"; + downloadPage = "https://www.hifile.app/download"; + license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ ymstnt ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/ho/homeassistant-satellite/package.nix b/pkgs/by-name/ho/homeassistant-satellite/package.nix new file mode 100644 index 0000000000000..26f90237f5218 --- /dev/null +++ b/pkgs/by-name/ho/homeassistant-satellite/package.nix @@ -0,0 +1,56 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "homeassistant-satellite"; + version = "2.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "synesthesiam"; + repo = "homeassistant-satellite"; + rev = "v${version}"; + hash = "sha256-iosutOpkpt0JJIMyALuQSDLj4jk57ITShVyPYlQgMFg="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + wheel + ]; + + propagatedBuildInputs = with python3.pkgs; [ + aiohttp + ]; + + passthru.optional-dependencies = { + pulseaudio = with python3.pkgs; [ + pasimple + pulsectl + ]; + silerovad = with python3.pkgs; [ + numpy + onnxruntime + ]; + webrtc = with python3.pkgs; [ + webrtc-noise-gain + ]; + }; + + pythonImportsCheck = [ + "homeassistant_satellite" + ]; + + # no tests + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/synesthesiam/homeassistant-satellite/blob/v${version}/CHANGELOG.md"; + description = "Streaming audio satellite for Home Assistant"; + homepage = "https://github.com/synesthesiam/homeassistant-satellite"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + mainProgram = "homeassistant-satellite"; + }; +} diff --git a/pkgs/by-name/ji/jitterentropy-rngd/package.nix b/pkgs/by-name/ji/jitterentropy-rngd/package.nix new file mode 100644 index 0000000000000..feb7d1e2fb126 --- /dev/null +++ b/pkgs/by-name/ji/jitterentropy-rngd/package.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "jitterentropy-rngd"; + version = "1.2.8"; + + src = fetchFromGitHub { + owner = "smuellerDD"; + repo = pname; + rev = "v${version}"; + hash = "sha256-LDym636ss3B1G/vrqatu9g5vbVEeDX0JQcxZ/IxGeY0="; + }; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + make install DESTDIR= PREFIX=$out UNITDIR=$out/lib/systemd/system + + runHook postInstall + ''; + + meta = with lib; { + description = ''A random number generator, which injects entropy to the kernel''; + homepage = "https://github.com/smuellerDD/jitterentropy-rngd"; + changelog = "https://github.com/smuellerDD/jitterentropy-rngd/releases/tag/v${version}"; + license = [ licenses.gpl2Only licenses.bsd3 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ thillux ]; + mainProgram = "jitterentropy-rngd"; + }; +} diff --git a/pkgs/by-name/kc/kconfig-frontends/package.nix b/pkgs/by-name/kc/kconfig-frontends/package.nix new file mode 100644 index 0000000000000..954ca475a75d3 --- /dev/null +++ b/pkgs/by-name/kc/kconfig-frontends/package.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchurl +, bash +, bison +, flex +, gperf +, ncurses +, pkg-config +, python3 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kconfig-frontends"; + version = "4.11.0.1"; + + src = fetchurl { + url = "https://bitbucket.org/nuttx/tools/downloads/kconfig-frontends-${finalAttrs.version}.tar.bz2"; + hash = "sha256-yxg4z+Lwl7oJyt4n1HUncg1bKeK3FcCpbDPQtqELqxM="; + }; + + patches = [ + # This patch is a fixed file, there is no need to normalize it + (fetchurl { + url = "https://bitbucket.org/nuttx/tools/downloads/gperf3.1_kconfig_id_lookup.patch"; + hash = "sha256-cqAWjRnMA/fJ8wnEfUxoPEW0hIJY/mprE6/TQMY6NPI="; + }) + ]; + + outputs = [ "out" "lib" "dev" "doc" ]; + + nativeBuildInputs = [ + bison + flex + gperf + pkg-config + ]; + + buildInputs = [ + bash + ncurses + python3 + ]; + + strictDeps = true; + + configureFlags = [ + "--enable-frontends=conf,mconf,nconf" + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; + + meta = { + description = "Out of Linux tree packaging of the kconfig infrastructure"; + longDescription = '' + Configuration language and system for the Linux kernel and other + projects. Features simple syntax and grammar, limited yet adequate option + types, simple organization of options, and direct and reverse + dependencies. + ''; + homepage = "https://bitbucket.org/nuttx/tools/"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ko/konbucase/package.nix b/pkgs/by-name/ko/konbucase/package.nix new file mode 100644 index 0000000000000..75876d990661e --- /dev/null +++ b/pkgs/by-name/ko/konbucase/package.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, vala +, pkg-config +, wrapGAppsHook +, pantheon +, gtksourceview5 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "konbucase"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "ryonakano"; + repo = "konbucase"; + rev = finalAttrs.version; + hash = "sha256-g3EDa9EXymi6c8dRHFZYGEAT7k8M2TXUAzZVKTnLzyk="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + pantheon.granite7 + gtksourceview5 + ]; + + postInstall = '' + mv $out/bin/com.github.ryonakano.konbucase $out/bin/konbucase + substituteInPlace $out/share/applications/com.github.ryonakano.konbucase.desktop \ + --replace 'Exec=com.github.ryonakano.konbucase' 'Exec=${placeholder "out"}/bin/konbucase' + ''; + + meta = with lib; { + homepage = "https://github.com/ryonakano/konbucase"; + description = "A case converting app suitable for coding or typing"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ galaxy ]; + platforms = platforms.linux; + mainProgram = "konbucase"; + }; +}) diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix new file mode 100644 index 0000000000000..b7b99c4a58ebd --- /dev/null +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "namespace-cli"; + version = "0.0.301"; + + src = fetchFromGitHub { + owner = "namespacelabs"; + repo = "foundation"; + rev = "v${version}"; + hash = "sha256-e2le7yIzgb3dReniU7grR814xDWhGgckuyzx4omeRYI="; + }; + + vendorHash = "sha256-jYkEXoCxqlxLF7oRc7H+/pMwkphOEwt2qUFkg+JOKVA="; + + subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"]; + + ldflags = [ + "-s" + "-w" + "-X namespacelabs.dev/foundation/internal/cli/version.Tag=v${version}" + ]; + + meta = with lib; { + mainProgram = "nsc"; + maintainers = with maintainers; [ techknowlogick ]; + license = licenses.asl20; + changelog = "https://github.com/namespacelabs/foundation/releases/tag/v${version}"; + homepage = "https://github.com/namespacelabs/foundation"; + description = "A command line interface for the Namespaces platform"; + }; +} diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index 357772d5f8ece..f77ca05a6345a 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "oelint-adv"; - version = "3.25.0"; + version = "3.26.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_adv"; - hash = "sha256-dhTS2DZ7Usb1jgBv9Wm86w8CCMt64aHyBrxucLZUQjs="; + hash = "sha256-xQC3y9YeY8o4L4pLV+nLs1Ao8KH6q1BprwTeUm8f+2w="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix new file mode 100644 index 0000000000000..6ffd81584f3e7 --- /dev/null +++ b/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/pkgs/by-name/on/onedriver/package.nix b/pkgs/by-name/on/onedriver/package.nix new file mode 100644 index 0000000000000..f4087401ea92d --- /dev/null +++ b/pkgs/by-name/on/onedriver/package.nix @@ -0,0 +1,64 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, pkg-config +, webkitgtk +, glib +, fuse +, installShellFiles +}: +let + pname = "onedriver"; + version = "0.13.0-2"; + + src = fetchFromGitHub { + owner = "jstaf"; + repo = "onedriver"; + rev = "v${version}"; + hash = "sha256-Bcjgmx9a4pTRhkzR3tbOB6InjvuH71qomv4t+nRNc+w="; + }; +in +buildGoModule { + inherit pname version src; + vendorHash = "sha256-OOiiKtKb+BiFkoSBUQQfqm4dMfDW3Is+30Kwcdg8LNA="; + + nativeBuildInputs = [ pkg-config installShellFiles ]; + buildInputs = [ webkitgtk glib fuse ]; + + ldflags = [ "-X github.com/jstaf/onedriver/cmd/common.commit=v${version}" ]; + + subPackages = [ + "cmd/onedriver" + "cmd/onedriver-launcher" + ]; + + postInstall = '' + echo "Running postInstall" + install -Dm644 ./resources/onedriver.svg $out/share/icons/onedriver/onedriver.svg + install -Dm644 ./resources/onedriver.png $out/share/icons/onedriver/onedriver.png + install -Dm644 ./resources/onedriver-128.png $out/share/icons/onedriver/onedriver-128.png + + install -Dm644 ./resources/onedriver.desktop $out/share/applications/onedriver.desktop + + mkdir -p $out/share/man/man1 + installManPage ./resources/onedriver.1 + + substituteInPlace $out/share/applications/onedriver.desktop \ + --replace "/usr/bin/onedriver-launcher" "$out/bin/onedriver-launcher" \ + --replace "/usr/share/icons" "$out/share/icons" + ''; + + meta = with lib; { + description = "A network filesystem for Linux"; + longDescription = '' + onedriver is a network filesystem that gives your computer direct access to your files on Microsoft OneDrive. + This is not a sync client. Instead of syncing files, onedriver performs an on-demand download of files when + your computer attempts to use them. onedriver allows you to use files on OneDrive as if they were files on + your local computer. + ''; + inherit (src.meta) homepage; + license = licenses.gpl3Plus; + maintainers = [ maintainers.massimogengarelli ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/pa/paper-age/package.nix b/pkgs/by-name/pa/paper-age/package.nix new file mode 100644 index 0000000000000..d4bf9c731fa84 --- /dev/null +++ b/pkgs/by-name/pa/paper-age/package.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "paper-age"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "matiaskorhonen"; + repo = "paper-age"; + rev = "v${version}"; + hash = "sha256-/8t+4iO+rYlc2WjjECq5mk8t0af/whmzatU63r9sO98="; + }; + + cargoHash = "sha256-lLY3PINWGpdnNojIPT+snvLJTH4UEM7JWXdqrOLxibY="; + + meta = with lib; { + description = "Easy and secure paper backups of secrets"; + homepage = "https://github.com/matiaskorhonen/paper-age"; + changelog = "https://github.com/matiaskorhonen/paper-age/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ tomfitzhenry ]; + mainProgram = "paper-age"; + }; +} diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index bbfbb1a64476f..dee9c6610b148 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/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/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index e3c42056a2759..6e09e86f2059f 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "presenterm"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "mfontanini"; repo = "presenterm"; - rev = version; - hash = "sha256-mNWnUUezKIffh5gMgMMdvApNZZTxxB8XrL0jFLyBxuk="; + rev = "v${version}"; + hash = "sha256-sXVMVU34gxZKGNye6hoyv07a7N7f6UbivA6thbSOeZA="; }; - cargoHash = "sha256-JLPJLhWN/yXpPIHa+FJ2aQ/GDUFKtZ7t+/8rvR8WNKM="; + cargoHash = "sha256-PsDaXMws/8hEvAZwClQ4okGuryg1iKg0IBr7Xp2QYBE="; meta = with lib; { description = "A terminal based slideshow tool"; diff --git a/pkgs/by-name/ri/river-bnf/package.nix b/pkgs/by-name/ri/river-bnf/package.nix new file mode 100644 index 0000000000000..f869a6e2ff0c0 --- /dev/null +++ b/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/pkgs/by-name/sp/spice-autorandr/package.nix b/pkgs/by-name/sp/spice-autorandr/package.nix new file mode 100644 index 0000000000000..e79f4cb18bd97 --- /dev/null +++ b/pkgs/by-name/sp/spice-autorandr/package.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, libX11 +, libXrandr +}: + +stdenv.mkDerivation { + pname = "spice-autorandr"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "seife"; + repo = "spice-autorandr"; + rev = "0f61dc921b638761ee106b5891384c6348820b26"; + hash = "sha256-eBvzalWT3xI8+uNns0/ZyRes91ePpj0beKb8UBVqo0E="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libX11 libXrandr ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp $pname $out/bin/ + + runHook postInstall + ''; + + meta = { + description = "Automatically adjust the client window resolution in Linux KVM guests using the SPICE driver."; + longDescription = '' + Some desktop environments update the display resolution automatically, + this package is only useful when running without a DE or with a DE that + does not update display resolution automatically. + + This package relies on `spice-vdagent` running an updating the xrandr modes. Enable + `spice-vdagent` by adding `services.spice-autorandr.enable = true` to your `configuration.nix`. + ''; + homepage = "https://github.com/seife/spice-autorandr"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + dmytrokyrychuk + ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/sy/symbolicator/Cargo.lock b/pkgs/by-name/sy/symbolicator/Cargo.lock index 6657c265645d3..1752195bb12ad 100644 --- a/pkgs/by-name/sy/symbolicator/Cargo.lock +++ b/pkgs/by-name/sy/symbolicator/Cargo.lock @@ -29,9 +29,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", ] @@ -157,14 +157,14 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "async-compression" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" +checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" dependencies = [ "brotli", "flate2", @@ -185,13 +185,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.37", + "syn 2.0.38", ] [[package]] @@ -716,7 +716,7 @@ version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cexpr", "clang-sys", "lazy_static", @@ -729,7 +729,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.37", + "syn 2.0.38", "which", ] @@ -741,9 +741,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" [[package]] name = "block-buffer" @@ -816,9 +816,9 @@ checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7" [[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" @@ -883,9 +883,9 @@ 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", ] @@ -898,7 +898,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.19", + "semver 1.0.20", "serde", "serde_json", ] @@ -991,7 +991,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1222,10 +1222,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", ] @@ -1353,26 +1354,15 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" +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 = "error-chain" version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1431,9 +1421,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", @@ -1478,7 +1468,7 @@ dependencies = [ "pmutil", "proc-macro2", "swc_macros_common", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1537,7 +1527,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1917,9 +1907,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "lazy_static", @@ -1977,7 +1967,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2028,9 +2018,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", ] @@ -2172,9 +2162,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" @@ -2194,9 +2184,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -2340,7 +2330,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b23ab3a13de24f89fa3060579288f142ac4d138d37eec8a398ba59b0ca4d577" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "debugid", "num-derive", "num-traits", @@ -2564,13 +2554,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2585,9 +2575,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", ] @@ -2632,7 +2622,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", @@ -2649,7 +2639,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2824,7 +2814,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2874,7 +2864,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2909,10 +2899,16 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[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" @@ -2931,7 +2927,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2950,16 +2946,16 @@ 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", ] [[package]] name = "process-event" -version = "23.10.0" +version = "23.10.1" dependencies = [ "anyhow", "clap", @@ -3130,14 +3126,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.6" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.9", - "regex-syntax 0.7.5", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -3151,13 +3147,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.9" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -3168,9 +3164,9 @@ 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" @@ -3265,16 +3261,16 @@ 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]] name = "rustix" -version = "0.38.15" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -3383,7 +3379,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3430,9 +3426,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", ] @@ -3580,22 +3576,22 @@ dependencies = [ [[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", ] [[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]] @@ -3688,9 +3684,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -3723,9 +3719,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" [[package]] name = "simple_asn1" @@ -3783,7 +3779,7 @@ checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3906,7 +3902,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3967,7 +3963,7 @@ version = "0.106.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebf4d6804b1da4146c4c0359d129e3dd43568d321f69d7953d9abbca4ded76ba" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "is-macro", "num-bigint", "scoped-tls", @@ -4020,7 +4016,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4032,7 +4028,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4056,7 +4052,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4204,7 +4200,7 @@ dependencies = [ [[package]] name = "symbolicator" -version = "23.10.0" +version = "23.10.1" dependencies = [ "anyhow", "axum", @@ -4222,6 +4218,7 @@ dependencies = [ "symbolic", "symbolicator-crash", "symbolicator-js", + "symbolicator-native", "symbolicator-service", "symbolicator-sources", "symbolicator-test", @@ -4241,7 +4238,7 @@ dependencies = [ [[package]] name = "symbolicator-crash" -version = "23.10.0" +version = "23.10.1" dependencies = [ "bindgen", "cmake", @@ -4249,7 +4246,7 @@ dependencies = [ [[package]] name = "symbolicator-js" -version = "23.10.0" +version = "23.10.1" dependencies = [ "data-url", "futures", @@ -4274,20 +4271,47 @@ dependencies = [ ] [[package]] -name = "symbolicator-service" -version = "23.10.0" +name = "symbolicator-native" +version = "23.10.1" dependencies = [ "anyhow", "apple-crash-report-parser", "async-trait", + "chrono", + "futures", + "insta", + "minidump", + "minidump-processor", + "minidump-unwind", + "moka", + "once_cell", + "regex", + "sentry", + "serde", + "serde_json", + "symbolic", + "symbolicator-service", + "symbolicator-sources", + "symbolicator-test", + "tempfile", + "test-assembler", + "thiserror", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "symbolicator-service" +version = "23.10.1" +dependencies = [ + "anyhow", "aws-config", "aws-credential-types", "aws-sdk-s3", "aws-types", - "backtrace", "cadence", "chrono", - "data-url", "filetime", "flate2", "futures", @@ -4295,18 +4319,11 @@ dependencies = [ "humantime", "humantime-serde", "idna 0.4.0", - "insta", "ipnetwork", "jsonwebtoken", - "lazy_static", - "minidump", - "minidump-processor", - "minidump-unwind", "moka", "once_cell", - "parking_lot 0.12.1", "rand", - "regex", "reqwest", "sentry", "serde", @@ -4318,7 +4335,6 @@ dependencies = [ "symbolicator-sources", "symbolicator-test", "tempfile", - "test-assembler", "thiserror", "tokio", "tokio-util", @@ -4331,13 +4347,13 @@ dependencies = [ [[package]] name = "symbolicator-sources" -version = "23.10.0" +version = "23.10.1" dependencies = [ "anyhow", "aws-types", "glob", "insta", - "lazy_static", + "once_cell", "serde", "serde_yaml", "symbolic", @@ -4346,7 +4362,7 @@ dependencies = [ [[package]] name = "symbolicator-stress" -version = "23.10.0" +version = "23.10.1" dependencies = [ "anyhow", "axum", @@ -4358,6 +4374,7 @@ dependencies = [ "serde_json", "serde_yaml", "symbolicator-js", + "symbolicator-native", "symbolicator-service", "symbolicator-test", "tempfile", @@ -4367,7 +4384,7 @@ dependencies = [ [[package]] name = "symbolicator-test" -version = "23.10.0" +version = "23.10.1" dependencies = [ "axum", "humantime", @@ -4385,7 +4402,7 @@ dependencies = [ [[package]] name = "symbolicli" -version = "23.10.0" +version = "23.10.1" dependencies = [ "anyhow", "clap", @@ -4397,6 +4414,7 @@ dependencies = [ "serde_yaml", "symbolic", "symbolicator-js", + "symbolicator-native", "symbolicator-service", "symbolicator-sources", "tempfile", @@ -4409,13 +4427,13 @@ dependencies = [ [[package]] name = "symsorter" -version = "23.10.0" +version = "23.10.1" dependencies = [ "anyhow", "chrono", "clap", "console", - "lazy_static", + "once_cell", "rayon", "regex", "serde", @@ -4439,9 +4457,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", @@ -4522,7 +4540,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4537,14 +4555,15 @@ dependencies = [ [[package]] name = "time" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", "libc", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -4582,9 +4601,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", @@ -4605,14 +4624,14 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "tokio-metrics" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4b2fc67d5dec41db679b9b052eb572269616926040b7831e32c8a152df77b84" +checksum = "eace09241d62c98b7eeb1107d4c5c64ca3bd7da92e8c218c153ab3a78f9be112" dependencies = [ "futures-util", "pin-project-lite", @@ -4721,7 +4740,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bytes", "futures-core", "futures-util", @@ -4754,11 +4773,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", "log", "pin-project-lite", "tracing-attributes", @@ -4767,20 +4785,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.37", + "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", @@ -5104,7 +5122,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -5138,7 +5156,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5151,7 +5169,7 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-split" -version = "23.10.0" +version = "23.10.1" dependencies = [ "anyhow", "clap", @@ -5421,9 +5439,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", ] @@ -5499,30 +5517,28 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "6.0.6" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ - "libc", "zstd-sys", ] [[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/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix index 56891611f9812..c744f572a59e9 100644 --- a/pkgs/by-name/sy/symbolicator/package.nix +++ b/pkgs/by-name/sy/symbolicator/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "symbolicator"; - version = "23.10.0"; + version = "23.10.1"; src = fetchFromGitHub { owner = "getsentry"; repo = "symbolicator"; rev = version; - hash = "sha256-yD1uXqFN1T7bgbW20zu7VauELZTsTPpv4sdtVa/Xc3I="; + hash = "sha256-G8ElLH6u07uJR2Jz05rM59tnVADaDQ768lK477NuWuM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix new file mode 100644 index 0000000000000..5da79686b5f86 --- /dev/null +++ b/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/pkgs/by-name/ta/taschenrechner/package.nix b/pkgs/by-name/ta/taschenrechner/package.nix new file mode 100644 index 0000000000000..eeb2b841abffa --- /dev/null +++ b/pkgs/by-name/ta/taschenrechner/package.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitLab +}: + +rustPlatform.buildRustPackage rec { + pname = "taschenrechner"; + version = "1.3.0"; + + src = fetchFromGitLab { + domain = "gitlab.fem-net.de"; + owner = "mabl"; + repo = "taschenrechner"; + rev = version; + hash = "sha256-PF9VCdlgA4c4Qw8Ih3JT29/r2e7i162lVAbW1QSOlWo="; + }; + + cargoHash = "sha256-SFgStvpcqEwus1JBs5ZyMHO1UD0oWV7mvS6o4v5gIFc="; + + meta = with lib; { + description = "A cli-calculator written in Rust"; + homepage = "https://gitlab.fem-net.de/mabl/taschenrechner"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ netali ]; + mainProgram = "taschenrechner"; + }; +} diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/by-name/te/tecoc/package.nix index 778115dfbfa78..a5531b3aa874b 100644 --- a/pkgs/applications/editors/tecoc/default.nix +++ b/pkgs/by-name/te/tecoc/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { TECOC is a portable C implementation of TECO-11. ''; license = { - url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt"; + url = "https://github.com/blakemcbride/TECOC/blob/${finalAttrs.src.rev}/doc/readme-1st.txt"; }; maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/te/textsnatcher/package.nix b/pkgs/by-name/te/textsnatcher/package.nix new file mode 100644 index 0000000000000..21b75c31a37f0 --- /dev/null +++ b/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/pkgs/by-name/tp/tpm2-totp/package.nix b/pkgs/by-name/tp/tpm2-totp/package.nix new file mode 100644 index 0000000000000..766c6e138af64 --- /dev/null +++ b/pkgs/by-name/tp/tpm2-totp/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, tpm2-tss +, autoreconfHook +, autoconf-archive +, pkg-config +, qrencode +}: + +stdenv.mkDerivation rec { + pname = "tpm2-totp"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "tpm2-software"; + repo = "tpm2-totp"; + rev = "v${version}"; + hash = "sha256-aeWhI2GQcWa0xAqlmHfcbCMg78UqcD6eanLlEVNVnRM="; + }; + + preConfigure = '' + echo '0.3.0' > VERSION + ''; + + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkg-config + ]; + + buildInputs = [ + tpm2-tss + qrencode + ]; + + meta = with lib; { + description = "Attest the trustworthiness of a device against a human using time-based one-time passwords"; + homepage = "https://github.com/tpm2-software/tpm2-totp"; + changelog = "https://github.com/tpm2-software/tpm2-totp/blob/${src.rev}/CHANGELOG.md"; + license = licenses.bsd3; + mainProgram = "tpm2-totp"; + platforms = platforms.all; + maintainers = with maintainers; [ raitobezarius ]; + }; +} diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 1a9d5569f2351..6aee9c1598b9e 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -17,13 +17,13 @@ assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.28.12"; + version = "2.29.36"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-uWCpCjYFtK2pNeHHZWhWI6YZ+cllQpkKz//nHracl5s="; + hash = "sha256-tQp2DOBW71Wm1aQqspW9tuH8aM8ir+ilZiENdElB/+0="; }; postPatch = '' diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix index 0ba415d1bb968..6c8b7055fc680 100644 --- a/pkgs/by-name/tr/trunk-ng/package.nix +++ b/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/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index bb40115a53fd0..bc04a2fc8fea3 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "uiua"; - version = "0.0.20"; + version = "0.0.22"; src = fetchFromGitHub { owner = "uiua-lang"; repo = "uiua"; rev = "refs/tags/${version}"; - hash = "sha256-fFsMN+4ORB//Ch+wrRRMeZKXvW8ta5m66Vy3I3uyHO8="; + hash = "sha256-x1xZH+AVJqnvwxgBgcVB5LvDb54C+HnPBCTIqZ8Dv7E="; }; - cargoHash = "sha256-old+U0sJWnp8wTiZBjcQ7+mv+6N15cpyyTDEjTUnghk="; + cargoHash = "sha256-gY+KeE2ATsCydpxcRoLtRDeyEvOGv7+I0SskLq8b9rw="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index f858733d12b9f..a0c13b8ebb369 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "unstable-2023-09-06"; + version = "unstable-2023-09-29"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "d7f96acb93742744fec32ba667a4b4438dcf90cf"; - hash = "sha256-kaYT61qDSPtpNd0M3IHxR8EzhnsB5uNH075+Xag1Vv8="; + rev = "c71842aa8472f26c0ea7fbf92624659313c038ba"; + hash = "sha256-Lo1AkK81Hv8A0jBfpR4lxlBJcWkh9LttURiXVoibKSs="; }; outputs = [ "out" "projects" ]; diff --git a/pkgs/by-name/wa/waybar-mpris/package.nix b/pkgs/by-name/wa/waybar-mpris/package.nix new file mode 100644 index 0000000000000..253829d9abecc --- /dev/null +++ b/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/pkgs/data/fonts/whatsapp-emoji/default.nix b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix index 5e34282891b94..5e34282891b94 100644 --- a/pkgs/data/fonts/whatsapp-emoji/default.nix +++ b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix diff --git a/pkgs/by-name/xs/xsct/package.nix b/pkgs/by-name/xs/xsct/package.nix new file mode 100644 index 0000000000000..80023f676c493 --- /dev/null +++ b/pkgs/by-name/xs/xsct/package.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchFromGitHub +, gitUpdater +, libX11 +, libXrandr +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "xsct"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "faf0"; + repo = "sct"; + rev = finalAttrs.version; + hash = "sha256-XhrkaK85I/U2ChO5mZYah/TaXz03yahfMEbfgzXqytU="; + }; + + buildInputs = [ + libX11 + libXrandr + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "Set color temperature of screen"; + homepage = "https://github.com/faf0/sct"; + license = licenses.unlicense; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = with platforms; linux ++ freebsd ++ openbsd; + }; +}) diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 33ed947ae6904..8147db6e10863 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/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/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix index d65b270c881f0..d65b270c881f0 100755..100644 --- a/pkgs/data/fonts/vazir-fonts/default.nix +++ b/pkgs/data/fonts/vazir-fonts/default.nix diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 55df79358bae6..fd0f1b5647334 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "ad59313651a92d9b7356f616268c7a3d80f52886", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ad59313651a92d9b7356f616268c7a3d80f52886.tar.gz", - "sha256": "0s66dx6daxfkdm40fcqvlh3h9bcjx1cydrmgxd7dxrlmqqgwn4lc", - "msg": "Update from Hackage at 2023-09-13T23:29:30Z" + "commit": "d37311b9195c41b254b2d71c74c93e51f6ccebab", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d37311b9195c41b254b2d71c74c93e51f6ccebab.tar.gz", + "sha256": "1m2xcnyz6y03m5l5qdxc0avi4gi53g82hq4ab9qcjbxi82g3qn4v", + "msg": "Update from Hackage at 2023-10-04T18:27:12Z" } diff --git a/pkgs/data/misc/sing-geosite/default.nix b/pkgs/data/misc/sing-geosite/default.nix index 55ba01c61559d..900e5ef86c8f3 100644 --- a/pkgs/data/misc/sing-geosite/default.nix +++ b/pkgs/data/misc/sing-geosite/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo120Module , fetchFromGitHub , substituteAll , v2ray-domain-list-community @@ -11,7 +11,7 @@ let geosite_data = "${v2ray-domain-list-community}/share/v2ray/geosite.dat"; }; in -buildGoModule rec { +buildGo120Module { pname = "sing-geosite"; inherit (v2ray-domain-list-community) version; diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 5dbaa6c9c93bb..fb9064a437d10 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -8,18 +8,18 @@ }: let - generator = pkgsBuildBuild.buildGoModule { + generator = pkgsBuildBuild.buildGo120Module { pname = "v2ray-geoip"; - version = "unstable-2023-03-27"; + version = "unstable-2023-10-11"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "9321a7f5e301a957228eba44845144b4555b6658"; - hash = "sha256-S30XEgzA9Vrq7I7REfO/WN/PKpcjcI7KZnrL4uw/Chs="; + rev = "3182dda7b38c900f28505b91a44b09ec486e6f36"; + hash = "sha256-KSRgof78jScwnUeMtryj34J0mBsM/x9hFE4H9WtZUuM="; }; - vendorHash = "sha256-bAXeA1pDIUuEvzTLydUIX6S6fm6j7CUQmBG+7xvxUcc="; + vendorHash = "sha256-rlRazevKnWy/Ig143s8TZgV3JlQMlHID9rnncLYhQDc="; meta = with lib; { description = "GeoIP for V2Ray"; diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index 8d977671fe7da..a64b870d12b98 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -2,75 +2,78 @@ , stdenv , fetchFromGitHub , gtk-engine-murrine +, breeze-icons +, plasma-framework +, plasma-workspace , jdupes }: 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"; }) ]; @@ -79,38 +82,57 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ jdupes ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + breeze-icons + plasma-framework + plasma-workspace + ]; + + dontWrapQtApps = true; 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/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index 2d07ac3ae380d..351c1c22207cd 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -26,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-05-27"; + version = "2023-10-20"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - hash = "sha256-I1a8y9dAJqFgnhyMqfupSdGvbbScf6tSYKlAhAzY4Dk="; + hash = "sha256-GhSzTtbuvbAuXxKNm29sJX5kXE2s2jMDB6Ww6Q7GNSo="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/pkgs/desktops/lomiri/development/deviceinfo/default.nix b/pkgs/desktops/lomiri/development/deviceinfo/default.nix index 11150c2ca1dee..04abf4f88f46d 100644 --- a/pkgs/desktops/lomiri/development/deviceinfo/default.nix +++ b/pkgs/desktops/lomiri/development/deviceinfo/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "deviceinfo"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/deviceinfo"; rev = finalAttrs.version; - hash = "sha256-oKuX9JbYWIjroKgA2Y+/oqPkC26DPy3e6yHFU8mmbxQ="; + hash = "sha256-x0Xm4Z3hpvO5p/5JxMRloFqn58cRH2ak8rKtuxmmVVQ="; }; outputs = [ diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 5ae845b104f49..b65a91e00442d 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -4,6 +4,7 @@ , pkg-config , gettext , glib +, glib-networking , libxml2 , gtk3 , libsoup @@ -13,11 +14,11 @@ stdenv.mkDerivation rec { pname = "libmateweather"; - version = "1.26.1"; + version = "1.26.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wgCZD0uOnU0OLG99MaWHY3TD0qNsa4y1kEQAQ6hg7zo="; + sha256 = "ylCoFYZlXPU6j5Z2a5zpCk0H7Q/hYr1eFdra3QBgx/Y="; }; strictDeps = true; @@ -30,11 +31,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 libsoup tzdata ]; + propagatedBuildInputs = [ + glib + glib-networking # for obtaining IWIN forecast data + gtk3 + ]; + configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-locations-compression" diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 7d0d1eec009f4..b6445151f594e 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -4,7 +4,7 @@ , pkg-config , gettext , gtk3 -, libindicator-gtk3 +, libayatana-indicator , mate , hicolor-icon-theme , wrapGAppsHook @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { sha256 = "144fh9f3lag2cqnmb6zxlh8k83ya8kha6rmd7r8gg3z5w3nzpyz4"; }; + postPatch = '' + # Find installed Unity & Ayatana (new-style) indicators + substituteInPlace src/applet-main.c \ + --replace '/usr/share' '/run/current-system/sw/share' + ''; + nativeBuildInputs = [ pkg-config gettext @@ -28,11 +34,13 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - libindicator-gtk3 + libayatana-indicator mate.mate-panel hicolor-icon-theme ]; + configureFlags = [ "--with-ayatana-indicators" ]; + enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 74f5592e8ee67..9024b823542bb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-network"; - version = "2.4.4"; + version = "unstable-2023-09-05"; # 2.4.4 does not support networkmanager 1.44 src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = version; - sha256 = "sha256-g62+DF84eEI+TvUr1OkeqLnCLz/b7e+xwuTNZS0WJQA="; + rev = "3b69132788ff8734a481d498b49207e05a4f7d70"; + hash = "sha256-XWiihU/FK6oeWQWRYsc/IxqafuvwA89ZE3o/WzaxudE="; }; patches = [ diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 393c55177464a..e11672ce472e7 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -4,12 +4,12 @@ let pname = "elixir-ls"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-xC6JfhqUNnTqKh1jEm3WshFB69ne97lZGVqlEUbDkk4="; + hash = "sha256-uWNBUHdXahOrwCA+lnq6s5rj9wjcNV+AXSk319SuVQs="; fetchSubmodules = true; }; in diff --git a/pkgs/development/compilers/flutter/package-overrides/default.nix b/pkgs/development/compilers/dart/package-overrides/default.nix index c162929e336a5..c162929e336a5 100644 --- a/pkgs/development/compilers/flutter/package-overrides/default.nix +++ b/pkgs/development/compilers/dart/package-overrides/default.nix diff --git a/pkgs/development/compilers/flutter/package-overrides/flutter-secure-storage-linux/default.nix b/pkgs/development/compilers/dart/package-overrides/flutter-secure-storage-linux/default.nix index 91a61cb6c603f..91a61cb6c603f 100644 --- a/pkgs/development/compilers/flutter/package-overrides/flutter-secure-storage-linux/default.nix +++ b/pkgs/development/compilers/dart/package-overrides/flutter-secure-storage-linux/default.nix diff --git a/pkgs/development/compilers/flutter/package-overrides/handy-window/default.nix b/pkgs/development/compilers/dart/package-overrides/handy-window/default.nix index 49b5d47487e88..49b5d47487e88 100644 --- a/pkgs/development/compilers/flutter/package-overrides/handy-window/default.nix +++ b/pkgs/development/compilers/dart/package-overrides/handy-window/default.nix diff --git a/pkgs/development/compilers/flutter/package-overrides/matrix/default.nix b/pkgs/development/compilers/dart/package-overrides/matrix/default.nix index fb1adafa3208a..fb1adafa3208a 100644 --- a/pkgs/development/compilers/flutter/package-overrides/matrix/default.nix +++ b/pkgs/development/compilers/dart/package-overrides/matrix/default.nix diff --git a/pkgs/development/compilers/flutter/package-overrides/olm/default.nix b/pkgs/development/compilers/dart/package-overrides/olm/default.nix index e91e8f393ca7f..e91e8f393ca7f 100644 --- a/pkgs/development/compilers/flutter/package-overrides/olm/default.nix +++ b/pkgs/development/compilers/dart/package-overrides/olm/default.nix diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 296c815e31f6e..c71dd278e203a 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -69,7 +69,7 @@ let attoparsec = self.attoparsec_0_13_2_5; # aeson 2.0.3.0 does not build with attoparsec_0_13_2_5 - aeson = self.aeson_1_5_6_0; + aeson = doJailbreak self.aeson_1_5_6_0; # elm-instrument needs this indents = self.callPackage ./packages/indents.nix {}; diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix index 47a84a6e5f2d2..9ce582623fe1b 100644 --- a/pkgs/development/compilers/flix/default.nix +++ b/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.40.0"; + version = "0.41.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-NVQY2TgIR9ROy4x8PWxCjuaOkNx0bcUA4oZHjpQbHc4="; + sha256 = "sha256-bDeqwk+grkCxmGE9H8Ks7Q8KvLxNCzaLe44DlR6E7YE="; }; dontUnpack = true; diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index e3c1791de6f78..ff18036677a1b 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -74,20 +74,20 @@ in { inherit wrapFlutter; stable = mkFlutter { - version = "3.13.4"; - engineVersion = "9064459a8b0dcd32877107f6002cc429a71659d1"; - dartVersion = "3.1.2"; + version = "3.13.8"; + engineVersion = "767d8c75e898091b925519803830fc2721658d07"; + dartVersion = "3.1.4"; dartHash = { - x86_64-linux = "sha256-kriMqIvS/ZPhCR+hDTZReW4MMBYCVzSO9xTuPrJ1cPg="; - aarch64-linux = "sha256-Fvg9Rr9Z7LYz8MjyzVCZwCzDiWPLDvH8vgD0oDZTksw="; - x86_64-darwin = "sha256-WL42AYjT2iriVP05Pm7288um+oFwS8o8gU5tCwSOvUM="; - aarch64-darwin = "sha256-BMbjSNJuh3RC+ObbJf2l6dacv2Hsn2/uygKDrP5EiuU="; + x86_64-linux = "sha256-42wrqzjRcFDWw2aEY6+/faX+QE9PA8FmRWP4M/NkgBE="; + aarch64-linux = "sha256-/tWWWwTOgXHbwzotc7ZDDZa8+cbX6NODGYrjLK9gPPg="; + x86_64-darwin = "sha256-BchKowKd6BscVuk/dXibcQzdFkW9//GDfll77mHEI4M="; + aarch64-darwin = "sha256-9yrx09vYrOTmdqkfJI7mfh7DI1/rg67tPlf82m5+iKI="; }; flutterHash = rec { - x86_64-linux = "sha256-BPEmO4c3H2bOa+sBAVDz5/qvajobK3YMnBfQWhJUydw="; + x86_64-linux = "sha256-ouI1gjcynSQfPTnfTVXQ4r/NEDdhmzUsKdcALLRiCbg="; aarch64-linux = x86_64-linux; - x86_64-darwin = "sha256-BpxeCE9vTnmlIp6OS7BTPkOFptidjXbf2qVOVUAqstY="; - aarch64-darwin = "sha256-rccuxrE9nzC86uKGL96Etxxs4qMbVXJ1jCn/wjp9WlQ="; + x86_64-darwin = "sha256-k6KNazP/I71zG5mbx3iEtXBJ8EZi9Qq+7PgL/HAJrgE="; + aarch64-darwin = "sha256-Duvw8EqrGb3PmBHBH/prZjyij2xJd9sLkNfPRYpC0pQ="; }; patches = flutter3Patches; }; diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix index b027a2a8ce92e..7bfb60d7a9acb 100644 --- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix +++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix @@ -1,118 +1,117 @@ { - "9064459a8b0dcd32877107f6002cc429a71659d1" = { + "767d8c75e898091b925519803830fc2721658d07" = { skyNotice = "sha256-bJMktK26wC9fVzdhLNcTHqOg5sHRZ535LB5u5dgwjlY="; flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA="; android-arm = { - "artifacts.zip" = "sha256-AABHJH/EOOQzEcD0O/XftA1AAV8tNFX3dj0OsJJ3/9A="; + "artifacts.zip" = "sha256-pnUDY2sUN2r/LrivyNkfTUpQC90GKOI6Ya+0lgIz+c0="; }; android-arm-profile = { - "artifacts.zip" = "sha256-MLlQFtjrGDQc3mH2T7CUlR/wDOPS7HRfgUuoLXjtd+E="; - "linux-x64.zip" = "sha256-S2/5ZFhNkDxUqsUZCFrwTERTUZIZpOiFijhcLZnozLI="; - "darwin-x64.zip" = "sha256-IwtYSpcg+5JmnkHuj6LGVp7GWiuUzETOPgKYRQczWzc="; + "artifacts.zip" = "sha256-/kDNI+no4u2Ri/FqqsQEp2iEqifULYGqzz8w0G4pzCM="; + "linux-x64.zip" = "sha256-fUfaDJIo1VcdJHcd0jO98Az3OdNQ+JtA5Mp6nQVVU4E="; + "darwin-x64.zip" = "sha256-J7vDD5VEsgnWmbI8acM3vQwrnrqcfMaCijiItDfniLY="; }; android-arm-release = { - "artifacts.zip" = "sha256-NLvwaB4UkYBRzg4cxzNZkileDFQk6GT/8nRugHU98Is="; - "linux-x64.zip" = "sha256-dua4xvVqsJY1d/eyA8j6NPnpAbotigPIs8SRj28F87w="; - "darwin-x64.zip" = "sha256-2B1+s6sngbN0+sPP1qKVpeMF6RIZZToF88baiqcNQT4="; + "artifacts.zip" = "sha256-tVAFHHG8A8vlgQu6l6ybdfm6OmBf2vrYf3PZByWvs08="; + "linux-x64.zip" = "sha256-lrejG7zpUBox9kPvs1uPM/lyR1d/SAc1w+c6kcqghHI="; + "darwin-x64.zip" = "sha256-8lKOsqLgbnuoCR87v84dn8V3PRzl1+maWFIHopiGvbc="; }; android-arm64 = { - "artifacts.zip" = "sha256-Hf+S8XuAzD9HCU4FVmjN0jvTTxPtzEm+k++8IgaXOyM="; + "artifacts.zip" = "sha256-rcU2mX0nP1ot+6DU+uxvILUOAuwTPGH23UQ6riBs0d4="; }; android-arm64-profile = { - "artifacts.zip" = "sha256-k4miTzdDL+gg9LxzjBVRtAuwhKELBiVDsvQ+aVeWTeI="; - "linux-x64.zip" = "sha256-2ErIxNdX1NfHrjiqZzNwISKybeS9SGOlqFh7G8KCAcE="; - "darwin-x64.zip" = "sha256-1FdvI6llPjAeSc7+e97rvG7SvvFHqZH+4MREuRyF1DA="; + "artifacts.zip" = "sha256-x4TEJWi3c6mEPGh+3l4PtRqsg4Tq7mxHtGz+4MqwzPw="; + "linux-x64.zip" = "sha256-PsDKOq3DXaNeNtaFtDQJ9JIEESXBHm8XHHpOw2u1cGg="; + "darwin-x64.zip" = "sha256-K4W1CEBOlZVsHjuhvKCUZWv45VSohRd23vviaLqMNjQ="; }; android-arm64-release = { - "artifacts.zip" = "sha256-y64Xhi5QFirZadU+fW8MOpkEarq/KPoEmmo0XRYf3/E="; - "linux-x64.zip" = "sha256-8dKrP9wQ9hDHNNrz1ZiYLV6zeGB60ikyrRFS6xdu+4Q="; - "darwin-x64.zip" = "sha256-2/eyFFAAUnuDtDoVh6L5emRXaQ03kwNRf6yIceWX3eU="; + "artifacts.zip" = "sha256-w+J4sNhYoj44IiHpZ0BkemCYlE9wOTvWL57Y8RCstkI="; + "linux-x64.zip" = "sha256-MJsmck27V14/f0IAT6b/R47p8/eCMX9Nn//PEAbEeOY="; + "darwin-x64.zip" = "sha256-xXa5GFatJPiwBANqeWUpAdM9gibD4xH85aI6YpJrcpI="; }; android-x64 = { - "artifacts.zip" = "sha256-b3AtOxad05vaXQzeCBtSf3G8ZiM0tOG0JRu4vbNtfgI="; + "artifacts.zip" = "sha256-doNUwEJkwncHPIf2c8xOZByUU8dmogtWlc6q7n7ElDY="; }; android-x64-profile = { - "artifacts.zip" = "sha256-TVOtSjKc8WkvYsY+aK7OH9eTA/q7tmtnSdQArPWS2vM="; - "linux-x64.zip" = "sha256-IHv3TGI1Yvhoq1ehVyVUn3JtPTCFyEtxdysvr/SWFxY="; - "darwin-x64.zip" = "sha256-B4XooSrLRJh3XADfIAv/YBDCT/Mpg2di0oE4SZlU8I8="; + "artifacts.zip" = "sha256-N3AjdHdzj4s6v3f3Gf6n/1Xk0W7xFQP70SneCNlj2sk="; + "linux-x64.zip" = "sha256-pNn75iZqLwOGO3ZmymmrSasDPMmDWwp9ZWBv9Xti4cU="; + "darwin-x64.zip" = "sha256-6O4lA/4wZ91ODUUYHe4HpjvraAEbhHiehBmf3sT37Dc="; }; android-x64-release = { - "artifacts.zip" = "sha256-EaImhQlUnG/zYHDROkdgQdGHD9AfDJULowS785aVoCM="; - "linux-x64.zip" = "sha256-ZBvtCVUNf0D1P1lz4vmIrhsn9hZmJZ5Tn65v9Wot6bk="; - "darwin-x64.zip" = "sha256-IbMANAKyz7uFG5oqOKMj0KTVhaCBryBKdobvgS9bOgI="; + "artifacts.zip" = "sha256-odDS/m8fgSA24EYt+W2sEDmOlPO17FZxxomWuYUHmns="; + "linux-x64.zip" = "sha256-sVQYmu0KaPADlL59XZc26Ks+TbmaJxRGPiJKlWxUhRA="; + "darwin-x64.zip" = "sha256-dep/CmBIDkvqYKQPWMCDTDbFhVvOk6N7JAF8v3dr/P8="; }; android-x86 = { - "artifacts.zip" = "sha256-ElFkaxlyLVbexdocyQ1AIKgfr93ol1EDyf+aFDt4I10="; + "artifacts.zip" = "sha256-MzTFQ0XPtd9OXvKfM98bwpxN/xfEcXox24gn/4aS/Do="; }; android-x86-jit-release = { - "artifacts.zip" = "sha256-ptrhyXrx8xGuRQYs8nBryzyDuCiIMsgMmqxi3kHXQ4s="; + "artifacts.zip" = "sha256-cUsBqJxOOluwnYEFzdtZof8c4Vp1D81HkEEH8aRGLyY="; }; darwin-arm64 = { - "artifacts.zip" = "sha256-nG23DmYeKoMJnuTPMnvouPHzK3XNKBrEIZ5zijiCoAg="; - "font-subset.zip" = "sha256-Kx3G5FmN2bVgIvYiQP9og8kgl28ZCXThpcmByAv+f6U="; + "artifacts.zip" = "sha256-df+rmN0RqLM7MgEKjTcybMY0bFYCB1jsTvaVE1J0BzY="; + "font-subset.zip" = "sha256-hJ5fECxN4oZX6E9ivzSDGejNSj56t2SKccbyfozXxps="; }; darwin-arm64-profile = { - "artifacts.zip" = "sha256-Uzg5F2NPlVN/cui4ixJ3JxBttn0KQMEyKEVLmecssuU="; + "artifacts.zip" = "sha256-EaXOr998zE4cG5G5FRtsDGt3jjg1GjkRGE/ZDD3Coto="; }; darwin-arm64-release = { - "artifacts.zip" = "sha256-qZ1jYvvkBcaIHqZszFTOcuCDWnEmm/vsJt2aSZvgO+s="; + "artifacts.zip" = "sha256-1XMoM8jDRoUSPMauKD5lsgC25B7Htod8wYouDKSEGJY="; }; darwin-x64 = { - "FlutterEmbedder.framework.zip" = "sha256-6ApkTiLh++bwgfYOGRoqnXglboqCWxc0VpNcYitjLLk="; - "FlutterMacOS.framework.zip" = "sha256-PP2E+PY1HB2OkX8a8/E/HpUBPRoDJyo/2BNUKd1Xd2s="; - "artifacts.zip" = "sha256-aZf99m1KlIpEuwwMMWAksp9d/SQQXt8jOTs/6GJUhcw="; - "font-subset.zip" = "sha256-ZfdDnRPDOqNsj3dCHStLWXWCMOzodmR4ojQrMQt6hQY="; - "gen_snapshot.zip" = "sha256-1xi4EJsiOIJSaBSIhl7p4L0aWtLYR1vGz4yYzNdVuQw="; + "FlutterEmbedder.framework.zip" = "sha256-vzvt0pwo1HbIxxym/jn2Y+1+Iqm/Gw2TfymEcuUHIXQ="; + "FlutterMacOS.framework.zip" = "sha256-cMTCULaVOKDq8VrqCmZLo0IPBve0GSh0K2yvtdCvX8c="; + "artifacts.zip" = "sha256-8BViZUz4b0XurQJM+FCU2toONKmhajabCc66gBUVGgY="; + "font-subset.zip" = "sha256-VgqNdUmvTbSedQtJNT+Eq90GWS4hXCDCBDBjno6s1dk="; + "gen_snapshot.zip" = "sha256-4O0ZfKt96x8/Jwh8DgBoPFiv84Tqf9tR/f0PVRJlJiQ="; }; darwin-x64-profile = { - "FlutterMacOS.framework.zip" = "sha256-zDTey1dN4TYfi2/tDlxHPZhW3szZuGTMSaObNNH4zZo="; - "artifacts.zip" = "sha256-kZ6io/+ohx5jKhu1i/l0UZbTB1gk6BSn1VryZJxPcjU="; - "gen_snapshot.zip" = "sha256-5AUul5CQ6A8YGb6/PAfbPH7G/c+9rElDftmL3WIi4ZQ="; + "FlutterMacOS.framework.zip" = "sha256-IrXK0Mjllic3OKaYKKpAE9gPIceTO32hGqgxGR66QmY="; + "artifacts.zip" = "sha256-IHllbxwRMrEWA1MI0DRCYYRzYAdQIL8B9b5rZHsOvjc="; + "gen_snapshot.zip" = "sha256-bPI6pHrWQR1X7CzytbJA90TYe3cg1yN+9v7JtsCCrbQ="; }; darwin-x64-release = { - "FlutterMacOS.dSYM.zip" = "sha256-DN5R/U+pcCgFyR6wLcp11Bjvov4sS0J3crMWOx0dNBI="; - "FlutterMacOS.framework.zip" = "sha256-9rEkGe0iz51aVXtCXK+KolJqjNUOEMwjeRHdF6kBjPs="; - "artifacts.zip" = "sha256-Lpz0WLAdspPybLhTnS2fsReTAZ0qkJmMvY+u8iCe53s="; - "gen_snapshot.zip" = "sha256-RLO5V6B/xzI5ljbIY7Yj4m1aFYYJ0PeO6nAyAN/ufnM="; - }; - "flutter_patched_sdk.zip" = "sha256-d1KBJex2XgFbM0GgtcMFGDG2MN00zPd5HyAP54vBIaw="; - "flutter_patched_sdk_product.zip" = "sha256-TG0OfcYQHy7Um1nl7xHXGl0oGGkna1tKSWhtnLTo2Ic=" - ; + "FlutterMacOS.dSYM.zip" = "sha256-HjU8sLPwvOwO3LP7krpZZW6/t3sN3rX2frFnBp1Kk0I="; + "FlutterMacOS.framework.zip" = "sha256-GuTWojZFdSEeOiSYxH8XGSWsxcrkUpnXA61B0NpDa5A="; + "artifacts.zip" = "sha256-tQCm1HHrhffNz9a0lNIHXLBqFMbT4QiaibKvRKuuhJ4="; + "gen_snapshot.zip" = "sha256-0na+yx0Nxe/FuHVZqhgbRniZLInShoKE3USaJg0829o="; + }; + "flutter_patched_sdk.zip" = "sha256-AVjXLND3nJAaGyBAhytBRUvbkJtwZEcndQSrq+D2c08="; + "flutter_patched_sdk_product.zip" = "sha256-31qgieDI897sXtEf8ok2SdFgrlN57bwhT3FUfdofZi0="; ios = { - "artifacts.zip" = "sha256-bTtAJ4mrJZmT9IcDppfvm1ih3lNqJqywgatN3k48hoI="; + "artifacts.zip" = "sha256-RicBTTBX5aIQwfcolDrKe0MVG9uTp56RYMWgR75AVEw="; }; ios-profile = { - "artifacts.zip" = "sha256-4bqMbZ0ASURIRp6Zfs25Nww+5FasRqdXcppX2KSWK0g="; + "artifacts.zip" = "sha256-6EXHvy36K+rRGpjt0GL/DyuOhpAGeaOrZAZvPZuLyys="; }; ios-release = { - "Flutter.dSYM.zip" = "sha256-LsYX9BTj9FXaW4f+7q6S/raZNx97FmGdJvegYrFiCAc="; - "artifacts.zip" = "sha256-KZBpNSeXCqfRydOdFzcaYdde3OCw7oI7x9/1l/4WlSk="; + "Flutter.dSYM.zip" = "sha256-zYqlX4QhxnDb9LasMcBcPO/+30LCfVbwC+z+wZiiEqk="; + "artifacts.zip" = "sha256-DVpynf2LxU6CPC1BPQbi8OStcIwJKX55rDSWNiJ4KNk="; }; linux-arm64 = { - "artifacts.zip" = "sha256-YBXe02wlxxpWT2pDUSILK/GXpKGx2vQo55E8zDOd4IQ="; - "font-subset.zip" = "sha256-02PHMUCPn6VBaQazfjEqVCGDPeGRXVTMXW8eAOuQRhY="; + "artifacts.zip" = "sha256-djesma+IqQZgGlxQj4Gv6hAkQhQKQp7Gsa1I4hksqNc="; + "font-subset.zip" = "sha256-Wo11dks0uhLI2nu+9QJ7aLmvfsPcuqvcmquak4qv5XM="; }; linux-arm64-debug = { - "linux-arm64-flutter-gtk.zip" = "sha256-ZTWenA3msfvFjoPA5ByX1/kXTDtd6H0H6i8AP2K9Zt8="; + "linux-arm64-flutter-gtk.zip" = "sha256-6T2Ycxe3GTVnFGfBFfXLZwPklIndQ6hojnCSnMeXJso="; }; linux-arm64-profile = { - "linux-arm64-flutter-gtk.zip" = "sha256-CDXfWkg/WHT9A8EAzo78KiUI3uN1rZyvrPSDH5fyiQU="; + "linux-arm64-flutter-gtk.zip" = "sha256-ycInFHuRu7r+50GsoFR4v/rIRiAQaQ9zFemd2d9AnpQ="; }; linux-arm64-release = { - "linux-arm64-flutter-gtk.zip" = "sha256-62dlbrqCj5mbIQXxMPzXTXHSJdJH4nao1a1c1WOSB1Y="; + "linux-arm64-flutter-gtk.zip" = "sha256-J60MU8pHDVL9DyX5A3YdCRkKXnTgvALhHiEzYiPSSuA="; }; linux-x64 = { - "artifacts.zip" = "sha256-YVKajJeP6hFkLJk0HPIrEg/ig0tzkGj34z3ZA3VB8fE="; - "font-subset.zip" = "sha256-OFWcMnVi6AQoXKYcyMU8JN4/XM3OgSes0hzz8odTc8w="; + "artifacts.zip" = "sha256-ZUMRJ0dzaeRQUYy5S7gDLWa3w9CVhNPORN9l+lwxAMs="; + "font-subset.zip" = "sha256-pmtHAgIj5tXzUsDrrxB5JwfLDNzMCqouUCOyYN5BOEQ="; }; linux-x64-debug = { - "linux-x64-flutter-gtk.zip" = "sha256-Z8xCDor+sBwXg63r0o7RudzoWj5AsAUkc53F6dvEsLY="; + "linux-x64-flutter-gtk.zip" = "sha256-otmghZAiUlpLYfFaWd18UWlfctKcYsMRBMP78ZyBj/E="; }; linux-x64-profile = { - "linux-x64-flutter-gtk.zip" = "sha256-x7n84R4y7/jH/rUbe86Gm0oLM5aLSTB2UjjeIpRJ1zQ="; + "linux-x64-flutter-gtk.zip" = "sha256-bT6xMYlwTB9JOV1790cJqTSEXYstdI4sZCQzFzcpa5s="; }; linux-x64-release = { - "linux-x64-flutter-gtk.zip" = "sha256-B/Rtkln/rLS9M1gciXRnKvhPwR6bJrjGhrE9o1waamI="; + "linux-x64-flutter-gtk.zip" = "sha256-E8Eogr0nD7yaxjuoNhpvF4tTx9N53y3iOkI71Eqx5Ko="; }; }; } diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 47b64fe474014..f525bcc7ab314 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/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/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix b/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix index e7dc570a560cb..fc88e61c6560e 100644 --- a/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix +++ b/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix @@ -31,7 +31,22 @@ let # SHLIB_LC = lib.optionalString stdenv.targetPlatform.isPower "-mnewlib"; -in '' - echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in - echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in - '' +in +'' + echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in + echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in +'' + + # Meanwhile, crt{i,n}.S are not present on certain platforms + # (e.g. LoongArch64), resulting in the following error: + # + # 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, + # 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 +'' diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index eb77b6f365241..4544f3862fea3 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -311,17 +311,15 @@ lib.pipe ((callFile ./common/builder.nix {}) ({ libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( - '' echo "fixing the \`GLIBC_DYNAMIC_LINKER'${lib.optionalString atLeast6 ", \\`UCLIBC_DYNAMIC_LINKER',"} and \`${if atLeast6 then "MUSL" else "UCLIBC"}_DYNAMIC_LINKER' macros..." + '' echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h do grep -q ${lib.optionalString (!atLeast6) "LIBC"}_DYNAMIC_LINKER "$header" || continue - echo " fixing \`$header'..." + echo " fixing $header..." sed -i "$header" \ - -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'${lib.optionalString atLeast6 " \\"} - '' + lib.optionalString atLeast6 '' -${""} -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' - '' + '' -${""} done + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' + done '' + lib.optionalString (atLeast6 && targetPlatform.libc == "musl") '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' @@ -329,9 +327,7 @@ ${""} done )) + lib.optionalString (atLeast7 && targetPlatform.isAvr) ('' makeFlagsArray+=( - '' + (lib.optionalString atLeast10 '' '-s' # workaround for hitting hydra log limit - '') + '' 'LIMITS_H_TEST=false' ) ''); diff --git a/pkgs/development/compilers/ghc/9.4.7.nix b/pkgs/development/compilers/ghc/9.4.7.nix new file mode 100644 index 0000000000000..48cec53e3b18c --- /dev/null +++ b/pkgs/development/compilers/ghc/9.4.7.nix @@ -0,0 +1,388 @@ +# DO NOT port this expression to hadrian. It is not possible to build a GHC +# cross compiler with 9.4.* and hadrian. +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, xattr, autoSignDarwinBinariesHook +, bash + +, libiconv ? null, ncurses +, glibcLocales ? null + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !(stdenv.targetPlatform.isx86 + || stdenv.targetPlatform.isPower + || stdenv.targetPlatform.isSparc + || stdenv.targetPlatform.isAarch64) +, # LLVM is conceptually a run-time-only dependency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildTargetLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slightly slower native + # bignum backend instead of the faster but GPLed gmp backend. + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) +, gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + +, enableProfiledLibs ? true + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pulls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS +}: + +assert !enableNativeBignum -> gmp != null; + +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} + # Build haddocks for boot packages with hyperlinking + EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump + + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} + '' + lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + '' + lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + + # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) + # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. + # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell + lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC -fexternal-dynamic-refs + GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: lib.optional enableTerminfo ncurses + ++ [libffi] + ++ lib.optional (!enableNativeBignum) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + # TODO(@sternenseemann): is buildTarget LLVM unnecessary? + # GHC doesn't seem to have {LLC,OPT}_HOST + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); + + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableNativeBignum "-native-bignum") + ]; + +in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + +stdenv.mkDerivation (rec { + version = "9.4.7"; + pname = "${targetPrefix}ghc${variantSuffix}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "06775a52b4d13ac09edc6dabc299fd11e59d8886bbcae450af367baee2684c8f"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [ + # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs + # Can be removed if the Cabal library included with ghc backports the linked fix + (fetchpatch { + url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch"; + stripLen = 1; + extraPrefix = "libraries/Cabal/"; + sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; + }) + ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ + # Prevent the paths module from emitting symbols that we don't use + # when building with separate outputs. + # + # These cause problems as they're not eliminated by GHC's dead code + # elimination on aarch64-darwin. (see + # https://github.com/NixOS/nixpkgs/issues/140774 for details). + ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ]; + + postPatch = "patchShebangs ."; + + # GHC needs the locale configured during the Haddock phase. + LANG = "en_US.UTF-8"; + + # GHC is a bit confused on its cross terminology. + # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" + '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" + '' + lib.optionalString useLLVM '' + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + '' + '' + + echo -n "${buildMK}" > mk/build.mk + + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" + '' + lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 + export XATTR=${lib.getBin xattr}/bin/xattr + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + '' + # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have + # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian. + + '' + substituteInPlace configure --replace \ + 'MinBootGhcVersion="9.0"' \ + 'MinBootGhcVersion="8.10"' + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook + ] ++ lib.optionals enableDocs [ + sphinx + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + + # big-parallel allows us to build with more than 2 cores on + # Hydra which already warrants a significant speedup + requiredSystemFeatures = [ "big-parallel" ]; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # This is used by the haskell builder to query + # the presence of the haddock program. + hasHaddock = enableHaddockProgram; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/ghc/9.8.1.nix b/pkgs/development/compilers/ghc/9.8.1.nix new file mode 100644 index 0000000000000..7c8c476c5b1a6 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.8.1.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix rec { + version = "9.8.1"; + sha256 = "b2f8ed6b7f733797a92436f4ff6e088a520913149c9a9be90465b40ad1f20751"; +} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index c7b4aa1f87836..e876c4be0af71 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -155,7 +155,10 @@ ghcVersion = version; userSettings = hadrianUserSettings; # Disable haddock generating pretty source listings to stay under 3GB on aarch64-linux - enableHyperlinkedSource = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); + enableHyperlinkedSource = + # TODO(@sternenseemann): Disabling currently doesn't work with GHC >= 9.8 + lib.versionAtLeast version "9.8" || + !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); } , # Whether to build sphinx documentation. diff --git a/pkgs/development/compilers/go/1.20.nix b/pkgs/development/compilers/go/1.20.nix index dfa88fe6132e4..1124c2ea98a4b 100644 --- a/pkgs/development/compilers/go/1.20.nix +++ b/pkgs/development/compilers/go/1.20.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.20.8"; + version = "1.20.10"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-ONcXFPpSeflyQEUZVtjkfjwbal3ny4QTeUnWK13TGC4="; + hash = "sha256-ctL1GAXEcVAGbBA3VMdf3bLBnUjJIZ+jPR5GaWyEHbs="; }; strictDeps = true; diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index e0562ad32b98d..7806cf0744380 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.21.1"; + version = "1.21.3"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-v6Nr916aHpy725q8+dFwfkeb06B4gKiuNWTK7lcRy5k="; + hash = "sha256-GG8rb4yLcE5paCGwmrIEGlwe4T3LwxVqE63PdZMe5Ig="; }; strictDeps = true; diff --git a/pkgs/development/compilers/llvm/15/llvm/default.nix b/pkgs/development/compilers/llvm/15/llvm/default.nix index e6f339ff6d6d3..8a1c0547890b6 100644 --- a/pkgs/development/compilers/llvm/15/llvm/default.nix +++ b/pkgs/development/compilers/llvm/15/llvm/default.nix @@ -227,6 +227,8 @@ in stdenv.mkDerivation (rec { --replace "PassBuilderCallbacksTest.cpp" "" rm unittests/IR/PassBuilderCallbacksTest.cpp rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + # timing-based tests are trouble + rm utils/lit/tests/googletest-timeout.py '' + optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../../TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 9dbe65ed68da5..24dd31ea9fef8 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -255,14 +255,6 @@ in let [ "-rtlib=compiler-rt" "-Wno-unused-command-line-argument" "-B${targetLlvmLibraries.compiler-rt}/lib" - - # Combat "__cxxabi_config.h not found". Maybe this could be fixed by - # copying these headers into libcxx? Note that building libcxx - # outside of monorepo isn't supported anymore, might be related to - # https://github.com/llvm/llvm-project/issues/55632 - # ("16.0.3 libcxx, libcxxabi: circular build dependencies") - # Looks like the machinery changed in https://reviews.llvm.org/D120727. - "-I${lib.getDev targetLlvmLibraries.libcxx.cxxabi}/include/c++/v1" ] ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" ++ lib.optional diff --git a/pkgs/development/compilers/llvm/16/llvm/default.nix b/pkgs/development/compilers/llvm/16/llvm/default.nix index c70f9d37a562c..9475b5c994855 100644 --- a/pkgs/development/compilers/llvm/16/llvm/default.nix +++ b/pkgs/development/compilers/llvm/16/llvm/default.nix @@ -221,6 +221,8 @@ in --replace "PassBuilderCallbacksTest.cpp" "" rm unittests/IR/PassBuilderCallbacksTest.cpp rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + # timing-based tests are trouble + rm utils/lit/tests/googletest-timeout.py '' + optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../../TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ diff --git a/pkgs/development/compilers/mrustc/default.nix b/pkgs/development/compilers/mrustc/default.nix index 6570199f8523b..eae17cbce91fa 100644 --- a/pkgs/development/compilers/mrustc/default.nix +++ b/pkgs/development/compilers/mrustc/default.nix @@ -4,9 +4,9 @@ }: let - version = "0.10"; + version = "0.10.1"; tag = "v${version}"; - rev = "b364724f15fd6fce8234ad8add68107c23a22151"; + rev = "b6754f574f8846eb842feba4ccbeeecb10bdfacc"; in stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "thepowersgang"; repo = "mrustc"; rev = tag; - sha256 = "0f7kh4n2663sn0z3xib8gzw0s97qpvwag40g2vs3bfjlrbpgi9z0"; + hash = "sha256-sYnx5dUTaQbK4ugnSzAJwIUwZKPUhThmNA+WlY+LEWc="; }; postPatch = '' diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index e717a910f7035..ab0696e172c05 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap, fetchpatch , setJavaClassPath @@ -27,7 +27,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ @@ -67,7 +67,6 @@ let "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-freetype=system" - "--with-harfbuzz=system" "--with-libjpeg=system" "--with-giflib=system" "--with-libpng=system" @@ -96,6 +95,12 @@ let buildFlags = [ "all" ]; + postBuild = '' + cd build/linux* + make images + cd - + ''; + installPhase = '' mkdir -p $out/lib diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index b012459ba0461..5d5d9f774771e 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch , setJavaClassPath @@ -27,7 +27,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ @@ -72,7 +72,6 @@ let "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-freetype=system" - "--with-harfbuzz=system" "--with-libjpeg=system" "--with-giflib=system" "--with-libpng=system" @@ -101,6 +100,12 @@ let buildFlags = [ "all" ]; + postBuild = '' + cd build/linux* + make images + cd - + ''; + installPhase = '' mkdir -p $out/lib @@ -161,7 +166,7 @@ let disallowedReferences = [ openjdk-bootstrap ]; - meta = import ./meta.nix lib version; + meta = (import ./meta.nix lib version) // { broken = true; }; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 0f4f17d078e55..348fd3996c9f2 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk14-bootstrap , setJavaClassPath @@ -27,7 +27,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ @@ -67,7 +67,6 @@ let "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-freetype=system" - "--with-harfbuzz=system" "--with-libjpeg=system" "--with-giflib=system" "--with-libpng=system" @@ -96,6 +95,12 @@ let buildFlags = [ "all" ]; + postBuild = '' + cd build/linux* + make images + cd - + ''; + installPhase = '' mkdir -p $out/lib @@ -157,7 +162,7 @@ let disallowedReferences = [ openjdk-bootstrap ]; - meta = import ./meta.nix lib version; + meta = (import ./meta.nix lib version) // { broken = true; }; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index 54bce680a1888..2447b0783ca4c 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk15-bootstrap , setJavaClassPath @@ -30,7 +30,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip zip file which ]; buildInputs = [ - cpio perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib + cpio perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ @@ -70,15 +70,13 @@ let "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-freetype=system" - "--with-harfbuzz=system" "--with-libjpeg=system" "--with-giflib=system" "--with-libpng=system" "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" + ] ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; @@ -99,6 +97,12 @@ let buildFlags = [ "all" ]; + postBuild = '' + cd build/linux* + make images + cd - + ''; + installPhase = '' mkdir -p $out/lib diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 802449e4027ff..4b0874a03a415 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio -, file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib +, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib , libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap , setJavaClassPath @@ -31,7 +31,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ @@ -74,15 +74,13 @@ let "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-freetype=system" - "--with-harfbuzz=system" "--with-libjpeg=system" "--with-giflib=system" "--with-libpng=system" "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" + ] ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; @@ -103,6 +101,12 @@ let buildFlags = [ "all" ]; + postBuild = '' + cd build/linux* + make images + cd - + ''; + installPhase = '' mkdir -p $out/lib diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index 9aa952156d291..d2c71683c9bfe 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -98,8 +98,7 @@ let "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" + ] ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix index 48d68f7b071fd..2c496721be070 100644 --- a/pkgs/development/compilers/openjdk/18.nix +++ b/pkgs/development/compilers/openjdk/18.nix @@ -88,8 +88,7 @@ let "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" + ] ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; @@ -110,6 +109,12 @@ let buildFlags = [ "images" ]; + postBuild = '' + cd build/linux* + make images + cd - + ''; + installPhase = '' mkdir -p $out/lib diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index 214831a3d5692..51fd0d8eb533f 100644 --- a/pkgs/development/compilers/openjdk/19.nix +++ b/pkgs/development/compilers/openjdk/19.nix @@ -98,8 +98,7 @@ let "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" + ] ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; diff --git a/pkgs/development/compilers/openjdk/20.nix b/pkgs/development/compilers/openjdk/20.nix index 105a1cc7b35d0..2be834a27b58e 100644 --- a/pkgs/development/compilers/openjdk/20.nix +++ b/pkgs/development/compilers/openjdk/20.nix @@ -98,8 +98,7 @@ let "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" + ] ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; diff --git a/pkgs/development/compilers/rust/1_72.nix b/pkgs/development/compilers/rust/1_72.nix index 05e55d24a75aa..f540c229c6ff6 100644 --- a/pkgs/development/compilers/rust/1_72.nix +++ b/pkgs/development/compilers/rust/1_72.nix @@ -11,6 +11,7 @@ { stdenv, lib , buildPackages +, targetPackages , newScope, callPackage , CoreFoundation, Security, SystemConfiguration , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost @@ -19,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.72.0"; - rustcSha256 = "sha256-6p1hu7UddrbqaBFW9p8OBZa1lyLwRBSwHG4QC0tb46E="; + rustcVersion = "1.72.1"; + rustcSha256 = "sha256-f0iEX2pSzbtdY/sFKP1fUg60QydbVfmOMoFZ+GVo+JU="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 90e921651f140..0a0af7832366b 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -13,6 +13,7 @@ }: { stdenv, lib , buildPackages +, targetPackages , newScope, callPackage , CoreFoundation, Security, SystemConfiguration , pkgsBuildBuild @@ -21,7 +22,7 @@ let # Use `import` to make sure no packages sneak in here. - lib' = import ../../../build-support/rust/lib { inherit lib; }; + lib' = import ../../../build-support/rust/lib { inherit lib stdenv buildPackages targetPackages; }; # Allow faster cross compiler generation by reusing Build artifacts fastCross = (stdenv.buildPlatform == stdenv.hostPlatform) && (stdenv.hostPlatform != stdenv.targetPlatform); in @@ -29,7 +30,7 @@ in lib = lib'; # Backwards compat before `lib` was factored out. - inherit (lib') toTargetArch toTargetOs toRustTarget toRustTargetSpec IsNoStdTarget; + inherit (lib') toTargetArch toTargetOs toRustTarget toRustTargetSpec IsNoStdTarget toRustTargetForUseInEnvVars envVars; # This just contains tools for now. But it would conceivably contain # libraries too, say if we picked some default/recommended versions to build diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index b53be1633d56b..40f6237dbe984 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -38,6 +38,7 @@ rustPlatform.buildRustPackage rec { description = "A tool for formatting Rust code according to style guidelines"; homepage = "https://github.com/rust-lang-nursery/rustfmt"; license = with licenses; [ mit asl20 ]; + mainProgram = "rustfmt"; maintainers = with maintainers; [ globin basvandijk ]; }; } diff --git a/pkgs/development/compilers/swift/foundation/default.nix b/pkgs/development/compilers/swift/foundation/default.nix index efb35bd74c9fe..b0da48c68a957 100644 --- a/pkgs/development/compilers/swift/foundation/default.nix +++ b/pkgs/development/compilers/swift/foundation/default.nix @@ -5,6 +5,7 @@ { lib , stdenv +, fetchpatch , callPackage , cmake , ninja @@ -23,6 +24,15 @@ in stdenv.mkDerivation { inherit (sources) version; src = sources.swift-corelibs-foundation; + patches = [ + # from https://github.com/apple/swift-corelibs-foundation/pull/4811 + # fix build with glibc >=2.38 + (fetchpatch { + url = "https://github.com/apple/swift-corelibs-foundation/commit/47260803a108c6e0d639adcebeed3ac6a76e8bcd.patch"; + hash = "sha256-1JUSQW86IHKkBZqxvpk0P8zcSKntzOTNlMoGBfgeT4c="; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ninja swift ]; diff --git a/pkgs/development/compilers/vala/setup-hook.sh b/pkgs/development/compilers/vala/setup-hook.sh index 8252143e998b8..33acdf1daee02 100644 --- a/pkgs/development/compilers/vala/setup-hook.sh +++ b/pkgs/development/compilers/vala/setup-hook.sh @@ -7,6 +7,15 @@ make_vala_find_vapi_files() { addEnvHooks "$hostOffset" make_vala_find_vapi_files +disable_incompabile_pointer_conversion_warning() { + # Work around incompatible function pointer conversion errors with clang 16 + # by setting ``-Wno-incompatible-function-pointer-types` in an env hook. + # See https://gitlab.gnome.org/GNOME/vala/-/issues/1413. + NIX_CFLAGS_COMPILE+=" -Wno-incompatible-function-pointer-types" +} + +addEnvHooks "$hostOffset" disable_incompabile_pointer_conversion_warning + _multioutMoveVapiDirs() { moveToOutput share/vala/vapi "${!outputDev}" moveToOutput share/vala-@apiVersion@/vapi "${!outputDev}" diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index a9384d9b2b8b3..e3e0f2672cf25 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "stm32cubemx"; - version = "6.9.1"; + version = "6.9.2"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "sha256-KTbIRj7DkWoC2h/TLKjVduvsKVSue28kGOL34JqBVx4="; + sha256 = "sha256-x3ZRMtTvFGz2/0gJMx4zOx9rSnrSkCEl3pj5raeyVHg="; stripRoot = false; }; diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix index 2b4fd46ea2756..ac5d373955f5e 100644 --- a/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/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/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index 84d53b66e19b4..6afddd8d362e5 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/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/pkgs/development/guile-modules/guile-gnutls/default.nix b/pkgs/development/guile-modules/guile-gnutls/default.nix index 91ffe90b0435f..ae666077bf8ff 100644 --- a/pkgs/development/guile-modules/guile-gnutls/default.nix +++ b/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/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index 81febc3171b7d..cb34e22e62379 100644 --- a/pkgs/development/guile-modules/guile-json/default.nix +++ b/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/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 75e45b00d4e75..8c38432e3e230 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/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/pkgs/development/guile-modules/guile-sqlite3/default.nix b/pkgs/development/guile-modules/guile-sqlite3/default.nix index 430249f2c935f..4b309f7fbe5de 100644 --- a/pkgs/development/guile-modules/guile-sqlite3/default.nix +++ b/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/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 69723242dff54..61c2e51b7939e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -24,7 +24,7 @@ self: super: { Cabal-syntax = self.Cabal-syntax_3_10_1_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible - process = self.process_1_6_17_0; + process = self.process_1_6_18_0; })); # cabal-install needs most recent versions of Cabal and Cabal-syntax, @@ -50,22 +50,22 @@ self: super: { # cabal-install, but we need to recompile process even if the correct # version is available to prevent inconsistent dependencies: # process depends on directory. - process = cself.process_1_6_17_0; + process = cself.process_1_6_18_0; # hspec < 2.10 depends on ghc (the library) directly which in turn # depends on directory, causing a dependency conflict which is practically # not solvable short of recompiling GHC. Instead of adding # allowInconsistentDependencies for all reverse dependencies of hspec-core, # just upgrade to an hspec version without the offending dependency. - hspec-core = cself.hspec-core_2_11_4; - hspec-discover = cself.hspec-discover_2_11_4; - hspec = cself.hspec_2_11_4; + hspec-core = cself.hspec-core_2_11_5; + hspec-discover = cself.hspec-discover_2_11_5; + hspec = cself.hspec_2_11_5; # hspec-discover and hspec-core depend on hspec-meta for testing which # we need to avoid since it depends on ghc as well. Since hspec*_2_11* # are overridden to take the versioned attributes as inputs, we need # to make sure to override the versioned attribute with this fix. - hspec-discover_2_11_4 = dontCheck csuper.hspec-discover_2_11_4; + hspec-discover_2_11_5 = dontCheck csuper.hspec-discover_2_11_5; # Prevent dependency on doctest which causes an inconsistent dependency # due to depending on ghc which depends on directory etc. @@ -96,10 +96,7 @@ self: super: { ### HASKELL-LANGUAGE-SERVER SECTION ### ####################################### - haskell-language-server = (lib.pipe super.haskell-language-server [ - dontCheck - (disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways … - ]).overrideScope (lself: lsuper: { + haskell-language-server = dontCheck (super.haskell-language-server.overrideScope (lself: lsuper: { # For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix, # because some packages, like ormolu, need a newer Cabal version. # ghc-paths is special because it depends on Cabal for building @@ -110,7 +107,12 @@ self: super: { # otherwise we have different versions of ghc-paths # around which have the same abi-hash, which can lead to confusions and conflicts. ghc-paths = lsuper.ghc-paths.override { Cabal = null; }; - }); + })); + + # hasn't bumped upper bounds + # test fails: "floskell-test: styles/base.md: openBinaryFile: does not exist (No such file or directory)" + # https://github.com/ennocramer/floskell/issues/48 + floskell = dontCheck (doJailbreak super.floskell); # 2023-04-03: https://github.com/haskell/haskell-language-server/issues/3546#issuecomment-1494139751 # There will probably be a new revision soon. @@ -119,19 +121,6 @@ self: super: { # For -f-auto see cabal.project in haskell-language-server. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex); - # Test ldap server test/ldap.js is missing from sdist - # https://github.com/supki/ldap-client/issues/18 - ldap-client-og = dontCheck super.ldap-client-og; - - stylish-haskell = - # Too-strict upper bounds, no Hackage revisions - doJailbreak - # For -fghc-lib see cabal.project in haskell-language-server. - (if lib.versionAtLeast super.ghc.version "9.2" - then enableCabalFlag "ghc-lib" super.stylish-haskell - else super.stylish-haskell - ); - hiedb = lib.pipe super.hiedb @@ -153,6 +142,10 @@ self: super: { ### END HASKELL-LANGUAGE-SERVER SECTION ### ########################################### + # Test ldap server test/ldap.js is missing from sdist + # https://github.com/supki/ldap-client/issues/18 + ldap-client-og = dontCheck super.ldap-client-og; + vector = overrideCabal (old: { # Too strict bounds on doctest which isn't used, but is part of the configuration jailbreak = true; @@ -215,7 +208,7 @@ self: super: { # 2023-08-09: Jailbreak because of vector < 0.13 monad-bayes = doJailbreak (super.monad-bayes.override { - hspec = self.hspec_2_11_4; + hspec = self.hspec_2_11_5; }); # Disable tests failing on odd floating point numbers generated by QuickCheck 2.14.3 @@ -316,12 +309,7 @@ self: super: { # Overriding the version pandoc dependency uses as the latest release has version bounds # defined as >= 3.1 && < 3.2, can be removed once pandoc gets bumped by Stackage. - # - # The patch can be removed once the commit being pulled is in a release. - patat = appendPatch (fetchpatch { - url = "https://github.com/jaspervdj/patat/pull/143/commits/cb5d5b6439204b5bd52939e42a11518ac81139fe.patch"; - sha256 = "sha256-EPiyxziPtn2fAExKknI2uKUGahWCFnv7K8bpVkAgezQ="; - }) (super.patat.override { pandoc = self.pandoc_3_1_8; }); + patat = super.patat.override { pandoc = self.pandoc_3_1_8; }; # http2 also overridden in all-packages.nix for mailctl. # twain is currently only used by mailctl, so the .overrideScope shouldn't @@ -352,7 +340,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "sha256-+buXiG9auq46+reMrs2rBWoxHgPkHmP8BY5BugooU+Q="; + sha256 = "14x7avdvf0fjqncwxydlrv32lbyfiqrm346nvypzg27gq46fvkcg"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -890,10 +878,6 @@ self: super: { ''; }) super.ghc-mod; - # 2022-03-20: descriptive is unmaintained since 2018 and archived on github.com - # It does not support aeson 2.0 - descriptive = super.descriptive.override { aeson = self.aeson_1_5_6_0; }; - # Apply compatibility patches until a new release arrives # https://github.com/phadej/spdx/issues/33 spdx = appendPatches [ @@ -1193,39 +1177,33 @@ self: super: { jailbreak = assert drv.version == "1.0.9" && drv.revision == "1"; true; }) super.dhall-nixpkgs); + crypton-connection = super.crypton-connection.override { + # requires tls >= 1.7 + tls = self.tls_1_9_0; + }; + stack = lib.pipe super.stack [ (self.generateOptparseApplicativeCompletions [ "stack" ]) - # Seems to be an unnecessarily strict dep on ansi-terminal - doJailbreak - - # The below patch has unix line endings, but the actual file - # has CRLF line endings. The following override changes the - # file to unix line endings before applying the patch. - (overrideCabal (oldAttrs: { - prePatch = oldAttrs.prePatch or "" + '' - "${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix" src/main/BuildInfo.hs - ''; + # stack-2.13.1 requires a bunch of the latest packages. + (drv: drv.overrideScope (hfinal: hprev: { + ansi-terminal = hprev.ansi-terminal_1_0; # needs ansi-terminal >= 1.0 + crypton = hprev.crypton_0_33; # needs crypton >= 0.33 + hedgehog = doJailbreak hprev.hedgehog; # has too strict version bound for ansi-terminal + hpack = hprev.hpack_0_36_0; # needs hpack == 0.36.0 + http-client-tls = hprev.http-client-tls_0_3_6_3; # needs http-client-tls >= 0.3.6.2 + http-download = dontCheck hprev.http-download_0_2_1_0; # needs http-download >= 0.2.1.0, tests access network + optparse-applicative = hprev.optparse-applicative_0_18_1_0; # needs optparse-applicative >= 0.18.1.0 + pantry = dontCheck hprev.pantry_0_9_2; # needs pantry >= 0.9.2, tests access network + syb = dontCheck hprev.syb; # cyclic dependencies + tar-conduit = hprev.tar-conduit_0_4_0; # pantry needs tar-conduit >= 0.4.0 + temporary = dontCheck hprev.temporary; # cyclic dependencies })) - # stack-2.11.1 has a bug when building without git. - # https://github.com/commercialhaskell/stack/pull/6127 - (appendPatch - (fetchpatch { - name = "stack-fix-building-without-git.patch"; - url = "https://github.com/commercialhaskell/stack/pull/6127/commits/086f93933d547736a7007fc4110f7816ef21f691.patch"; - hash = "sha256-1nwzMoumWceVu8RNnH2mmSxYT24G1FAnFRJvUMeD3po="; - includes = [ "src/main/BuildInfo.hs" ]; - }) - ) ]; - # Too strict version bound on hashable-time. - # Tests require newer package version. - aeson_1_5_6_0 = dontCheck (doJailbreak super.aeson_1_5_6_0); - # musl fixes # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time; @@ -1510,11 +1488,6 @@ self: super: { rdf4h = dontCheck super.rdf4h; # hasn't bumped upper bounds - # test fails: "floskell-test: styles/base.md: openBinaryFile: does not exist (No such file or directory)" - # https://github.com/ennocramer/floskell/issues/48 - floskell = dontCheck (doJailbreak super.floskell); - - # hasn't bumped upper bounds # test fails because of a "Warning: Unused LANGUAGE pragma" # https://github.com/ennocramer/monad-dijkstra/issues/4 monad-dijkstra = dontCheck super.monad-dijkstra; @@ -1706,19 +1679,19 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give latest hspec correct dependency versions without overrideScope - hspec_2_11_4 = doDistribute (super.hspec_2_11_4.override { - hspec-discover = self.hspec-discover_2_11_4; - hspec-core = self.hspec-core_2_11_4; + hspec_2_11_5 = doDistribute (super.hspec_2_11_5.override { + hspec-discover = self.hspec-discover_2_11_5; + hspec-core = self.hspec-core_2_11_5; }); - hspec-meta_2_11_4 = doDistribute (super.hspec-meta_2_11_4.override { + hspec-meta_2_11_5 = doDistribute (super.hspec-meta_2_11_5.override { hspec-expectations = self.hspec-expectations_0_8_4; }); - hspec-discover_2_11_4 = doDistribute (super.hspec-discover_2_11_4.override { - hspec-meta = self.hspec-meta_2_11_4; + hspec-discover_2_11_5 = doDistribute (super.hspec-discover_2_11_5.override { + hspec-meta = self.hspec-meta_2_11_5; }); - # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_4 + # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_5 # is overlayed to hspec-core. - hspec-core_2_11_4 = doDistribute (dontCheck (super.hspec-core_2_11_4.override { + hspec-core_2_11_5 = doDistribute (dontCheck (super.hspec-core_2_11_5.override { hspec-expectations = self.hspec-expectations_0_8_4; })); @@ -1794,11 +1767,6 @@ self: super: { # compatible with Cabal 3. No upstream repository found so far readline = appendPatch ./patches/readline-fix-for-cabal-3.patch super.readline; - # 2020-12-05: this package requires a newer version of http-client, - # but it still compiles with older version: - # https://github.com/turion/essence-of-live-coding/pull/86 - essence-of-live-coding-warp = doJailbreak super.essence-of-live-coding-warp; - # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) pandoc-include-code = doJailbreak super.pandoc-include-code; @@ -1883,10 +1851,6 @@ self: super: { # pandoc-cli requires pandoc >= 3.1 pandoc = self.pandoc_3_1_8; - # pandoc depends on crypton-connection, which requires tls >= 1.7 - tls = self.tls_1_9_0; - crypton-connection = unmarkBroken super.crypton-connection; - # pandoc depends on http-client-tls, which only starts depending # on crypton-connection in http-client-tls-0.3.6.2. http-client-tls = self.http-client-tls_0_3_6_3; @@ -2449,11 +2413,6 @@ self: super: { ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core; hasura-ekg-core = doJailbreak super.hasura-ekg-core; - # https://github.com/Synthetica9/nix-linter/issues/65 - nix-linter = super.nix-linter.overrideScope (self: super: { - aeson = self.aeson_1_5_6_0; - }); - # Test suite doesn't support hspec 2.8 # https://github.com/zellige/hs-geojson/issues/29 geojson = dontCheck super.geojson; @@ -2704,11 +2663,6 @@ self: super: { # libfuse3 fails to mount fuse file systems within the build environment libfuse3 = dontCheck super.libfuse3; - # Tests fail due to the newly-build fourmolu not being in PATH - # https://github.com/fourmolu/fourmolu/issues/231 - fourmolu_0_14_0_0 = dontCheck super.fourmolu_0_14_0_0; - fourmolu_0_13_1_0 = dontCheck super.fourmolu_0_13_1_0; - # Merged upstream, but never released. Allows both intel and aarch64 darwin to build. # https://github.com/vincenthz/hs-gauge/pull/106 gauge = appendPatch (pkgs.fetchpatch { @@ -2728,4 +2682,6 @@ self: super: { # https://github.com/kowainik/typerep-map/pull/128 typerep-map = doJailbreak super.typerep-map; + # Too strict bounds on base + kewar = doJailbreak super.kewar; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index d452618667b23..5964e0d78972d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -99,21 +99,7 @@ self: super: { executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; }) super.hnix); - haskell-language-server = let - # These aren't included in hackage-packages.nix because hackage2nix is configured for GHC 9.2, under which these plugins aren't supported. - # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self.<package>.scope` - additionalDeps = with self.haskell-language-server.scope; [ - hls-haddock-comments-plugin - (unmarkBroken hls-splice-plugin) - hls-tactics-plugin - ]; - in addBuildDepends additionalDeps (super.haskell-language-server.overrideScope (lself: lsuper: { - Cabal = lself.Cabal_3_6_3_0; - aeson = lself.aeson_1_5_6_0; - lens-aeson = doJailbreak lself.lens-aeson_1_1_3; - lsp-types = dontCheck (doJailbreak lsuper.lsp-types); # Checks require aeson >= 2.0 - hls-overloaded-record-dot-plugin = null; - })); + haskell-language-server = throw "haskell-language-server dropped support for ghc 8.10 in version 2.3.0.0 please use a newer ghc version or an older nixpkgs version"; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_8_20230729; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1; @@ -122,27 +108,12 @@ self: super: { mod = super.mod_0_1_2_2; path-io = doJailbreak super.path-io; - hls-cabal-plugin = super.hls-cabal-plugin.override { - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - }; ormolu = self.ormolu_0_5_0_1; fourmolu = dontCheck self.fourmolu_0_9_0_0; hlint = self.hlint_3_4_1; stylish-haskell = doJailbreak self.stylish-haskell_0_14_3_0; - hls-tactics-plugin = unmarkBroken (addBuildDepends (with self.hls-tactics-plugin.scope; [ - aeson extra fingertree generic-lens ghc-exactprint ghc-source-gen ghcide - hls-graph hls-plugin-api hls-refactor-plugin hyphenation lens lsp megaparsec - parser-combinators prettyprinter refinery retrie syb unagi-chan unordered-containers - ]) super.hls-tactics-plugin); - - # This package is marked as unbuildable on GHC 9.2, so hackage2nix doesn't include any dependencies. - # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self.<package>.scope` - hls-haddock-comments-plugin = unmarkBroken (addBuildDepends (with self.hls-haddock-comments-plugin.scope; [ - ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lsp-types unordered-containers - ]) super.hls-haddock-comments-plugin); - mime-string = disableOptimization super.mime-string; # weeder 2.3.* no longer supports GHC 8.10 @@ -196,10 +167,6 @@ self: super: { apply-refact = self.apply-refact_0_9_3_0; - hls-hlint-plugin = super.hls-hlint-plugin.override { - inherit (self) apply-refact; - }; - # Needs OneTuple for ghc < 9.2 binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 7c2d3828866de..453526274094f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -76,9 +76,7 @@ self: super: { Cabal-syntax = self.Cabal-syntax_3_8_1_0; }; - fourmolu = self.fourmolu_0_10_1_0.override { - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - }; + stylish-haskell = doJailbreak super.stylish-haskell_0_14_4_0; doctest = dontCheck super.doctest; # Apply patches from head.hackage. @@ -91,16 +89,15 @@ self: super: { # These aren't included in hackage-packages.nix because hackage2nix is configured for GHC 9.2, under which these plugins aren't supported. # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self.<package>.scope` additionalDeps = with self.haskell-language-server.scope; [ - hls-haddock-comments-plugin (unmarkBroken hls-splice-plugin) - hls-tactics-plugin ]; - in addBuildDepends additionalDeps (super.haskell-language-server.overrideScope (lself: lsuper: { + in addBuildDepends additionalDeps (disableCabalFlag "fourmolu" (super.haskell-language-server.overrideScope (lself: lsuper: { # Needed for modern ormolu and fourmolu. # Apply this here and not in common, because other ghc versions offer different Cabal versions. Cabal = lself.Cabal_3_6_3_0; hls-overloaded-record-dot-plugin = null; - })); + hls-fourmolu-plugin = null; + }))); # Needs to use ghc-lib due to incompatible GHC ghc-tags = doDistribute (addBuildDepend self.ghc-lib self.ghc-tags_1_5); diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 29e7aab2491a9..0c1bf8518ea4d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -71,10 +71,9 @@ self: super: { Cabal-syntax = self.Cabal-syntax_3_8_1_0; }; - fourmolu = self.fourmolu_0_10_1_0.override { - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - }; + stylish-haskell = doJailbreak super.stylish-haskell_0_14_4_0; + haskell-language-server = disableCabalFlag "fourmolu" (super.haskell-language-server.override { hls-fourmolu-plugin = null; }); # For GHC < 9.4, some packages need data-array-byte as an extra dependency hashable = addBuildDepends [ self.data-array-byte ] super.hashable; primitive = addBuildDepends [ self.data-array-byte ] super.primitive; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 7b9feb98dcba1..691f82c09616a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -111,7 +111,32 @@ in { # https://github.com/kowainik/relude/issues/436 relude = dontCheck super.relude; - fourmolu = overrideCabal (drv: { - libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; - }) (disableCabalFlag "fixity-th" super.fourmolu); + inherit + ( + let + hls_overlay = lself: lsuper: { + ghc-lib-parser = lself.ghc-lib-parser_9_6_2_20230523; + ghc-lib-parser-ex = doDistribute lself.ghc-lib-parser-ex_9_6_0_2; + Cabal-syntax = lself.Cabal-syntax_3_10_1_0; + }; + in + lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { + haskell-language-server = allowInconsistentDependencies super.haskell-language-server; + # Tests fail due to the newly-build fourmolu not being in PATH + # https://github.com/fourmolu/fourmolu/issues/231 + fourmolu = dontCheck super.fourmolu_0_14_0_0; + ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0); + hlint = super.hlint_3_6_1; + stylish-haskell = super.stylish-haskell; + } + ) + haskell-language-server + # HLS from 2.3 needs at least formolu 0.14. + # This means we need to bump a lot of other tools, too, because they all us ghc-lib-parser + # We do this globally to prevent inconsistent formatting or lints between hls and the command line tools. + fourmolu + ormolu + hlint + stylish-haskell + ; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 098a856f78e49..f6ba21f37574a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -74,6 +74,7 @@ self: super: { bifunctors = doDistribute self.bifunctors_5_6_1; base-compat = doDistribute self.base-compat_0_13_0; base-compat-batteries = doDistribute self.base-compat-batteries_0_13_0; + fgl = doDistribute self.fgl_5_8_1_1; # Because we bumped the version of th-abstraction above.^ aeson = doJailbreak super.aeson; @@ -90,6 +91,12 @@ self: super: { ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_2_20230523; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_2; + # Tests fail due to the newly-build fourmolu not being in PATH + # https://github.com/fourmolu/fourmolu/issues/231 + fourmolu = dontCheck super.fourmolu_0_14_0_0; + ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0); + hlint = super.hlint_3_6_1; + # v0.1.6 forbids base >= 4.18 singleton-bool = doDistribute super.singleton-bool_0_1_7; @@ -141,16 +148,6 @@ self: super: { sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv"; }) (doJailbreak super.language-haskell-extract); - # Patch for support of mtl-2.3 - monad-par = appendPatch - (pkgs.fetchpatch { - name = "monad-par-mtl-2.3.patch"; - url = "https://github.com/simonmar/monad-par/pull/75/commits/ce53f6c1f8246224bfe0223f4aa3d077b7b6cc6c.patch"; - sha256 = "1jxkl3b3lkjhk83f5q220nmjxbkmni0jswivdw4wfbzp571djrlx"; - stripLen = 1; - }) - (doJailbreak super.monad-par); - # Patch 0.17.1 for support of mtl-2.3 xmonad-contrib = appendPatch (pkgs.fetchpatch { @@ -175,23 +172,19 @@ self: super: { hls-floskell-plugin = null; }; - fourmolu = super.fourmolu_0_13_1_0; - ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0); - stylish-haskell = super.stylish-haskell_0_14_5_0; - # Newer version of servant required for GHC 9.6 - servant = self.servant_0_20; + servant = self.servant_0_20_1; servant-server = self.servant-server_0_20; servant-client = self.servant-client_0_20; servant-client-core = self.servant-client-core_0_20; - # Select versions compatible with servant_0_20 + # Select versions compatible with servant_0_20_1 servant-docs = self.servant-docs_0_13; servant-swagger = self.servant-swagger_1_2; # Jailbreaks for servant <0.20 servant-lucid = doJailbreak super.servant-lucid; # Jailbreak strict upper bounds: http-api-data <0.6 - servant_0_20 = doJailbreak super.servant_0_20; + servant_0_20_1 = doJailbreak super.servant_0_20_1; servant-server_0_20 = doJailbreak super.servant-server_0_20; servant-client_0_20 = doJailbreak super.servant-client_0_20; servant-client-core_0_20 = doJailbreak super.servant-client-core_0_20; @@ -214,8 +207,6 @@ self: super: { HUnit Diff data-default extra fail free ghc-paths ordered-containers silently syb ]) super.ghc-exactprint_1_7_0_1); - hlint = super.hlint_3_6_1; - inherit (pkgs.lib.mapAttrs (_: doJailbreak ) super) hls-cabal-plugin algebraic-graphs @@ -271,7 +262,7 @@ self: super: { }) super.ConfigFile; # The curl executable is required for withApplication tests. - warp_3_3_28 = addTestToolDepend pkgs.curl super.warp_3_3_28; + warp_3_3_29 = addTestToolDepend pkgs.curl super.warp_3_3_29; # The NCG backend for aarch64 generates invalid jumps in some situations, # the workaround on 9.6 is to revert to the LLVM backend (which is used diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index b340848b01a8c..206f397580904 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -139,6 +139,7 @@ broken-packages: - altfloat # failure in job https://hydra.nixos.org/build/233197874 at 2023-09-02 - alure # failure in job https://hydra.nixos.org/build/233230238 at 2023-09-02 - amazon-emailer # failure in job https://hydra.nixos.org/build/233220018 at 2023-09-02 + - amazonka-contrib-rds-utils # failure building library in job https://hydra.nixos.org/build/237240275 at 2023-10-21 - amazonka-iam-policy # failure in job https://hydra.nixos.org/build/233233098 at 2023-09-02 - amazon-products # failure in job https://hydra.nixos.org/build/233193877 at 2023-09-02 - AMI # failure in job https://hydra.nixos.org/build/233232505 at 2023-09-02 @@ -163,6 +164,12 @@ broken-packages: - antfarm # failure in job https://hydra.nixos.org/build/233225661 at 2023-09-02 - antigate # failure in job https://hydra.nixos.org/build/233194081 at 2023-09-02 - antimirov # failure in job https://hydra.nixos.org/build/233210987 at 2023-09-02 + - antiope-athena # failure building library in job https://hydra.nixos.org/build/237246022 at 2023-10-21 + - antiope-es # failure building library in job https://hydra.nixos.org/build/237237240 at 2023-10-21 + - antiope-messages # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237239158 at 2023-10-21 + - antiope-optparse-applicative # failure in job https://hydra.nixos.org/build/237235649 at 2023-10-21 + - antiope-sns # failure in job https://hydra.nixos.org/build/237241347 at 2023-10-21 + - antiope-sqs # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237241846 at 2023-10-21 - antiope-swf # failure in job https://hydra.nixos.org/build/233206369 at 2023-09-02 - antiquoter # failure in job https://hydra.nixos.org/build/233221962 at 2023-09-02 - antisplice # failure in job https://hydra.nixos.org/build/233238144 at 2023-09-02 @@ -290,6 +297,7 @@ broken-packages: - awesome-prelude # failure in job https://hydra.nixos.org/build/233232761 at 2023-09-02 - awesomium-raw # failure in job https://hydra.nixos.org/build/233241036 at 2023-09-02 - aws-cloudfront-signer # failure in job https://hydra.nixos.org/build/233194723 at 2023-09-02 + - aws-easy # failure building library in job https://hydra.nixos.org/build/237244335 at 2023-10-21 - aws-ec2 # failure in job https://hydra.nixos.org/build/233201556 at 2023-09-02 - aws-ec2-knownhosts # failure in job https://hydra.nixos.org/build/233237078 at 2023-09-02 - aws-general # failure in job https://hydra.nixos.org/build/233211106 at 2023-09-02 @@ -298,6 +306,8 @@ broken-packages: - aws-performance-tests # failure in job https://hydra.nixos.org/build/233259271 at 2023-09-02 - aws-route53 # failure in job https://hydra.nixos.org/build/233218200 at 2023-09-02 - aws-sdk-text-converter # failure in job https://hydra.nixos.org/build/233237525 at 2023-09-02 + - aws-ses-easy # failure building library in job https://hydra.nixos.org/build/237249788 at 2023-10-21 + - aws-simple # failure building library in job https://hydra.nixos.org/build/237242730 at 2023-10-21 - azubi # failure in job https://hydra.nixos.org/build/233258480 at 2023-09-02 - azure-acs # failure in job https://hydra.nixos.org/build/233252578 at 2023-09-02 - azure-email # failure in job https://hydra.nixos.org/build/233255535 at 2023-09-02 @@ -457,6 +467,7 @@ broken-packages: - blockhash # failure in job https://hydra.nixos.org/build/233227049 at 2023-09-02 - Blogdown # failure in job https://hydra.nixos.org/build/233239841 at 2023-09-02 - BlogLiterately # failure in job https://hydra.nixos.org/build/233202164 at 2023-09-02 + - bloodhound-amazonka-auth # failure building library in job https://hydra.nixos.org/build/237245625 at 2023-10-21 - bloomfilter-redis # failure in job https://hydra.nixos.org/build/233226393 at 2023-09-02 - blosum # failure in job https://hydra.nixos.org/build/233198029 at 2023-09-02 - blubber-server # failure in job https://hydra.nixos.org/build/233199530 at 2023-09-02 @@ -601,6 +612,7 @@ broken-packages: - cairo-core # failure in job https://hydra.nixos.org/build/233248151 at 2023-09-02 - cake3 # failure in job https://hydra.nixos.org/build/233231662 at 2023-09-02 - cal3d # failure in job https://hydra.nixos.org/build/233200357 at 2023-09-02 + - calamity # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/238601583 at 2023-10-21 - caledon # failure in job https://hydra.nixos.org/build/233209888 at 2023-09-02 - calenderweek # failure in job https://hydra.nixos.org/build/233209930 at 2023-09-02 - call-alloy # failure in job https://hydra.nixos.org/build/233249056 at 2023-09-02 @@ -618,6 +630,7 @@ broken-packages: - ca-patterns # failure in job https://hydra.nixos.org/build/233246800 at 2023-09-02 - capped-list # failure in job https://hydra.nixos.org/build/233232627 at 2023-09-02 - capri # failure in job https://hydra.nixos.org/build/233247984 at 2023-09-02 + - caps # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237244140 at 2023-10-21 - caramia # failure in job https://hydra.nixos.org/build/233257225 at 2023-09-02 - carbonara # failure in job https://hydra.nixos.org/build/233201166 at 2023-09-02 - carettah # failure in job https://hydra.nixos.org/build/233230612 at 2023-09-02 @@ -730,6 +743,7 @@ broken-packages: - clash-prelude # failure in job https://hydra.nixos.org/build/233252128 at 2023-09-02 - Clash-Royale-Hack-Cheats # failure in job https://hydra.nixos.org/build/233216034 at 2023-09-02 - ClassLaws # failure in job https://hydra.nixos.org/build/233243019 at 2023-09-02 + - classy-effects-base # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237233636 at 2023-10-21 - classy-influxdb-simple # failure in job https://hydra.nixos.org/build/233253418 at 2023-09-02 - classy-parallel # failure in job https://hydra.nixos.org/build/233213514 at 2023-09-02 - classyplate # failure in job https://hydra.nixos.org/build/233212613 at 2023-09-02 @@ -794,6 +808,7 @@ broken-packages: - collate # failure in job https://hydra.nixos.org/build/233243978 at 2023-09-02 - collections-api # failure in job https://hydra.nixos.org/build/233220769 at 2023-09-02 - collections # failure in job https://hydra.nixos.org/build/233251207 at 2023-09-02 + - co-log-polysemy-formatting # failure building executable 'example' in job https://hydra.nixos.org/build/237249360 at 2023-10-21 - co-log-sys # failure in job https://hydra.nixos.org/build/233206587 at 2023-09-02 - colonnade # failure in job https://hydra.nixos.org/build/233248956 at 2023-09-02 - colorless # failure in job https://hydra.nixos.org/build/233220728 at 2023-09-02 @@ -954,6 +969,7 @@ broken-packages: - crdt-event-fold # failure in job https://hydra.nixos.org/build/233191438 at 2023-09-02 - crdt # failure in job https://hydra.nixos.org/build/233254930 at 2023-09-02 - creatur # failure in job https://hydra.nixos.org/build/233252591 at 2023-09-02 + - credentials # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237240683 at 2023-10-21 - credential-store # failure in job https://hydra.nixos.org/build/233230143 at 2023-09-02 - crem # failure in job https://hydra.nixos.org/build/233240415 at 2023-09-02 - cr # failure in job https://hydra.nixos.org/build/233235318 at 2023-09-02 @@ -974,7 +990,6 @@ broken-packages: - cryptoids-types # failure in job https://hydra.nixos.org/build/233242596 at 2023-09-02 - crypto-keys-ssh # failure in job https://hydra.nixos.org/build/233222227 at 2023-09-02 - crypto-multihash # failure in job https://hydra.nixos.org/build/233220770 at 2023-09-02 - - crypton-connection # failure in job https://hydra.nixos.org/build/233230068 at 2023-09-02 - crypto-numbers # failure in job https://hydra.nixos.org/build/233225721 at 2023-09-02 - crypto-pubkey-openssh # failure in job https://hydra.nixos.org/build/233207007 at 2023-09-02 - crypto-random-effect # failure in job https://hydra.nixos.org/build/233236324 at 2023-09-02 @@ -1012,6 +1027,7 @@ broken-packages: - cut-the-crap # failure in job https://hydra.nixos.org/build/233238478 at 2023-09-02 - CV # failure in job https://hydra.nixos.org/build/233223571 at 2023-09-02 - d3js # failure in job https://hydra.nixos.org/build/233251474 at 2023-09-02 + - daemons # failure in job https://hydra.nixos.org/build/237233422 at 2023-10-21 - dag # failure in job https://hydra.nixos.org/build/233220719 at 2023-09-02 - DAG-Tournament # failure in job https://hydra.nixos.org/build/233218747 at 2023-09-02 - dahdit # failure in job https://hydra.nixos.org/build/233245113 at 2023-09-02 @@ -1019,6 +1035,7 @@ broken-packages: - danibot # failure in job https://hydra.nixos.org/build/233197740 at 2023-09-02 - Dao # failure in job https://hydra.nixos.org/build/233207745 at 2023-09-02 - dao # failure in job https://hydra.nixos.org/build/233240654 at 2023-09-02 + - dap # failure in job https://hydra.nixos.org/build/237239767 at 2023-10-21 - darcs2dot # failure in job https://hydra.nixos.org/build/233209236 at 2023-09-02 - darcs-buildpackage # failure in job https://hydra.nixos.org/build/233213566 at 2023-09-02 - darcs-cabalized # failure in job https://hydra.nixos.org/build/233234765 at 2023-09-02 @@ -1152,6 +1169,7 @@ broken-packages: - derive-trie # failure in job https://hydra.nixos.org/build/233207961 at 2023-09-02 - derp-lib # failure in job https://hydra.nixos.org/build/233199053 at 2023-09-02 - describe # failure in job https://hydra.nixos.org/build/233207296 at 2023-09-02 + - descriptive # failure building library in job https://hydra.nixos.org/build/237623359 at 2023-10-21 - desktop-portal # failure in job https://hydra.nixos.org/build/233241462 at 2023-09-02 - deterministic-game-engine # failure in job https://hydra.nixos.org/build/233259188 at 2023-09-02 - detrospector # failure in job https://hydra.nixos.org/build/233209424 at 2023-09-02 @@ -1199,6 +1217,7 @@ broken-packages: - digest-pure # failure in job https://hydra.nixos.org/build/233194135 at 2023-09-02 - DigitalOcean # failure in job https://hydra.nixos.org/build/233231291 at 2023-09-02 - digitalocean-kzs # failure in job https://hydra.nixos.org/build/233251576 at 2023-09-02 + - digit # failure in job https://hydra.nixos.org/build/237241758 at 2023-10-21 - dijkstra-simple # failure in job https://hydra.nixos.org/build/233218373 at 2023-09-02 - DimensionalHash # failure in job https://hydra.nixos.org/build/233230945 at 2023-09-02 - diophantine # failure in job https://hydra.nixos.org/build/233229215 at 2023-09-02 @@ -1312,6 +1331,7 @@ broken-packages: - dynamic-mvector # failure in job https://hydra.nixos.org/build/233252826 at 2023-09-02 - dynamic-object # failure in job https://hydra.nixos.org/build/233216605 at 2023-09-02 - DynamicTimeWarp # failure in job https://hydra.nixos.org/build/233238244 at 2023-09-02 + - dynamodb-simple # failure building library in job https://hydra.nixos.org/build/237238415 at 2023-10-21 - dyna-processing # failure in job https://hydra.nixos.org/build/234451875 at 2023-09-13 - dynloader # failure in job https://hydra.nixos.org/build/233239248 at 2023-09-02 - DysFRP # failure in job https://hydra.nixos.org/build/233214134 at 2023-09-02 @@ -1331,6 +1351,7 @@ broken-packages: - easytest # failure in job https://hydra.nixos.org/build/233209710 at 2023-09-02 - ebeats # failure in job https://hydra.nixos.org/build/233235039 at 2023-09-02 - ebnf-bff # failure in job https://hydra.nixos.org/build/233221694 at 2023-09-02 + - ec2-unikernel # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237245061 at 2023-10-21 - eccrypto-ed25519-bindings # failure in job https://hydra.nixos.org/build/233217399 at 2023-09-02 - ecma262 # failure in job https://hydra.nixos.org/build/233260026 at 2023-09-02 - ecta-plugin # failure in job https://hydra.nixos.org/build/233224764 at 2023-09-02 @@ -1360,6 +1381,7 @@ broken-packages: - either-unwrap # failure in job https://hydra.nixos.org/build/233254495 at 2023-09-02 - ejdb2-binding # failure in job https://hydra.nixos.org/build/233253666 at 2023-09-02 - ekg-bosun # failure in job https://hydra.nixos.org/build/233250564 at 2023-09-02 + - ekg-cloudwatch # failure in job https://hydra.nixos.org/build/237236508 at 2023-10-21 - ekg-elastic # failure in job https://hydra.nixos.org/build/233204565 at 2023-09-02 - ekg-elasticsearch # failure in job https://hydra.nixos.org/build/233234000 at 2023-09-02 - ekg-json # failure in job https://hydra.nixos.org/build/233245374 at 2023-09-02 @@ -1446,6 +1468,7 @@ broken-packages: - eventsourced # failure in job https://hydra.nixos.org/build/233192731 at 2023-09-02 - eventstore # failure in job https://hydra.nixos.org/build/233202734 at 2023-09-02 - evoke # failure in job https://hydra.nixos.org/build/233213948 at 2023-09-02 + - EVP # failure in job https://hydra.nixos.org/build/237241792 at 2023-10-21 - ewe # failure in job https://hydra.nixos.org/build/233217228 at 2023-09-02 - exact-cover # failure in job https://hydra.nixos.org/build/233203182 at 2023-09-02 - exact-real-positional # failure in job https://hydra.nixos.org/build/233239627 at 2023-09-02 @@ -1485,6 +1508,7 @@ broken-packages: - extensioneer # failure in job https://hydra.nixos.org/build/233663099 at 2023-09-02 - external-sort # failure in job https://hydra.nixos.org/build/233244337 at 2023-09-02 - extism # failure in job https://hydra.nixos.org/build/233242807 at 2023-09-02 + - extism-pdk # failure in job https://hydra.nixos.org/build/237239071 at 2023-10-21 - extractelf # failure in job https://hydra.nixos.org/build/233240806 at 2023-09-02 - Extra # failure in job https://hydra.nixos.org/build/233243671 at 2023-09-02 - extralife # failure in job https://hydra.nixos.org/build/233236550 at 2023-09-02 @@ -1556,6 +1580,7 @@ broken-packages: - FileManipCompat # failure in job https://hydra.nixos.org/build/233254887 at 2023-09-02 - FileManip # failure in job https://hydra.nixos.org/build/233237292 at 2023-09-02 - fileneglect # failure in job https://hydra.nixos.org/build/233209920 at 2023-09-02 + - filepather # failure in job https://hydra.nixos.org/build/237242258 at 2023-10-21 - Files # failure in job https://hydra.nixos.org/build/233207543 at 2023-09-02 - filesystem-conduit # failure in job https://hydra.nixos.org/build/233239975 at 2023-09-02 - FileSystem # failure in job https://hydra.nixos.org/build/233230289 at 2023-09-02 @@ -1952,6 +1977,7 @@ broken-packages: - gridfs # failure in job https://hydra.nixos.org/build/233213958 at 2023-09-02 - grids # failure in job https://hydra.nixos.org/build/233218294 at 2023-09-02 - grm # failure in job https://hydra.nixos.org/build/233259788 at 2023-09-02 + - groot # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237248418 at 2023-10-21 - GroteTrap # failure in job https://hydra.nixos.org/build/233203176 at 2023-09-02 - groundhog # failure in job https://hydra.nixos.org/build/233199269 at 2023-09-02 - grouped-list # failure in job https://hydra.nixos.org/build/233240891 at 2023-09-02 @@ -2077,6 +2103,7 @@ broken-packages: - HaPy # failure in job https://hydra.nixos.org/build/233256693 at 2023-09-02 - haquery # failure in job https://hydra.nixos.org/build/233216714 at 2023-09-02 - harchive # failure in job https://hydra.nixos.org/build/233259819 at 2023-09-02 + - harfbuzz-pure # failure in job https://hydra.nixos.org/build/237235780 at 2023-10-21 - harg # failure in job https://hydra.nixos.org/build/233232453 at 2023-09-02 - HARM # failure in job https://hydra.nixos.org/build/233232650 at 2023-09-02 - HarmTrace-Base # failure in job https://hydra.nixos.org/build/233213843 at 2023-09-02 @@ -2169,6 +2196,7 @@ broken-packages: - haskintex # failure in job https://hydra.nixos.org/build/233238166 at 2023-09-02 - haskmon # failure in job https://hydra.nixos.org/build/233228390 at 2023-09-02 - haskoin # failure in job https://hydra.nixos.org/build/233201668 at 2023-09-02 + - haskoin-store # failure in job https://hydra.nixos.org/build/238048371 at 2023-10-21 - haskoin-util # failure in job https://hydra.nixos.org/build/233222171 at 2023-09-02 - haskoin-wallet # failure in job https://hydra.nixos.org/build/233206922 at 2023-09-02 - haskore # failure in job https://hydra.nixos.org/build/233238668 at 2023-09-02 @@ -2255,6 +2283,7 @@ broken-packages: - heddit # failure in job https://hydra.nixos.org/build/233229058 at 2023-09-02 - hedgehog-checkers # failure in job https://hydra.nixos.org/build/233229405 at 2023-09-02 - hedgehog-generic # failure in job https://hydra.nixos.org/build/233204695 at 2023-09-02 + - hedgehog-gen # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237243271 at 2023-10-21 - hedgehog-golden # failure in job https://hydra.nixos.org/build/233219619 at 2023-09-02 - hedgehog-lens # failure in job https://hydra.nixos.org/build/233251825 at 2023-09-02 - hedgehog-servant # failure in job https://hydra.nixos.org/build/233258223 at 2023-09-02 @@ -2379,6 +2408,7 @@ broken-packages: - hledger-chart # failure in job https://hydra.nixos.org/build/233205387 at 2023-09-02 - hledger-diff # failure in job https://hydra.nixos.org/build/233199639 at 2023-09-02 - hledger-flow # failure in job https://hydra.nixos.org/build/233252169 at 2023-09-02 + - hledger-iadd # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/238288021 at 2023-10-21 - hledger-irr # failure in job https://hydra.nixos.org/build/233230276 at 2023-09-02 - hledger-makeitso # failure in job https://hydra.nixos.org/build/233213046 at 2023-09-02 - hledger-vty # failure in job https://hydra.nixos.org/build/233191782 at 2023-09-02 @@ -2571,6 +2601,7 @@ broken-packages: - hsns # failure in job https://hydra.nixos.org/build/233240328 at 2023-09-02 - hsnsq # failure in job https://hydra.nixos.org/build/233215245 at 2023-09-02 - hsntp # failure in job https://hydra.nixos.org/build/233206211 at 2023-09-02 + - hs-opentelemetry-propagator-datadog # failure in job https://hydra.nixos.org/build/237245341 at 2023-10-21 - hsoptions # failure in job https://hydra.nixos.org/build/233198363 at 2023-09-02 - hsoz # failure in job https://hydra.nixos.org/build/233217005 at 2023-09-02 - hs-pattrans # failure in job https://hydra.nixos.org/build/233230577 at 2023-09-02 @@ -2692,6 +2723,7 @@ broken-packages: - huttons-razor # failure in job https://hydra.nixos.org/build/233224736 at 2023-09-02 - hVOIDP # failure in job https://hydra.nixos.org/build/233227778 at 2023-09-02 - hwall-auth-iitk # failure in job https://hydra.nixos.org/build/233217629 at 2023-09-02 + - hw-aws-sqs-conduit # failure building library in job https://hydra.nixos.org/build/237235400 at 2023-10-21 - hw-ci-assist # failure in job https://hydra.nixos.org/build/233207990 at 2023-09-02 - hw-dsv # failure in job https://hydra.nixos.org/build/233252280 at 2023-09-02 - hw-dump # failure in job https://hydra.nixos.org/build/233208818 at 2023-09-02 @@ -2769,6 +2801,7 @@ broken-packages: - imapget # failure in job https://hydra.nixos.org/build/233235664 at 2023-09-02 - imgur # failure in job https://hydra.nixos.org/build/233191096 at 2023-09-02 - imj-prelude # failure in job https://hydra.nixos.org/build/233234877 at 2023-09-02 + - imm # failure in job https://hydra.nixos.org/build/237239261 at 2023-10-21 - immortal-worker # failure in job https://hydra.nixos.org/build/233246961 at 2023-09-02 - ImperativeHaskell # failure in job https://hydra.nixos.org/build/233240920 at 2023-09-02 - impl # failure in job https://hydra.nixos.org/build/233203425 at 2023-09-02 @@ -2799,6 +2832,7 @@ broken-packages: - inj-base # failure in job https://hydra.nixos.org/build/233198720 at 2023-09-02 - inject-function # failure in job https://hydra.nixos.org/build/233252462 at 2023-09-02 - injections # failure in job https://hydra.nixos.org/build/233207796 at 2023-09-02 + - inline-c-cuda # failure in job https://hydra.nixos.org/build/237234701 at 2023-10-21 - inline-c-objc # failure in job https://hydra.nixos.org/build/233223704 at 2023-09-02 - inline-r # failure in job https://hydra.nixos.org/build/233210520 at 2023-09-02 - in-other-words-plugin # failure in job https://hydra.nixos.org/build/233202396 at 2023-09-02 @@ -3228,6 +3262,7 @@ broken-packages: - ll-picosat # failure in job https://hydra.nixos.org/build/233206257 at 2023-09-02 - llsd # failure in job https://hydra.nixos.org/build/233241590 at 2023-09-02 - llvm-base # failure in job https://hydra.nixos.org/build/233244366 at 2023-09-02 + - llvm-ffi # failure in job https://hydra.nixos.org/build/237230725 at 2023-10-21 - llvm-general-pure # failure in job https://hydra.nixos.org/build/233246430 at 2023-09-02 - llvm-hs # failure in job https://hydra.nixos.org/build/233205149 at 2023-09-02 - llvm-ht # failure in job https://hydra.nixos.org/build/233203770 at 2023-09-02 @@ -3719,6 +3754,7 @@ broken-packages: - nextstep-plist # failure in job https://hydra.nixos.org/build/233227343 at 2023-09-02 - NGrams # failure in job https://hydra.nixos.org/build/233230426 at 2023-09-02 - ngrams-loader # failure in job https://hydra.nixos.org/build/233211319 at 2023-09-02 + - ngx-export-healthcheck # failure in job https://hydra.nixos.org/build/238601669 at 2023-10-21 - ngx-export-log # failure in job https://hydra.nixos.org/build/233193133 at 2023-09-02 - niagra # failure in job https://hydra.nixos.org/build/233234016 at 2023-09-02 - nibblestring # failure in job https://hydra.nixos.org/build/233224888 at 2023-09-02 @@ -4005,6 +4041,7 @@ broken-packages: - patches-vector # failure in job https://hydra.nixos.org/build/233244862 at 2023-09-02 - Pathfinder # failure in job https://hydra.nixos.org/build/233236573 at 2023-09-02 - path-formatting # failure in job https://hydra.nixos.org/build/233199358 at 2023-09-02 + - path-sing # failure in job https://hydra.nixos.org/build/237234354 at 2023-10-21 - PathTree # failure in job https://hydra.nixos.org/build/233216203 at 2023-09-02 - patronscraper # failure in job https://hydra.nixos.org/build/233258571 at 2023-09-02 - pattern-trie # failure in job https://hydra.nixos.org/build/233237252 at 2023-09-02 @@ -4080,6 +4117,7 @@ broken-packages: - phone-push # failure in job https://hydra.nixos.org/build/233246934 at 2023-09-02 - phonetic-languages-constaints # failure in job https://hydra.nixos.org/build/233232580 at 2023-09-02 - phonetic-languages-simplified-generalized-examples-array # failure in job https://hydra.nixos.org/build/233245242 at 2023-09-02 + - phonetic-languages-simplified-generalized-properties-array # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237248983 at 2023-10-21 - phonetic-languages-simplified-properties-array # failure in job https://hydra.nixos.org/build/233195530 at 2023-09-02 - phonetic-languages-simplified-properties-array-old # failure in job https://hydra.nixos.org/build/233258258 at 2023-09-02 - phonetic-languages-vector # failure in job https://hydra.nixos.org/build/233258156 at 2023-09-02 @@ -5070,6 +5108,7 @@ broken-packages: - sparse-merkle-trees # failure in job https://hydra.nixos.org/build/233251228 at 2023-09-02 - sparse-tensor # failure in job https://hydra.nixos.org/build/233224869 at 2023-09-02 - spars # failure in job https://hydra.nixos.org/build/233221560 at 2023-09-02 + - SpatialMath # failure in job https://hydra.nixos.org/build/237243985 at 2023-10-21 - special-functors # failure in job https://hydra.nixos.org/build/233215268 at 2023-09-02 - special-keys # failure in job https://hydra.nixos.org/build/233191988 at 2023-09-02 - spectacle # failure in job https://hydra.nixos.org/build/233207488 at 2023-09-02 @@ -5100,6 +5139,7 @@ broken-packages: - sqlite-simple-errors # failure in job https://hydra.nixos.org/build/233232977 at 2023-09-02 - sql-simple # failure in job https://hydra.nixos.org/build/233252834 at 2023-09-02 - sqlvalue-list # failure in job https://hydra.nixos.org/build/233197313 at 2023-09-02 + - sqsd-local # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237237046 at 2023-10-21 - srcinst # failure in job https://hydra.nixos.org/build/233221356 at 2023-09-02 - srt-attoparsec # failure in job https://hydra.nixos.org/build/233248456 at 2023-09-02 - sscan # failure in job https://hydra.nixos.org/build/233248144 at 2023-09-02 @@ -5111,6 +5151,7 @@ broken-packages: - stack2cabal # failure in job https://hydra.nixos.org/build/233663091 at 2023-09-02 - stack2nix # failure in job https://hydra.nixos.org/build/233662912 at 2023-09-02 - stackage-cli # failure in job https://hydra.nixos.org/build/233213721 at 2023-09-02 + - stackage-curator # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237229157 at 2023-10-21 - stackage-metadata # failure in job https://hydra.nixos.org/build/233197359 at 2023-09-02 - stackage-to-hackage # failure in job https://hydra.nixos.org/build/233233948 at 2023-09-02 - stackage-types # failure in job https://hydra.nixos.org/build/233239995 at 2023-09-02 @@ -5320,6 +5361,7 @@ broken-packages: - tagsoup-selection # failure in job https://hydra.nixos.org/build/233228969 at 2023-09-02 - tagtree # failure in job https://hydra.nixos.org/build/233209409 at 2023-09-02 - tahoe-capabilities # failure in job https://hydra.nixos.org/build/233253813 at 2023-09-02 + - tahoe-chk # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237298038 at 2023-10-21 - tai64 # failure in job https://hydra.nixos.org/build/233257422 at 2023-09-02 - tai # failure in job https://hydra.nixos.org/build/233210483 at 2023-09-02 - tailwind # failure in job https://hydra.nixos.org/build/233238757 at 2023-09-02 @@ -5368,6 +5410,7 @@ broken-packages: - templatepg # failure in job https://hydra.nixos.org/build/233250442 at 2023-09-02 - template-toolkit # failure in job https://hydra.nixos.org/build/233195990 at 2023-09-02 - template-yj # failure in job https://hydra.nixos.org/build/233236245 at 2023-09-02 + - templatise # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237235933 at 2023-10-21 - tempodb # failure in job https://hydra.nixos.org/build/233205994 at 2023-09-02 - tempus # failure in job https://hydra.nixos.org/build/233245670 at 2023-09-02 - ten # failure in job https://hydra.nixos.org/build/233216705 at 2023-09-02 @@ -5526,6 +5569,7 @@ broken-packages: - tonalude # failure in job https://hydra.nixos.org/build/233204874 at 2023-09-02 - tonaparser # failure in job https://hydra.nixos.org/build/233224261 at 2023-09-02 - toodles # failure in job https://hydra.nixos.org/build/233245612 at 2023-09-02 + - toolbox # failure in job https://hydra.nixos.org/build/237240871 at 2023-10-21 - Top # failure in job https://hydra.nixos.org/build/233234827 at 2023-09-02 - topkata # failure in job https://hydra.nixos.org/build/233231937 at 2023-09-02 - torch # failure in job https://hydra.nixos.org/build/233222854 at 2023-09-02 @@ -5700,6 +5744,7 @@ broken-packages: - unix-handle # failure in job https://hydra.nixos.org/build/233233273 at 2023-09-02 - unix-process-conduit # failure in job https://hydra.nixos.org/build/233191509 at 2023-09-02 - unix-recursive # failure in job https://hydra.nixos.org/build/233194742 at 2023-09-02 + - unleash-client-haskell-core # failure in job https://hydra.nixos.org/build/237229757 at 2023-10-21 - unlifted-list # failure in job https://hydra.nixos.org/build/233205239 at 2023-09-02 - unlift # failure in job https://hydra.nixos.org/build/233217875 at 2023-09-02 - unliftio-messagebox # failure in job https://hydra.nixos.org/build/233200633 at 2023-09-02 @@ -5977,6 +6022,7 @@ broken-packages: - writer-cps-morph # failure in job https://hydra.nixos.org/build/233241891 at 2023-09-02 - wsdl # failure in job https://hydra.nixos.org/build/233208187 at 2023-09-02 - wsedit # failure in job https://hydra.nixos.org/build/233232333 at 2023-09-02 + - ws # failure building executable 'ws' in job https://hydra.nixos.org/build/237237311 at 2023-10-21 - wtk # failure in job https://hydra.nixos.org/build/233220668 at 2023-09-02 - wumpus-core # failure in job https://hydra.nixos.org/build/233244405 at 2023-09-02 - wxdirect # failure in job https://hydra.nixos.org/build/233255519 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 8f6af23747f39..83a0821c054d2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -47,9 +47,8 @@ default-package-overrides: - implicit-hie < 0.1.3 - hie-bios < 0.13 - # 2023-07-06: newer versions of stylish-haskell require - # ghc-lib-parser-ex >= 9.6, but LTS-21 contains ghc-lib-parser-ex-9.4 - - stylish-haskell < 0.14.5.0 + # pandoc-crossref 0.3.17 needs pandoc >= 3.1.8 + - pandoc-crossref < 0.3.17.0 # 2023-09-17: reflex-dom 0.6.3.0 is broken https://github.com/reflex-frp/reflex-dom/issues/462 - reflex-dom < 0.6.2.0 @@ -58,6 +57,9 @@ default-package-overrides: # https://github.com/obsidiansystems/dependent-sum-template/issues/5 - dependent-sum-template < 0.1.2 + # hls-floskell-plugin 2.4 does not yet support floskell 0.11 + - floskell < 0.11 + extra-packages: - Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8 - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 @@ -121,17 +123,13 @@ extra-packages: - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 - - ormolu == 0.5.0.1 # 2022-02-21: for hls on ghc 8.10 + - fourmolu == 0.11.* # 2023-10-22: for hls on ghc 9.0 - ormolu == 0.5.2.0 # 2023-08-08: for hls on ghc 9.0 and 9.2 - - fourmolu == 0.9.0.0 # 2022-09-21: for hls on ghc 8.10 - - fourmolu == 0.10.1.0 # 2023-04-18: for hls on ghc 9.0 and 9.2 - - fourmolu == 0.13.* # 2023-09-16: latest version compatible with hls 2.2.* on ghc 9.6 - - mod == 0.1.2.2 # needed for hls on ghc 8.10 - pantry == 0.5.2.1 # needed for stack-2.7.3 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - resolv < 0.2 # required to build cabal-install-3.10.1.0 with Stackage LTS 21 - sbv == 7.13 # required for pkgs.petrinizer - - stylish-haskell == 0.14.3.0 # 2022-09-19: needed for hls on ghc 8.8 + - stylish-haskell == 0.14.4.0 # 2022-09-19: needed for hls on ghc 9.2 - tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format - text == 2.0.2 # 2023-09-14: Needed for elm (which is currently on ghc-8.10) - th-abstraction < 0.6 # 2023-09-11: needed for aeson-2.2.0.0 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 9f46ba60bdfec..e3444f9fbfca6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 21.11 +# Stackage LTS 21.14 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -115,9 +115,9 @@ default-package-overrides: - attoparsec-run ==0.0.2.0 - attoparsec-time ==1.0.3 - audacity ==0.0.2.1 - - authenticate ==1.3.5.1 + - authenticate ==1.3.5.2 - authenticate-oauth ==1.7 - - autodocodec ==0.2.0.4 + - autodocodec ==0.2.0.5 - autodocodec-openapi3 ==0.2.1.1 - autodocodec-schema ==0.1.0.3 - autodocodec-yaml ==0.2.0.3 @@ -209,7 +209,7 @@ default-package-overrides: - blaze-builder ==0.4.2.3 - blaze-colonnade ==1.2.2.1 - blaze-html ==0.9.1.2 - - blaze-markup ==0.8.2.8 + - blaze-markup ==0.8.3.0 - blaze-svg ==0.3.7 - blaze-textual ==0.2.3.1 - bloodhound ==0.21.0.0 @@ -245,7 +245,7 @@ default-package-overrides: - buffer-pipe ==0.0 - bugsnag ==1.0.0.1 - bugsnag-haskell ==0.0.4.4 - - bugsnag-hs ==0.2.0.11 + - bugsnag-hs ==0.2.0.12 - bugsnag-wai ==1.0.0.1 - bugsnag-yesod ==1.0.0.1 - bugzilla-redhat ==1.0.1 @@ -259,7 +259,7 @@ default-package-overrides: - byte-order ==0.1.3.0 - byteorder ==1.0.4 - bytes ==0.17.3 - - byteset ==0.1.1.0 + - byteset ==0.1.1.1 - byteslice ==0.2.11.1 - bytesmith ==0.3.10.0 - bytestring-builder ==0.10.8.2.0 @@ -279,7 +279,7 @@ default-package-overrides: - cabal-doctest ==1.0.9 - cabal-file ==0.1.1 - cabal-install-solver ==3.8.1.0 - - cabal-rpm ==2.1.2 + - cabal-rpm ==2.1.3 - cache ==0.1.3.0 - cached-json-file ==0.1.1 - cacophony ==0.10.1 @@ -370,9 +370,9 @@ default-package-overrides: - comfort-blas ==0.0.0.1 - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - - comfort-graph ==0.0.3.2 + - comfort-graph ==0.0.4 - commonmark ==0.2.3 - - commonmark-extensions ==0.2.3.5 + - commonmark-extensions ==0.2.3.6 - commonmark-pandoc ==0.2.1.3 - commutative ==0.0.2 - commutative-semigroups ==0.1.0.1 @@ -416,10 +416,10 @@ default-package-overrides: - constraints ==0.13.4 - constraints-extras ==0.4.0.0 - constraint-tuples ==0.1.2 - - context ==0.2.0.1 - - context-http-client ==0.2.0.1 - - context-resource ==0.2.0.1 - - context-wai-middleware ==0.2.0.1 + - context ==0.2.0.2 + - context-http-client ==0.2.0.2 + - context-resource ==0.2.0.2 + - context-wai-middleware ==0.2.0.2 - contiguous ==0.6.3.0 - contravariant ==1.5.5 - contravariant-extras ==0.3.5.3 @@ -539,7 +539,7 @@ default-package-overrides: - DBFunctor ==0.1.2.1 - dbus ==1.2.29 - dbus-hslogger ==0.1.0.1 - - debian ==4.0.4 + - debian ==4.0.5 - debian-build ==0.10.2.1 - debug-trace-var ==0.2.0 - dec ==0.0.5 @@ -567,6 +567,7 @@ default-package-overrides: - dhall-yaml ==1.2.12 - di ==1.3 - diagrams ==1.4.1 + - diagrams-cairo ==1.4.2.1 - diagrams-canvas ==1.4.1.2 - diagrams-contrib ==1.4.5.1 - diagrams-core ==1.5.1 @@ -656,7 +657,7 @@ default-package-overrides: - editor-open ==0.6.0.0 - effectful ==2.2.2.0 - effectful-core ==2.2.2.2 - - effectful-plugin ==1.1.0.1 + - effectful-plugin ==1.1.0.2 - effectful-th ==1.0.0.1 - either ==5.0.2 - either-both ==0.1.1.1 @@ -868,7 +869,6 @@ default-package-overrides: - genvalidity-hspec-persistent ==1.0.0.0 - genvalidity-mergeful ==0.3.0.0 - genvalidity-mergeless ==0.3.0.0 - - genvalidity-path ==1.0.0.1 - genvalidity-persistent ==1.0.0.1 - genvalidity-property ==1.0.0.0 - genvalidity-scientific ==1.0.0.0 @@ -954,7 +954,7 @@ default-package-overrides: - glpk-headers ==0.5.1 - GLURaw ==2.0.0.5 - GLUT ==2.7.0.16 - - gmail-simple ==0.1.0.4 + - gmail-simple ==0.1.0.5 - gnuplot ==0.5.7 - goldplate ==0.2.1.1 - google-isbn ==1.0.3 @@ -984,7 +984,7 @@ default-package-overrides: - hackage-security ==0.6.2.3 - haddock-library ==1.11.0 - haha ==0.3.1.1 - - hakyll ==4.16.1.0 + - hakyll ==4.16.2.0 - hal ==1.0.0.1 - half ==0.3.1 - hall-symbols ==0.1.0.6 @@ -1000,7 +1000,7 @@ default-package-overrides: - happy-meta ==0.2.1.0 - harp ==0.4.3.6 - HasBigDecimal ==0.2.0.0 - - hasbolt ==0.1.6.2 + - hasbolt ==0.1.6.3 - hashable ==1.4.3.0 - hashing ==0.1.1.0 - hashmap ==1.3.3 @@ -1034,7 +1034,7 @@ default-package-overrides: - hasql-transaction ==1.0.1.2 - has-transformers ==0.1.0.4 - hasty-hamiltonian ==1.3.4 - - HaTeX ==3.22.3.2 + - HaTeX ==3.22.4.0 - HaXml ==1.25.13 - haxr ==3000.11.5 - HCodecs ==0.5.2 @@ -1111,7 +1111,7 @@ default-package-overrides: - hpack-dhall ==0.5.7 - hpc-codecov ==0.3.0.0 - hpc-lcov ==1.1.1 - - HPDF ==1.6.1 + - HPDF ==1.6.2 - hpp ==0.6.5 - hpqtypes ==1.11.1.1 - hpqtypes-extras ==1.16.4.4 @@ -1120,7 +1120,7 @@ default-package-overrides: - hruby ==0.5.0.0 - hsass ==0.8.0 - hs-bibutils ==6.10.0.0 - - hsc2hs ==0.68.9 + - hsc2hs ==0.68.10 - hscolour ==1.24.4 - hsdns ==1.8 - hse-cpp ==0.2 @@ -1128,7 +1128,7 @@ default-package-overrides: - hset ==2.2.0 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 - - hsini ==0.5.2.1 + - hsini ==0.5.2.2 - hsinstall ==2.8 - HSlippyMap ==3.0.1 - hslogger ==1.3.1.0 @@ -1180,7 +1180,7 @@ default-package-overrides: - HSvm ==0.1.1.3.25 - hsx2hs ==0.14.1.11 - hsx-jmacro ==7.3.8.2 - - HsYAML ==0.2.1.1 + - HsYAML ==0.2.1.2 - HsYAML-aeson ==0.2.0.1 - hsyslog ==5.0.2 - htaglib ==1.2.0 @@ -1209,7 +1209,7 @@ default-package-overrides: - httpd-shed ==0.4.1.1 - http-io-streams ==0.1.6.2 - http-link-header ==1.2.1 - - http-media ==0.8.1.0 + - http-media ==0.8.1.1 - http-query ==0.1.3 - http-reverse-proxy ==0.6.0.1 - http-streams ==0.8.9.8 @@ -1219,7 +1219,7 @@ default-package-overrides: - HUnit-approx ==1.1.1.1 - hunit-dejafu ==2.0.0.6 - hvect ==0.4.0.1 - - hvega ==0.12.0.5 + - hvega ==0.12.0.7 - hw-balancedparens ==0.4.1.3 - hw-bits ==0.7.2.2 - hw-conduit ==0.2.1.1 @@ -1289,8 +1289,8 @@ default-package-overrides: - infinite-list ==0.1 - ini ==0.4.2 - inj ==1.0 - - inline-c ==0.9.1.8 - - inline-c-cpp ==0.5.0.1 + - inline-c ==0.9.1.10 + - inline-c-cpp ==0.5.0.2 - inline-r ==1.0.1 - input-parsers ==0.3.0.1 - insert-ordered-containers ==0.2.5.3 @@ -1343,7 +1343,7 @@ default-package-overrides: - jmacro ==0.6.18 - jose ==0.10 - jose-jwt ==0.9.6 - - journalctl-stream ==0.6.0.4 + - journalctl-stream ==0.6.0.5 - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1357,7 +1357,7 @@ default-package-overrides: - JuicyPixels ==3.3.8 - JuicyPixels-extra ==0.6.0 - JuicyPixels-scale-dct ==0.1.2 - - junit-xml ==0.1.0.2 + - junit-xml ==0.1.0.3 - justified-containers ==0.3.0.0 - jwt ==0.11.0 - kan-extensions ==5.2.5 @@ -1571,7 +1571,7 @@ default-package-overrides: - mintty ==0.1.4 - misfortune ==0.1.2.1 - missing-foreign ==0.1.1 - - MissingH ==1.6.0.0 + - MissingH ==1.6.0.1 - mixed-types-num ==0.5.12 - mmap ==0.5.9 - mmark ==0.0.7.6 @@ -1603,7 +1603,7 @@ default-package-overrides: - monad-memo ==0.5.4 - monadoid ==0.0.3 - monadology ==0.1 - - monad-par ==0.3.5 + - monad-par ==0.3.6 - monad-parallel ==0.8 - monad-par-extras ==0.3.3 - monad-peel ==0.2.1.2 @@ -1645,7 +1645,7 @@ default-package-overrides: - multi-containers ==0.2 - multimap ==1.2.1 - multipart ==0.2.1 - - MultipletCombiner ==0.0.6 + - MultipletCombiner ==0.0.7 - multiset ==0.3.4.3 - murmur3 ==1.0.5 - murmur-hash ==0.1.0.10 @@ -1841,7 +1841,7 @@ default-package-overrides: - pcg-random ==0.1.4.0 - pcre2 ==2.2.1 - pcre-heavy ==1.0.0.3 - - pcre-light ==0.4.1.0 + - pcre-light ==0.4.1.2 - pcre-utils ==0.1.9 - pdc ==0.1.1 - pdf-toolbox-content ==0.1.1 @@ -1861,7 +1861,7 @@ default-package-overrides: - persistent-mtl ==0.5.0.1 - persistent-mysql ==2.13.1.4 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.13.5.2 + - persistent-postgresql ==2.13.6.1 - persistent-qq ==2.12.0.5 - persistent-redis ==2.13.0.1 - persistent-refs ==0.4 @@ -1872,7 +1872,7 @@ default-package-overrides: - pg-harness-client ==0.6.0 - pgp-wordlist ==0.1.0.3 - pg-transact ==0.3.2.0 - - phantom-state ==0.2.1.3 + - phantom-state ==0.2.1.4 - phatsort ==0.6.0.0 - picosat ==0.1.6 - pid1 ==0.1.3.1 @@ -1908,9 +1908,9 @@ default-package-overrides: - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.13 - - polysemy ==1.9.1.1 + - polysemy ==1.9.1.2 - polysemy-fs ==0.1.0.0 - - polysemy-plugin ==0.4.5.0 + - polysemy-plugin ==0.4.5.1 - polysemy-webserver ==0.2.1.2 - pontarius-xmpp ==0.5.6.6 - pooled-io ==0.0.2.3 @@ -1919,7 +1919,7 @@ default-package-overrides: - posix-paths ==0.3.0.0 - posix-pty ==0.2.2 - possibly ==1.0.0.0 - - postgres-options ==0.2.0.0 + - postgres-options ==0.2.1.0 - postgresql-binary ==0.13.1 - postgresql-libpq ==0.9.5.0 - postgresql-libpq-notify ==0.2.0.0 @@ -2122,10 +2122,10 @@ default-package-overrides: - riak-protobuf ==0.25.0.0 - rio ==0.1.22.0 - rio-orphans ==0.1.2.0 - - rio-prettyprint ==0.1.5.0 + - rio-prettyprint ==0.1.7.0 - rng-utils ==0.3.1 - rocksdb-haskell ==1.0.1 - - rocksdb-haskell-jprupp ==2.1.4 + - rocksdb-haskell-jprupp ==2.1.6 - rocksdb-query ==0.4.2 - roles ==0.2.1.0 - rollbar ==1.1.3 @@ -2167,11 +2167,11 @@ default-package-overrides: - sample-frame-np ==0.0.5 - sampling ==0.3.5 - sandi ==0.5 - - sandwich ==0.1.5.0 + - sandwich ==0.1.5.2 - sandwich-hedgehog ==0.1.3.0 - sandwich-quickcheck ==0.1.0.7 - sandwich-slack ==0.1.2.0 - - sandwich-webdriver ==0.2.3.0 + - sandwich-webdriver ==0.2.3.1 - say ==0.1.0.1 - sbp ==4.15.0 - sbv ==10.2 @@ -2232,7 +2232,7 @@ default-package-overrides: - servant-machines ==0.15.1 - servant-multipart ==0.12.1 - servant-multipart-api ==0.12.1 - - servant-multipart-client ==0.12.1 + - servant-multipart-client ==0.12.2 - servant-openapi3 ==2.0.1.6 - servant-pipes ==0.15.3 - servant-rate-limit ==0.2.0.0 @@ -2260,7 +2260,7 @@ default-package-overrides: - SHA ==1.6.4.4 - shake ==0.19.7 - shake-plus ==0.3.4.0 - - shakespeare ==2.1.0 + - shakespeare ==2.1.0.1 - shakespeare-text ==1.1.0 - shared-memory ==0.2.0.1 - shell-conduit ==5.0.0 @@ -2326,7 +2326,7 @@ default-package-overrides: - some-dict-of ==0.1.0.2 - sop-core ==0.5.0.2 - sort ==1.0.0.0 - - sorted-list ==0.2.1.0 + - sorted-list ==0.2.1.2 - sound-collage ==0.2.1 - sourcemap ==0.1.7 - sox ==0.2.3.2 @@ -2358,7 +2358,7 @@ default-package-overrides: - srt ==0.1.2.0 - srtree ==1.0.0.5 - stache ==2.3.4 - - stack-all ==0.4.1 + - stack-all ==0.4.2 - stack-clean-old ==0.4.8 - stack-templatizer ==0.1.1.0 - state-codes ==0.1.3 @@ -2368,7 +2368,7 @@ default-package-overrides: - stateWriter ==0.4.0 - static-canvas ==0.2.0.3 - static-text ==0.2.0.7 - - statistics ==0.16.2.0 + - statistics ==0.16.2.1 - statistics-linreg ==0.3 - status-notifier-item ==0.3.1.0 - step-function ==0.2.0.1 @@ -2438,7 +2438,7 @@ default-package-overrides: - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - swagger2 ==2.8.7 - - swish ==0.10.5.0 + - swish ==0.10.6.0 - syb ==0.7.2.4 - sydtest ==0.15.1.0 - sydtest-aeson ==0.1.0.0 @@ -2489,10 +2489,10 @@ default-package-overrides: - tar-conduit ==0.3.2.1 - tardis ==0.4.4.0 - tasty ==1.4.3 - - tasty-ant-xml ==1.1.8 + - tasty-ant-xml ==1.1.9 - tasty-autocollect ==0.4.1 - - tasty-bench ==0.3.4 - - tasty-dejafu ==2.1.0.0 + - tasty-bench ==0.3.5 + - tasty-dejafu ==2.1.0.1 - tasty-discover ==5.0.0 - tasty-expected-failure ==0.12.3 - tasty-fail-fast ==0.0.3 @@ -2502,7 +2502,7 @@ default-package-overrides: - tasty-hslua ==1.1.0 - tasty-hspec ==1.2.0.3 - tasty-html ==0.4.2.1 - - tasty-hunit ==0.10.0.3 + - tasty-hunit ==0.10.1 - tasty-hunit-compat ==0.2.0.1 - tasty-inspection-testing ==0.2 - tasty-kat ==0.0.3 @@ -2510,8 +2510,8 @@ default-package-overrides: - tasty-lua ==1.1.0 - tasty-program ==1.1.0 - tasty-quickcheck ==0.10.2 - - tasty-rerun ==1.1.18 - - tasty-silver ==3.3.1.1 + - tasty-rerun ==1.1.19 + - tasty-silver ==3.3.1.2 - tasty-smallcheck ==0.8.2 - tasty-tap ==0.1.0 - tasty-th ==0.1.7 @@ -2544,7 +2544,7 @@ default-package-overrides: - test-fun ==0.1.0.0 - testing-feat ==1.1.1.1 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.8.2 + - texmath ==0.12.8.3 - text-ansi ==0.2.1.1 - text-binary ==0.2.1.1 - text-builder ==0.6.7 @@ -2552,7 +2552,7 @@ default-package-overrides: - text-builder-linear ==0.1.1.1 - text-conversions ==0.3.1.1 - text-format ==0.3.2.1 - - text-icu ==0.8.0.2 + - text-icu ==0.8.0.3 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.14 - textlocal ==0.1.0.5 @@ -2588,7 +2588,7 @@ default-package-overrides: - th-printf ==0.7 - thread-hierarchy ==0.3.0.2 - thread-local-storage ==0.2 - - threads ==0.5.1.7 + - threads ==0.5.1.8 - threads-extras ==0.1.0.3 - thread-supervisor ==0.2.0.0 - th-reify-compat ==0.0.1.5 @@ -2688,7 +2688,7 @@ default-package-overrides: - typst-symbols ==0.1.4 - tz ==0.1.3.6 - tzdata ==0.2.20230322.0 - - tztime ==0.1.0.0 + - tztime ==0.1.1.0 - ua-parser ==0.7.7.0 - uglymemo ==0.1.0.1 - ulid ==0.3.2.0 @@ -2728,7 +2728,7 @@ default-package-overrides: - universum ==1.8.2 - unix-bytestring ==0.4.0 - unix-compat ==0.7 - - unix-time ==0.4.10 + - unix-time ==0.4.11 - unjson ==0.15.4 - unliftio ==0.2.25.0 - unliftio-core ==0.2.1.0 @@ -2758,7 +2758,6 @@ default-package-overrides: - validity-bytestring ==0.4.1.1 - validity-case-insensitive ==0.0.0.0 - validity-containers ==0.5.0.4 - - validity-path ==0.4.0.1 - validity-persistent ==0.0.0.0 - validity-primitive ==0.0.0.1 - validity-scientific ==0.2.0.3 @@ -2809,7 +2808,7 @@ default-package-overrides: - wai-enforce-https ==1.0.0.0 - wai-eventsource ==3.0.0 - wai-extra ==3.1.13.0 - - wai-feature-flags ==0.1.0.6 + - wai-feature-flags ==0.1.0.7 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.4.0 - wai-middleware-bearer ==1.0.3 @@ -2922,13 +2921,13 @@ default-package-overrides: - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 - - yesod-auth ==1.6.11.1 + - yesod-auth ==1.6.11.2 - yesod-auth-basic ==0.1.0.3 - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.7.1.1 - yesod-auth-oidc ==0.1.4 - yesod-bin ==1.6.2.2 - - yesod-core ==1.6.24.4 + - yesod-core ==1.6.24.5 - yesod-eventsource ==1.6.0.1 - yesod-fb ==0.6.1 - yesod-form ==1.7.6 @@ -2945,7 +2944,7 @@ default-package-overrides: - yesod-routes-flow ==3.0.0.2 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - - yesod-test ==1.6.15 + - yesod-test ==1.6.16 - yesod-websockets ==0.3.0.3 - yes-precure5-command ==5.5.3 - yi-rope ==0.11 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 2d33f3f2c1e36..136aed746efb8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -33,6 +33,7 @@ dont-distribute-packages: - BPS - Barracuda - BerlekampAlgorithm + - BesselJ - BioHMM - Biobase - BiobaseBlast @@ -113,6 +114,7 @@ dont-distribute-packages: - Fin - Finance-Treasury - FiniteCategories + - FiniteCategoriesGraphViz - FiniteMap - FirstOrderTheory - Flippi @@ -250,6 +252,7 @@ dont-distribute-packages: - KiCS-debugger - KiCS-prophecy - LDAPv3 + - LPFP - LPPaver - LambdaHack - LambdaINet @@ -403,6 +406,7 @@ dont-distribute-packages: - UTFTConverter - UrlDisp - ViennaRNA-extras + - Vis - WEditorBrick - WEditorHyphen - WL500gPControl @@ -485,8 +489,6 @@ dont-distribute-packages: - amby - ampersand - amqp-streamly - - amqp-utils_0_6_4_0 - - amqp_0_22_2 - analyze-client - anatomy - animate-example @@ -599,6 +601,7 @@ dont-distribute-packages: - babylon - backblaze-b2-hs - backdropper + - balkon - ballast - bamboo - bamboo-launcher @@ -747,7 +750,6 @@ dont-distribute-packages: - cakyrespa - cal3d-examples - cal3d-opengl - - calamity - calc - calculator - caldims @@ -847,6 +849,8 @@ dont-distribute-packages: - clash-vhdl - clashilator - classify-frog + - classy-effects + - classy-effects-th - classy-miso - clckwrks - clckwrks-cli @@ -986,6 +990,7 @@ dont-distribute-packages: - craftwerk-cairo - craftwerk-gtk - craze + - credentials-cli - crf-chain1 - crf-chain1-constrained - crf-chain2-generic @@ -1145,10 +1150,12 @@ dont-distribute-packages: - distributed-process-systest - distributed-process-task - distributed-process-tests + - distributed-process-zookeeper - distributed-static - distribution-plot - dixi - dl-fedora + - dl-fedora_1_0 - dmenu-pkill - dmenu-pmount - dmenu-search @@ -1933,7 +1940,6 @@ dont-distribute-packages: - haskoin-crypto - haskoin-protocol - haskoin-script - - haskoin-store - haskoon - haskoon-httpspec - haskoon-salvia @@ -2004,6 +2010,8 @@ dont-distribute-packages: - hedgehog-checkers-lens - hedgehog-gen-json - hedis-pile + - heftia + - heftia-effects - heist-aeson - heist-async - heist-extra @@ -2027,6 +2035,7 @@ dont-distribute-packages: - hesql - heterolist - hetzner + - hetzner_0_4_0_1 - hevolisa - hevolisa-dph - hexpat-conduit @@ -2183,9 +2192,7 @@ dont-distribute-packages: - htoml-parse - htsn-import - http-client-auth - - http-client-restricted_0_1_0 - http-client-rustls - - http-client-tls_0_3_6_3 - http-enumerator - http-exchange - http-exchange-instantiations @@ -2488,6 +2495,7 @@ dont-distribute-packages: - ldapply - leaky - lean + - learn-physics_0_6_6 - learning-hmm - legion - legion-discovery @@ -2812,7 +2820,6 @@ dont-distribute-packages: - nero-wai - nero-warp - nested-routes - - net-mqtt_0_8_6_0 - net-spider - net-spider-cli - net-spider-pangraph @@ -2826,7 +2833,6 @@ dont-distribute-packages: - nettle-openflow - network-anonymous-i2p - network-anonymous-tor - - network-conduit-tls_1_4_0 - network-connection - network-enumerator - network-hans @@ -3017,6 +3023,7 @@ dont-distribute-packages: - phonetic-languages-simplified-common - phonetic-languages-simplified-examples-array - phonetic-languages-simplified-examples-common + - phonetic-languages-simplified-generalized-examples-common - phonetic-languages-simplified-lists-examples - phonetic-languages-simplified-properties-lists - phonetic-languages-simplified-properties-lists-double @@ -3109,6 +3116,7 @@ dont-distribute-packages: - potoki-conduit - potoki-hasql - potoki-zlib + - powerqueue-sqs - pqueue-mtl - practice-room - pred-set @@ -3339,7 +3347,6 @@ dont-distribute-packages: - repo-based-blog - repr - representable-tries - - req_3_13_1 - reserve - resin - resource-simple @@ -3739,6 +3746,7 @@ dont-distribute-packages: - stackage-sandbox - stackage-setup - stackage-upload + - stackage2nix - stackctl - starrover2 - stateful-mtl @@ -3772,6 +3780,7 @@ dont-distribute-packages: - stripe-tests - strongswan-sql - structural-induction + - structured-haskell-mode - structured-mongoDB - stunts - stutter @@ -3827,7 +3836,6 @@ dont-distribute-packages: - tagged-th - tagsoup-navigate - tagstew - - tahoe-chk - tahoe-directory - tahoe-great-black-swamp - tahoe-ssk @@ -4178,7 +4186,6 @@ dont-distribute-packages: - workflow-extra - workflow-pure - workflow-types - - wraxml - wrecker - wrecker-ui - wright @@ -4190,7 +4197,6 @@ dont-distribute-packages: - wumpus-drawing - wumpus-microprint - wumpus-tree - - wuss_2_0_1_4 - wx - wxAsteroids - wxFruit @@ -4310,4 +4316,5 @@ dont-distribute-packages: - zoom-cache - zoom-cache-pcm - zoom-cache-sndfile + - zoovisitor - zuramaru diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c0e514aed8c3d..89a268a09a6ed 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -93,13 +93,6 @@ self: super: builtins.intersectAttrs super { doCheck = false; }) super.ghcide; - # Test suite needs executable - agda2lagda = overrideCabal (drv: { - preCheck = '' - export PATH="$PWD/dist/build/agda2lagda:$PATH" - '' + drv.preCheck or ""; - }) super.agda2lagda; - hiedb = overrideCabal (drv: { preCheck = '' export PATH=$PWD/dist/build/hiedb:$PATH @@ -185,6 +178,14 @@ self: super: builtins.intersectAttrs super { ### END HASKELL-LANGUAGE-SERVER SECTION ### ########################################### + # Test suite needs executable + agda2lagda = overrideCabal (drv: { + preCheck = '' + export PATH="$PWD/dist/build/agda2lagda:$PATH" + '' + drv.preCheck or ""; + }) super.agda2lagda; + + audacity = enableCabalFlag "buildExamples" (overrideCabal (drv: { executableHaskellDepends = [self.optparse-applicative self.soxlib]; }) super.audacity); diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1f461ba370952..f46ce422cc7f4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1167,6 +1167,23 @@ self: { broken = true; }) {}; + "AsyncRattus" = callPackage + ({ mkDerivation, base, Cabal, containers, ghc, hashtables + , simple-affine-space, transformers + }: + mkDerivation { + pname = "AsyncRattus"; + version = "0.1"; + sha256 = "0ppij9i4nv26dkc9gb5b669bvb3wipx1a5kam23cx5gia60k45s1"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + base containers ghc hashtables simple-affine-space transformers + ]; + testHaskellDepends = [ base containers ]; + description = "An asynchronous modal FRP language"; + license = lib.licenses.bsd3; + }) {}; + "AttoBencode" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-textual , bytestring, containers, QuickCheck, test-framework @@ -1519,6 +1536,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "BesselJ" = callPackage + ({ mkDerivation, base, gamma, numerical-integration + , system-cxx-std-lib, tasty, tasty-hunit + }: + mkDerivation { + pname = "BesselJ"; + version = "0.2.0.1"; + sha256 = "1s5pmaycxrxkidndg23y3b6rpk0vfqc5l603kh273fgvmif5h77l"; + libraryHaskellDepends = [ + base gamma numerical-integration system-cxx-std-lib + ]; + testHaskellDepends = [ base gamma tasty tasty-hunit ]; + description = "Bessel J-function, Anger J-function, Weber E-function, and Anger-Weber function"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "BiGUL" = callPackage ({ mkDerivation, base, containers, mtl, template-haskell, th-extras }: @@ -5242,6 +5276,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "EVP" = callPackage + ({ mkDerivation, base, containers, data-default-class, text, yaml + }: + mkDerivation { + pname = "EVP"; + version = "0"; + sha256 = "1hix7vl8yaagmdzr6flxfxqmnvv04mcja9rp539iiixmams5q5jd"; + libraryHaskellDepends = [ + base containers data-default-class text yaml + ]; + testHaskellDepends = [ base text ]; + description = "Environment Variable Parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "Earley" = callPackage ({ mkDerivation, base, criterion, deepseq, ListLike, parsec , QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -6235,26 +6286,45 @@ self: { }) {}; "FiniteCategories" = callPackage - ({ mkDerivation, base, containers, directory, fgl, filepath - , graphviz, process, random, text, WeakSets + ({ mkDerivation, base, containers, directory, filepath, random + , text, WeakSets }: mkDerivation { pname = "FiniteCategories"; - version = "0.2.0.0"; - sha256 = "1sv1p5q3nja0hh60k6d86l50hl8na7y9mmp45zgx7ai9kpwa30ap"; + version = "0.3.0.1"; + sha256 = "0jsggzvdxx7v02inl68fc3x86xrbsn2407hnfqy5c9rkiiqx7w94"; libraryHaskellDepends = [ - base containers directory fgl filepath graphviz process random text - WeakSets + base containers directory filepath random text WeakSets ]; testHaskellDepends = [ - base containers directory fgl filepath graphviz process random text - WeakSets + base containers directory filepath random text WeakSets ]; description = "Finite categories and usual categorical constructions on them"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; }) {}; + "FiniteCategoriesGraphViz" = callPackage + ({ mkDerivation, base, containers, directory, fgl, filepath + , FiniteCategories, graphviz, process, random, text, WeakSets + }: + mkDerivation { + pname = "FiniteCategoriesGraphViz"; + version = "0.1.0.0"; + sha256 = "07ssar4sv8wma7imgc9mnx77c4kd9n9bqr87f1d5aqxvv2a62np0"; + libraryHaskellDepends = [ + base containers directory fgl filepath FiniteCategories graphviz + process random text WeakSets + ]; + testHaskellDepends = [ + base containers directory fgl filepath FiniteCategories graphviz + process random text WeakSets + ]; + description = "Transform objects of the package FiniteCategories into graphs using GraphViz"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "FiniteMap" = callPackage ({ mkDerivation, base, haskell98 }: mkDerivation { @@ -8978,8 +9048,8 @@ self: { }: mkDerivation { pname = "HList"; - version = "0.5.2.0"; - sha256 = "00gfghf3dxa4f3r5kvwd8n2yfgc4paa7vbk1h8mlxykb7kxwx2n1"; + version = "0.5.3.0"; + sha256 = "0azwcaky2jlf4ldbj3aasv8i457g67ih9aap6qgjcmdz6q8ad2f4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base base-orphans ghc-prim mtl profunctors semigroups tagged @@ -9181,8 +9251,8 @@ self: { }: mkDerivation { pname = "HPDF"; - version = "1.6.1"; - sha256 = "078rx1p3352ha64yg2y7w085inkk2p2m8j7ajafw6xrfcfybzw1l"; + version = "1.6.2"; + sha256 = "0a28fg6h0aw8l3fb278jf1xh3jjkjcl3i9cj1j86a991j0mabl3v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9560,8 +9630,8 @@ self: { ({ mkDerivation, base, containers, hashable, hashtables }: mkDerivation { pname = "HSet"; - version = "0.0.1"; - sha256 = "0snix2qdj1d66v6qj6fl0zizl617kjzbmxiswdd5i0b5lzjkpagb"; + version = "0.0.2"; + sha256 = "0iz040fl4pmn1h6mqkma1c66yfmfyx4yzhyn0985jc692lj1ysqh"; libraryHaskellDepends = [ base containers hashable hashtables ]; description = "Faux heterogeneous sets"; license = lib.licenses.bsd3; @@ -10009,8 +10079,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.22.3.2"; - sha256 = "1hxj661nkaylh46xrwddj8zm1gb64714yz7jk1afmy5n4yzsqdzj"; + version = "3.22.4.0"; + sha256 = "1amna2ya9ika0x9nzxnn7a6450lz5nivm9kn8c9qz9g5d41fayx6"; libraryHaskellDepends = [ base bibtex bytestring containers hashable matrix parsec prettyprinter QuickCheck text transformers @@ -11167,6 +11237,8 @@ self: { pname = "HsOpenSSL"; version = "0.11.7.6"; sha256 = "18n7yhffqhgl2favmwlky9j0xx61bhs1akhf7ccc3ajapf8y4bb6"; + revision = "1"; + editedCabalFile = "0nqvb9g1wxz7ydpx9qc9lq9piwsy5zfk454v7mxlwng4i1jsgpk1"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -11284,10 +11356,8 @@ self: { }: mkDerivation { pname = "HsYAML"; - version = "0.2.1.1"; - sha256 = "0a7nbvpl4p8kwbbjfn1dj6s3fif5k8zhbckdvyz1k74pj3yb8ns6"; - revision = "5"; - editedCabalFile = "018lvykffss0mmip9qr9bhqrmxvsznxwfyqi8jqi85r5vjy97n6h"; + version = "0.2.1.2"; + sha256 = "1k8azk85jqwqcfbw9bcpj3vqy3y0xd525c9pwm2hjppna8jkxm86"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11309,8 +11379,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.1"; sha256 = "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r"; - revision = "8"; - editedCabalFile = "0wprpy6312ly8dh5w2fdr5ni0p3ywfn8m6axmzh8i79zjaffnxcl"; + revision = "9"; + editedCabalFile = "1rfaj175vh635s8csm6pazrvwwaw8gg3axi2cchpafw5pb9n5xg8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12607,8 +12677,8 @@ self: { }: mkDerivation { pname = "LDAPv3"; - version = "0.1.1.0"; - sha256 = "164d3n9gi236qghbb0pyqi7f9c3w5xmj1p5h315zcrcc1hydac0m"; + version = "0.1.2.0"; + sha256 = "09x8s9yh821lcc60sxifcy2pbzghnp9aw0vk6mcnrj0lb741f6f4"; libraryHaskellDepends = [ base binary bytestring containers deepseq int-cast newtype parsec text text-short @@ -12625,24 +12695,36 @@ self: { "LPFP" = callPackage ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib - , gloss, gnuplot, linear, not-gloss, spatial-math + , gloss, gnuplot, linear, SpatialMath, Vis }: mkDerivation { pname = "LPFP"; - version = "1.1"; - sha256 = "0r5h06aqd6b74shfzl45rzmfd8plpmbp00k244mrxh2qjhscra71"; + version = "1.1.1"; + sha256 = "1j4jhkrwpvzj5dr3j63l78g0y555vcgdcp6kqk2s8nm4ja7apysi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers diagrams-cairo diagrams-lib gloss gnuplot not-gloss - spatial-math + base containers diagrams-cairo diagrams-lib gloss gnuplot linear + SpatialMath Vis ]; executableHaskellDepends = [ - base diagrams-cairo diagrams-lib gloss gnuplot linear not-gloss - spatial-math + base diagrams-cairo diagrams-lib gloss gnuplot linear SpatialMath + Vis ]; description = "Code for the book Learn Physics with Functional Programming"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "LPFP-core" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "LPFP-core"; + version = "1.1.1"; + sha256 = "030n95g1hq2ikawbwifgqzjfdg2y6hyl8vpvybg7ha36hb6vafn1"; + libraryHaskellDepends = [ base containers ]; + description = "Code for the book Learn Physics with Functional Programming"; + license = lib.licenses.bsd3; }) {}; "LPPaver" = callPackage @@ -13205,8 +13287,8 @@ self: { pname = "ListLike"; version = "4.7.8.1"; sha256 = "10i1ynfhafnmiw0ka9w0v05y5dcdcifsh0kx5f8py1k5ax1ha4by"; - revision = "1"; - editedCabalFile = "1kalhs60wszshvni5awwnmr7bzbz0j602z76lik44arcxghf3ck8"; + revision = "2"; + editedCabalFile = "0bdj0m0wjxzkrhdjdmaazgh7hwgvdjmnjsawyn83pjl6l36ygmxh"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -14009,30 +14091,10 @@ self: { }: mkDerivation { pname = "MissingH"; - version = "1.6.0.0"; - sha256 = "0krd15c5c1k92zm1w2qmqwib2gg93bxqz76xmyhcjkx1l229cfzw"; - libraryHaskellDepends = [ - array base containers directory filepath hslogger mtl network - network-bsd old-locale old-time parsec process regex-compat time - unix - ]; - testHaskellDepends = [ - base containers directory filepath HUnit old-time parsec - regex-compat time unix - ]; - description = "Large utility library"; - license = lib.licenses.bsd3; - }) {}; - - "MissingH_1_6_0_1" = callPackage - ({ mkDerivation, array, base, containers, directory, filepath - , hslogger, HUnit, mtl, network, network-bsd, old-locale, old-time - , parsec, process, regex-compat, time, unix - }: - mkDerivation { - pname = "MissingH"; version = "1.6.0.1"; sha256 = "0f5d7ws2vqm1vpwjab9cp691jn5j3dxycfn4w5p1rb4aim504aa9"; + revision = "1"; + editedCabalFile = "08zq00a2anzs6i7ml8dsbah45skgb95nljqn86ixa2gqya6ki253"; libraryHaskellDepends = [ array base containers directory filepath hslogger mtl network network-bsd old-locale old-time parsec process regex-compat time @@ -14044,7 +14106,6 @@ self: { ]; description = "Large utility library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "MissingK" = callPackage @@ -14521,25 +14582,12 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "MultipletCombiner"; - version = "0.0.6"; - sha256 = "18kfn355zib3mhssm4zqnr3ily4snxsjnkxhca453vhhs6n8fca2"; - libraryHaskellDepends = [ base HUnit ]; - testHaskellDepends = [ base HUnit ]; - description = "A Haskell implementation for combining SU(n) multiplets"; - license = lib.licenses.bsd3; - }) {}; - - "MultipletCombiner_0_0_7" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "MultipletCombiner"; version = "0.0.7"; sha256 = "19x0dw5jisxzbb739z8l5mh8kbd3nixqn0x3q10qzlgvczh91hj2"; libraryHaskellDepends = [ base HUnit ]; testHaskellDepends = [ base HUnit ]; description = "A Haskell implementation for combining SU(n) multiplets"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Munkres" = callPackage @@ -14869,8 +14917,8 @@ self: { }: mkDerivation { pname = "NanoID"; - version = "3.3.0"; - sha256 = "1334i8hqacsd2nr9798dibdfn7dci2r4afhhghch5nwcxm15qk6i"; + version = "3.4.0"; + sha256 = "0j2z1rb6jny4kpn43d7pp1kdj1djpmai95k6glhydb9ls7k9zpc0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15666,6 +15714,8 @@ self: { pname = "OneTuple"; version = "0.4.1.1"; sha256 = "0axv63061gzjg6b31h9zg6v54fms6ggd1m8v6kcclmqyxva69ry9"; + revision = "1"; + editedCabalFile = "10p6wvv3z8xp2zgai9ay2dnzp8zzry5mglr61sgzp1i02znzsbb3"; libraryHaskellDepends = [ base ghc-prim template-haskell ]; testHaskellDepends = [ base foldable1-classes-compat hashable template-haskell @@ -19853,6 +19903,28 @@ self: { mainProgram = "SpacePrivateers"; }) {}; + "SpatialMath" = callPackage + ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, lens + , linear, QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "SpatialMath"; + version = "0.2.7.1"; + sha256 = "0ikl4yzrp3blhrw6i29xympvw6s6wfkbmq446gnkbnfv455xmdgw"; + revision = "1"; + editedCabalFile = "1jc32ff5005hjhi72jc8qb7r2lvzi5dq54yk102pq4015kr4n5q6"; + libraryHaskellDepends = [ + base binary cereal ghc-prim lens linear + ]; + testHaskellDepends = [ + base doctest QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "3d math including quaternions/euler angles/dcms and utility functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "SpinCounter" = callPackage ({ mkDerivation, base, monad-loops, ref-mtl, stm }: mkDerivation { @@ -21736,6 +21808,25 @@ self: { broken = true; }) {}; + "Vis" = callPackage + ({ mkDerivation, base, binary, bmp, bytestring, GLUT, OpenGL + , OpenGLRaw, SpatialMath, time, vector, vector-binary-instances + }: + mkDerivation { + pname = "Vis"; + version = "0.7.7.0"; + sha256 = "1qsk7qc1d5j4wbn65ah1p33k548q68sd7w0sv4i3c7qj61hpmh09"; + revision = "2"; + editedCabalFile = "0ipr0qq2szrck21akrip2ib82xxsys84y4hdm2mk1cvs3vy1f8mm"; + libraryHaskellDepends = [ + base binary bmp bytestring GLUT OpenGL OpenGLRaw SpatialMath time + vector vector-binary-instances + ]; + description = "Painless 3D graphics, no affiliation with gloss"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Vulkan" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -21947,8 +22038,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "WeakSets"; - version = "1.4.0.0"; - sha256 = "1wx5m6x8xswjzavwxkhmpha4b8mb61qjsw1n0726acxmjrxrkw3y"; + version = "1.4.0.1"; + sha256 = "0lv7vwj3vl8i18w2l0jkv6i3l9ihpy7lrxd84s666fspx6fxkdp9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Simple set types. Useful to create sets of arbitrary types and nested sets."; @@ -24981,6 +25072,8 @@ self: { pname = "ad"; version = "4.5.4"; sha256 = "034n4zabzbbxc8bbc6drc0pam0cn12ijad0z2i3gdcqqn93bcap1"; + revision = "1"; + editedCabalFile = "1ngiimld502c4lhp5fba5lbcv007kqhwipmrk1918rdj722hxkvg"; libraryHaskellDepends = [ adjunctions array base comonad containers data-reify erf free nats reflection semigroups transformers @@ -25028,6 +25121,17 @@ self: { broken = true; }) {}; + "adaptive-cubature" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "adaptive-cubature"; + version = "0.1.1.0"; + sha256 = "07zi06qqmrn14awz7vxn5rx1j62fc9xp2qx52s1j91kh9zy8pzxn"; + libraryHaskellDepends = [ base ]; + description = "Multidimensional integration"; + license = lib.licenses.gpl3Only; + }) {}; + "adaptive-tuple" = callPackage ({ mkDerivation, base, template-haskell, type-level }: mkDerivation { @@ -25218,8 +25322,8 @@ self: { pname = "adjunctions"; version = "4.4.2"; sha256 = "06354xzgf78jl4g1xw11rp74gi7zh94rgvsji7ma1g0hp26myyql"; - revision = "1"; - editedCabalFile = "0ii8818fr1h3wpyaqwa44gn1kv7lafbw9b4qdj7r86w5k5q00ypp"; + revision = "2"; + editedCabalFile = "07bqjrmlhz67y2jnflphqd521yji9gw40dpp5wy54gcdnzk6l81h"; libraryHaskellDepends = [ array base comonad containers contravariant distributive free mtl profunctors semigroupoids semigroups tagged transformers @@ -27640,8 +27744,8 @@ self: { pname = "algebra"; version = "4.3.1"; sha256 = "090jaipyx5pcav2wqcqzds51fwx49l4c9cpp9nnk16bgkf92z615"; - revision = "2"; - editedCabalFile = "1yrqg6p9p7vfzv8gjbcvln5gd221kslg6zvn5d1722wfa06g4g1j"; + revision = "3"; + editedCabalFile = "1cfjlq0xlv645864hrn7blg0li6lkpxlhsas01a5wigf2kdy1dsv"; libraryHaskellDepends = [ adjunctions array base containers distributive mtl nats semigroupoids semigroups tagged transformers void @@ -30067,7 +30171,9 @@ self: { ]; description = "A Haskell equivalent of \"aws rds generate-db-auth-token\""; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "generate-db-auth-token"; + broken = true; }) {}; "amazonka-controltower" = callPackage @@ -32666,6 +32772,28 @@ self: { license = lib.licenses.mpl20; }) {}; + "amazonka-mtl" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base, Blammo + , conduit, hspec, lens, markdown-unlit, mtl, resourcet, text, time + , unliftio-core + }: + mkDerivation { + pname = "amazonka-mtl"; + version = "0.1.1.0"; + sha256 = "0r7fmffqj3yl6vwidfny4s2ynhkfx9h0di6l7pm79j5m5fp5vdvr"; + libraryHaskellDepends = [ + amazonka amazonka-core base conduit lens mtl resourcet + unliftio-core + ]; + testHaskellDepends = [ + amazonka-core amazonka-s3 base Blammo conduit hspec lens + markdown-unlit mtl text time + ]; + testToolDepends = [ markdown-unlit ]; + description = "MTL-style type-class and deriving-via newtypes for Amazonka"; + license = lib.licenses.mit; + }) {}; + "amazonka-mwaa" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , case-insensitive, tasty, tasty-hunit, text, time @@ -35675,8 +35803,8 @@ self: { pname = "ansi-terminal-game"; version = "1.9.1.3"; sha256 = "0ln6cx98g7nv6yv600m7p721pscln1c10wkmmykwlfvsrrvnvk7w"; - revision = "1"; - editedCabalFile = "116hl7fm358hqx55w7r1svbwj7gv3m3brxmzqs5qaahqcixndsqx"; + revision = "2"; + editedCabalFile = "01kfj2qz0s5jygd49ixj2cgzcmikbqb3rhwxs4n8cx3acqzx6cpx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35888,6 +36016,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "antiope-contract" = callPackage @@ -35971,6 +36101,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "antiope-messages" = callPackage @@ -35995,6 +36127,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "antiope-optparse-applicative" = callPackage @@ -36016,6 +36150,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "antiope-s3" = callPackage @@ -36098,6 +36234,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "antiope-sqs" = callPackage @@ -36124,6 +36262,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "antiope-swf" = callPackage @@ -37910,8 +38050,8 @@ self: { pname = "arch-hs"; version = "0.11.1.0"; sha256 = "1f50id3xplp8zwi379n6xi4in01gms97qbqnfxnsqzrv47xszwj4"; - revision = "1"; - editedCabalFile = "1kpjz5x3f0g1jz0bkji0xnysgzbvg4livjgg4bbq3r1123d3rryy"; + revision = "2"; + editedCabalFile = "17y3c5rk3bylmnm63x06a50wa5r38wbm18gq3w5mbf6pfqfimkj5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38549,6 +38689,8 @@ self: { pname = "arithmoi"; version = "0.13.0.0"; sha256 = "0bcxfx8gm0vd07pg417yid11dqakgw5w1hndmg8667g92ar5njsc"; + revision = "1"; + editedCabalFile = "0vpldqnwzanpn8bavcarlzbajx57j43ddfm91jl3qbi32x4mbzja"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base chimera constraints containers deepseq exact-pi @@ -39815,6 +39957,8 @@ self: { pname = "assoc"; version = "1.1"; sha256 = "1x0dyv2kg1yrhkbkw4a62ixc9xmag6a6685chsi4k79xidafd8ks"; + revision = "1"; + editedCabalFile = "0li6d6mm2cavdmabs9l1z3bjhq8qzrdbl6dzh672dxma2wfgvl2n"; libraryHaskellDepends = [ base tagged ]; description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; license = lib.licenses.bsd3; @@ -41294,21 +41438,21 @@ self: { }) {}; "attoparsec-uri" = callPackage - ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip - , QuickCheck, quickcheck-instances, strict, tasty, tasty-quickcheck - , text, vector + ({ mkDerivation, attoparsec, base, bytedump, ip, QuickCheck + , quickcheck-instances, strict, tasty, tasty-quickcheck, text + , vector }: mkDerivation { pname = "attoparsec-uri"; - version = "0.0.7"; - sha256 = "0p3j4m5ps4j8phm2c00rk6m06vidckf14fy50xgcq2zr8b1lk79n"; + version = "0.0.9"; + sha256 = "0vplsw0i9v7lmrx6hqdihvzh0626zx3nxwv8sk8r3pj3hy4xh1jz"; libraryHaskellDepends = [ - attoparsec attoparsec-ip base bytedump ip QuickCheck - quickcheck-instances strict text vector + attoparsec base bytedump ip QuickCheck quickcheck-instances strict + text vector ]; testHaskellDepends = [ - attoparsec attoparsec-ip base bytedump ip QuickCheck - quickcheck-instances strict tasty tasty-quickcheck text vector + attoparsec base bytedump ip QuickCheck quickcheck-instances strict + tasty tasty-quickcheck text vector ]; description = "URI parser / printer using attoparsec"; license = lib.licenses.bsd3; @@ -41531,19 +41675,20 @@ self: { }) {}; "authenticate" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , case-insensitive, conduit, containers, html-conduit, http-conduit - , http-types, network-uri, resourcet, text, transformers - , unordered-containers, xml-conduit + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , blaze-builder, bytestring, case-insensitive, conduit, containers + , html-conduit, http-conduit, http-types, network-uri, resourcet + , text, transformers, unordered-containers, xml-conduit }: mkDerivation { pname = "authenticate"; - version = "1.3.5.1"; - sha256 = "1rhbvdgwdr68gp13p5piddfdqf3l9lmx4w7k249lc98y23780c3x"; + version = "1.3.5.2"; + sha256 = "1lsa5fgwxrz87l94d7whag2gpg0f3bxfn0244mi0byl6j5zpl0wp"; libraryHaskellDepends = [ - aeson attoparsec base blaze-builder bytestring case-insensitive - conduit containers html-conduit http-conduit http-types network-uri - resourcet text transformers unordered-containers xml-conduit + aeson attoparsec attoparsec-aeson base blaze-builder bytestring + case-insensitive conduit containers html-conduit http-conduit + http-types network-uri resourcet text transformers + unordered-containers xml-conduit ]; description = "Authentication methods for Haskell web applications"; license = lib.licenses.mit; @@ -41688,18 +41833,19 @@ self: { }) {}; "autodocodec" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hashable, mtl - , scientific, text, time, unordered-containers, validity - , validity-scientific, vector + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , hashable, mtl, scientific, text, time, unordered-containers + , validity, validity-scientific, vector }: mkDerivation { pname = "autodocodec"; - version = "0.2.0.4"; - sha256 = "08075y8dfl32hhla8da7lrg0kzrlhj2rhfn5aqz11qm3vkwwbd6q"; + version = "0.2.0.5"; + sha256 = "0wk84rnxdy6wh8953yx2gfn4kfpranv42w1hs13gxmrg0b2n3pjy"; libraryHaskellDepends = [ aeson base bytestring containers hashable mtl scientific text time unordered-containers validity validity-scientific vector ]; + testHaskellDepends = [ base doctest ]; description = "Self-documenting encoder and decoder"; license = lib.licenses.mit; }) {}; @@ -42560,7 +42706,9 @@ self: { ]; description = "Helper function and types for working with amazonka"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "aws-easy-demo"; + broken = true; }) {}; "aws-ec2" = callPackage @@ -43049,6 +43197,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Wrapper over Amazonka's SES"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "aws-sign4" = callPackage @@ -43090,6 +43240,8 @@ self: { ]; description = "Dead simple bindings to commonly used AWS Services"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "aws-sns" = callPackage @@ -43839,6 +43991,7 @@ self: { doHaddock = false; description = "Text layout engine built on top of HarfBuzz"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "ballast" = callPackage @@ -44283,12 +44436,12 @@ self: { broken = true; }) {}; - "base_4_18_0_0" = callPackage + "base_4_18_1_0" = callPackage ({ mkDerivation, ghc-bignum, ghc-prim, rts }: mkDerivation { pname = "base"; - version = "4.18.0.0"; - sha256 = "0wx6a14k4gp7kmsy3bpz752q5gvnka0k69bi65zn2arpq89s8nsn"; + version = "4.18.1.0"; + sha256 = "1kwz6pyg3mww3w6c7fkqz0av81lym2gnvq48501i8nzgkzg0gj26"; libraryHaskellDepends = [ ghc-bignum ghc-prim rts ]; description = "Basic libraries"; license = lib.licenses.bsd3; @@ -44548,6 +44701,8 @@ self: { pname = "base16-bytestring"; version = "1.0.2.0"; sha256 = "1167f9jaivnabn6kg2gc421ac9njb67fr4v0adbj3qph7qa92nhx"; + revision = "1"; + editedCabalFile = "1zg2c9jwpbmwnpfw5ail1bvnhasrx8zks8rzn3q7kz69ks7yi556"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -46511,8 +46666,8 @@ self: { }: mkDerivation { pname = "betris"; - version = "0.2.3.0"; - sha256 = "0nqwz88hfhfrcfdd3224cc54yzdqz8hgq358pxyvp5im006didcx"; + version = "0.2.3.1"; + sha256 = "076v2ss2jpslpwwl8bk4ijhwlpgrn1k5mi6mzhb62kp2yf1w8m58"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46852,8 +47007,8 @@ self: { pname = "bifunctors"; version = "5.6.1"; sha256 = "1z2p9l2c0i6irbhfib5z7089jg8s22jj2jrc3dm525mynmqi8f06"; - revision = "1"; - editedCabalFile = "0f4swdx6nvjzci5mwiwcqxsg7xqsf7vqvignq4k644sclrih2v38"; + revision = "2"; + editedCabalFile = "0ma7m6as59vdmk1ysip0gslrc2sc84van5z1blvzl2wzyvc7xyl2"; libraryHaskellDepends = [ assoc base comonad containers foldable1-classes-compat tagged template-haskell th-abstraction transformers @@ -47704,6 +47859,21 @@ self: { broken = true; }) {}; + "binder" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover, lens + , text, transformers + }: + mkDerivation { + pname = "binder"; + version = "0.1"; + sha256 = "0j0c3vbxxw4mcrfq1q2h3m4psjhg6kw81m2vrpnk8pqxq30v6kkv"; + libraryHaskellDepends = [ base containers lens text transformers ]; + testHaskellDepends = [ base containers hspec text transformers ]; + testToolDepends = [ hspec-discover ]; + description = "Variable binding for abstract syntax tree"; + license = lib.licenses.mit; + }) {}; + "binding-core" = callPackage ({ mkDerivation, base, HTF, HUnit, QuickCheck, random, stm }: mkDerivation { @@ -50286,8 +50456,8 @@ self: { pname = "blank-canvas"; version = "0.7.3"; sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "16"; - editedCabalFile = "1kkc6m89sk0xjhpji416wjpk8672w32m5l2pvd3386v1yvd1x7vj"; + revision = "17"; + editedCabalFile = "00q92mlylrp73v624i6h4jc4v9yxcdm6zjhdylh7zklc2di9ihgb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -50645,10 +50815,10 @@ self: { }: mkDerivation { pname = "blaze-markup"; - version = "0.8.2.8"; - sha256 = "0jd30wg5yz0a97b36zwqg4hv8faifza1n2gys3l1p3fwf9l3zz23"; - revision = "5"; - editedCabalFile = "17ibcxcv51a1xc1cvvwzfvih3v42f4z4j6ipk944im2lgqvjcwfl"; + version = "0.8.3.0"; + sha256 = "1s1hb477smr0m8rvpp7vr768hvwv5rsv4w07phdqyzqz9a5sq1l6"; + revision = "1"; + editedCabalFile = "1f97jb8xz7i713jsisnibixfpfmhv6y2ss3751f0cf47p745ldm8"; libraryHaskellDepends = [ base blaze-builder bytestring text ]; testHaskellDepends = [ base blaze-builder bytestring containers HUnit QuickCheck tasty @@ -50905,8 +51075,8 @@ self: { }: mkDerivation { pname = "blockfrost-api"; - version = "0.8.0.0"; - sha256 = "030q47qxk8hzrff1dz0m7409kg3a7fg978c0776dw1l0bljk0v0a"; + version = "0.8.1.0"; + sha256 = "12rsch1ind86fn97518ypycqvrj86cs7q8sykfj3ikzfkn12cssg"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deriving-aeson lens safe-money servant servant-docs servant-multipart-api @@ -51089,6 +51259,8 @@ self: { ]; description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bloomfilter" = callPackage @@ -52445,6 +52617,17 @@ self: { broken = true; }) {}; + "bounded-qsem" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "bounded-qsem"; + version = "0.1.0.1"; + sha256 = "0pds88mz4rarx4qx4mkwn6ya7fijicks6v2p1ic08ynp5vg6npdf"; + libraryHaskellDepends = [ base ]; + description = "Bounded quantity semaphores"; + license = lib.licenses.mit; + }) {}; + "bounded-queue" = callPackage ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit }: mkDerivation { @@ -54077,23 +54260,6 @@ self: { }: mkDerivation { pname = "bugsnag-hs"; - version = "0.2.0.11"; - sha256 = "0xdl77nm1lzj4lyxd6s86v8whxls3a9rsgck4b188sgcv6bvcad6"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring http-client text time unordered-containers - ]; - testHaskellDepends = [ aeson base bytestring hedgehog ]; - description = "A Bugsnag client for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "bugsnag-hs_0_2_0_12" = callPackage - ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client - , text, time, unordered-containers - }: - mkDerivation { - pname = "bugsnag-hs"; version = "0.2.0.12"; sha256 = "0850a02jy023wn3vipj409wmys2caxq3bf60j90yhh52f75skis8"; enableSeparateDataOutput = true; @@ -54103,7 +54269,6 @@ self: { testHaskellDepends = [ aeson base bytestring hedgehog ]; description = "A Bugsnag client for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bugsnag-wai" = callPackage @@ -54188,6 +54353,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "bugzilla-redhat_1_0_1_1" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers + , hspec, http-conduit, http-types, iso8601-time, resourcet, text + , time, unordered-containers, vector + }: + mkDerivation { + pname = "bugzilla-redhat"; + version = "1.0.1.1"; + sha256 = "0ka3dh5gqimwny7s3qalkynlyarkmnwd5pcy92b4g4vaqk7k3pvr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring containers http-conduit + http-types iso8601-time resourcet text time unordered-containers + vector + ]; + testHaskellDepends = [ aeson base hspec time ]; + description = "A Haskell interface to the Bugzilla native REST API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "build" = callPackage ({ mkDerivation, algebraic-graphs, base, containers, extra , filepath, mtl, random, transformers @@ -54741,8 +54928,8 @@ self: { }: mkDerivation { pname = "bv-little"; - version = "1.3.1"; - sha256 = "1ffsmfldgmyln6h6xmfs2cvb57l8yrz9243aywpa5wziaarqc5sm"; + version = "1.3.2"; + sha256 = "0mdgqsqf52dw72saq3dndvzx8yx51gi60zbka39km47r6si4nnjq"; libraryHaskellDepends = [ base binary deepseq hashable integer-gmp keys mono-traversable mono-traversable-keys primitive QuickCheck text-show @@ -55098,10 +55285,8 @@ self: { ({ mkDerivation, base, binary }: mkDerivation { pname = "byteset"; - version = "0.1.1.0"; - sha256 = "18dg863wbbjh95yial4gy6vi5spwygp0l7dfx6bj00lz4xdrqj8k"; - revision = "1"; - editedCabalFile = "1lgxxxrmw4g32pa861n6qbfpzwv14wfjrlp4hv5zd9hygy6v6q2p"; + version = "0.1.1.1"; + sha256 = "1sy7xp2zvmhlldgb18ah3g17382p9q2i0w3zxrzriq0ib9lrln1x"; libraryHaskellDepends = [ base binary ]; description = "Set of bytes"; license = lib.licenses.bsd3; @@ -56356,8 +56541,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "5.2.1"; - sha256 = "1fz71v2yx3rykvzswvqza5v9jwdhy2ahxj003gkkhfwfc2qjip3p"; + version = "5.2.2"; + sha256 = "1xafkjh4g60gcgrcl1l8xyla3firjxkaaks44plq1z9gnnwlfb90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57113,21 +57298,22 @@ self: { }) {}; "cabal-rpm" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, extra - , filepath, http-client, http-client-tls, http-conduit - , optparse-applicative, process, simple-cabal, simple-cmd - , simple-cmd-args, time, unix + ({ mkDerivation, aeson, base, bytestring, Cabal, cached-json-file + , directory, extra, filepath, http-client, http-client-tls + , http-conduit, http-query, optparse-applicative, process + , simple-cabal, simple-cmd, simple-cmd-args, text, time, unix }: mkDerivation { pname = "cabal-rpm"; - version = "2.1.2"; - sha256 = "0593260apchmhkvn48m7fgffi3w668ky0n8fyhbx8557kqv55w6f"; + version = "2.1.3"; + sha256 = "0wkb1h08ns93gkwycbsi7ap49px05kaybw5badjg1633n0i2bmww"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring Cabal directory extra filepath http-client - http-client-tls http-conduit optparse-applicative process - simple-cabal simple-cmd simple-cmd-args time unix + aeson base bytestring Cabal cached-json-file directory extra + filepath http-client http-client-tls http-conduit http-query + optparse-applicative process simple-cabal simple-cmd + simple-cmd-args text time unix ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = lib.licenses.gpl3Only; @@ -57182,19 +57368,21 @@ self: { }) {}; "cabal-sort" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , explicit-exception, fgl, filepath, process, transformers + ({ mkDerivation, base, bytestring, Cabal, comfort-graph, containers + , directory, explicit-exception, filepath, non-empty + , optparse-applicative, process, shell-utility, transformers , utility-ht }: mkDerivation { pname = "cabal-sort"; - version = "0.0.5.5"; - sha256 = "0lxw7kbqpaf4j03rrlivkb0imvnw0wsnxjy8gvcjs0jb101dzf8g"; + version = "0.1.2"; + sha256 = "1pvqnviv1dv9fdaghj1rzyhjnbjymprypn595w1svl2x8ylzw871"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring Cabal containers directory explicit-exception fgl - filepath process transformers utility-ht + base bytestring Cabal comfort-graph containers directory + explicit-exception filepath non-empty optparse-applicative process + shell-utility transformers utility-ht ]; description = "Topologically sort cabal packages"; license = lib.licenses.bsd3; @@ -57668,6 +57856,8 @@ self: { pname = "cache"; version = "0.1.3.0"; sha256 = "0d75257kvjpnv95ja50x5cs77pj8ccfr0nh9q5gzvcps83qdksa2"; + revision = "1"; + editedCabalFile = "17mn9vm493c2bihz1ivmg1rzy4mnjyvm1y2chrj2hbhf8wixx58s"; libraryHaskellDepends = [ base clock hashable stm transformers unordered-containers ]; @@ -57855,84 +58045,71 @@ self: { ({ mkDerivation, aeson, ascii-progress, async, base , base64-bytestring, bytestring, cachix-api, concurrent-extra , conduit, conduit-concurrent-map, conduit-extra, conduit-zstd - , containers, cookie, cryptonite, deepseq, dhall, directory - , ed25519, either, extra, filepath, fsnotify - , hercules-ci-cnix-store, here, hnix-store-core, hspec - , hspec-discover, http-client, http-client-tls, http-conduit - , http-types, inline-c-cpp, katip, lukko, lzma-conduit, megaparsec - , memory, mmorph, netrc, network-uri, nix, optparse-applicative - , pretty-terminal, prettyprinter, process, protolude, resourcet - , retry, safe-exceptions, servant, servant-auth - , servant-auth-client, servant-client, servant-client-core - , servant-conduit, stm, stm-chans, stm-conduit, systemd, temporary - , text, time, unix, unordered-containers, uri-bytestring, uuid - , vector, versions, websockets, wuss + , containers, cryptonite, deepseq, dhall, directory, ed25519 + , either, extra, filepath, fsnotify, hercules-ci-cnix-store, here + , hnix-store-core, hspec, hspec-discover, http-client + , http-client-tls, http-conduit, http-types, immortal, katip, lukko + , lzma-conduit, megaparsec, memory, netrc, network, nix + , optparse-applicative, pretty-terminal, prettyprinter, process + , protolude, resourcet, retry, safe-exceptions, servant + , servant-auth, servant-auth-client, servant-client + , servant-client-core, servant-conduit, stm, stm-chans, stm-conduit + , systemd, temporary, text, time, unix, unordered-containers + , uri-bytestring, uuid, vector, versions, websockets, wuss }: mkDerivation { pname = "cachix"; - version = "1.6"; - sha256 = "0p47zrm7v474bzrxj24dfcf9y22bs6yvdjravzc9n79skidd3bv6"; + version = "1.6.1"; + sha256 = "1xha1m9cik1sm877mk2vk96z4qc3570663cw1b4dw51v1qn57pbr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ascii-progress async base base64-bytestring bytestring cachix-api concurrent-extra conduit conduit-concurrent-map - conduit-extra conduit-zstd containers cookie cryptonite deepseq - dhall directory ed25519 either extra filepath fsnotify + conduit-extra conduit-zstd containers cryptonite deepseq dhall + directory ed25519 either extra filepath fsnotify hercules-ci-cnix-store here hnix-store-core http-client - http-client-tls http-conduit http-types inline-c-cpp katip lukko - lzma-conduit megaparsec memory mmorph netrc network-uri - optparse-applicative pretty-terminal prettyprinter process - protolude resourcet retry safe-exceptions servant servant-auth - servant-auth-client servant-client servant-client-core - servant-conduit stm stm-chans stm-conduit systemd temporary text - time unix unordered-containers uri-bytestring uuid vector versions - websockets wuss + http-client-tls http-conduit http-types immortal katip lukko + lzma-conduit megaparsec memory netrc network optparse-applicative + pretty-terminal prettyprinter process protolude resourcet retry + safe-exceptions servant servant-auth servant-auth-client + servant-client servant-conduit stm stm-chans stm-conduit systemd + temporary text time unix unordered-containers uri-bytestring uuid + vector versions websockets wuss ]; libraryPkgconfigDepends = [ nix ]; executableHaskellDepends = [ - aeson async base cachix-api conduit http-conduit katip protolude - safe-exceptions stm stm-chans stm-conduit time uuid websockets wuss + aeson async base cachix-api katip protolude safe-exceptions + stm-chans stm-conduit time uuid websockets ]; - executableToolDepends = [ hspec-discover ]; testHaskellDepends = [ aeson base bytestring cachix-api dhall directory extra here hspec protolude servant-auth-client servant-client-core temporary ]; - description = "Command line client for Nix binary cache hosting https://cachix.org"; + testToolDepends = [ hspec-discover ]; + description = "Command-line client for Nix binary cache hosting https://cachix.org"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.domenkozar ]; }) {inherit (pkgs) nix;}; "cachix-api" = callPackage - ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring - , conduit, cookie, cryptonite, deepseq, deriving-aeson, exceptions - , hspec, hspec-discover, http-api-data, http-media, jose, lens - , memory, nix-narinfo, protolude, resourcet, safe-exceptions - , servant, servant-auth, servant-auth-swagger, servant-client - , servant-swagger, servant-swagger-ui-core, stm-chans, string-conv - , swagger2, text, time, transformers, unordered-containers, uuid - , websockets + ({ mkDerivation, aeson, async, base, bytestring, conduit + , cryptonite, deriving-aeson, exceptions, hspec, hspec-discover + , http-media, jose, memory, nix-narinfo, protolude, resourcet + , safe-exceptions, servant, servant-auth, stm-chans, swagger2, text + , time, unordered-containers, uuid, websockets }: mkDerivation { pname = "cachix-api"; - version = "1.6"; - sha256 = "0yca7xrxhxlgx3y0w4k2mwrzgg72wz6iq5bppxaa4f70538ckp57"; + version = "1.6.1"; + sha256 = "07axz6yj1058807zwd6l6nqnklxia2rph7af5cghrxpvnsnk4vcc"; libraryHaskellDepends = [ - aeson async base base16-bytestring bytestring conduit cookie - cryptonite deepseq deriving-aeson exceptions http-api-data - http-media jose lens memory nix-narinfo protolude resourcet - safe-exceptions servant servant-auth servant-auth-swagger - servant-client stm-chans string-conv swagger2 text time - transformers unordered-containers uuid websockets - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring conduit cookie cryptonite - hspec http-api-data http-media lens memory protolude servant - servant-auth servant-auth-swagger servant-swagger - servant-swagger-ui-core string-conv swagger2 text transformers - unordered-containers + aeson async base bytestring conduit cryptonite deriving-aeson + exceptions http-media jose memory nix-narinfo protolude resourcet + safe-exceptions servant servant-auth stm-chans swagger2 text time + unordered-containers uuid websockets ]; + testHaskellDepends = [ aeson base bytestring hspec protolude ]; testToolDepends = [ hspec-discover ]; description = "Servant HTTP API specification for https://cachix.org"; license = lib.licenses.asl20; @@ -58256,6 +58433,7 @@ self: { description = "A library for writing discord bots in haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "calamity-commands" = callPackage @@ -58424,8 +58602,8 @@ self: { pname = "call-alloy"; version = "0.4.0.3"; sha256 = "0aabh7a43cyprwywv8622q860ys2i7mlasigbxaklyj558xma59f"; - revision = "1"; - editedCabalFile = "1fq8qi0y39naha72widlqyz9smcd82v6q5wmvymmgvgw5yj93yw6"; + revision = "2"; + editedCabalFile = "0hwlxg2nmi3wq316wb20f0kv077v9lrjb7705acnnl2a099jx7j5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base bytestring containers directory extra filepath mtl @@ -59031,6 +59209,8 @@ self: { testHaskellDepends = [ base mtl tasty tasty-hunit ]; description = "Monadic capabilities with late binding"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "captcha-2captcha" = callPackage @@ -59940,8 +60120,8 @@ self: { pname = "cassava"; version = "0.5.3.0"; sha256 = "1gp954w05bj83z4i6isq2qxi1flqwppsgxxrp1f75mrs8cglbj5l"; - revision = "4"; - editedCabalFile = "0iabyfiwj08gfzrllaz836n28gx2jybszw45jcsy7y333wwcsg7q"; + revision = "5"; + editedCabalFile = "081c6gzskkdvajc38f8ng8471d58a25k7wpl3azjviqm6vzfl2c4"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -61742,6 +61922,8 @@ self: { pname = "charset"; version = "0.3.10"; sha256 = "1y9571120f428rkif97w4vwjas9x0916qgl9kkm71yxjz7dm2ihy"; + revision = "1"; + editedCabalFile = "0m92xqpmfnhv6ii1rdfplw4w6fkmzxciwi02vjxsk1ga5bzjw1mc"; libraryHaskellDepends = [ array base bytestring containers unordered-containers ]; @@ -63988,8 +64170,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "1.6.5"; - sha256 = "0ixnnv4nyir5sjrygdnsvz59yx214bz35cx2lfvx63aws07nm1gl"; + version = "1.6.6"; + sha256 = "0hzcqkbmpwybvi5rvzhkf3n7rdbimbqzyi1ijagfsivjvfkxs1m5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64009,12 +64191,12 @@ self: { "clash-lib" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, async - , attoparsec, base, base16-bytestring, binary, bytestring - , clash-prelude, concurrent-supply, containers, cryptohash-sha256 - , data-binary-ieee754, data-default, deepseq, directory, dlist - , exceptions, extra, filepath, ghc, ghc-bignum, ghc-boot-th - , ghc-typelits-knownnat, Glob, hashable, haskell-src-exts - , haskell-src-meta, hint, interpolate, lens, mtl + , attoparsec, attoparsec-aeson, base, base16-bytestring, binary + , bytestring, clash-prelude, concurrent-supply, containers + , cryptohash-sha256, data-binary-ieee754, data-default, deepseq + , directory, dlist, exceptions, extra, filepath, ghc, ghc-bignum + , ghc-boot-th, ghc-typelits-knownnat, Glob, hashable + , haskell-src-exts, haskell-src-meta, hint, interpolate, lens, mtl , ordered-containers, pretty-show, prettyprinter, primitive , quickcheck-text, stringsearch, tasty, tasty-hunit , tasty-quickcheck, template-haskell, temporary, terminal-size @@ -64023,29 +64205,30 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "1.6.5"; - sha256 = "0n7r9448qzvy9l4ggqgk31ac3pbxnbjdmgc5pzx72alijdjpvgh1"; + version = "1.6.6"; + sha256 = "0v31cp9f6bciag31f5zdxmz1cdlk2aw3skrgam40psaxmksih6ns"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal array async attoparsec base - base16-bytestring binary bytestring clash-prelude concurrent-supply - containers cryptohash-sha256 data-binary-ieee754 data-default - deepseq directory dlist exceptions extra filepath ghc ghc-bignum - ghc-boot-th hashable haskell-src-meta hint interpolate lens mtl - ordered-containers pretty-show prettyprinter primitive - template-haskell temporary terminal-size text time transformers - trifecta unordered-containers vector vector-binary-instances yaml + aeson aeson-pretty ansi-terminal array async attoparsec + attoparsec-aeson base base16-bytestring binary bytestring + clash-prelude concurrent-supply containers cryptohash-sha256 + data-binary-ieee754 data-default deepseq directory dlist exceptions + extra filepath ghc ghc-bignum ghc-boot-th hashable haskell-src-meta + hint interpolate lens mtl ordered-containers pretty-show + prettyprinter primitive template-haskell temporary terminal-size + text time transformers trifecta unordered-containers vector + vector-binary-instances yaml ]; executableHaskellDepends = [ - aeson base bytestring containers deepseq directory Glob - stringsearch yaml + aeson attoparsec-aeson base bytestring containers deepseq directory + Glob stringsearch yaml ]; testHaskellDepends = [ - aeson aeson-pretty base base16-bytestring bytestring clash-prelude - concurrent-supply containers data-default deepseq ghc - ghc-typelits-knownnat haskell-src-exts lens pretty-show + aeson aeson-pretty attoparsec-aeson base base16-bytestring + bytestring clash-prelude concurrent-supply containers data-default + deepseq ghc ghc-typelits-knownnat haskell-src-exts lens pretty-show quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell text transformers unordered-containers ]; @@ -64063,8 +64246,8 @@ self: { }: mkDerivation { pname = "clash-lib-hedgehog"; - version = "1.6.5"; - sha256 = "1hbdqv4zzhhb7dnmn5zcc0c6gh72xkyj5j4r7pcz2scidgvwdw5q"; + version = "1.6.6"; + sha256 = "1hnhlkimgrhcn26y78xpf4f3p5dix4qp0cjlvpp1vz1w9fl2va6v"; libraryHaskellDepends = [ base clash-lib containers data-binary-ieee754 fakedata ghc-typelits-knownnat ghc-typelits-natnormalise hedgehog @@ -64105,8 +64288,8 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "1.6.5"; - sha256 = "1iqyrcclzh5pfkckfh81h4kbmagwp7d69f9wdv6vv09p1gki6dx9"; + version = "1.6.6"; + sha256 = "06dwpyf4f9i2l7gqd67by3j5jjzj5wd5rs8bqbw0b718idmcga8z"; libraryHaskellDepends = [ array arrows base binary bytestring constraints containers data-binary-ieee754 data-default-class deepseq extra ghc-bignum @@ -64137,8 +64320,8 @@ self: { }: mkDerivation { pname = "clash-prelude-hedgehog"; - version = "1.6.5"; - sha256 = "0z7clyw3s05w9f2yrbwym7q386qql8z48zf9mqhzl6hpy62x3as1"; + version = "1.6.6"; + sha256 = "0li04hy6jj92wcp9j5gr92a71w1pbzj87hv75m66i94ifj6ybq39"; libraryHaskellDepends = [ base clash-prelude ghc-typelits-knownnat ghc-typelits-natnormalise hedgehog text @@ -64302,6 +64485,61 @@ self: { mainProgram = "classify-frog"; }) {}; + "classy-effects" = callPackage + ({ mkDerivation, base, classy-effects-base, classy-effects-th + , tasty, tasty-discover, tasty-hunit + }: + mkDerivation { + pname = "classy-effects"; + version = "0.1.0.0"; + sha256 = "15c1sln37qc0b0fdg8pyifp84q829918jvzwbjdvfzkq9hvwdb0w"; + libraryHaskellDepends = [ + base classy-effects-base classy-effects-th + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + testToolDepends = [ tasty-discover ]; + description = "An interface for a handler-independent, typeclass-based effect system"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + + "classy-effects-base" = callPackage + ({ mkDerivation, base, compdata, tasty, tasty-discover, tasty-hunit + }: + mkDerivation { + pname = "classy-effects-base"; + version = "0.1.0.0"; + sha256 = "047bz8ii9qx708cjdgpajrv2lry9wfracj6f1m7rm38vmhr9yj55"; + libraryHaskellDepends = [ base compdata ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + testToolDepends = [ tasty-discover ]; + description = "An interface for a handler-independent, typeclass-based effect system"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "classy-effects-th" = callPackage + ({ mkDerivation, base, classy-effects-base, extra, lens, mtl, tasty + , tasty-discover, tasty-hunit, template-haskell, th-abstraction + }: + mkDerivation { + pname = "classy-effects-th"; + version = "0.1.0.0"; + sha256 = "1w7gm3nl2ddp19a0g7id6qhdj8vzpvs2y9hvfrcyk81yfhx6km6c"; + libraryHaskellDepends = [ + base classy-effects-base extra lens mtl template-haskell + th-abstraction + ]; + testHaskellDepends = [ + base classy-effects-base tasty tasty-hunit + ]; + testToolDepends = [ tasty-discover ]; + description = "Automatic compliance with the classy-effects protocols"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "classy-influxdb-simple" = callPackage ({ mkDerivation, aeson, async-io-either, base, bytestring, lens , mtl, scientific, text, time, vector, wreq @@ -65504,8 +65742,8 @@ self: { }: mkDerivation { pname = "closed-intervals"; - version = "0.2.0.1"; - sha256 = "0ixh65ijhr0skxzfwps3g24zasizmds6mddg02akfs522lrmznji"; + version = "0.2.1.0"; + sha256 = "0awwdd4ij22lqg048mki32zimlrs7vipq66av708y2f34nbb3d91"; libraryHaskellDepends = [ base containers filtrable time ]; testHaskellDepends = [ base containers doctest-exitcode-stdio doctest-lib QuickCheck time @@ -66348,25 +66586,22 @@ self: { "co-log" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos - , co-log-core, containers, contravariant, directory, doctest - , exceptions, filepath, Glob, hedgehog, markdown-unlit, mtl, text - , transformers, typerep-map, vector + , co-log-core, containers, contravariant, dependent-map + , dependent-sum, directory, doctest, exceptions, filepath, Glob + , hedgehog, mtl, text, transformers, unliftio-core, vector }: mkDerivation { pname = "co-log"; - version = "0.5.0.0"; - sha256 = "1afzqh3kncmlxjdsw6v0pwb24mlfa492jdryn8pr00pskrmcr8mg"; + version = "0.6.0.2"; + sha256 = "1mnwxga6rj7lwp5zqqfqs7d6gi1q4a3ay5gcg3fakh4ci8lfzl47"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base bytestring chronos co-log-core containers - contravariant directory exceptions filepath mtl text transformers - typerep-map vector - ]; - executableHaskellDepends = [ - base bytestring co-log-core mtl text typerep-map + contravariant dependent-map dependent-sum directory exceptions + filepath mtl text transformers unliftio-core vector ]; - executableToolDepends = [ markdown-unlit ]; + executableHaskellDepends = [ base bytestring dependent-map mtl ]; testHaskellDepends = [ base co-log-core doctest Glob hedgehog ]; description = "Composable Contravariant Comonadic Logging Library"; license = lib.licenses.mpl20; @@ -66391,8 +66626,8 @@ self: { pname = "co-log-core"; version = "0.3.2.0"; sha256 = "1r8yq4wan48mm37p32vsym44icdx4c5dyc5wkm5vz8f4l39yv59l"; - revision = "1"; - editedCabalFile = "0ljr9pam99q2mgqig8yf1pmz5j0jxk6dq9c2rvzyc4jbv6bnbwnf"; + revision = "2"; + editedCabalFile = "0zfmgjdp2hp7x9a1kma1mvn51mm4kdhvrzq450mk0ysh026xfjls"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; @@ -66452,7 +66687,9 @@ self: { ]; description = "A Polysemy logging effect for high quality (unstructured) logs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "example"; + broken = true; }) {}; "co-log-sys" = callPackage @@ -68087,20 +68324,18 @@ self: { "comfort-graph" = callPackage ({ mkDerivation, base, containers, doctest-exitcode-stdio - , QuickCheck, semigroups, transformers, utility-ht + , doctest-lib, QuickCheck, semigroups, transformers, utility-ht }: mkDerivation { pname = "comfort-graph"; - version = "0.0.3.2"; - sha256 = "13g6dcqcnysh1l0hsm3j3q9il9r987brxc3557m69k0ag0wk5m4b"; - revision = "1"; - editedCabalFile = "0f0zgf8nk5bihs1z3kz37c4ansg7pk9d3pbvnazabqqwv4c11kl5"; + version = "0.0.4"; + sha256 = "1v3acgdr8srvpddl2kvap556ag93b9yphjf3y1qy14sq6f7v46hc"; libraryHaskellDepends = [ base containers QuickCheck semigroups transformers utility-ht ]; testHaskellDepends = [ - base containers doctest-exitcode-stdio QuickCheck transformers - utility-ht + base containers doctest-exitcode-stdio doctest-lib QuickCheck + transformers utility-ht ]; description = "Graph structure with type parameters for nodes and edges"; license = lib.licenses.bsd3; @@ -68313,27 +68548,6 @@ self: { }: mkDerivation { pname = "commonmark-extensions"; - version = "0.2.3.5"; - sha256 = "03mpbc66k3h6mm3k46bsn7pkp46ik930prgy6qvqqinzjvwlg207"; - libraryHaskellDepends = [ - base commonmark containers emojis filepath network-uri parsec text - transformers - ]; - testHaskellDepends = [ - base commonmark parsec tasty tasty-hunit text - ]; - benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; - description = "Pure Haskell commonmark parser"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark-extensions_0_2_3_6" = callPackage - ({ mkDerivation, base, commonmark, containers, emojis, filepath - , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text - , transformers - }: - mkDerivation { - pname = "commonmark-extensions"; version = "0.2.3.6"; sha256 = "0b26h9fmr5pqv0d66az3af38ha07jkxrf5874m0k7i9ymaxwbckg"; libraryHaskellDepends = [ @@ -68346,7 +68560,6 @@ self: { benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; description = "Pure Haskell commonmark parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-pandoc" = callPackage @@ -68470,8 +68683,8 @@ self: { pname = "comonad"; version = "5.0.8"; sha256 = "04rxycp2pbkrvhjgpgx08jmsipjz4cdmhv59dbp47k4jq8ndyv7g"; - revision = "1"; - editedCabalFile = "0zlgkcd61cwsdbgjz03pfbjxhj6dc25792h7rwh0zy677vbsn6hz"; + revision = "2"; + editedCabalFile = "1qy55616zcl1fmdzkr9kbb84nqmmx2aakz0hfyc66jgv0fyvykaa"; libraryHaskellDepends = [ base containers distributive indexed-traversable tagged transformers transformers-compat @@ -68576,8 +68789,8 @@ self: { pname = "compact"; version = "0.2.0.0"; sha256 = "0xv24vd2h76928355rr8gzdbkyn2j17yf6wjyghnzw7qyhsbb9h3"; - revision = "1"; - editedCabalFile = "1013dkawaw3c6hvlfn9x584pq8z65fvbnp79dl6ll6r0a75rivvm"; + revision = "2"; + editedCabalFile = "1x38yjkl9b2ss6p9bdhpk5h1p4p3rlar09a31cpa8cgj959ws1da"; libraryHaskellDepends = [ base binary bytestring ghc-compact ]; testHaskellDepends = [ base directory ]; description = "Non-GC'd, contiguous storage for immutable data structures"; @@ -71365,8 +71578,8 @@ self: { pname = "config-schema"; version = "1.3.0.0"; sha256 = "1j5br9y4s51ajxyg4aldibywqhf4qrxhrypac8jgca2irxdwb29w"; - revision = "2"; - editedCabalFile = "0vd9s4qhf7qx1l7fsxi1j6kacnk8jzclmqy9195rd9q0xsw5dfm6"; + revision = "3"; + editedCabalFile = "1awzybmy87y3am6qsvcx083g2xs62p1gk9jhbnpnr39kgld5zn17"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -71401,8 +71614,8 @@ self: { pname = "config-value"; version = "0.8.3"; sha256 = "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w"; - revision = "3"; - editedCabalFile = "1qiqaad3zpgvwpcb5p1q9aaska82bfm75qrsfdcdlwc70r7w57gj"; + revision = "4"; + editedCabalFile = "0l6s3pp6jdqbz8v4v9pc5lxpfvkcxli3i06nx5953pd68nd2viqs"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -72350,12 +72563,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "containers_0_6_7" = callPackage + "containers_0_7" = callPackage ({ mkDerivation, array, base, deepseq, template-haskell }: mkDerivation { pname = "containers"; - version = "0.6.7"; - sha256 = "0x684l54zpz2xh8jqyc1q107aggf9v3a5vz9cmgcx9l8bvyfy5l5"; + version = "0.7"; + sha256 = "09732p786v3886vgk5c272fid62wlwqa4wrncjwg0n3isba04sfg"; libraryHaskellDepends = [ array base deepseq template-haskell ]; description = "Assorted concrete container types"; license = lib.licenses.bsd3; @@ -72481,8 +72694,8 @@ self: { }: mkDerivation { pname = "context"; - version = "0.2.0.1"; - sha256 = "089v5dkpmlqrpdghhhmwca91dzzigsxwygjpg71ig5352cdfwdf4"; + version = "0.2.0.2"; + sha256 = "0wrqjpdiwpv3gcxqbfn0ixqfxfp6d1xnj6slkkz744bl1dmxdhaf"; libraryHaskellDepends = [ base containers exceptions ]; testHaskellDepends = [ async base ghc-prim hspec ]; testToolDepends = [ hspec-discover ]; @@ -72544,8 +72757,8 @@ self: { }: mkDerivation { pname = "context-http-client"; - version = "0.2.0.1"; - sha256 = "1sm36mrnc80pnafpyikcalajy2kz1rxp7d40sgqng1s48k6d8js1"; + version = "0.2.0.2"; + sha256 = "06mr9r9c5vb1y6y532pwpb6dmp2nm0bzzpcjdqwj4h8lncd4pn12"; libraryHaskellDepends = [ base context http-client ]; testHaskellDepends = [ async base bytestring case-insensitive context hspec http-client @@ -72562,8 +72775,8 @@ self: { }: mkDerivation { pname = "context-resource"; - version = "0.2.0.1"; - sha256 = "1hcmzd82nxbxask6qckb9ivpxlrxhph9pwk379vkx235jgqy79gj"; + version = "0.2.0.2"; + sha256 = "0rmzl16hxp9vqc4y2j3f3wf73l0xdvi50ff82c4swg12hb0ln5bl"; libraryHaskellDepends = [ base context exceptions ]; testHaskellDepends = [ async base context hspec ]; testToolDepends = [ hspec-discover ]; @@ -72592,8 +72805,8 @@ self: { }: mkDerivation { pname = "context-wai-middleware"; - version = "0.2.0.1"; - sha256 = "1y34137h0zjqxs4f5mbjyq500sazsryl20sfx4p5b227nb8lyplh"; + version = "0.2.0.2"; + sha256 = "0sb18dqg6586fcz3vdhaya9b2vpyj7llnn6nmxzpq7m4qap6j74f"; libraryHaskellDepends = [ base context wai ]; testHaskellDepends = [ async base bytestring case-insensitive context hspec http-client @@ -75158,6 +75371,8 @@ self: { testHaskellDepends = [ base ]; description = "Secure Credentials Storage and Distribution"; license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "credentials-cli" = callPackage @@ -75182,6 +75397,7 @@ self: { ]; description = "Secure Credentials Administration"; license = "unknown"; + hydraPlatforms = lib.platforms.none; mainProgram = "credentials"; }) {}; @@ -76263,8 +76479,8 @@ self: { pname = "cryptohash-md5"; version = "0.11.101.0"; sha256 = "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"; - revision = "2"; - editedCabalFile = "112lx16przdk80m269rqizma0lxaij52l4haspb0cd07rbgp50cd"; + revision = "3"; + editedCabalFile = "1v7gv0xa9yfkxq3g9j79ppzn6hjf467aajzb4x5882yflibfi9ki"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring pureMD5 tasty tasty-hunit @@ -76283,8 +76499,8 @@ self: { pname = "cryptohash-sha1"; version = "0.11.101.0"; sha256 = "0h9jl9v38gj0vnscqx7xdklk634p05fa6z2pcvknisq2mnbjq154"; - revision = "2"; - editedCabalFile = "1v495qn836flf4nhn43sbq14bhqfljvcpncmfrnvkhbrp5drxgi5"; + revision = "3"; + editedCabalFile = "08f68cjmdrwx76id4hcyp3jxs8dsnb1jv9pfkm5x7gsvxmrk6pdw"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -76303,8 +76519,8 @@ self: { pname = "cryptohash-sha256"; version = "0.11.102.1"; sha256 = "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"; - revision = "2"; - editedCabalFile = "1g7lpcn3zhrp4a65gj71v2164387r0m42pyavlx6bbifhyar1kkj"; + revision = "3"; + editedCabalFile = "1204ybm4685yc78mpyriwbplg3ppciid3g1b79562zwqc58hdnq3"; configureFlags = [ "-fuse-cbits" ]; isLibrary = true; isExecutable = true; @@ -76326,8 +76542,8 @@ self: { pname = "cryptohash-sha512"; version = "0.11.102.0"; sha256 = "0b48qwgyn68rfbq4fh6fmsk1kc07n8qq95217n8gjnlzvsh2395z"; - revision = "1"; - editedCabalFile = "1y9d4f495gb5gdwsmzamgrq9yl16fx1bsaw6pr5236q6yahz0sb1"; + revision = "2"; + editedCabalFile = "1v1d8bv54vwwz31z8pdni6pa5lzm5zaxkzdg0857jzghzkdzg7d5"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -76515,8 +76731,6 @@ self: { ]; description = "Simple and easy network connections API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "crypton-x509" = callPackage @@ -78328,8 +78542,8 @@ self: { }: mkDerivation { pname = "daemons"; - version = "0.3.0"; - sha256 = "05h03qk31lank60cd0ig9h4rf8zl6p4li5smba919lgpm89lyvy3"; + version = "0.4.0"; + sha256 = "10fcxk749q90mlwgknqn6l5mff8b09acmikxzh5jkk5sr6bj86hz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -78347,6 +78561,8 @@ self: { ]; description = "Daemons in Haskell made fun and easy"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dag" = callPackage @@ -78501,6 +78717,32 @@ self: { broken = true; }) {}; + "dap" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring + , containers, hspec, lifted-base, monad-control, mtl, network + , network-simple, stm, string-conversions, text, time + , transformers-base, unordered-containers + }: + mkDerivation { + pname = "dap"; + version = "0.1.0.0"; + sha256 = "1iq6vd2s6qz5mmcqfg8a9a4y9i9k4v6ak4n3jl5n5mdqbrli7ipz"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers lifted-base + monad-control mtl network network-simple stm text time + transformers-base unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty async base bytestring containers hspec + lifted-base monad-control mtl network network-simple stm + string-conversions text time transformers-base unordered-containers + ]; + description = "A debug adaptor protocol library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "dapi" = callPackage ({ mkDerivation, base, containers, explicit-exception, multiarg , old-locale, parsec, prednote, rainbow, text, time, transformers @@ -79797,8 +80039,8 @@ self: { pname = "data-fix"; version = "0.3.2"; sha256 = "1k0rcbb6dzv0ggdxqa2bh4jr829y0bczjrg98mrk5733q0xjs5rs"; - revision = "4"; - editedCabalFile = "1s9xivrnsp5n7jhflz4h4vzwwdcxal7kwchpaa982m8pfr23ayy2"; + revision = "5"; + editedCabalFile = "1waspjvz1r21r7ax6b2ni5wmbg6diky70s0iv18kpjlanvw6yzfd"; libraryHaskellDepends = [ base deepseq hashable ]; description = "Fixpoint data types"; license = lib.licenses.bsd3; @@ -81601,7 +81843,7 @@ self: { license = lib.licenses.asl20; }) {}; - "dbus_1_3_0" = callPackage + "dbus_1_3_1" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens , network, parsec, process, QuickCheck, random, resourcet, split @@ -81610,8 +81852,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.3.0"; - sha256 = "0qvlq4qaxvpyx9ckiaqlj210gm98fqbd9f7bwq021vwdm3xwzh3c"; + version = "1.3.1"; + sha256 = "0n3ghygqdbhgknv9hr650lv9vfk8jb6qfcw7p39kxjw9qxxbfvm3"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -82208,8 +82450,8 @@ self: { }: mkDerivation { pname = "debian"; - version = "4.0.4"; - sha256 = "11510xb7a9nlvaygrmwbx9imagj8517iz2am6jv88934m0l5iy1n"; + version = "4.0.5"; + sha256 = "1s0pin0qbdakigm0ijnyvs8k27d4p8rdcysymh405ay90kqwp6p4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83845,6 +84087,20 @@ self: { broken = true; }) {}; + "derive-has-field" = callPackage + ({ mkDerivation, base, hspec, template-haskell, th-abstraction }: + mkDerivation { + pname = "derive-has-field"; + version = "0.0.1.1"; + sha256 = "0aai12n4acvxga6w6jz4npca1581ks7x1y6y337y0n46mqlsy6kf"; + libraryHaskellDepends = [ base template-haskell th-abstraction ]; + testHaskellDepends = [ + base hspec template-haskell th-abstraction + ]; + description = "Derive HasField instances with Template Haskell"; + license = lib.licenses.mit; + }) {}; + "derive-lifted-instances" = callPackage ({ mkDerivation, base, bifunctors, reflection, template-haskell }: mkDerivation { @@ -83980,6 +84236,8 @@ self: { pname = "deriving-compat"; version = "0.6.5"; sha256 = "1wrjapgp6sy2h8jql05ryyzmiadlkfy5qw1brka466j6ag7jwha7"; + revision = "1"; + editedCabalFile = "093kv76593jr1af12c5idqr97mbkf9vs93zbhrw7kcqwiydpsi91"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -84196,6 +84454,8 @@ self: { ]; description = "Self-describing consumers/parsers; forms, cmd-line args, JSON, etc"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "desert" = callPackage @@ -84227,8 +84487,8 @@ self: { }: mkDerivation { pname = "desktop-portal"; - version = "0.3.1.0"; - sha256 = "00pr8l4m1g5mcnxv8w8dab2iah1935fq79az7chsa6jgki6lflqf"; + version = "0.3.2.0"; + sha256 = "0xl8bib8wsnf8ylmmpln25fnw48zq0js7r9blb0km6sskwdvx6kw"; libraryHaskellDepends = [ base binary bytestring containers data-default-class dbus directory modern-uri network random text unix @@ -85956,8 +86216,8 @@ self: { pname = "diagrams-lib"; version = "1.4.6"; sha256 = "1a0wl8lspwkby5x45j1wa1xq27bs67x5vwj8jzavym56a3f2pjcb"; - revision = "2"; - editedCabalFile = "0dxs255ryr1wl3b1ba797290xg0qf22j2n89047ispzsk0n6scjb"; + revision = "3"; + editedCabalFile = "09b3hdmsk5byjm1jcq03zjb8fz7h3lid747abi3fq9bvsaqsp5ka"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -86892,8 +87152,8 @@ self: { }: mkDerivation { pname = "digit"; - version = "0.11"; - sha256 = "1ic9qvlqrdi3a8wlgrahl6mrc43sc9x1k9p7myydzai4zg1wr013"; + version = "0.12"; + sha256 = "1z765d5rsz3gh0rq8601gq5fhzm3yvk175vchw9qnanv7zn596wx"; libraryHaskellDepends = [ base lens parsers scientific semigroupoids semigroups template-haskell @@ -86904,6 +87164,8 @@ self: { ]; description = "A data-type representing digits 0-9 and other combinations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "digitalocean-kzs" = callPackage @@ -89021,6 +89283,31 @@ self: { mainProgram = "dl-fedora"; }) {}; + "dl-fedora_1_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, directory, extra + , filepath, http-client, http-client-tls, http-directory + , http-types, optparse-applicative, regex-posix, simple-cmd + , simple-cmd-args, simple-prompt, text, time, unix, xdg-userdirs + }: + mkDerivation { + pname = "dl-fedora"; + version = "1.0"; + sha256 = "1rg77n4q2xpvbibh57nki0vdbq1r3n1h1ci99v670p06q8j99myz"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint base bytestring directory extra filepath http-client + http-client-tls http-directory http-types optparse-applicative + regex-posix simple-cmd simple-cmd-args simple-prompt text time unix + xdg-userdirs + ]; + testHaskellDepends = [ base simple-cmd ]; + description = "Fedora image download tool"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "dl-fedora"; + }) {}; + "dlist" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { @@ -92856,6 +93143,8 @@ self: { ]; description = "Typesafe library for working with DynamoDB database"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dynloader" = callPackage @@ -93315,8 +93604,8 @@ self: { }: mkDerivation { pname = "ebird-cli"; - version = "0.1.0.0"; - sha256 = "0h21yfda4hhs0kx05yfr20qwzdhfm5p2h280x3nr2kgj9wq889wi"; + version = "0.2.0.0"; + sha256 = "0vla1xz74qjpfa0qjfkvlp19mdv58dp1kr0m0g9jg07aqjwa4r92"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93326,7 +93615,7 @@ self: { executableHaskellDepends = [ base ]; description = "A command-line utility for interacting with the eBird API"; license = lib.licenses.mit; - mainProgram = "ebird"; + mainProgram = "ebird-cli"; }) {}; "ebird-client" = callPackage @@ -93422,7 +93711,9 @@ self: { ]; description = "A handy tool for uploading unikernels to Amazon's EC2"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "ec2-unikernel"; + broken = true; }) {}; "eccrypto" = callPackage @@ -94123,25 +94414,12 @@ self: { ({ mkDerivation, base, containers, effectful-core, ghc }: mkDerivation { pname = "effectful-plugin"; - version = "1.1.0.1"; - sha256 = "1clm190xhf9wibck7i5slzchbq926f2xfxij6zxqv656fx9l5vf6"; - libraryHaskellDepends = [ base containers effectful-core ghc ]; - testHaskellDepends = [ base effectful-core ]; - description = "A GHC plugin for improving disambiguation of effects"; - license = lib.licenses.bsd3; - }) {}; - - "effectful-plugin_1_1_0_2" = callPackage - ({ mkDerivation, base, containers, effectful-core, ghc }: - mkDerivation { - pname = "effectful-plugin"; version = "1.1.0.2"; sha256 = "1g4ic03aad2sc62jxspcq5zsisqmr03fs39ganzcklh86asmdb8h"; libraryHaskellDepends = [ base containers effectful-core ghc ]; testHaskellDepends = [ base effectful-core ]; description = "A GHC plugin for improving disambiguation of effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "effectful-st" = callPackage @@ -94345,6 +94623,8 @@ self: { pname = "egison-pattern-src"; version = "0.2.1.2"; sha256 = "14g13m9c4353j8hir5inqhfzwapkxdkbvkzfbrrgca6hyj7mn1vf"; + revision = "1"; + editedCabalFile = "0p81fpqrhb9vjcfp79cy62ckj9qmyc5ixqbywsjqi46wgcai26im"; libraryHaskellDepends = [ base containers free megaparsec mtl parser-combinators prettyprinter recursion-schemes text @@ -94744,6 +95024,8 @@ self: { ]; description = "An ekg backend for Amazon Cloudwatch"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ekg-core" = callPackage @@ -97655,8 +97937,8 @@ self: { }: mkDerivation { pname = "error-codes"; - version = "0.1.2.0"; - sha256 = "1ylbbanzwxh2ggqj1f4c4mib91swvvp3mk5cxn1d2ppkkssx7h8z"; + version = "0.1.3.0"; + sha256 = "15i7xyq3jll98cj1dd7rk5dm0aba4sf504f89fqy69ciacd35ckj"; libraryHaskellDepends = [ base bytestring primitive primitive-unlifted text text-short ]; @@ -97895,6 +98177,39 @@ self: { broken = true; }) {}; + "ersatz_0_5" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, containers + , data-default, fail, HUnit, lens, mtl, parsec, process, semigroups + , streams, temporary, test-framework, test-framework-hunit + , transformers, unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.5"; + sha256 = "1fzaany3mzzmizfzdglwqni3q842ip5z86apgdla2ynhq0hlmh3m"; + revision = "1"; + editedCabalFile = "0mg4bip6ngviyriyx3d0d588h5mm8a985gdhijd6y98yd86krb43"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process semigroups streams temporary transformers + unordered-containers + ]; + executableHaskellDepends = [ + array base containers fail lens mtl parsec semigroups + ]; + testHaskellDepends = [ + array base containers data-default HUnit test-framework + test-framework-hunit + ]; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -100458,8 +100773,8 @@ self: { }: mkDerivation { pname = "exon"; - version = "1.5.0.0"; - sha256 = "0j3l228ygb8gg8lgfmmajq78hv2y6078rqlmps8gs62vvbfrsnri"; + version = "1.5.0.1"; + sha256 = "1kj81x9haqvx61bi3f7baaqxnbpw6xkyfcmgb3653c1wiscd756d"; libraryHaskellDepends = [ base flatparse generics-sop ghc-hs-meta incipit-base template-haskell @@ -101079,8 +101394,8 @@ self: { pname = "extensible"; version = "0.9"; sha256 = "06zmc71r4cqglkv3av38djbkakvw9zxc3901xi2h65fwxn4npvnc"; - revision = "1"; - editedCabalFile = "1k8z4dnwkjisba6w5qjxyxvh7ibp6nvl82d6l8apjh7hriapwfx9"; + revision = "2"; + editedCabalFile = "19d0w4ifmjlkw7i36ah9xqcy3b9na7hcjnvj6grk5iqnlmkz6six"; libraryHaskellDepends = [ aeson base bytestring cassava comonad constraints deepseq ghc-prim hashable incremental membership prettyprinter primitive profunctors @@ -101302,6 +101617,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "extism-pdk" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, containers + , extism-manifest, json, messagepack + }: + mkDerivation { + pname = "extism-pdk"; + version = "0.2.0.0"; + sha256 = "0aqbzd9vnnfxn0wh5q6axcwq44iq2z5gq276qcbcfppd03vf83mm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring cereal containers extism-manifest json + messagepack + ]; + executableHaskellDepends = [ base ]; + description = "Extism Plugin Development Kit"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "extra" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, quickcheck-instances, time, unix @@ -104623,20 +104959,22 @@ self: { }) {}; "filepather" = callPackage - ({ mkDerivation, base, bytestring, contravariant, directory - , filepath, lens, mmorph, mtl, semigroupoids, semigroups, time + ({ mkDerivation, base, bytestring, containers, contravariant + , directory, filepath, lens, mmorph, mtl, semigroupoids, time , transformers }: mkDerivation { pname = "filepather"; - version = "0.4.1"; - sha256 = "0pvb828gsq4rip8vf66bxacd3jrb9z6pz3g2vd4zcnya5wgy47fh"; + version = "0.5.1"; + sha256 = "1drd7sfng2bmrmprj3yqazd76j2jny3rxcid7xvq95ga2imch45w"; libraryHaskellDepends = [ - base bytestring contravariant directory filepath lens mmorph mtl - semigroupoids semigroups time transformers + base bytestring containers contravariant directory filepath lens + mmorph mtl semigroupoids time transformers ]; description = "Functions on System.FilePath"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "filepattern" = callPackage @@ -105441,8 +105779,8 @@ self: { }: mkDerivation { pname = "fits-parse"; - version = "0.3.4"; - sha256 = "0kahw1bciy793wabn5v0xzxzr2csy99byycls7g3f3q0hly2y293"; + version = "0.3.5"; + sha256 = "0gs3ikdsn7g9g1mpdibimvybgmawmmpm8af6cj9gn0c617gqdm6r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106723,6 +107061,42 @@ self: { mainProgram = "floskell"; }) {}; + "floskell_0_11_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, attoparsec + , attoparsec-aeson, base, bytestring, containers, criterion + , data-default, deepseq, directory, exceptions, filepath, ghc-prim + , haskell-src-exts, hspec, monad-dijkstra, mtl + , optparse-applicative, text, transformers, unordered-containers + }: + mkDerivation { + pname = "floskell"; + version = "0.11.0"; + sha256 = "07l14zr1igq2vbs6m09ffc9ddchwbakmhb1bjnxldb3rsvaqnjc3"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-aeson base bytestring containers + data-default directory filepath haskell-src-exts monad-dijkstra mtl + text transformers unordered-containers + ]; + executableHaskellDepends = [ + aeson-pretty ansi-wl-pprint base bytestring directory ghc-prim + haskell-src-exts optparse-applicative text + ]; + testHaskellDepends = [ + base bytestring deepseq exceptions haskell-src-exts hspec text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq exceptions ghc-prim + haskell-src-exts text + ]; + description = "A flexible Haskell source code pretty printer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "floskell"; + }) {}; + "flow" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { @@ -107469,8 +107843,8 @@ self: { pname = "foldable1-classes-compat"; version = "0.1"; sha256 = "04pzjppmb195ffgxdzh8dh39z5dalr5wd6sifcnbg9p1b3rw6myh"; - revision = "3"; - editedCabalFile = "0ggamxlpw70njjb7rc8xxb432ra7drmjnfgazb5zqbb1a32bjjfh"; + revision = "4"; + editedCabalFile = "0kpsp659y563h2vanhrdnbza9skq1j9sm6y3fg2j4p1xsgnkqjzv"; libraryHaskellDepends = [ base containers ghc-prim tagged transformers ]; @@ -107798,8 +108172,8 @@ self: { }: mkDerivation { pname = "fontconfig-pure"; - version = "0.2.0.0"; - sha256 = "0i8crknwzqbhzkzfq1jjrm9cy1jabi7hd4mw3mg6qcma6zzi5q46"; + version = "0.3.0.0"; + sha256 = "1a9kd8wl2078bkh3p45z0m4zq8g3ya8gnzri0g3dj6rpjhrmhh51"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108624,78 +108998,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "fourmolu_0_9_0_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring - , Cabal, containers, Diff, directory, dlist, exceptions, filepath - , ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec - , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io - , pretty, process, QuickCheck, syb, template-haskell, temporary - , text, th-lift-instances, yaml - }: - mkDerivation { - pname = "fourmolu"; - version = "0.9.0.0"; - sha256 = "0zq9fv5yszm7icirgwj8g4lhg21lg87fhz56sssjnfikzmkwyh1l"; - revision = "1"; - editedCabalFile = "0hbjn9qzbr7a9571isi4i651gdi60qqa40idpfg87qlg2sd61485"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal array base bytestring Cabal containers Diff - directory dlist exceptions filepath ghc-lib-parser megaparsec - MemoTrie mtl syb template-haskell text th-lift-instances yaml - ]; - executableHaskellDepends = [ - base containers directory filepath ghc-lib-parser gitrev - optparse-applicative text yaml - ]; - testHaskellDepends = [ - base containers Diff directory filepath ghc-lib-parser hspec - hspec-megaparsec megaparsec path path-io pretty process QuickCheck - temporary text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "fourmolu"; - }) {}; - - "fourmolu_0_10_1_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring - , Cabal-syntax, containers, Diff, directory, dlist, exceptions - , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover - , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, pretty, process, QuickCheck, syb, template-haskell - , temporary, text, th-lift-instances, yaml - }: - mkDerivation { - pname = "fourmolu"; - version = "0.10.1.0"; - sha256 = "0gkzd2wf8hji5j0pxjv7l43m405zwsvppj7hax69j86346mb8hp4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal array base bytestring Cabal-syntax containers - Diff directory dlist exceptions filepath ghc-lib-parser megaparsec - MemoTrie mtl syb template-haskell text th-lift-instances yaml - ]; - executableHaskellDepends = [ - base containers directory filepath ghc-lib-parser gitrev - optparse-applicative text yaml - ]; - testHaskellDepends = [ - base containers Diff directory filepath ghc-lib-parser hspec - hspec-megaparsec megaparsec path path-io pretty process QuickCheck - temporary text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "fourmolu"; - }) {}; - "fourmolu" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary , bytestring, Cabal-syntax, containers, Diff, directory, dlist @@ -108732,43 +109034,6 @@ self: { mainProgram = "fourmolu"; }) {}; - "fourmolu_0_13_1_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base, binary - , bytestring, Cabal-syntax, containers, deepseq, Diff, directory - , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover - , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, pretty, process, QuickCheck, scientific, syb - , temporary, text, th-env, yaml - }: - mkDerivation { - pname = "fourmolu"; - version = "0.13.1.0"; - sha256 = "05vkqygrmgfgmsd8a4vxq8mq0c1z9cb3hja28aszd6llfv427dm1"; - revision = "1"; - editedCabalFile = "0jqgixycw8cv0q7amx5fs4ml9knql70ghg31br3hjkcy0vb2hi5v"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal array base binary bytestring Cabal-syntax - containers deepseq Diff directory file-embed filepath - ghc-lib-parser megaparsec MemoTrie mtl scientific syb text yaml - ]; - executableHaskellDepends = [ - base Cabal-syntax containers directory filepath ghc-lib-parser - optparse-applicative text th-env yaml - ]; - testHaskellDepends = [ - base bytestring Cabal-syntax containers Diff directory filepath - ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io - pretty process QuickCheck temporary text yaml - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "fourmolu"; - }) {}; - "fourmolu_0_14_0_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary , bytestring, Cabal-syntax, containers, deepseq, Diff, directory @@ -109177,39 +109442,45 @@ self: { "freckle-app" = callPackage ({ mkDerivation, aeson, aws-xray-client-persistent - , aws-xray-client-wai, base, Blammo, bugsnag, bytestring + , aws-xray-client-wai, base, bcp47, Blammo, bugsnag, bytestring , case-insensitive, cassava, conduit, conduit-extra, containers - , datadog, doctest, dotenv, ekg-core, envparse, errors, exceptions - , extra, filepath, Glob, hashable, hspec, hspec-core - , hspec-expectations-lifted, hspec-junit-formatter, http-client - , http-conduit, http-link-header, http-types, hw-kafka-client - , immortal, lens, lens-aeson, memcache, monad-control - , monad-validate, MonadRandom, mtl, network-uri + , cookie, datadog, doctest, dotenv, ekg-core, envparse, errors + , exceptions, extra, filepath, Glob, hashable, hs-opentelemetry-api + , hs-opentelemetry-instrumentation-persistent + , hs-opentelemetry-instrumentation-wai + , hs-opentelemetry-propagator-datadog, hs-opentelemetry-sdk, hspec + , hspec-core, hspec-expectations-lifted, hspec-junit-formatter + , http-client, http-conduit, http-link-header, http-types + , hw-kafka-client, immortal, lens, lens-aeson, memcache + , monad-control, monad-validate, MonadRandom, mtl, network-uri , nonempty-containers, path-pieces, persistent , persistent-postgresql, postgresql-simple, primitive, QuickCheck , resource-pool, resourcet, retry, safe, scientist, semigroupoids , template-haskell, text, time, transformers, transformers-base , typed-process, unliftio, unliftio-core, unordered-containers - , vector, wai, wai-extra, yaml, yesod-core + , vector, wai, wai-extra, yaml, yesod-core, yesod-test }: mkDerivation { pname = "freckle-app"; - version = "1.9.4.0"; - sha256 = "0z2hra1vc7ky1q5l6bjrnf78cdadf6dml5xzqqq085px4bcy4ca3"; - libraryHaskellDepends = [ - aeson aws-xray-client-persistent aws-xray-client-wai base Blammo - bugsnag bytestring case-insensitive cassava conduit conduit-extra - containers datadog doctest dotenv ekg-core envparse errors - exceptions extra filepath Glob hashable hspec hspec-core - hspec-expectations-lifted hspec-junit-formatter http-client - http-conduit http-link-header http-types hw-kafka-client immortal - lens memcache monad-control monad-validate MonadRandom mtl - network-uri nonempty-containers path-pieces persistent - persistent-postgresql postgresql-simple primitive resource-pool - resourcet retry safe scientist semigroupoids template-haskell text - time transformers transformers-base typed-process unliftio - unliftio-core unordered-containers vector wai wai-extra yaml - yesod-core + version = "1.10.1.0"; + sha256 = "1kwqiglc28xh73qh7fqs4233rxadfpp7yff9vf289xklw6c8la51"; + libraryHaskellDepends = [ + aeson aws-xray-client-persistent aws-xray-client-wai base bcp47 + Blammo bugsnag bytestring case-insensitive cassava conduit + conduit-extra containers cookie datadog doctest dotenv ekg-core + envparse errors exceptions extra filepath Glob hashable + hs-opentelemetry-api hs-opentelemetry-instrumentation-persistent + hs-opentelemetry-instrumentation-wai + hs-opentelemetry-propagator-datadog hs-opentelemetry-sdk hspec + hspec-core hspec-expectations-lifted hspec-junit-formatter + http-client http-conduit http-link-header http-types + hw-kafka-client immortal lens memcache monad-control monad-validate + MonadRandom mtl network-uri nonempty-containers path-pieces + persistent persistent-postgresql postgresql-simple primitive + resource-pool resourcet retry safe scientist semigroupoids + template-haskell text time transformers transformers-base + typed-process unliftio unliftio-core unordered-containers vector + wai wai-extra yaml yesod-core yesod-test ]; testHaskellDepends = [ aeson base Blammo bugsnag bytestring cassava conduit errors hspec @@ -109272,8 +109543,8 @@ self: { pname = "free"; version = "5.2"; sha256 = "12agp68cwwixcwfwnvk2xamg34a2x6ax7s1naxv66chpi5y7z1kj"; - revision = "2"; - editedCabalFile = "0gpw6n6pzy12ycwhi47cdzf90lxn94ajkqrvc12yvypzh2k5yaqk"; + revision = "3"; + editedCabalFile = "0w5yl0kg77nxrizd1d0r3d2f1wqy1wsq4mmpwxk7h7gq34d6rmsd"; libraryHaskellDepends = [ base comonad containers distributive exceptions indexed-traversable mtl profunctors semigroupoids template-haskell th-abstraction @@ -111607,8 +111878,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.3"; - sha256 = "0vqww2fmn2ksnxwrkzmxizgcnd0k20dgq9v20fqnn3xkyi7a5das"; + version = "0.25.5"; + sha256 = "1jikcawlhx0529dvdikz52qyb3q1hp1avagzdmgdggj5yik9wc38"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111908,8 +112179,8 @@ self: { }: mkDerivation { pname = "fuzzyset"; - version = "0.2.3"; - sha256 = "02rc846kfrkd0gd3j37gkmf87z09rzfa9bz2f0i2b83mh8ppk1sl"; + version = "0.2.4"; + sha256 = "0rj6d5z2cy954w3xzq4dfn0i3dg2idb8y2lcf2f10ar42r58zhxn"; libraryHaskellDepends = [ base data-default text text-metrics unordered-containers vector ]; @@ -113505,6 +113776,8 @@ self: { pname = "generic-deriving"; version = "1.14.5"; sha256 = "0jcl6cdf3pdg57yhf90rhdscszna0znvwhlffdcq3bnzkc2797za"; + revision = "1"; + editedCabalFile = "1fv2fy6f0wmsxghyn1ywl3zqvdlcv6sd6hqw02pgvhjjzavsysc0"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -113960,8 +114233,8 @@ self: { pname = "generically"; version = "0.1.1"; sha256 = "1ks3pi6mpma83xffplz8vmimyhvzpnhmcgvk3bvl3c64pqva9i84"; - revision = "1"; - editedCabalFile = "0pkyhym7q9v03pplpfjg80vmpk0cbgc56panfx9vcbzadvxmx6rb"; + revision = "2"; + editedCabalFile = "0z2rjz0ap63zjpj4166fxl09zfrlpmzn85pi3l0vhlr8pi4w13ip"; libraryHaskellDepends = [ base base-orphans ]; description = "Generically newtype to use with DerivingVia"; license = lib.licenses.bsd3; @@ -114491,6 +114764,26 @@ self: { license = lib.licenses.mit; }) {}; + "genvalidity-hspec_1_0_0_3" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-property, hspec + , hspec-core, QuickCheck, transformers, validity + }: + mkDerivation { + pname = "genvalidity-hspec"; + version = "1.0.0.3"; + sha256 = "0z4ykzbww4ydxf6f10hkrlmwbn4mkildbj2r57m8llyih8y51rhd"; + libraryHaskellDepends = [ + base genvalidity genvalidity-property hspec hspec-core QuickCheck + transformers validity + ]; + testHaskellDepends = [ + base genvalidity hspec hspec-core QuickCheck + ]; + description = "Standard spec's for GenValidity instances"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "genvalidity-hspec-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, genvalidity , genvalidity-aeson, genvalidity-hspec, genvalidity-property @@ -114573,6 +114866,28 @@ self: { license = lib.licenses.mit; }) {}; + "genvalidity-hspec-hashable_1_0_0_1" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec + , genvalidity-property, hashable, hspec, hspec-core, QuickCheck + , validity + }: + mkDerivation { + pname = "genvalidity-hspec-hashable"; + version = "1.0.0.1"; + sha256 = "07i60jkwx1dnazhc5v2z5ya0840lmpijhlj56nz0j3jq88hrf2wm"; + libraryHaskellDepends = [ + base genvalidity genvalidity-hspec genvalidity-property hashable + hspec QuickCheck validity + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec genvalidity-property hashable + hspec hspec-core QuickCheck validity + ]; + description = "Standard spec's for Hashable instances"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "genvalidity-hspec-optics" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec , genvalidity-property, hspec, microlens, QuickCheck, validity @@ -114737,6 +115052,33 @@ self: { license = lib.licenses.mit; }) {}; + "genvalidity-persistent_1_0_0_2" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, genvalidity + , genvalidity-containers, genvalidity-criterion, genvalidity-hspec + , hspec, persistent, persistent-template, QuickCheck + , validity-containers, validity-persistent + }: + mkDerivation { + pname = "genvalidity-persistent"; + version = "1.0.0.2"; + sha256 = "1ia99sv51zbp3mhk6apskhx95rfjly7z47p6r78mbm0j6m36a2vy"; + libraryHaskellDepends = [ + base containers genvalidity genvalidity-containers persistent + QuickCheck validity-containers validity-persistent + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec persistent + persistent-template QuickCheck validity-containers + ]; + benchmarkHaskellDepends = [ + base criterion deepseq genvalidity genvalidity-criterion persistent + persistent-template + ]; + description = "GenValidity support for Persistent"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "genvalidity-property" = callPackage ({ mkDerivation, base, genvalidity, hspec, pretty-show, QuickCheck , validity @@ -114831,6 +115173,28 @@ self: { license = lib.licenses.mit; }) {}; + "genvalidity-sydtest-hashable_1_0_0_1" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-sydtest, hashable + , QuickCheck, sydtest, sydtest-discover, validity + }: + mkDerivation { + pname = "genvalidity-sydtest-hashable"; + version = "1.0.0.1"; + sha256 = "1vmav4h4lcdwcbl2kpd3c3cqcb6x09ldfzkr84a75i38x9x07s52"; + libraryHaskellDepends = [ + base genvalidity genvalidity-sydtest hashable QuickCheck sydtest + validity + ]; + testHaskellDepends = [ + base genvalidity genvalidity-sydtest hashable QuickCheck sydtest + validity + ]; + testToolDepends = [ sydtest-discover ]; + description = "Standard spec's for Hashable instances for sydtest"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "genvalidity-sydtest-lens" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-sydtest, microlens , QuickCheck, sydtest, sydtest-discover, validity @@ -114960,6 +115324,28 @@ self: { license = lib.licenses.mit; }) {}; + "genvalidity-unordered-containers_1_0_0_1" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable + , hspec, QuickCheck, unordered-containers, validity + , validity-unordered-containers + }: + mkDerivation { + pname = "genvalidity-unordered-containers"; + version = "1.0.0.1"; + sha256 = "0880shsq544dhciabc19fhzi3hdjggb5vkg327hg3vg6xbvq250k"; + libraryHaskellDepends = [ + base genvalidity hashable QuickCheck unordered-containers validity + validity-unordered-containers + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec unordered-containers + validity + ]; + description = "GenValidity support for unordered-containers"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "genvalidity-uuid" = callPackage ({ mkDerivation, base, criterion, genvalidity , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck, uuid @@ -115479,7 +115865,7 @@ self: { mainProgram = "gh-pocket-knife"; }) {}; - "ghc_9_6_1" = callPackage + "ghc_9_6_3" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, Cabal , containers, deepseq, deriveConstants, directory, exceptions , filepath, genprimopcode, ghc-boot, ghc-heap, ghci, happy, hpc @@ -115487,8 +115873,8 @@ self: { }: mkDerivation { pname = "ghc"; - version = "9.6.1"; - sha256 = "1jrcqhg4qc1lj8cfv8apzpw0479g42lv5pw8dr3dvmhg21njp386"; + version = "9.6.3"; + sha256 = "0zl2g21ak4awsfr4qq2fdxngwnbhr27jsqnn15ld3wwhnwx9d106"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -115568,14 +115954,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-boot_9_6_1" = callPackage + "ghc-boot_9_6_3" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers , deepseq, directory, filepath, ghc-boot-th, unix }: mkDerivation { pname = "ghc-boot"; - version = "9.6.1"; - sha256 = "1vmlkp0sh5jlqgjj137kz02gb362913bzhvl3ij8vhdvd76r9116"; + version = "9.6.3"; + sha256 = "0m0w1v1s63w4zzh18q4ac403pxm7ic0v6cc6r8fl0pjl0cxsgbwr"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath @@ -115586,12 +115972,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-boot-th_9_6_1" = callPackage + "ghc-boot-th_9_6_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "9.6.1"; - sha256 = "1swd7wwjn80fvinfixqavd3akfdsxm7i3ymy1gyccbj03md4wz2b"; + version = "9.6.3"; + sha256 = "05bp3yr0pmim1zzc5jrbsvjb3vpvbg8wi4n9339s3cvrral57p5b"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = lib.licenses.bsd3; @@ -116150,12 +116536,12 @@ self: { broken = true; }) {}; - "ghc-heap_9_6_1" = callPackage + "ghc-heap_9_6_3" = callPackage ({ mkDerivation, base, containers, ghc-prim, rts }: mkDerivation { pname = "ghc-heap"; - version = "9.6.1"; - sha256 = "1ksbhlddq6s4r5mvg7q8xvpa02rq6al5768ca3qkqha8ssnziw53"; + version = "9.6.3"; + sha256 = "17lfv1cdqcrh8g6lps9lkisn3imfylg89xqx4k8amh59b9l4jmj6"; libraryHaskellDepends = [ base containers ghc-prim rts ]; description = "Functions for walking GHC's heap"; license = lib.licenses.bsd3; @@ -117559,17 +117945,16 @@ self: { }) {}; "ghcide" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, async, base - , base16-bytestring, binary, bytestring, case-insensitive - , co-log-core, containers, cryptohash-sha1, data-default, deepseq - , dependent-map, dependent-sum, Diff, directory, dlist, enummapset - , exceptions, extra, filepath, fingertree, focus, fuzzy, ghc - , ghc-boot, ghc-boot-th, ghc-check, ghc-paths, ghc-trace-events - , gitrev, Glob, haddock-library, hashable, hie-bios, hie-compat - , hiedb, hls-graph, hls-plugin-api, implicit-hie - , implicit-hie-cradle, lens, list-t, lsp, lsp-test, lsp-types - , monoid-subclasses, mtl, network-uri, opentelemetry - , optparse-applicative, parallel, prettyprinter + ({ mkDerivation, aeson, array, async, base, base16-bytestring + , binary, bytestring, case-insensitive, co-log-core, containers + , cryptohash-sha1, data-default, deepseq, dependent-map + , dependent-sum, Diff, directory, dlist, enummapset, exceptions + , extra, filepath, fingertree, focus, fuzzy, ghc, ghc-boot + , ghc-boot-th, ghc-check, ghc-paths, ghc-trace-events, gitrev, Glob + , haddock-library, hashable, hie-bios, hie-compat, hiedb, hls-graph + , hls-plugin-api, implicit-hie, implicit-hie-cradle, lens, list-t + , lsp, lsp-test, lsp-types, monoid-subclasses, mtl, network-uri + , opentelemetry, optparse-applicative, parallel, prettyprinter , prettyprinter-ansi-terminal, QuickCheck, random, regex-tdfa , row-types, safe-exceptions, shake, sorted-list, sqlite-simple , stm, stm-containers, syb, tasty, tasty-expected-failure @@ -117579,13 +117964,13 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "2.2.0.0"; - sha256 = "0rsai3xk50qxr234vwz6rmh1na9jxnacjibx71c3qj6pnh60ynl4"; + version = "2.3.0.0"; + sha256 = "0h05xdq46bchlk64x3rlf1gn2xz3sjr9pay0b1p2l7jc951czdg4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty array async base base16-bytestring binary - bytestring case-insensitive co-log-core containers cryptohash-sha1 + aeson array async base base16-bytestring binary bytestring + case-insensitive co-log-core containers cryptohash-sha1 data-default deepseq dependent-map dependent-sum Diff directory dlist enummapset exceptions extra filepath fingertree focus ghc ghc-boot ghc-boot-th ghc-check ghc-paths ghc-trace-events Glob @@ -117624,8 +118009,8 @@ self: { }: mkDerivation { pname = "ghcide-bench"; - version = "2.1.0.0"; - sha256 = "1ka6yfjrdam9jlgmkmirpbqr4yjhm372l7qlfby11cvjcq13bbh0"; + version = "2.3.0.0"; + sha256 = "17clwl9scj3yzg6x8krmcjpi90h9ivrf840xw3y90n2lx0835w04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118032,6 +118417,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghostscript-parallel" = callPackage + ({ mkDerivation, base, directory, optparse-applicative, pooled-io + , process, shell-utility, utility-ht + }: + mkDerivation { + pname = "ghostscript-parallel"; + version = "0.0"; + sha256 = "0ybxcghkrhr1g5sw3v4r3rn7ck4qic2vlv4zdfpg3bs3bi5f7x1j"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory optparse-applicative pooled-io process shell-utility + utility-ht + ]; + description = "Let Ghostscript render pages in parallel"; + license = lib.licenses.bsd3; + mainProgram = "gs-parallel"; + }) {}; + "ght" = callPackage ({ mkDerivation, base, binary, bytestring, data-default, directory , filepath, iteratee, iteratee-compress, mmap, mtl, old-locale, SHA @@ -119758,7 +120162,7 @@ self: { ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, aws, base , blaze-builder, bloomfilter, bup, byteable, bytestring, Cabal , case-insensitive, clientsession, concurrent-output, conduit - , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus + , containers, crypto-api, crypton, curl, data-default, DAV, dbus , deepseq, directory, disk-free-space, dlist, edit-distance , exceptions, fdo-notify, feed, filepath, filepath-bytestring, free , git, git-lfs, gnupg, hinotify, http-client @@ -119778,8 +120182,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20230828"; - sha256 = "0pb6834dwjs9kdki977rfkdyg58dfzy8wfwvswrz3n7h6bcnjd0b"; + version = "10.20230926"; + sha256 = "06m4f0prdcdhg5glqw9dknsiglb3bisk0jk2r1p95dqhma4x3pp7"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -119794,7 +120198,7 @@ self: { executableHaskellDepends = [ aeson ansi-terminal async attoparsec aws base blaze-builder bloomfilter byteable bytestring case-insensitive clientsession - concurrent-output conduit containers crypto-api cryptonite + concurrent-output conduit containers crypto-api crypton data-default DAV dbus deepseq directory disk-free-space dlist edit-distance exceptions fdo-notify feed filepath filepath-bytestring free git-lfs hinotify http-client @@ -120361,8 +120765,8 @@ self: { pname = "github"; version = "0.29"; sha256 = "1hki9lvf5vcq980ky98vwc7rh86rgf3z8pvqfgpb6jinc7jylcpx"; - revision = "3"; - editedCabalFile = "17dfigfd2p2h8zpvxfnr1y1ghl7a2f89k50rni4ibh1mn6x1j49r"; + revision = "4"; + editedCabalFile = "0lk7dhwgcgjxrryvag1qwnpb6ds5cmrcwj755n5f60nz4hm0hvqs"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -121031,8 +121435,8 @@ self: { pname = "gl"; version = "0.9"; sha256 = "1kb1igc9cyjavf3f3ccv9xhhsfn46pcrsw47qd9m5793nnmg13ii"; - revision = "2"; - editedCabalFile = "1lcqk3hb4s7qq4mxp0cykzinpgk8s1lbn05ay7i92q2h75jyhvk6"; + revision = "3"; + editedCabalFile = "19vnbwjldls1s8x8dr0rv7fgg4h4w423ly2lzcjdq3q1cdydh7h7"; libraryHaskellDepends = [ base containers fixed half transformers ]; @@ -122057,8 +122461,8 @@ self: { }: mkDerivation { pname = "gmail-simple"; - version = "0.1.0.4"; - sha256 = "1xjgww7hn27x4vmj23ji3i2r2552kkinbc0170k6sc5f2bxdda6f"; + version = "0.1.0.5"; + sha256 = "10h39d9hkqf4plgr5dh6lwsy2fdk62ciwn41dsn61pvvq01qpsyz"; libraryHaskellDepends = [ aeson base base64 blaze-html bytestring containers cryptonite http-api-data http-conduit http-media jwt text time @@ -126591,6 +126995,8 @@ self: { pname = "graphs"; version = "0.7.2"; sha256 = "1isdy8qx3q00pb3jinvvmfvzhwblr3yhj4dzmlv0hdj0yi9j8bly"; + revision = "1"; + editedCabalFile = "1yhlaqgzwm52llhirhff90cvgb92pirmwmn63vwh44b83nx6m2xc"; libraryHaskellDepends = [ array base containers transformers transformers-compat void ]; @@ -127179,29 +127585,28 @@ self: { }) {}; "grisette" = callPackage - ({ mkDerivation, array, base, bytestring, call-stack, deepseq - , doctest, generic-deriving, Glob, hashable, hashtables, intern - , loch-th, mtl, parallel, prettyprinter, QuickCheck, sbv, tasty - , tasty-hunit, tasty-quickcheck, tasty-test-reporter - , template-haskell, text, th-compat, transformers - , unordered-containers, vector + ({ mkDerivation, array, base, bytestring, deepseq, doctest + , generic-deriving, Glob, hashable, hashtables, HUnit, intern + , loch-th, mtl, parallel, prettyprinter, QuickCheck, sbv + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, th-compat, transformers + , unordered-containers }: mkDerivation { pname = "grisette"; - version = "0.3.1.0"; - sha256 = "0cph7bid3qx6zqnyhr8vaixr0mjf6hkfp0pi3h47rzrj0mm2ph3v"; + version = "0.3.1.1"; + sha256 = "15bzr7z0893p9yb85968lvisc76crnfqnrkxfv0qlff5png6ygrs"; libraryHaskellDepends = [ - array base bytestring call-stack deepseq generic-deriving hashable - hashtables intern loch-th mtl parallel prettyprinter QuickCheck sbv + array base bytestring deepseq generic-deriving hashable hashtables + intern loch-th mtl parallel prettyprinter QuickCheck sbv template-haskell text th-compat transformers unordered-containers - vector ]; testHaskellDepends = [ - array base bytestring call-stack deepseq doctest generic-deriving - Glob hashable hashtables intern loch-th mtl parallel prettyprinter - QuickCheck sbv tasty tasty-hunit tasty-quickcheck - tasty-test-reporter template-haskell text th-compat transformers - unordered-containers vector + array base bytestring deepseq doctest generic-deriving Glob + hashable hashtables HUnit intern loch-th mtl parallel prettyprinter + QuickCheck sbv template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 text th-compat transformers + unordered-containers ]; description = "Symbolic evaluation as a library"; license = lib.licenses.bsd3; @@ -127314,7 +127719,9 @@ self: { ]; description = "Command line utility to manage AWS ECS resources"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "groot"; + broken = true; }) {}; "gross" = callPackage @@ -130036,8 +130443,8 @@ self: { pname = "hackage-repo-tool"; version = "0.1.1.3"; sha256 = "13q81gi3xmkzwfrbyk5dwxws3c92vnrlslksi021iasmjwhw2h6l"; - revision = "3"; - editedCabalFile = "0kiqfglppvwb718z05chwpl50bv5yfvrfx67w5qhx4kpi4bsxcvs"; + revision = "4"; + editedCabalFile = "1yybcwkpkkdzivpv35z05dmi9f3awyw0c03vhm26wa87wvmpsqir"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -130062,8 +130469,8 @@ self: { pname = "hackage-security"; version = "0.6.2.3"; sha256 = "0rm0avcc1k247qbrajhzi3vz92cgcc4nr3kbhhfmfm8rjxv0bvjj"; - revision = "6"; - editedCabalFile = "1999rc45cq04gf4c28zn8hylx47kxhij7q9p1wzgd706f0l6c33q"; + revision = "7"; + editedCabalFile = "09hahx1a7vvmi1y4z5h3bnvmikjdcqhdvyvmndp5q861dl3iwj98"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -130087,8 +130494,8 @@ self: { pname = "hackage-security-HTTP"; version = "0.1.1.1"; sha256 = "14hp7gssf80b9937j7m56w8sxrv3hrzjf2s9kgfk76v6llgx79k2"; - revision = "6"; - editedCabalFile = "10y3yd4nlk71xwhkrwnw4bcnpp2wf2mkvf9ahx3n6qdcqjh1gk4s"; + revision = "7"; + editedCabalFile = "004wgr36a1f835ixmqnsa41c3161yh8kykbjvj3wyx52bwp9xa26"; libraryHaskellDepends = [ base bytestring hackage-security HTTP mtl network network-uri zlib ]; @@ -130394,8 +130801,8 @@ self: { ({ mkDerivation, base, filepath, haddock-api }: mkDerivation { pname = "haddock"; - version = "2.27.0"; - sha256 = "094207chb9vw7nnz5bznnifzyk9waxwylv0r7n1nyahbjs013lyn"; + version = "2.29.1"; + sha256 = "15492x6z95mwkv2d463kc8cb3naabfjrwl0pyz1cr6wakrlds6m0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haddock-api ]; @@ -130442,8 +130849,8 @@ self: { }: mkDerivation { pname = "haddock-api"; - version = "2.27.0"; - sha256 = "198j5cn6zasb44w3yb8dqhsx6bv2xndh6xfc8ypjfg491qs8819z"; + version = "2.29.1"; + sha256 = "0i6zpyd42a6hg9xmh2qi1j7sxacm2bwdnz4mljhx34314bp8xkyj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers deepseq directory exceptions @@ -131123,8 +131530,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.16.1.0"; - sha256 = "0w1x2m1395a47b0712v4j8qjhha8sjqlmxdmfbxnr65nz36340jj"; + version = "4.16.2.0"; + sha256 = "1p3x9f1ha6dkis71nzbxh1h7mzldsj4qvmfx3f0vng7y1ydlcw0z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -131590,6 +131997,30 @@ self: { broken = true; }) {}; + "hakyllbars" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, data-default + , directory, filepath, hakyll, hspec, MissingH, mtl, network-uri + , pandoc, parsec, process, scientific, text, time + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hakyllbars"; + version = "1.0.0.2"; + sha256 = "0zw1jp64zzflgy9hwdd00zkh3vbi8vbfi0qswmqdgr6dk0c390g0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring data-default directory filepath hakyll + MissingH mtl network-uri pandoc parsec process scientific text time + unordered-containers vector yaml + ]; + executableHaskellDepends = [ base hakyll MissingH pandoc time ]; + testHaskellDepends = [ base hspec parsec ]; + description = "A Hakyll compiler for Handlebars-like templates"; + license = lib.licenses.bsd3; + mainProgram = "hakyllbars-site"; + }) {}; + "hal" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, conduit, conduit-extra, containers, exceptions @@ -133425,23 +133856,30 @@ self: { }) {}; "harfbuzz-pure" = callPackage - ({ mkDerivation, base, bytestring, derive-storable, freetype2 - , harfbuzz, parallel, text + ({ mkDerivation, base, bytestring, criterion, deepseq + , derive-storable, file-embed, filepath, freetype2, harfbuzz + , parallel, text }: mkDerivation { pname = "harfbuzz-pure"; - version = "1.0.3.2"; - sha256 = "0dkr860mrbyy734k7z7b3l32fvf691iyn2kwmip7g06wkabd2a50"; + version = "1.0.4.0"; + sha256 = "1qhwkm9sgjw1pqy3ich6fq6xzwan07yn2i485pwpadfi2ylsv3k7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring derive-storable freetype2 text + base bytestring deepseq derive-storable freetype2 text ]; libraryPkgconfigDepends = [ harfbuzz ]; - executableHaskellDepends = [ base bytestring parallel text ]; + executableHaskellDepends = [ + base bytestring criterion file-embed filepath parallel text + ]; + benchmarkHaskellDepends = [ + base criterion file-embed filepath parallel text + ]; description = "Pure-functional Harfbuzz language bindings"; license = lib.licenses.mit; - mainProgram = "shape-text"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) harfbuzz;}; "harg" = callPackage @@ -133650,10 +134088,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.6.2"; - sha256 = "1y7vjng3qjy5jaj3c90b5a08xrn49c4bb2wa9s612ny5qc98dl9g"; - revision = "1"; - editedCabalFile = "029sw5fqcqpzsx2ahkngfimyd9kyjn7abg0cvz4pb8y96ypl3cs7"; + version = "0.1.6.3"; + sha256 = "0ji2kk89sprw95c2p5i8m763jik1ibzgpbwif3vmr2idmmpjilz0"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default deepseq deepseq-generics mtl network text @@ -133677,8 +134113,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.3.0"; - sha256 = "0cvbwybvxzy5bq6y6sh9pvjjr0s5pslz32a0ip9bklg7ivvpd8f7"; + version = "0.0.3.1"; + sha256 = "1hbnzbv8rhsqhz1n2575dm22spfglcs0f237y1rrprfsxm7isqwy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133990,6 +134426,8 @@ self: { pname = "hashable"; version = "1.4.3.0"; sha256 = "1xdhg8mn1i3bci7sbw9nx18sxadkz6fw7rfbnw4n4y4i51nb3vrj"; + revision = "1"; + editedCabalFile = "153i7nzxqmimb565yrq0c6wnypmmzvf2rvvqldja1xqdzan6igzk"; libraryHaskellDepends = [ base bytestring containers deepseq filepath ghc-bignum ghc-prim text @@ -134577,6 +135015,8 @@ self: { pname = "haskeline"; version = "0.8.2.1"; sha256 = "1zs0rlhd7lzp5g4kp7v5ca7cdwan7w4bx3jh5q2ri950svr2k1x0"; + revision = "1"; + editedCabalFile = "1vmsi909jaykpaqfssnv92lzr1n2gy34s07lsh29p75187ps6gny"; configureFlags = [ "-fterminfo" ]; isLibrary = true; isExecutable = true; @@ -135484,8 +135924,8 @@ self: { }: mkDerivation { pname = "haskell-language-server"; - version = "2.2.0.0"; - sha256 = "0896ji6drjkmpsgzhq64ls3wgk2fg8imr3hdxyjlb8izkrq1vvmy"; + version = "2.3.0.0"; + sha256 = "1q0xxmqhvgad89zg4qg3a4660qdmxy1m6sspyf9a7l4v2jxyl8vi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137507,8 +137947,8 @@ self: { }: mkDerivation { pname = "haskintex"; - version = "0.8.0.1"; - sha256 = "12q6j9z7hwb93sli4wk4lidlf3m7y3dazpp5ymvpbxnb7wjzirr6"; + version = "0.8.0.2"; + sha256 = "1wp46yh0267kcjxq0x4in51bxam2lm4n85mcsm3v6nzznf0dddr2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137821,55 +138261,53 @@ self: { "haskoin-store" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base16, base64, bytes , bytestring, cereal, conduit, containers, data-default, deepseq - , ekg-core, ekg-statsd, filepath, foldl, hashable, hashtables - , haskoin-core, haskoin-node, haskoin-store-data, hedis, hspec - , hspec-discover, http-types, lens, monad-control, monad-logger - , mtl, network, nqe, optparse-applicative, QuickCheck, random - , rocksdb-haskell-jprupp, rocksdb-query, scotty, stm - , string-conversions, text, time, transformers, unliftio - , unordered-containers, vault, wai, wai-extra, wai-websockets, warp - , websockets, wreq + , filepath, hashable, hashtables, haskoin-core, haskoin-node + , haskoin-store-data, hedis, hspec, hspec-discover, http-types + , lens, monad-control, monad-logger, mtl, network, nqe + , optparse-applicative, QuickCheck, random, rocksdb-haskell-jprupp + , rocksdb-query, scotty, statsd-rupp, stm, string-conversions, text + , time, transformers, unliftio, unordered-containers, vault, wai + , wai-websockets, warp, websockets, wreq }: mkDerivation { pname = "haskoin-store"; - version = "1.0.1"; - sha256 = "19i4m1hgf5gzlxq3pkq8wcn0z264b701xljzxsaq5zwdp9hvx9iy"; + version = "1.2.1"; + sha256 = "1jnglyi1kmfxl69gczws2pp4x43jazrkdm5bdh978ckv9v94s849"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base base16 bytes bytestring cereal conduit - containers data-default deepseq ekg-core ekg-statsd foldl hashable - hashtables haskoin-core haskoin-node haskoin-store-data hedis - http-types lens monad-control monad-logger mtl network nqe random - rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions - text time transformers unliftio unordered-containers vault wai - wai-extra wai-websockets warp websockets wreq + containers data-default deepseq hashable hashtables haskoin-core + haskoin-node haskoin-store-data hedis http-types lens monad-control + monad-logger mtl network nqe random rocksdb-haskell-jprupp + rocksdb-query scotty statsd-rupp stm string-conversions text time + transformers unliftio unordered-containers vault wai wai-websockets + warp websockets wreq ]; executableHaskellDepends = [ aeson aeson-pretty base base16 bytes bytestring cereal conduit - containers data-default deepseq ekg-core ekg-statsd filepath foldl - hashable hashtables haskoin-core haskoin-node haskoin-store-data - hedis http-types lens monad-control monad-logger mtl network nqe - optparse-applicative random rocksdb-haskell-jprupp rocksdb-query - scotty stm string-conversions text time transformers unliftio - unordered-containers vault wai wai-extra wai-websockets warp - websockets wreq + containers data-default deepseq filepath hashable hashtables + haskoin-core haskoin-node haskoin-store-data hedis http-types lens + monad-control monad-logger mtl network nqe optparse-applicative + random rocksdb-haskell-jprupp rocksdb-query scotty statsd-rupp stm + string-conversions text time transformers unliftio + unordered-containers vault wai wai-websockets warp websockets wreq ]; testHaskellDepends = [ aeson aeson-pretty base base16 base64 bytes bytestring cereal - conduit containers data-default deepseq ekg-core ekg-statsd foldl - hashable hashtables haskoin-core haskoin-node haskoin-store-data - hedis hspec http-types lens monad-control monad-logger mtl network - nqe QuickCheck random rocksdb-haskell-jprupp rocksdb-query scotty - stm string-conversions text time transformers unliftio - unordered-containers vault wai wai-extra wai-websockets warp - websockets wreq + conduit containers data-default deepseq hashable hashtables + haskoin-core haskoin-node haskoin-store-data hedis hspec http-types + lens monad-control monad-logger mtl network nqe QuickCheck random + rocksdb-haskell-jprupp rocksdb-query scotty statsd-rupp stm + string-conversions text time transformers unliftio + unordered-containers vault wai wai-websockets warp websockets wreq ]; testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "haskoin-store"; + broken = true; }) {}; "haskoin-store-data" = callPackage @@ -137900,7 +138338,7 @@ self: { license = lib.licenses.mit; }) {}; - "haskoin-store-data_1_0_2" = callPackage + "haskoin-store-data_1_2_0" = callPackage ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal , containers, data-default, deepseq, hashable, haskoin-core, hspec , hspec-discover, http-client, http-types, lens, mtl, network @@ -137909,8 +138347,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "1.0.2"; - sha256 = "1h5barixyfvjaqdk9k14l4n4nz6gaxn37zhwydd296gbzzg6fg0y"; + version = "1.2.0"; + sha256 = "0a1b33q9b93wsjl2kr7iiy0fxbxi1bbdpna62sm3d2dv6lj1gck7"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -139054,8 +139492,8 @@ self: { pname = "hasql-listen-notify"; version = "0.1.0"; sha256 = "0bq4s4x76spjziqgda0shdzfwdhgz1fhsbdg63r3l0m01ixg1a50"; - revision = "1"; - editedCabalFile = "13k436xbjv74zw1yhl5xqa5bld0l838d5s7z72mfxk3kk6dbh9rx"; + revision = "2"; + editedCabalFile = "0h0dk2wkgxmwbkz1hhpyhi7q7m3lz9l5n9kdvxmibsx811qmizhh"; libraryHaskellDepends = [ base bytestring hasql mtl postgresql-libpq text ]; @@ -139450,8 +139888,8 @@ self: { }: mkDerivation { pname = "hasql-transaction-io"; - version = "0.2.2.0"; - sha256 = "1rrcpvkkg4l1lzmrhf4vihp4a56xg28cysdshlvl8anbf1ga3q41"; + version = "0.2.3.0"; + sha256 = "1wz4sjrnivq9jbgg9q6wgxmknvflnkdvrdrxdrxwmvmvi2g1qybp"; libraryHaskellDepends = [ base bytestring bytestring-tree-builder exceptions hasql mtl resourcet safe-exceptions transformers unliftio-core @@ -141864,8 +142302,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.5.4"; sha256 = "0z9ik5asddc2pnz430jsi1pyahkh6jy36ng0vwm7ywcq7cvhcvlz"; - revision = "1"; - editedCabalFile = "06d6wjpg2dqip714az5w01kgz3rl4w8i61l09fb4mx79a43y6pa5"; + revision = "2"; + editedCabalFile = "1x66hrfnw3aqvhcvasfj8vk69nqss32ygnl9lfpy6rhhbwvpsf8c"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers vector wl-pprint-annotated @@ -141951,6 +142389,8 @@ self: { ]; description = "Customizable Gen for ADT using Generics"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hedgehog-gen-json" = callPackage @@ -142270,6 +142710,53 @@ self: { broken = true; }) {}; + "heftia" = callPackage + ({ mkDerivation, base, classy-effects-base, constraints, extensible + , free, kan-extensions, membership, mtl, tasty, tasty-discover + , tasty-hunit, transformers, transformers-base + }: + mkDerivation { + pname = "heftia"; + version = "0.1.0.0"; + sha256 = "1j7gfzdlb7wqrx47mcvvlm621p262fjx5s4ylgmq0r1w7g5blazw"; + libraryHaskellDepends = [ + base classy-effects-base constraints extensible free kan-extensions + membership mtl transformers transformers-base + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + testToolDepends = [ tasty-discover ]; + description = "Higher-order version of Freer"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + + "heftia-effects" = callPackage + ({ mkDerivation, base, classy-effects, extensible, extra + , ghc-typelits-knownnat, heftia, loglevel, mtl, tasty + , tasty-discover, tasty-hunit, text, time, transformers + }: + mkDerivation { + pname = "heftia-effects"; + version = "0.1.0.0"; + sha256 = "1ra1f7cvaasgdvp9v6cslkhp2av1hf4dn0dkls5a1i68593gxhxc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base classy-effects extensible heftia mtl transformers + ]; + executableHaskellDepends = [ + base classy-effects extra ghc-typelits-knownnat heftia loglevel + text time + ]; + testHaskellDepends = [ + base classy-effects heftia tasty tasty-hunit + ]; + testToolDepends = [ tasty-discover ]; + description = "Handlers for standard effects using Heftia"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hegg" = callPackage ({ mkDerivation, base, containers, tasty, tasty-bench, tasty-hunit , tasty-quickcheck, transformers @@ -143616,6 +144103,31 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hetzner_0_4_0_1" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit + , containers, country, directory, http-conduit, ip, megaparsec + , scientific, text, time, yaml + }: + mkDerivation { + pname = "hetzner"; + version = "0.4.0.1"; + sha256 = "13cykpg9505xw7b5k2897kyzibvb1y9sklr7cm4r552mk5h5wm4b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers country http-conduit ip + megaparsec scientific text time yaml + ]; + executableHaskellDepends = [ + base blaze-html bytestring directory time + ]; + testHaskellDepends = [ base ]; + description = "Hetzner Cloud and DNS library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hetzner-docs"; + }) {}; + "heukarya" = callPackage ({ mkDerivation, base, containers, deepseq, parallel, random, text }: @@ -144758,8 +145270,8 @@ self: { pname = "hgmp"; version = "0.1.2.1"; sha256 = "08w0b6yla086vk802xqcqslpkqpjx2h2hc6l3jyymms77qyn70f6"; - revision = "1"; - editedCabalFile = "01mgxv6gchzxkd8aqzl97mbs4bidnpvkb6462pz7s96c5kgm0z2q"; + revision = "2"; + editedCabalFile = "15n60g7bp59f6sbch4ww2k5dgjbghghw0k0jifn3rgiiki14gsxk"; libraryHaskellDepends = [ base ghc-bignum ghc-prim ]; testHaskellDepends = [ base QuickCheck ]; description = "Haskell interface to GMP"; @@ -146787,8 +147299,8 @@ self: { }: mkDerivation { pname = "hix"; - version = "0.6.1"; - sha256 = "15961xpyw5zibqqr8svix1d96njvgzxh464ahx5fyprmznxwkj59"; + version = "0.6.7"; + sha256 = "1549cgc4vw1zlqg3qwslimhf17ci7c5yad4k5jrdz1mf0qqk4cv5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147434,10 +147946,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.18"; - sha256 = "0j2p785hxjzmisz2yi5841zdfyl1sqjwzacm7ijz9px8gx812kbc"; - revision = "2"; - editedCabalFile = "0833bg0awc4sr3hlslirbivrcvy0varmhdklx0dwx0mz1gikyp9r"; + version = "1.3.19"; + sha256 = "12x9qdn0p2sq0z1q1gnxnajkvdlyk25xywq7yi7il1hqdrz1mkmf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147458,7 +147968,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "A terminal UI as drop-in replacement for hledger add"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hledger-iadd"; + broken = true; }) {}; "hledger-interest" = callPackage @@ -148008,8 +148520,8 @@ self: { ({ mkDerivation, base, containers, ghc, hlint }: mkDerivation { pname = "hlint-plugin"; - version = "1.0.1"; - sha256 = "1npzxf380wq24zmvrxid318afh6g41nl5pb7bqldf4y6m9wamp1k"; + version = "1.0.2"; + sha256 = "1vyaqqa40wsbsg8lddx9qswrfpwvnrdhc310wsl4a3s7zr08q96g"; libraryHaskellDepends = [ base containers ghc hlint ]; description = "GHC plugin for hlint"; license = lib.licenses.bsd3; @@ -148156,8 +148668,8 @@ self: { }: mkDerivation { pname = "hls-alternate-number-format-plugin"; - version = "2.2.0.0"; - sha256 = "05jz7nf4mp0z0bag0ym42c511c05w0hx3ai18kwamavin68a41kb"; + version = "2.3.0.0"; + sha256 = "0sblh25z3d8y3sn3mz5bxwk4jcshavc40xb8q3qyhdy96ab93g48"; libraryHaskellDepends = [ aeson base containers extra ghc-boot-th ghcide hie-compat hls-graph hls-plugin-api lens lsp mtl regex-tdfa syb text @@ -148190,8 +148702,8 @@ self: { }: mkDerivation { pname = "hls-cabal-fmt-plugin"; - version = "2.2.0.0"; - sha256 = "1lmf1cni6kclcdvwd70n40n14hd6b3din6apnmbwbdh84i7z43s6"; + version = "2.3.0.0"; + sha256 = "1lx59xyx867zak74a58z049061k9mzjdvvxcb824xs4hf1kr6cxm"; libraryHaskellDepends = [ base directory filepath ghcide hls-plugin-api lens lsp-types mtl process-extras text transformers @@ -148210,8 +148722,8 @@ self: { }: mkDerivation { pname = "hls-cabal-plugin"; - version = "2.2.0.0"; - sha256 = "0pl5zn09vbbfklkf49azd447353rb4x6mr95kswlckvk8qvxcb5n"; + version = "2.3.0.0"; + sha256 = "1qqr6c4xdyjhsnpsv3f7hxbn2hx2qsj4mlipfr1g3rijy0qjbj6l"; libraryHaskellDepends = [ base bytestring Cabal-syntax containers deepseq directory extra filepath ghcide hashable hls-graph hls-plugin-api lens lsp @@ -148234,8 +148746,8 @@ self: { }: mkDerivation { pname = "hls-call-hierarchy-plugin"; - version = "2.2.0.0"; - sha256 = "0ng0567z3fpsxzkxx60jhk6d3a1cllcgrdscijcndqknr38c97jk"; + version = "2.3.0.0"; + sha256 = "0283jv1kj63lj8npbi6k91f17sql2g9hnza98cnnrj620ic9ils1"; libraryHaskellDepends = [ aeson base containers extra ghcide hiedb hls-plugin-api lens lsp sqlite-simple text unordered-containers @@ -148255,8 +148767,8 @@ self: { }: mkDerivation { pname = "hls-change-type-signature-plugin"; - version = "2.2.0.0"; - sha256 = "0vpv87mnbk7d18vxl01r6f7pyz94107v9mc4mnbb2z2fmq6bcsfj"; + version = "2.3.0.0"; + sha256 = "18zals4rhx2z4dkkhz1ml6v3z53z3n4p1v66kgnxs5i4zvw282av"; libraryHaskellDepends = [ base containers ghcide hls-plugin-api lsp-types regex-tdfa syb text transformers unordered-containers @@ -148276,8 +148788,8 @@ self: { }: mkDerivation { pname = "hls-class-plugin"; - version = "2.2.0.0"; - sha256 = "042z92xjdxjp5f6zig692nq2f8dk1m5rhhjqqczn3zkw0zs9v96v"; + version = "2.3.0.0"; + sha256 = "10fr3vxw4scbpkwv32p9w2vd2k87ilvwwfm02wgh8gcxfzss53fp"; libraryHaskellDepends = [ aeson base containers deepseq extra ghc ghc-boot-th ghc-exactprint ghcide hls-graph hls-plugin-api lens lsp mtl text transformers @@ -148298,8 +148810,8 @@ self: { }: mkDerivation { pname = "hls-code-range-plugin"; - version = "2.2.0.0"; - sha256 = "0w6hh36szkjgpvxx07cckjr3jnrk80y2ib2mfga7xmw55pmcvrg8"; + version = "2.3.0.0"; + sha256 = "1pjq44mwv6q5vhj8k6i6jpklc9q69calavzj9vwvzri1zx2yv51b"; libraryHaskellDepends = [ aeson base containers deepseq extra ghcide hashable hls-plugin-api lens lsp mtl semigroupoids text transformers vector @@ -148324,8 +148836,8 @@ self: { }: mkDerivation { pname = "hls-eval-plugin"; - version = "2.2.0.0"; - sha256 = "05ap5rzrr8qjqn18l5gyn598iksmjf563f6ksg9mv5hkpzbiin1j"; + version = "2.3.0.0"; + sha256 = "0yqpi8v4g5n6081ymfj37sk58x4c68zbxh84v07cbvr2nm51xi0x"; libraryHaskellDepends = [ aeson base bytestring containers data-default deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide @@ -148366,8 +148878,8 @@ self: { }: mkDerivation { pname = "hls-explicit-fixity-plugin"; - version = "2.2.0.0"; - sha256 = "00mpdx9szdmbgh5glfi9lbwfb8qdqqi7jyi61d5fcppmniy51vcl"; + version = "2.3.0.0"; + sha256 = "1pshx1s29zv6k70rimvfdd1cz1yrs1j0206p6ndlyn6cv28vai7y"; libraryHaskellDepends = [ base containers deepseq extra ghc ghcide hashable hls-plugin-api lsp text transformers @@ -148385,8 +148897,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "2.2.0.0"; - sha256 = "0gh2vxdnyxhxhldfnrsj41p099jd113z1a8qnn4p4d0ba7j2qsic"; + version = "2.3.0.0"; + sha256 = "0lki1db4dmvky50k5k61yskfmyqmrph1lxjfwb31pg3rjiiasgqi"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api lens lsp mtl text transformers unordered-containers @@ -148406,8 +148918,8 @@ self: { }: mkDerivation { pname = "hls-explicit-record-fields-plugin"; - version = "2.2.0.0"; - sha256 = "1xhc2zb56q1bziiypdll0898nz26pvwgmqfwps3dh8agixfpvn15"; + version = "2.3.0.0"; + sha256 = "1f14nh9wjs35wljhrgssqm124gl4ilhxwn51fg5kbh15w6pqz1w9"; libraryHaskellDepends = [ aeson base containers ghc ghc-boot-th ghcide hls-graph hls-plugin-api lens lsp syb text transformers unordered-containers @@ -148425,8 +148937,8 @@ self: { }: mkDerivation { pname = "hls-floskell-plugin"; - version = "2.2.0.0"; - sha256 = "1kj1f7k0fdcj1mqijng56qax42y9aywkd3gi2pvivdsfd7rnc9dr"; + version = "2.3.0.0"; + sha256 = "09jld74jb7k3bs4hq3jq0v4lmk8h28pqcynpxmkp0yy86hfyn6q7"; libraryHaskellDepends = [ base floskell ghcide hls-plugin-api lsp-types mtl text transformers ]; @@ -148442,8 +148954,8 @@ self: { }: mkDerivation { pname = "hls-fourmolu-plugin"; - version = "2.2.0.0"; - sha256 = "16i26nk6zrjgrz1yf7xariygiin2h8xa0sqwfnm81nybzszr50h6"; + version = "2.3.0.0"; + sha256 = "1qpxay22ssipnzp32sqv76iaij13lxd8bdn4zj0qflrm25m90jzz"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens lsp mtl process-extras text transformers @@ -148465,8 +148977,8 @@ self: { }: mkDerivation { pname = "hls-gadt-plugin"; - version = "2.2.0.0"; - sha256 = "1pbqy9ndxkcn57lpwfgd2y38gs8vq55sqxhw44rdfsw6gjpmw1xj"; + version = "2.3.0.0"; + sha256 = "1l6kj9kp40ii8sfqsbi6mz2q8x6zp1076apdhy7d6fblrkv06ch0"; libraryHaskellDepends = [ aeson base containers extra ghc ghc-boot-th ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lens lsp mtl text transformers @@ -148488,8 +149000,8 @@ self: { }: mkDerivation { pname = "hls-graph"; - version = "2.2.0.0"; - sha256 = "0c306fb54kylj8bg6l4nm0f5fw88hyyk59nzps4w16gciqbdjlw1"; + version = "2.3.0.0"; + sha256 = "0vhzdvmk8s73m0z667dk3ryd6rdfzz96g6872q645mdhs2hqc0zg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions @@ -148528,8 +149040,8 @@ self: { }: mkDerivation { pname = "hls-hlint-plugin"; - version = "2.2.0.0"; - sha256 = "0qrygjvgm5x88j7cjw9dhzli38by0gzmda8f8bkqi8v1qx09ny76"; + version = "2.3.0.0"; + sha256 = "013vl2wrr73gzp8cswvzcis4j32a0s2zdda8nwy47k0qkmrdqxym"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc-exactprint ghc-lib-parser @@ -148552,8 +149064,8 @@ self: { }: mkDerivation { pname = "hls-module-name-plugin"; - version = "2.2.0.0"; - sha256 = "1z3iiqw7h08cpz99wciaqwdcsrnvpxff95jswidzk696lnlzyvbh"; + version = "2.3.0.0"; + sha256 = "10x7i61pk8j9jc1l83rnp5nhxcd54dpd4kllz9gyvgxz4kvwmddy"; libraryHaskellDepends = [ aeson base containers directory filepath ghcide hls-plugin-api lsp text transformers unordered-containers @@ -148564,21 +149076,23 @@ self: { }) {}; "hls-ormolu-plugin" = callPackage - ({ mkDerivation, base, extra, filepath, ghc, ghc-boot-th, ghcide - , hls-plugin-api, hls-test-utils, lens, lsp, lsp-types, mtl, ormolu - , text + ({ mkDerivation, aeson, base, containers, extra, filepath, ghc + , ghc-boot-th, ghcide, hls-plugin-api, hls-test-utils, lens, lsp + , lsp-types, mtl, ormolu, process-extras, text, transformers }: mkDerivation { pname = "hls-ormolu-plugin"; - version = "2.2.0.0"; - sha256 = "0c6kj7870q5fi00cgx3z4cpvldsdvn4brjg4v7vv32grfj7nwdc1"; + version = "2.3.0.0"; + sha256 = "0cxw2bmdlfr97vj2jgcs714pa94iw96p8xa07i8ahv6fpfc3j8rw"; libraryHaskellDepends = [ base extra filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp - mtl ormolu text + mtl ormolu process-extras text transformers ]; testHaskellDepends = [ - base filepath hls-test-utils lsp-types ormolu text + aeson base containers filepath hls-plugin-api hls-test-utils + lsp-types ormolu text ]; + testToolDepends = [ ormolu ]; description = "Integration with the Ormolu code formatter"; license = lib.licenses.asl20; }) {}; @@ -148591,8 +149105,8 @@ self: { }: mkDerivation { pname = "hls-overloaded-record-dot-plugin"; - version = "2.2.0.0"; - sha256 = "1cllpyqnwfy7kk2h17igzv2ly71qm1k76mm2wjjgpy3qfh3fz7wm"; + version = "2.3.0.0"; + sha256 = "1g92q71a4538l43c754q44xds6yg8sl7y8r7m3qrza664hs68wyl"; libraryHaskellDepends = [ aeson base containers deepseq ghc-boot-th ghcide hls-graph hls-plugin-api lens lsp syb text transformers unordered-containers @@ -148617,8 +149131,8 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "2.2.0.0"; - sha256 = "0j95g116vv92wx7mm7anjifx3w494f4bycw0ad7wxf57qrb063l1"; + version = "2.3.0.0"; + sha256 = "1q5s8l8z007li3nbk653vd3k4wjgr92yrl16ly42pnrabwwffy77"; libraryHaskellDepends = [ aeson base co-log-core containers data-default dependent-map dependent-sum Diff dlist extra filepath ghc hashable hls-graph @@ -148644,8 +149158,8 @@ self: { }: mkDerivation { pname = "hls-pragmas-plugin"; - version = "2.2.0.0"; - sha256 = "07dy9r63ixvzf5isbw8nl9vfpym17h66vzmxn79kgnh8xkx11rgm"; + version = "2.3.0.0"; + sha256 = "0lxh2ynfdx78x34a2mp9qsz2kdp6hyqqjn776mbsmxz26h9i94m8"; libraryHaskellDepends = [ base containers extra fuzzy ghc ghcide hls-plugin-api lens lsp text transformers unordered-containers @@ -148664,8 +149178,8 @@ self: { }: mkDerivation { pname = "hls-qualify-imported-names-plugin"; - version = "2.2.0.0"; - sha256 = "0viam4zzkbbi8lv4c86bqhy3r00x7qjrbwwaqakdgfhn4l8d97r6"; + version = "2.3.0.0"; + sha256 = "0mxd9zwsyf322lzlixs6956zhpbf9k7idvrzczfwij0jga7dppg9"; libraryHaskellDepends = [ aeson base containers deepseq dlist ghc ghcide hls-graph hls-plugin-api lens lsp text transformers unordered-containers @@ -148687,8 +149201,8 @@ self: { }: mkDerivation { pname = "hls-refactor-plugin"; - version = "2.2.0.0"; - sha256 = "0c7b00kx4imxvs4ydbr1g409ikl6lh0r9wl1m749xzx5dhblmwbh"; + version = "2.3.0.0"; + sha256 = "1ywgikx5r29q9nzhk625j5q2x7bn0ss1n4xkaj79665qnyhn98kh"; libraryHaskellDepends = [ aeson base bytestring containers data-default deepseq dlist extra ghc ghc-boot ghc-exactprint ghcide hls-graph hls-plugin-api lens @@ -148735,8 +149249,8 @@ self: { }: mkDerivation { pname = "hls-rename-plugin"; - version = "2.2.0.0"; - sha256 = "094kk4fi2bih43gqr9ndp7vfqbmsw0gzsgpmpbh6k2ad00csj5w6"; + version = "2.3.0.0"; + sha256 = "0c4g8mzr17lp1cmhgcfw507wmmh4xi1qrqaldf0qxxd232396a43"; libraryHaskellDepends = [ base containers extra ghc ghc-exactprint ghcide hashable hie-compat hiedb hls-plugin-api hls-refactor-plugin lens lsp lsp-types mod mtl @@ -148758,8 +149272,8 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "2.2.0.0"; - sha256 = "0ssx703pphm0m9930cjklwr02hx0y9qnrh6936ws55zvkpgq81fa"; + version = "2.3.0.0"; + sha256 = "0345q4jxbp8vabsa8qby5bmqx3qbi55kvjwj5fzg431f4m75lsqc"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory extra ghc ghcide hashable hls-plugin-api hls-refactor-plugin lens lsp lsp-types mtl @@ -148807,8 +149321,8 @@ self: { }: mkDerivation { pname = "hls-splice-plugin"; - version = "2.2.0.0"; - sha256 = "0vzawa9zq6bjb81847my2a62n091vm4292miq0jynbi1g075jgh5"; + version = "2.3.0.0"; + sha256 = "1ar4j6r258mbmapnfsc8rwpclrcp9s4an1lgnh9jnjcn15ia5zyd"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lens lsp mtl retrie syb text @@ -148840,8 +149354,8 @@ self: { }: mkDerivation { pname = "hls-stylish-haskell-plugin"; - version = "2.2.0.0"; - sha256 = "0rgkk4kfcwnzl2xvvj9v184xniapsn3lcbrxfzqw41qpl59k21xk"; + version = "2.3.0.0"; + sha256 = "08rq3i6d089vfnhmpj1nlfy3nmdxxna1gmmd4kkqyv7rxqdgka39"; libraryHaskellDepends = [ base directory filepath ghc ghc-boot-th ghcide hls-plugin-api lsp-types mtl stylish-haskell text @@ -148872,8 +149386,8 @@ self: { }: mkDerivation { pname = "hls-test-utils"; - version = "2.2.0.0"; - sha256 = "1pn87ba17x1fbd80nw7a2klgf8yh2swj037j36ljm5c4b07xbj3b"; + version = "2.3.0.0"; + sha256 = "1pak619y3s4mdachcqb8zbcczxxgfx35l61d2n5d2dq9n4fyhjjj"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default directory extra filepath ghcide hls-graph hls-plugin-api lens lsp @@ -151178,14 +151692,13 @@ self: { , hOpenPGP, http-client, http-client-tls, http-types, ixset-typed , lens, memory, monad-loops, mtl, openpgp-asciiarmor , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , prettyprinter-convert-ansi-wl-pprint, resourcet, text, time - , time-locale-compat, transformers, unordered-containers, vector - , yaml + , resourcet, text, time, time-locale-compat, transformers + , unordered-containers, vector, yaml }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.23.7"; - sha256 = "0mzq83bszlyxl3if35172nvzn930777nm1q9clkkyvqh2nrkfhdh"; + version = "0.23.8"; + sha256 = "009l8c4zzbmh8q8x9f7zj21ysvma03ksxdknjfcb7z189mafb2qm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151194,8 +151707,8 @@ self: { graphviz hOpenPGP http-client http-client-tls http-types ixset-typed lens memory monad-loops mtl openpgp-asciiarmor optparse-applicative prettyprinter prettyprinter-ansi-terminal - prettyprinter-convert-ansi-wl-pprint resourcet text time - time-locale-compat transformers unordered-containers vector yaml + resourcet text time time-locale-compat transformers + unordered-containers vector yaml ]; executableToolDepends = [ alex happy ]; description = "hOpenPGP-based command-line tools"; @@ -151674,31 +152187,35 @@ self: { , hs-opentelemetry-exporter-otlp, hs-opentelemetry-propagator-w3c , hs-opentelemetry-sdk, hs-opentelemetry-utils-exceptions , hs-opentelemetry-vendor-honeycomb, http-types - , optparse-applicative, text, time, typed-process, unliftio + , optparse-applicative, posix-escape, text, time, typed-process + , unliftio }: mkDerivation { pname = "hotel-california"; - version = "0.0.1.0"; - sha256 = "11l3pkdnkyya5sr4v00wjv7p1shikvmcc75g74l5a2b7n7p7ill1"; + version = "0.0.3.0"; + sha256 = "11r2bd9ralfv2vzd5ikw83bgz014hhs36g4bxfjxk5gqq65fkkh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk hs-opentelemetry-utils-exceptions hs-opentelemetry-vendor-honeycomb - http-types optparse-applicative text time typed-process unliftio + http-types optparse-applicative posix-escape text time + typed-process unliftio ]; executableHaskellDepends = [ base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk hs-opentelemetry-utils-exceptions hs-opentelemetry-vendor-honeycomb - http-types optparse-applicative text time typed-process unliftio + http-types optparse-applicative posix-escape text time + typed-process unliftio ]; testHaskellDepends = [ base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk hs-opentelemetry-utils-exceptions hs-opentelemetry-vendor-honeycomb - http-types optparse-applicative text time typed-process unliftio + http-types optparse-applicative posix-escape text time + typed-process unliftio ]; license = lib.licenses.bsd3; mainProgram = "hotel"; @@ -151967,36 +152484,36 @@ self: { mainProgram = "hpack"; }) {}; - "hpack_0_35_5" = callPackage + "hpack_0_36_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, crypton, deepseq, directory, filepath, Glob, hspec , hspec-discover, http-client, http-client-tls, http-types, HUnit - , infer-license, interpolate, mockery, pretty, QuickCheck + , infer-license, interpolate, mockery, mtl, pretty, QuickCheck , scientific, template-haskell, temporary, text, transformers , unordered-containers, vector, yaml }: mkDerivation { pname = "hpack"; - version = "0.35.5"; - sha256 = "1qm7fam54b2910nxg3xgv8bpqnkl06szl0gd7wvd6gi9ar8h3nr0"; + version = "0.36.0"; + sha256 = "0ypaagr7a5bvziybbzr3b4lixs3dv6fdkjj3lq7h71z51wd4xpm0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bifunctors bytestring Cabal containers crypton deepseq directory filepath Glob http-client http-client-tls http-types - infer-license pretty scientific text transformers + infer-license mtl pretty scientific text transformers unordered-containers vector yaml ]; executableHaskellDepends = [ aeson base bifunctors bytestring Cabal containers crypton deepseq directory filepath Glob http-client http-client-tls http-types - infer-license pretty scientific text transformers + infer-license mtl pretty scientific text transformers unordered-containers vector yaml ]; testHaskellDepends = [ aeson base bifunctors bytestring Cabal containers crypton deepseq directory filepath Glob hspec http-client http-client-tls - http-types HUnit infer-license interpolate mockery pretty + http-types HUnit infer-license interpolate mockery mtl pretty QuickCheck scientific template-haskell temporary text transformers unordered-containers vector yaml ]; @@ -152318,14 +152835,14 @@ self: { mainProgram = "hpc-codecov"; }) {}; - "hpc-codecov_0_4_0_0" = callPackage + "hpc-codecov_0_4_1_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, hpc, process, tasty, tasty-hunit, time }: mkDerivation { pname = "hpc-codecov"; - version = "0.4.0.0"; - sha256 = "0y545jm79p5jzvid27nqfyv5814iykk5wxdixv25mar49w5zd494"; + version = "0.4.1.0"; + sha256 = "1bvc7n19bqq1g1gw555yz2l13rl6372rxd4p0lfrxhxc523gkmly"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154011,6 +154528,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "hs-opentelemetry-propagator-datadog" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq + , hs-opentelemetry-api, hs-opentelemetry-sdk, hspec, hspec-discover + , http-types, pretty-hex, primitive, QuickCheck, text + }: + mkDerivation { + pname = "hs-opentelemetry-propagator-datadog"; + version = "0.0.0.0"; + sha256 = "0mpf3jl741336fhljhgdgfxvpxyblcyqphgs7kp8hv6d6nmwyl19"; + revision = "1"; + editedCabalFile = "0bfvcfmyq0npwjnzh0v9kcv2ghhhnnr2wcw5d65bb59vfwhw7gys"; + libraryHaskellDepends = [ + base bytestring hs-opentelemetry-api hs-opentelemetry-sdk + http-types primitive text + ]; + testHaskellDepends = [ + base bytestring hs-opentelemetry-api hspec pretty-hex primitive + QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq hs-opentelemetry-api primitive + ]; + description = "Datadog Propagator for OpenTelemetry"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hs-opentelemetry-propagator-w3c" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hs-opentelemetry-api , http-types, text @@ -154984,8 +155530,10 @@ self: { }: mkDerivation { pname = "hsc2hs"; - version = "0.68.9"; - sha256 = "02mwsgad10dg640alay7br1zrkn9vhwdf62iwf01921c1g710ny9"; + version = "0.68.10"; + sha256 = "0xpgbi6pssnizazz54583c50cz4axq3h78g03q4sfb7yi3bk8kkg"; + revision = "1"; + editedCabalFile = "0bgym1x99i2jn7b8kx9lz28gc3lsd7kag8rmizd42lcs2wmcm328"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -156216,8 +156764,8 @@ self: { }: mkDerivation { pname = "hsini"; - version = "0.5.2.1"; - sha256 = "1j4kcmqx4cq0zjimdn1fvm7a26phwl95bh405d68n5qc2qmncyyb"; + version = "0.5.2.2"; + sha256 = "1qnzrh7nn4j8y2qcvmliqnv07bqfq49wpxmgwrvb87bpp70gaq2c"; libraryHaskellDepends = [ base containers mtl parsec ]; testHaskellDepends = [ base parsec tasty tasty-hunit tasty-quickcheck tasty-th @@ -156376,8 +156924,8 @@ self: { pname = "hslogger"; version = "1.3.1.0"; sha256 = "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz"; - revision = "8"; - editedCabalFile = "10lqpvvg1fsv69v8v4nynwimln1flhd32d173pgpywmniaf40yy7"; + revision = "9"; + editedCabalFile = "1isrz8a09n88fww66qdrq76xlglai8sq14jk2ibv79g045qapj1g"; libraryHaskellDepends = [ base bytestring containers deepseq network network-bsd old-locale time unix @@ -157197,14 +157745,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_11_4" = callPackage + "hspec_2_11_5" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.11.4"; - sha256 = "0yk34qspm97l32qpk6i0gijvr4xfnhq89wch12mifxv2pcxywdpi"; + version = "2.11.5"; + sha256 = "1jk5pfjx8g3dd8sz0bzkbx6klhg644vsmwh6kjdlsr5p757mczpy"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -157219,8 +157767,8 @@ self: { }: mkDerivation { pname = "hspec-api"; - version = "2.11.4"; - sha256 = "09z0jxiv02j83q79aws948vr6vfqzpv5dm4dwwfqgxa715s9mlg8"; + version = "2.11.5"; + sha256 = "1r8mz2awqk3l3i8cwrqhs0pr919sqxvng4lr8lc33w1lwixlp41x"; libraryHaskellDepends = [ base hspec-core transformers ]; testHaskellDepends = [ base hspec hspec-core transformers ]; testToolDepends = [ hspec-discover ]; @@ -157346,7 +157894,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_11_4" = callPackage + "hspec-core_2_11_5" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -157355,8 +157903,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.11.4"; - sha256 = "0h1ilavzz23wr3659rx9crp0mijr8sz9qqhfm9fwq5hq91n6g1r8"; + version = "2.11.5"; + sha256 = "1hr9fvl21pfgy534qwj7xld7i0zmdg90w9anqif9snlwgjkrwzhw"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -157439,14 +157987,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_11_4" = callPackage + "hspec-discover_2_11_5" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.11.4"; - sha256 = "05j8jbjkl18c0w6nnaf0ymr449pp4vhnlkdri5470jyzqsawp879"; + version = "2.11.5"; + sha256 = "13c8ibmv72izjy5zi2pqnygk5hgb3cwwnzxf00ndp0gd5w3dpvgd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -157838,7 +158386,7 @@ self: { mainProgram = "hspec-meta-discover"; }) {}; - "hspec-meta_2_11_4" = callPackage + "hspec-meta_2_11_5" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq , directory, filepath, haskell-lexer, hspec-expectations, HUnit , process, QuickCheck, quickcheck-io, random, stm, tf-random, time @@ -157846,8 +158394,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.11.4"; - sha256 = "1bzgr0sxm3arrbm6dj819sd3f2h7q5siv1n3lzw648ijhqrlkpja"; + version = "2.11.5"; + sha256 = "12kxv36xwrqnd9h7jrs9sn769zymip9908j9723hphkrqa0sy941"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160663,10 +161211,8 @@ self: { }: mkDerivation { pname = "http-exchange-instantiations"; - version = "0.1.1.0"; - sha256 = "0fvkmhd8571r4k548l9x8n3ybdnlh9b8rczkcxv3f32xim0k9rx9"; - revision = "1"; - editedCabalFile = "1rn4yfwlxv1j4d917v0fggdl1qy47vl8dhibvvdma1v2554dgrcv"; + version = "0.1.3.0"; + sha256 = "002wa8lqpz4idnzkzz918ql9zghg01gnyp4pwar494yfsysiy4v8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160730,8 +161276,8 @@ self: { pname = "http-io-streams"; version = "0.1.6.2"; sha256 = "0nil98dnw0y6g417mr9c9dan071ri3726dv0asgwwplq5mwy780q"; - revision = "1"; - editedCabalFile = "1ayqy22q2ld87qx3zjpfzrkhryjmjn7zc7adgw0jhahmg2lbd6q9"; + revision = "2"; + editedCabalFile = "0sgk4mgm1r8nnna0lxjw8daa9784rl91qvh4m2ba675f7a016f5c"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary blaze-builder brotli-streams bytestring case-insensitive containers @@ -160846,27 +161392,6 @@ self: { }: mkDerivation { pname = "http-media"; - version = "0.8.1.0"; - sha256 = "1ydrs7iichc06mfj65x1f3g1piy06b7gbjidjf1lf3jp325k2him"; - revision = "1"; - editedCabalFile = "119vhcwlgra8s097jwxvkp51grr3kabjfy7a60jpqybrsncfjn0a"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers utf8-string - ]; - testHaskellDepends = [ - base bytestring case-insensitive containers QuickCheck tasty - tasty-quickcheck utf8-string - ]; - description = "Processing HTTP Content-Type and Accept headers"; - license = lib.licenses.mit; - }) {}; - - "http-media_0_8_1_1" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , QuickCheck, tasty, tasty-quickcheck, utf8-string - }: - mkDerivation { - pname = "http-media"; version = "0.8.1.1"; sha256 = "10zi0c6v0vngxadlbzfp1y1fgyx1ac5gvyvl0gv6gl8m3grss80r"; libraryHaskellDepends = [ @@ -160878,7 +161403,6 @@ self: { ]; description = "Processing HTTP Content-Type and Accept headers"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "http-mock" = callPackage @@ -161327,6 +161851,40 @@ self: { license = lib.licenses.bsd3; }) {}; + "http2_4_2_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, base + , base16-bytestring, bytestring, case-insensitive, containers + , crypton, directory, filepath, gauge, Glob, hspec, hspec-discover + , http-types, network, network-byte-order, network-run, psqueues + , random, stm, text, time-manager, typed-process, unix-time + , unliftio, unordered-containers, vector + }: + mkDerivation { + pname = "http2"; + version = "4.2.0"; + sha256 = "1jlxzlayfzfh0bypalg2p97nvjygychgv28fvwjnvgp0saqj79m3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager unix-time + unliftio + ]; + testHaskellDepends = [ + aeson aeson-pretty async base base16-bytestring bytestring crypton + directory filepath Glob hspec http-types network network-byte-order + network-run random text typed-process unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge + network-byte-order stm + ]; + description = "HTTP/2 library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, lifted-async, lifted-base, mtl, network, stm, time, tls @@ -161443,16 +162001,18 @@ self: { }) {}; "http2-tls" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, http2 - , network, network-run, recv, time-manager, tls, unliftio + ({ mkDerivation, base, bytestring, crypton-x509-store + , crypton-x509-validation, data-default-class, http2, network + , network-run, recv, time-manager, tls, unliftio }: mkDerivation { pname = "http2-tls"; - version = "0.0.1"; - sha256 = "104qqirzg4q3gy4qw8d0mhp94xiavzzr6ziwnwjc1xm1zv8m37nb"; + version = "0.1.0"; + sha256 = "1sans4zmcpc48xw8k1g6kgfg68xka5azgpcr3rd7g70ijj6zchjs"; libraryHaskellDepends = [ - base bytestring data-default-class http2 network network-run recv - time-manager tls unliftio + base bytestring crypton-x509-store crypton-x509-validation + data-default-class http2 network network-run recv time-manager tls + unliftio ]; description = "Library for HTTP/2 over TLS"; license = lib.licenses.bsd3; @@ -161469,8 +162029,8 @@ self: { }: mkDerivation { pname = "http3"; - version = "0.0.4"; - sha256 = "02w2f17m6n46rr0212c7fp33vrgb13zj41mncm9wyvwkmmm47gmv"; + version = "0.0.6"; + sha256 = "12pjwmiplch1pn89qnc5ijsb9kf554wdw7w3lf6xfi1fjzkizjr0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162369,8 +162929,8 @@ self: { }: mkDerivation { pname = "hvega"; - version = "0.12.0.5"; - sha256 = "0zxd6kdzragrmjanipf19dgbbbjvb1zfpmd2lw00akj8h2ddyy5i"; + version = "0.12.0.7"; + sha256 = "1x5xrkm7k1q9j0kijdf5qx7542c4mrpamq1s6r5nq2zj80f3xxk3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base text unordered-containers ]; @@ -162458,6 +163018,8 @@ self: { testHaskellDepends = [ base ]; description = "AWS SQS conduit"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hw-balancedparens" = callPackage @@ -164915,8 +165477,8 @@ self: { pname = "hyphenation"; version = "0.8.2"; sha256 = "05330kd99cg9v6w26sj87wk2nfvpmn2r177kr66vr9n0rlmia60y"; - revision = "2"; - editedCabalFile = "0l5b5a8cl9prqghgr8nfxzc3wx2w021mkp784k8af40ci0qgidsi"; + revision = "3"; + editedCabalFile = "033kzil5036pnlx10ghh7vcsxcya6kn0vxnalgbpryg8ca7vy0cz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers file-embed text unordered-containers @@ -166370,8 +166932,8 @@ self: { }: mkDerivation { pname = "ihp-hsx"; - version = "1.0.0"; - sha256 = "0ln4xgr3wamhjd34q8vvd0z8chh4prqq7javl9n4ljvriyky13p7"; + version = "1.1.0"; + sha256 = "0jzibardrljskif47x30z4nyxd4zw94lfg4cqhhp9jw8sgrk1vpp"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring containers ghc megaparsec string-conversions template-haskell text @@ -166787,6 +167349,8 @@ self: { ]; description = "Execute arbitrary actions for each item from RSS/Atom feeds"; license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "immortal_0_2_2_1" = callPackage @@ -167335,8 +167899,8 @@ self: { }: mkDerivation { pname = "incipit"; - version = "0.8.0.0"; - sha256 = "15pfxy2xzff9598v076gd7fl0k235y2ydm8pirvqj485zj7mgyyg"; + version = "0.9.0.1"; + sha256 = "0zalzp5p59cqz3zky1y0xvw5g44z386z5smffmzhx1gjk6v0b3pk"; libraryHaskellDepends = [ base incipit-core polysemy-conc polysemy-log polysemy-resume polysemy-time @@ -167616,8 +168180,8 @@ self: { pname = "indents"; version = "0.5.0.1"; sha256 = "0dpcwiz0dwn5aqdsc50plfaawh86adhf7jx5dsmhn5q5nz32qn51"; - revision = "1"; - editedCabalFile = "0zbcf8m4n63ff06hjp0mr18i59y5wd6c1k5z1j6rnl7kymghkjrg"; + revision = "2"; + editedCabalFile = "0rdj5w8d5ykb2sh88xsdgddxyp50dij4zb8bbb9220yfs0l18dsy"; libraryHaskellDepends = [ base mtl parsec ]; testHaskellDepends = [ base mtl parsec tasty tasty-hunit ]; description = "indentation sensitive parser-combinators for parsec"; @@ -167762,6 +168326,22 @@ self: { license = lib.licenses.bsd2; }) {}; + "indexed-traversable_0_1_3" = callPackage + ({ mkDerivation, array, base, containers, foldable1-classes-compat + , transformers + }: + mkDerivation { + pname = "indexed-traversable"; + version = "0.1.3"; + sha256 = "1nak3bq3yzai8b38mflmpsbirx8d6v29zcj9m193m3ppnrgr4chx"; + libraryHaskellDepends = [ + array base containers foldable1-classes-compat transformers + ]; + description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "indexed-traversable-instances" = callPackage ({ mkDerivation, base, containers, indexed-traversable, OneTuple , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck @@ -167771,8 +168351,8 @@ self: { pname = "indexed-traversable-instances"; version = "0.1.1.2"; sha256 = "0jippsyqg8ss61z5vc6vfjmlrirwc69kr4azs5s9z0fcbj4lx6qg"; - revision = "1"; - editedCabalFile = "1vyfs8xwxm2ipgiinzrp41pl0cy2xrmx7a9iim4vlz1sca1yv4xl"; + revision = "2"; + editedCabalFile = "0yrww1y9zrnqwymik9kkdqkx81n3jhr0kq27lpvy1gp297hy7m80"; libraryHaskellDepends = [ base indexed-traversable OneTuple tagged unordered-containers vector @@ -168431,23 +169011,24 @@ self: { }) {}; "inline-c" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers - , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq + ({ mkDerivation, base, bytestring, containers, hashable, hspec, mtl + , parsec, parsers, prettyprinter, QuickCheck, raw-strings-qq , regex-posix, split, template-haskell, transformers , unordered-containers, vector }: mkDerivation { pname = "inline-c"; - version = "0.9.1.8"; - sha256 = "1qa1rspwyac0f68g7qll17a0wc2a4qrr9fkfarpymfhm7gxzf947"; + version = "0.9.1.10"; + sha256 = "1cd4bqb4gzd8sgh8icnnzdyqnh81x7150ibx7mqjaygj9672w3bd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring containers hashable mtl parsec - parsers template-haskell transformers unordered-containers vector + base bytestring containers hashable mtl parsec parsers + prettyprinter template-haskell transformers unordered-containers + vector ]; testHaskellDepends = [ - ansi-wl-pprint base containers hashable hspec parsers QuickCheck + base containers hashable hspec parsers prettyprinter QuickCheck raw-strings-qq regex-posix split template-haskell transformers unordered-containers vector ]; @@ -168463,8 +169044,8 @@ self: { }: mkDerivation { pname = "inline-c-cpp"; - version = "0.5.0.1"; - sha256 = "16wf59kgs6zw8ypyb6wy842j04b2pdiwhfmpsvlvjkqhpqn2q406"; + version = "0.5.0.2"; + sha256 = "0m8rkmjmqh8xy41ci87z3c7x9z2r5p8j4qwibqw189rrgy5g1471"; libraryHaskellDepends = [ base bytestring containers inline-c safe-exceptions system-cxx-std-lib template-haskell text @@ -168478,6 +169059,30 @@ self: { maintainers = [ lib.maintainers.roberth ]; }) {}; + "inline-c-cuda" = callPackage + ({ mkDerivation, base, bytestring, containers, cudart, hspec + , inline-c, inline-c-cpp, process, safe-exceptions + , template-haskell, text, vector + }: + mkDerivation { + pname = "inline-c-cuda"; + version = "0.1.0.0"; + sha256 = "0ra61w37yhl5vcd07v25h69iq4n0kwfryp9zgxnxgc6lzzph4xpw"; + libraryHaskellDepends = [ + base bytestring containers inline-c inline-c-cpp process + safe-exceptions template-haskell text + ]; + librarySystemDepends = [ cudart ]; + testHaskellDepends = [ + base bytestring containers hspec inline-c inline-c-cpp + safe-exceptions template-haskell vector + ]; + description = "Lets you embed CUDA code into Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {cudart = null;}; + "inline-c-objc" = callPackage ({ mkDerivation, base, containers, hspec, inline-c , template-haskell @@ -169079,17 +169684,16 @@ self: { }) {}; "integer-conversion" = callPackage - ({ mkDerivation, base, bytestring, primitive, QuickCheck - , quickcheck-instances, tasty, tasty-bench, tasty-quickcheck, text + ({ mkDerivation, base, bytestring, primitive, QuickCheck, tasty + , tasty-bench, tasty-quickcheck, text }: mkDerivation { pname = "integer-conversion"; - version = "0.1"; - sha256 = "07fry6pwxlq4jrlnl9klp0xfxc9zhgsv34jkzbcywcgdm9dk1jgh"; + version = "0.1.0.1"; + sha256 = "0fbgqizla2jdchnii1lqp2yla3lkm04w4qn5laxmhm5n3k7p1b10"; libraryHaskellDepends = [ base bytestring primitive text ]; testHaskellDepends = [ - base bytestring QuickCheck quickcheck-instances tasty - tasty-quickcheck text + base bytestring QuickCheck tasty tasty-quickcheck text ]; benchmarkHaskellDepends = [ base bytestring tasty-bench text ]; description = "Conversion from strings to Integer"; @@ -169117,8 +169721,8 @@ self: { pname = "integer-logarithms"; version = "1.0.3.1"; sha256 = "0zzapclfabc76g8jzsbsqwdllx2zn0gp4raq076ib6v0mfgry2lv"; - revision = "4"; - editedCabalFile = "1jml3fygxcbh9f6nl006mc2gmixlwkzpnnsfxgdmk6pi786b8vrk"; + revision = "5"; + editedCabalFile = "03f07vv1xqvv53fiarn4rpj2hzsa9bx7lw883axmgzv49qrzq3ad"; libraryHaskellDepends = [ array base ghc-bignum ghc-prim ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -169984,6 +170588,8 @@ self: { pname = "invariant"; version = "0.6.2"; sha256 = "0271grdzgjfa86hvy50vrqh8k7n0l48i524k3bgyjmwa13l8ar63"; + revision = "1"; + editedCabalFile = "1zxvv6q03jsn343pdx53knmjq8l6p2fggvqyfkpgjgvcwf7iaf23"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim profunctors StateVar stm tagged template-haskell th-abstraction @@ -173780,8 +174386,8 @@ self: { }: mkDerivation { pname = "journalctl-stream"; - version = "0.6.0.4"; - sha256 = "0ckaxaja4152mvlhypd36x2cqw4wiiid11ph6ih9w4c0g9244njf"; + version = "0.6.0.5"; + sha256 = "1nkv3vfpqndi7hks5mrz6cynvv9fly27zckiln5na3sjbnx3mmyv"; libraryHaskellDepends = [ aeson base bytestring conduit process text time unordered-containers @@ -174828,8 +175434,8 @@ self: { }: mkDerivation { pname = "json-spec-elm"; - version = "0.3.0.2"; - sha256 = "0g1y6kfrysnpyha7b752y5vk8mxvbwqw3bhag8g0ylnl4wbl00xf"; + version = "0.3.0.3"; + sha256 = "00w04dv56z97wdps2y6467jhzg93fw6qddswg219ixjjgdl6r723"; libraryHaskellDepends = [ base bound containers elm-syntax json-spec mtl prettyprinter text unordered-containers @@ -174874,8 +175480,8 @@ self: { }: mkDerivation { pname = "json-spec-openapi"; - version = "0.1.0.1"; - sha256 = "0p65dwqp5dlrb6wcds0yjmmcn7xc57acrw4al3lzn2mqad3aq7ij"; + version = "0.1.0.2"; + sha256 = "1y2w13py1jlmzh9wr37hc9mw16fh4lw25sfilxagqhm69fkglk8w"; libraryHaskellDepends = [ aeson base json-spec lens openapi3 text ]; @@ -175740,19 +176346,6 @@ self: { }) {}; "junit-xml" = callPackage - ({ mkDerivation, base, tasty, tasty-golden, text, xml-conduit }: - mkDerivation { - pname = "junit-xml"; - version = "0.1.0.2"; - sha256 = "0sm738irwvmdnn8cvf0rnvp8s5gmr0ih241l27sasqq18nra2v04"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base text xml-conduit ]; - testHaskellDepends = [ base tasty tasty-golden ]; - description = "Producing JUnit-style XML test reports"; - license = lib.licenses.bsd3; - }) {}; - - "junit-xml_0_1_0_3" = callPackage ({ mkDerivation, base, filepath, tasty, tasty-golden, temporary , text, xml-conduit }: @@ -175767,7 +176360,6 @@ self: { ]; description = "Producing JUnit-style XML test reports"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "jupyter" = callPackage @@ -176238,8 +176830,8 @@ self: { pname = "kan-extensions"; version = "5.2.5"; sha256 = "08mddsk9v75mahp1jqn28vglygmdil1g37drcj3ivbqc0k6dq55r"; - revision = "1"; - editedCabalFile = "1rbcmvgkw714v3296pdkpk7726ghc43czsaxm8ygvanshzd87qi2"; + revision = "2"; + editedCabalFile = "1kwqhslcw4clcngjs24arsv1wdrvrisafi5h2pszlh2zarksgnzv"; libraryHaskellDepends = [ adjunctions array base comonad containers contravariant distributive free invariant mtl profunctors semigroupoids tagged @@ -176291,8 +176883,8 @@ self: { pname = "kansas-comet"; version = "0.4.1"; sha256 = "1j54rsqna8xrw1si8i74v0c9k4jjv8a2q001aa8sx4rxb7d1qbzy"; - revision = "8"; - editedCabalFile = "02b9q0s45wlrszr623mzv5zx7vya61ix697w6f2mjnicip9hga90"; + revision = "9"; + editedCabalFile = "036whnk5gqw3pgzld7hjdam12ffbhqpwcxlbbgy58hlnajgmfa7a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -177707,8 +178299,8 @@ self: { ({ mkDerivation, aeson, base, containers, HTF, text }: mkDerivation { pname = "keuringsdienst"; - version = "0.1.0.5"; - sha256 = "111f7895mqrvmdnpm7n4h7q1z5vyb6mdgy33abvrib9x0rsjyqbi"; + version = "0.1.1.0"; + sha256 = "0nwkwpm5c4na8yr0m18drd5g3si0f0kkvrc0v3kphnva0l3j1c4l"; libraryHaskellDepends = [ aeson base containers text ]; testHaskellDepends = [ aeson base containers HTF text ]; description = "Data validation in Haskell made easy"; @@ -177950,8 +178542,8 @@ self: { pname = "keys"; version = "3.12.3"; sha256 = "0ik6wsff306dnbz0v3gpiajlj5b558hrk9176fzcb2fclf4447nm"; - revision = "4"; - editedCabalFile = "16s7yj70fms01ab8x2f3262p576lwqdxlkq798qf9pjxfg95jvy9"; + revision = "5"; + editedCabalFile = "0qp6xvqjw4k98g3di4pnv7hvlhgfcab28nm3pdi48c1gk14qv1kf"; libraryHaskellDepends = [ array base comonad containers free hashable semigroupoids semigroups tagged transformers transformers-compat @@ -178500,8 +179092,8 @@ self: { }: mkDerivation { pname = "knead"; - version = "1.0"; - sha256 = "144x124wqdywrn158d3jzrhja09gzakfsfgvwvb9p67vzns7nv42"; + version = "1.0.1"; + sha256 = "0bga3kg1dridagd1ysvb4qk2gsjmacqm1z6qr1fhfcd59259acfz"; libraryHaskellDepends = [ base bool8 comfort-array fixed-length llvm-dsl llvm-extra llvm-tf prelude-compat storable-enum storable-record tagged tfp @@ -180248,19 +180840,19 @@ self: { }) {}; "lambdasound" = callPackage - ({ mkDerivation, ansi-terminal, base, binary, bytestring + ({ mkDerivation, ansi-terminal, base, bytestring , bytestring-to-vector, deepseq, directory, falsify, filepath , hashable, hashtables, massiv, proteaaudio-sdl, random, tasty , tasty-bench, tasty-hunit, text, transformers, vector, wave, zlib }: mkDerivation { pname = "lambdasound"; - version = "1.0.1"; - sha256 = "0g98gg397srwg5mcx4x56sgnmz5lm9jr1qd505i7r6maiq05v539"; + version = "1.1"; + sha256 = "0lvryqcqpvab87y0ks05l4li1ycawfzf90dhrcwhwyn8h6rh3a68"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base binary bytestring bytestring-to-vector deepseq + ansi-terminal base bytestring bytestring-to-vector deepseq directory filepath hashable hashtables massiv proteaaudio-sdl random text transformers vector wave zlib ]; @@ -180449,8 +181041,8 @@ self: { }: mkDerivation { pname = "language-Modula2"; - version = "0.1.3"; - sha256 = "0izh9scx1hky2f47qq0gbfwwcvn984h3icpbw475z5qbid0j3856"; + version = "0.1.4"; + sha256 = "06rqi2g0rbypjj6d11n1lw6vk6xfqf2i7zarwaiy9ay7csgclq9k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181402,8 +181994,8 @@ self: { }: mkDerivation { pname = "language-oberon"; - version = "0.3.2"; - sha256 = "0k4r2h02znhs4l5nm88pwva0d7d3p9bga1rrdjga6rjd1ihhbfx1"; + version = "0.3.3"; + sha256 = "0w59dqpwafrlxn6ff7icgd7qsb9nyjmd1cc5ficxc701w8b20yli"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181575,8 +182167,8 @@ self: { pname = "language-python"; version = "0.5.8"; sha256 = "1mf3czvnh9582klv0c9g7pcn1wx4qjwpvhv8la6afaifv6y5lki2"; - revision = "1"; - editedCabalFile = "13lc4d2b7id49yczxlqgs3zlms1g6gv0i8amk56g1jvswli6nsn9"; + revision = "2"; + editedCabalFile = "024fn653gmxw4ndmqvg1d3lwmxbvrlllc9iw2zw0c3nkcgcv39sg"; libraryHaskellDepends = [ array base containers monads-tf pretty transformers utf8-string ]; @@ -182024,6 +182616,8 @@ self: { pname = "large-anon"; version = "0.3.0"; sha256 = "07jy3q9x1h49c6zmad2x2s9id4lldklgd133m67l3sfh61qz72vv"; + revision = "1"; + editedCabalFile = "0jyyrlicgs0l4rg4vji8r68hm3iai3x4lmnl0ckr5f525y4yf3g1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182053,6 +182647,8 @@ self: { pname = "large-generics"; version = "0.2.1"; sha256 = "0av3j1a1400fsvdmmfji358nknf54n7592fvlilm4kahm4grjl1z"; + revision = "1"; + editedCabalFile = "0j2dmwf0ccggs25npzrrvz6zpachdbywn2crdlyl1dim3m6psrrh"; libraryHaskellDepends = [ aeson base deepseq generics-sop primitive sop-core ]; @@ -182108,6 +182704,8 @@ self: { pname = "large-records"; version = "0.4"; sha256 = "0g09ly8fck613lbs3g2w1slqrxp6fvvrn7i232w5g7nafgsdalfy"; + revision = "1"; + editedCabalFile = "0wcw9rnp2mkchq2xccsyiqqncxq09lj0nyk661a8xpggflsjbhwb"; libraryHaskellDepends = [ base containers ghc large-generics mtl primitive record-dot-preprocessor record-hasfield syb template-haskell @@ -183434,6 +184032,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "learn-physics_0_6_6" = callPackage + ({ mkDerivation, base, gloss, gnuplot, hmatrix, SpatialMath + , vector-space, Vis + }: + mkDerivation { + pname = "learn-physics"; + version = "0.6.6"; + sha256 = "175sbdinjvf8sp3z597ql49zpvab6gllygv1nrygln3xfsk23d97"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base gloss gnuplot hmatrix SpatialMath vector-space Vis + ]; + executableHaskellDepends = [ base gloss gnuplot SpatialMath Vis ]; + description = "Haskell code for learning physics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "learn-physics-examples" = callPackage ({ mkDerivation, base, gloss, gnuplot, learn-physics, not-gloss , spatial-math @@ -183491,17 +184108,20 @@ self: { }) {}; "leb128-binary" = callPackage - ({ mkDerivation, base, binary, bytestring, hedgehog, tasty - , tasty-hedgehog, tasty-hunit + ({ mkDerivation, base, binary, bytestring, deepseq, hedgehog, tasty + , tasty-bench, tasty-hedgehog, tasty-hunit }: mkDerivation { pname = "leb128-binary"; - version = "0.1.1"; - sha256 = "06i32qa79iwjb76caj5c1b32xi29mq1h0zfakz270p6q89hwkp1v"; + version = "0.1.2"; + sha256 = "1bw7xk269kxd9y5983dr57nxdg8a28hbwdnzgkxn7p6z461rgpqh"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base binary bytestring hedgehog tasty tasty-hedgehog tasty-hunit ]; + benchmarkHaskellDepends = [ + base binary bytestring deepseq tasty-bench + ]; description = "Signed and unsigned LEB128 codec for binary library"; license = lib.licenses.asl20; }) {}; @@ -183756,8 +184376,8 @@ self: { pname = "lens"; version = "5.2.3"; sha256 = "0kcr1dqvnjmi05yd9m9ylipk5210jwd7d00c9scq9n49vnl8q7nz"; - revision = "1"; - editedCabalFile = "0bbycnw01xxiidjjwg902wbla9mp0m17a2lpm5qw0za1gsnyl4q1"; + revision = "2"; + editedCabalFile = "0pnhyw3v9dbirh461hcyhds1mpj06qhs81ij7c387wyzdb3qfwk3"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -184703,6 +185323,8 @@ self: { pname = "lhs2tex"; version = "1.24"; sha256 = "09mkcklm9aixn4xwdcmy8z4x5myh4f5ky0nnadj1wgfjcychbmzc"; + revision = "1"; + editedCabalFile = "06vcx5i474sskqzk99l8qcxadzhz2rbmkjfyxk8aqp62pbxcq9r9"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ @@ -184993,14 +185615,14 @@ self: { broken = true; }) {}; - "libiserv_9_6_1" = callPackage + "libiserv_9_6_3" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , ghci, unix }: mkDerivation { pname = "libiserv"; - version = "9.6.1"; - sha256 = "0pv57knqj7pj6rg333hlzicappvvwgxpw3m39rqx1y06cgq6h93l"; + version = "9.6.3"; + sha256 = "1gq5gppahw443smf04fr6jjjsc7znpkzg2kq4gdmn1vzdxjh1z25"; libraryHaskellDepends = [ base binary bytestring containers deepseq ghci unix ]; @@ -185198,8 +185820,8 @@ self: { ({ mkDerivation, base, bytestring, data-default, modbus, vector }: mkDerivation { pname = "libmodbus"; - version = "1.1.2"; - sha256 = "1yd7wqnb78zqhlfg5byjkbyly33a9r7m1893d8c52wl244bmng3q"; + version = "1.1.3"; + sha256 = "1lpdpa01b43i5x4s0qfvb86dqvh8rhn5pn19yh34hf8fa693cqck"; libraryHaskellDepends = [ base bytestring data-default vector ]; librarySystemDepends = [ modbus ]; description = "Haskell bindings to the C modbus library"; @@ -186034,8 +186656,8 @@ self: { pname = "lift-generics"; version = "0.2.1"; sha256 = "1qkzq8hcb6j15cslv577bmhjcxmljzsrryysdgd7r99kr3q445b4"; - revision = "5"; - editedCabalFile = "142b5q8vcl583h23syr2i2i3ngcdxpfvds08h9cb0qqp789c5ys3"; + revision = "6"; + editedCabalFile = "0px8gjhzw1fvzbd1jha8kcc3p603hc8ki4kwi26vhg7n3ldy5nay"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell th-compat ]; @@ -186215,8 +186837,8 @@ self: { }: mkDerivation { pname = "lifx-lan"; - version = "0.8.1"; - sha256 = "1h971r7i36ay0v9nalgjfsz7vnpd1ps74g0d8lawcm00s4fgw8as"; + version = "0.8.2"; + sha256 = "17n684whz5b80zg1jr7l5dp5qz2fa6g3hgqn5b8mjhqlrgqsmfwn"; libraryHaskellDepends = [ ansi-terminal base binary bytestring colour composition containers extra monad-loops mtl network random safe text time transformers @@ -186635,8 +187257,8 @@ self: { pname = "linear"; version = "1.22"; sha256 = "1ddr0c54kbi9bw7d62i6h3jiss3q0qmrdpkvckajz6qf5lwkxr6g"; - revision = "2"; - editedCabalFile = "0ksiy3rkswrwdlz0fsq26dmc4xvw0fm8y7ixdpvgdfpkjr255c8y"; + revision = "3"; + editedCabalFile = "1fmq4i3qimccjsn7859q1rk7adpcy9d3zvybl0n7kljn04ag00k4"; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers deepseq distributive ghc-prim hashable indexed-traversable lens @@ -188487,8 +189109,8 @@ self: { pname = "literatex"; version = "0.3.0.0"; sha256 = "0ph3s26hxvnkdqc3s09d3ka1p224zmgwc3k6zi7jmma0sgrmnm9x"; - revision = "3"; - editedCabalFile = "0k1b9pbdlrz9n4aaj07arbzbzz4l4dy0srh3x8px3d0rjpvwyld7"; + revision = "4"; + editedCabalFile = "04pqdsvjznw5kbnmka2xq32qfc6qlsq7g6a9gi3k0fbg8zj5s057"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188774,8 +189396,8 @@ self: { }: mkDerivation { pname = "llvm-dsl"; - version = "0.1"; - sha256 = "1x3br3g227gh7hydfllzwjp3lv9lgq9p1rnrh09sw4whcv4crhbb"; + version = "0.1.1"; + sha256 = "15ad2kv7d4hr732zlxk6f2faw76xavaynpi2d18kch41x1giivxv"; libraryHaskellDepends = [ base bool8 llvm-extra llvm-tf numeric-prelude prelude-compat storable-enum storable-record tfp transformers unsafe utility-ht @@ -188836,14 +189458,16 @@ self: { ({ mkDerivation, base, enumset, LLVM }: mkDerivation { pname = "llvm-ffi"; - version = "13.0"; - sha256 = "039yrihb8lwnbjzif4g8cg0i9xhzaghkklfpksmisrq0ikvyy43r"; + version = "14.0"; + sha256 = "13x27wm4zhiwi1khb4iyp2fj5rmdfzcb4bk9m1r975adpmnwk537"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; librarySystemDepends = [ LLVM ]; description = "FFI bindings to the LLVM compiler toolkit"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {LLVM = null;}; "llvm-ffi-tools" = callPackage @@ -188852,10 +189476,8 @@ self: { }: mkDerivation { pname = "llvm-ffi-tools"; - version = "0.0.0.1"; - sha256 = "0nicgcdlywb8w5fr7hi5hgayv9phwslp5s47p2c30kavj7c3f3zk"; - revision = "1"; - editedCabalFile = "1wmwrhjs732izgbihbbb7l856pgxa1q5f32z06935ykwfwy160x7"; + version = "0.0.1"; + sha256 = "0si1v4fbkjzaizp5b6lqkcaf9qy1r4bkf8sbvr0q10caq3c66swd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -189127,8 +189749,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "12.1"; - sha256 = "0p285ssw0wii8pn1ml110wjpzd6hb8h1yb0zff0hyhzs8k23pm7a"; + version = "12.1.1"; + sha256 = "1qvxib55k0bw6rykl4c9551k50jia6m9pyhpshfs6lasvy4rs1gb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190664,6 +191286,8 @@ self: { pname = "long-double"; version = "0.1.1.1"; sha256 = "0xq2f0ziinlw1drgg3q6p7303rkzbasc9jwrz8lgjfl3wv24qk8l"; + revision = "1"; + editedCabalFile = "07hbfv5mcz39j4j9z63s4xs5d077hxc138vrcyzp552nns78cms7"; libraryHaskellDepends = [ base integer-gmp ]; description = "FFI bindings for C long double"; license = lib.licenses.bsd3; @@ -191143,6 +191767,19 @@ self: { license = lib.licenses.mit; }) {}; + "lpeg_1_1_0" = callPackage + ({ mkDerivation, base, lua, tasty, tasty-hunit }: + mkDerivation { + pname = "lpeg"; + version = "1.1.0"; + sha256 = "0yav34yxrkbgnkcd3870smay5s3cypyd28m0fsg2jhlikgmhj5a1"; + libraryHaskellDepends = [ base lua ]; + testHaskellDepends = [ base lua tasty tasty-hunit ]; + description = "LPeg – Parsing Expression Grammars For Lua"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lrucache" = callPackage ({ mkDerivation, base, containers, contravariant }: mkDerivation { @@ -191501,8 +192138,8 @@ self: { }: mkDerivation { pname = "ltext"; - version = "0.1.3"; - sha256 = "1sd8iqcfm7qsp8rq1ckixi8lss8mwi4siqqgsybbxjg6ajs9m2x6"; + version = "0.1.4"; + sha256 = "1znfwnv1m0pzzdlc6i89wh7gz8igv77r286ymwx5qzn86nkq6wxa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192704,8 +193341,8 @@ self: { pname = "machines"; version = "0.7.3"; sha256 = "1cmflvd0xphs15ip61347ph9w4hnhmsa4nlp425i53x1ld99l23c"; - revision = "2"; - editedCabalFile = "13msrrbravjx51j40jn5namgbkfc44dv565ry5pdb5l389gzfl1k"; + revision = "3"; + editedCabalFile = "0w0q2kq8m8fkgrf0yj0fd5yb5b1svyxvfgjml5yvc2cqxfdh7mm7"; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed profunctors semigroupoids semigroups transformers @@ -199467,6 +200104,19 @@ self: { broken = true; }) {}; + "miniterion" = callPackage + ({ mkDerivation, base, deepseq, directory, tasty, tasty-hunit }: + mkDerivation { + pname = "miniterion"; + version = "0.1.1.0"; + sha256 = "0byjlkmi6hr5wpqfbcmqyz7yzcs5nw7gc3x3878a32f9jz92a8jr"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base directory tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base ]; + description = "Simple and lightweight benchmark utilities"; + license = lib.licenses.mit; + }) {}; + "minitypeset-opengl" = callPackage ({ mkDerivation, base, containers, filepath, OpenGL, stb-truetype }: @@ -200534,8 +201184,8 @@ self: { }: mkDerivation { pname = "mmzk-typeid"; - version = "0.5.0.0"; - sha256 = "00q7rmbjkjjabs9a4cfhqb0d37g124j0j4jb64qbi77m0pa7l9dv"; + version = "0.5.0.1"; + sha256 = "0y2gb58afghdhqapq96qwcq1938ixy4iv27lj7d0khcsal3706kr"; libraryHaskellDepends = [ aeson array base binary bytestring entropy hashable random text time uuid uuid-types @@ -200685,28 +201335,6 @@ self: { license = lib.licenses.mit; }) {}; - "mod_0_1_2_2" = callPackage - ({ mkDerivation, base, deepseq, integer-gmp, primitive - , quickcheck-classes, quickcheck-classes-base, semirings, tasty - , tasty-bench, tasty-quickcheck, vector - }: - mkDerivation { - pname = "mod"; - version = "0.1.2.2"; - sha256 = "0m92yd323kjjwnphqlima2aj0hh7i1gnpblc8a29ks25gj0sv66v"; - libraryHaskellDepends = [ - base deepseq integer-gmp primitive semirings vector - ]; - testHaskellDepends = [ - base primitive quickcheck-classes quickcheck-classes-base semirings - tasty tasty-quickcheck vector - ]; - benchmarkHaskellDepends = [ base tasty-bench ]; - description = "Fast type-safe modular arithmetic"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "mod" = callPackage ({ mkDerivation, base, containers, deepseq, ghc-bignum, primitive , quickcheck-classes, quickcheck-classes-base, semirings, tasty @@ -201376,12 +202004,12 @@ self: { }: mkDerivation { pname = "monad-control-aligned"; - version = "0.0.1.1"; - sha256 = "1xhiw1g0p8zljhy8yz43ljnwhhqn6dwxqi06mdsfji365p9qzrs4"; + version = "0.0.2.1"; + sha256 = "18qk48nzivc51pdk0a1pd4s4yzs015kmrmmfdygmfgsy8h68b78p"; libraryHaskellDepends = [ base stm transformers transformers-base transformers-compat ]; - description = "Just like monad-control, except less efficient, and the monadic state terms are all * -> *"; + description = "Lift control operations, like exception catching, through monad transformers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -201987,10 +202615,10 @@ self: { }: mkDerivation { pname = "monad-par"; - version = "0.3.5"; - sha256 = "1a8m99g9x1ivch4vhksk7fdzygbil3d33w8gdqngxbmwdikdafl2"; - revision = "2"; - editedCabalFile = "1q4npp0vrsjpxk7n7rcf3lgqg1sf2qx628ciiw48al9y9xlznsaz"; + version = "0.3.6"; + sha256 = "10b2wir7g7pr7gf3d8azkv829fl2fmxzgy8wc4livlwks0vax9jf"; + revision = "1"; + editedCabalFile = "0n329g47a5bfx21fd2j1w2y0ngka87mpfsy1c6yxw57s5x0wda77"; libraryHaskellDepends = [ abstract-deque abstract-par array base containers deepseq monad-par-extras mtl mwc-random parallel @@ -203305,6 +203933,8 @@ self: { pname = "monoidal-containers"; version = "0.6.4.0"; sha256 = "09sg4gsrvgnsy12819sps2l0j97baanbsq2w1pvypnrkanzrw083"; + revision = "1"; + editedCabalFile = "0dav6640nvxizgqqkwqmpi9z04n2swhxmyl68xm94c9np356q5iw"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign these unordered-containers witherable @@ -203472,8 +204102,8 @@ self: { }: mkDerivation { pname = "monomer-hagrid"; - version = "0.3.1.0"; - sha256 = "12ym5n1gxyx6aavyikj3hi3biyz3jqsph2x6fsryc60qmhz667wm"; + version = "0.3.1.1"; + sha256 = "1akfgsz0j0ybgs2zynp9hbssbn8v457az2g6z094fylgcg2s3aix"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204664,6 +205294,27 @@ self: { badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; }) {inherit (pkgs) mpich;}; + "mpi-hs_0_7_3_0" = callPackage + ({ mkDerivation, base, bytestring, c2hs, monad-loops, ompi }: + mkDerivation { + pname = "mpi-hs"; + version = "0.7.3.0"; + sha256 = "1q6jb3sm8jspw9zas5iggvzr6w0zmcbr2qqw4q4j96hrfpjgj798"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring monad-loops ]; + libraryPkgconfigDepends = [ ompi ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base ]; + executablePkgconfigDepends = [ ompi ]; + testHaskellDepends = [ base monad-loops ]; + testPkgconfigDepends = [ ompi ]; + description = "MPI bindings for Haskell"; + license = lib.licenses.asl20; + badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + }) {ompi = null;}; + "mpi-hs-binary" = callPackage ({ mkDerivation, base, binary, bytestring, monad-loops, mpi-hs }: mkDerivation { @@ -205183,8 +205834,8 @@ self: { pname = "msgpack"; version = "1.0.1.0"; sha256 = "1ljb9rdhdbxqs32brrwd42c8v3z7yrl6pr4mzmid1rfqdipard77"; - revision = "1"; - editedCabalFile = "1gdn6cwkczn4i9ssx4m5v352hh5k20pd4c93am0inrldq8zncyx8"; + revision = "2"; + editedCabalFile = "07m8xrwfxp0p6dgg7bz1vwsypcwi9ix84bxva462261ncyaayd9p"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 deepseq hashable mtl text unordered-containers vector @@ -206792,6 +207443,8 @@ self: { pname = "multistate"; version = "0.8.0.4"; sha256 = "0y42c21ha0chqhrn40a4bikdbirsw7aqg4i866frpagz1ivr915q"; + revision = "1"; + editedCabalFile = "0m1wv2yv1isw1qkzfa2fgjx0md7irp9djcgy16739wvl8hnj1ciq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208342,12 +208995,12 @@ self: { }) {}; "n-tuple" = callPackage - ({ mkDerivation, base, singletons, vector }: + ({ mkDerivation, base, singletons-base, vector }: mkDerivation { pname = "n-tuple"; - version = "0.0.2.0"; - sha256 = "0gq2s7cfivzspr446h21c79md6wzg2q8wzmx8kivbxiixsr3bxva"; - libraryHaskellDepends = [ base singletons vector ]; + version = "0.0.3"; + sha256 = "0x9shjhkshfa81sdhppx9h8xdkm0j0v73lvkzhgp93hzavb9sffi"; + libraryHaskellDepends = [ base singletons-base vector ]; description = "Homogeneous tuples of arbitrary length"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -208552,8 +209205,8 @@ self: { pname = "named"; version = "0.3.0.1"; sha256 = "0dnp4qbhn6ci2dlp230gpq8c5z26wb2liani1myc598g2b3c2qij"; - revision = "4"; - editedCabalFile = "05m3mw2prbag8bshayvvigxr70jk32398sn3n5gjv1nfhbsplwcr"; + revision = "5"; + editedCabalFile = "0yhv6qxdjsip5sd3z2gvwhjfq2n3l9qx6n990xfm4mz0dn935v1f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Named parameters (keyword arguments) for Haskell"; @@ -208685,8 +209338,8 @@ self: { }: mkDerivation { pname = "named-text"; - version = "1.1.3.0"; - sha256 = "0a0nnq5zhjnh8s5ykny4rvzck4s7n5vj82qwlww8jm3fnv4sj9ax"; + version = "1.1.4.0"; + sha256 = "1brmqlnp107zwfx6j6rl91fr7v0kc07pd1izca9yg8plhk0qkgvj"; libraryHaskellDepends = [ aeson base deepseq hashable prettyprinter sayable text ]; @@ -209284,8 +209937,8 @@ self: { pname = "natural-transformation"; version = "0.4"; sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; - revision = "11"; - editedCabalFile = "1j4gmkamz6r7xggyfyb3by8lbmaah164haqakbxi2kb7y0v4kl24"; + revision = "12"; + editedCabalFile = "0nlyhp29s2c93d1rflrw4wkzpp98i9zr11fca2vd6z31yc7dg5pg"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -209797,8 +210450,8 @@ self: { }: mkDerivation { pname = "nested-routes"; - version = "9.0.2"; - sha256 = "197q5fapwj5rnlqvwlzajjn8sjb960mgxqd7sbw2sih6cj63a9a2"; + version = "10.0.0"; + sha256 = "16m926ajdjmma835l5p3s6w288j93sv4hcl8609a153cj5i1ni6f"; libraryHaskellDepends = [ attoparsec base errors exceptions extractable-singleton hashable monad-control-aligned mtl poly-arity pred-trie regex-compat text @@ -210341,8 +210994,8 @@ self: { pname = "netrc"; version = "0.2.0.0"; sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls"; - revision = "12"; - editedCabalFile = "1xk4q5jmnhynyajylvzsdfhnhd64hk9fmym7z1prg1v2z8764bmp"; + revision = "13"; + editedCabalFile = "01c405f31al4qv6fq3apx1p5s4szzkla2nhmwwzpf6lvl5rz8y8h"; libraryHaskellDepends = [ base bytestring deepseq parsec ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-quickcheck @@ -211650,8 +212303,8 @@ self: { }: mkDerivation { pname = "network-unexceptional"; - version = "0.1.3.1"; - sha256 = "0g99931i44f07byxv14a89d2rda12ibzv1b3vxi6rkwqikrh3jk3"; + version = "0.2.0.0"; + sha256 = "042mav0nrvffm31xd0skx5fjq8qd1608ar76wq4vg03az6xdy97d"; libraryHaskellDepends = [ base byteslice bytestring error-codes network posix-api primitive primitive-addr stm @@ -212335,8 +212988,8 @@ self: { }: mkDerivation { pname = "ngx-export-distribution"; - version = "0.5.0.3"; - sha256 = "1czpf9sjsqzzzf78aqvp8n3ja0bdhchwj3i79qzf3mvhhkcfqj3i"; + version = "0.5.1.2"; + sha256 = "1vv5pl6lazbq6g11nsj6ks14by1shjplxllfi9rmij49w67q0xln"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -212352,21 +213005,28 @@ self: { "ngx-export-healthcheck" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers - , enclosed-exceptions, http-client, http-client-brread-timeout - , http-client-tls, http-types, ngx-export, safe, snap-core - , snap-server, text, time, vector + , crypton-connection, crypton-x509, crypton-x509-system + , crypton-x509-validation, data-default-class, enclosed-exceptions + , http-client, http-client-brread-timeout, http-client-tls + , http-types, ngx-export, safe, snap-core, snap-server, text, time + , tls, unordered-containers, vector }: mkDerivation { pname = "ngx-export-healthcheck"; - version = "1.6"; - sha256 = "0haz3md5hx6rs9apdqd4ivm3f0vqvxa099ig3liw4mjjqnzmhdhy"; + version = "1.6.2"; + sha256 = "1zmmgf0m99m4dcg6q5zxjkbikiwkgn39mdifdvxd0fy5p8ff851a"; libraryHaskellDepends = [ - aeson async base bytestring containers enclosed-exceptions - http-client http-client-brread-timeout http-client-tls http-types - ngx-export safe snap-core snap-server text time vector + aeson async base bytestring containers crypton-connection + crypton-x509 crypton-x509-system crypton-x509-validation + data-default-class enclosed-exceptions http-client + http-client-brread-timeout http-client-tls http-types ngx-export + safe snap-core snap-server text time tls unordered-containers + vector ]; description = "Active health checks and monitoring of Nginx upstreams"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ngx-export-log" = callPackage @@ -212392,8 +213052,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "1.0"; - sha256 = "08549xn2rcx4nipzpcq379y5irkv0llrhis497d6zfqa3lgjyzk0"; + version = "1.2.0"; + sha256 = "0kn0h7c13zvsav93gn8bhmhx1nhdnp9vg2kgscw248f4l4czf2fp"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -212412,8 +213072,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "1.2.4"; - sha256 = "1phxcz622yz2als564ab0bs425lz44lbp9q0nmxgnp03bxlcn9gs"; + version = "1.2.5"; + sha256 = "0myggkgscm4yl4f9wdhpf571dz5yrdfb09ajl1ybic7yl8nmm9zq"; libraryHaskellDepends = [ aeson array async base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client @@ -215158,12 +215818,12 @@ self: { }) {}; "numerical-integration" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, system-cxx-std-lib }: mkDerivation { pname = "numerical-integration"; - version = "0.1.0.2"; - sha256 = "0vg9pdlqv5wl84q7jcjgd3g6hir1kkd5acmplivpn2gq9hdf8mwi"; - libraryHaskellDepends = [ base ]; + version = "0.1.2.3"; + sha256 = "1yzajs03wyv8y9n1j7npp66yw7gbjd04069ybw391w21m83wgz9j"; + libraryHaskellDepends = [ base system-cxx-std-lib ]; description = "Numerical integration"; license = lib.licenses.bsd3; }) {}; @@ -215742,6 +216402,30 @@ self: { mainProgram = "play-o-clock"; }) {}; + "o-clock_1_4_0" = callPackage + ({ mkDerivation, base, doctest, Glob, hedgehog, hspec-expectations + , markdown-unlit, tasty, tasty-hedgehog, tasty-hunit-compat + , type-spec + }: + mkDerivation { + pname = "o-clock"; + version = "1.4.0"; + sha256 = "1qmv0hq1z3x5h3mxpdd3prf9yhk7688hdm09zf8l36iq2602vj5g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest Glob hedgehog hspec-expectations markdown-unlit tasty + tasty-hedgehog tasty-hunit-compat type-spec + ]; + testToolDepends = [ doctest markdown-unlit ]; + description = "Type-safe time library"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "play-o-clock"; + }) {}; + "oanda-rest-api" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens @@ -216343,6 +217027,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ods2csv" = callPackage + ({ mkDerivation, base, bytestring, non-empty, optparse-applicative + , shell-utility, spreadsheet, tagchup, utf8-string, utility-ht + , xml-basic, zip-archive + }: + mkDerivation { + pname = "ods2csv"; + version = "0.1"; + sha256 = "16f4n8a1a3jq0dk8ds6sn7vljh69slhdbdvbw8mzzvhwjdxmk7cq"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring non-empty optparse-applicative shell-utility + spreadsheet tagchup utf8-string utility-ht xml-basic zip-archive + ]; + description = "Convert Open Document Spreadsheet ODS to CSV"; + license = lib.licenses.bsd3; + mainProgram = "ods2csv"; + }) {}; + "oeis" = callPackage ({ mkDerivation, base, HTTP, HUnit, network, network-uri , test-framework, test-framework-hunit @@ -216414,8 +217118,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.0.10"; - sha256 = "0v5ax7xyl5hnq37h97cajg679xxvdv6z7mjwa2h0nj3g70wkxd9f"; + version = "1.0.11"; + sha256 = "0q0hfmckply8n3jg1jkj4n4gaf6bc7l86amrjmdiml1mmfmaqvqf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ogma-core optparse-applicative ]; @@ -216437,8 +217141,8 @@ self: { }: mkDerivation { pname = "ogma-core"; - version = "1.0.10"; - sha256 = "04kkk6r947dq7v23x95dp6kkp3adkynh6b23px3ij5g83k86kv2g"; + version = "1.0.11"; + sha256 = "13bqy731qbhszjxy0l06zff5lyqiypnybxxg8hvmsj0r4p041fa2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base filepath IfElse mtl ogma-extra ogma-language-c @@ -216460,8 +217164,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.0.10"; - sha256 = "0r2qlzs8dyxv9mvj7nr4akihxxx36bdlndp7x6fp848yasbik8bg"; + version = "1.0.11"; + sha256 = "0ksrf2ahbnlydklvmgpkhxwcykxwxvaisr8ch6vbhv34r123rg45"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ]; @@ -216478,8 +217182,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.0.10"; - sha256 = "09yb37ccrg6wq7dflngfjnjwach3k633cw17il2vg6wh7r1b3ffw"; + version = "1.0.11"; + sha256 = "0kpmw1jkjw7adg05ijd1cr72d85jnwq5vywhpnx9lczsns7vp6i8"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -216497,8 +217201,8 @@ self: { }: mkDerivation { pname = "ogma-language-cocospec"; - version = "1.0.10"; - sha256 = "15hakc95xiy9yhzqm7hm5mrzxlam03g1a4rsppglv6zpn55764rb"; + version = "1.0.11"; + sha256 = "0xv2crz6qzskc0k94pv7p4y3xdw4vg1axp559hw47yn6q7nlvbkh"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -216514,8 +217218,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.0.10"; - sha256 = "1m6bbxkdxk7p20vb47abb796cx9qb3s87g9rjady9bncyyz0f199"; + version = "1.0.11"; + sha256 = "0js0xg83j2g6s6zja4sa81vhccj0w1jsjba2c9cw8r8pinr97jjb"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = "unknown"; @@ -216528,8 +217232,8 @@ self: { }: mkDerivation { pname = "ogma-language-fret-cs"; - version = "1.0.10"; - sha256 = "0lvh0cvn2m47pv87hv5ad2s5s1qfr2aii2zn53xlra5jm2ilmjav"; + version = "1.0.11"; + sha256 = "1cqbxa5nrfczjzq9jnn3b5g737x08q6ca0kflcj9d6my53381v2h"; libraryHaskellDepends = [ aeson base ogma-language-cocospec ogma-language-smv ]; @@ -216549,8 +217253,8 @@ self: { }: mkDerivation { pname = "ogma-language-fret-reqs"; - version = "1.0.10"; - sha256 = "1ryqnhfpvpigmfyidrfql54pj5z3633iddlnnvn9q6qgpch4a4s0"; + version = "1.0.11"; + sha256 = "0096phlf3sp6fw7bq16wra304gxf1s1kpqzjzp49z8xdnszhl0ln"; libraryHaskellDepends = [ aeson base ogma-language-cocospec ogma-language-smv text ]; @@ -216569,8 +217273,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.0.10"; - sha256 = "0n56k5f1gbk345qxdd9wjv3n4w0za05zg00xvqdmc3lmpdn31g9k"; + version = "1.0.11"; + sha256 = "1ixxsbh443zd83xl9m329myfw91a316kc1f9a58a60x8akmafvqx"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -217477,7 +218181,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "opaleye_0_10_0_0" = callPackage + "opaleye_0_10_1_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -217487,10 +218191,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.10.0.0"; - sha256 = "0x181722a8ml9a6nbcj5v9q8npjkc22qrahqkfrfrh69hb0zpqp4"; - revision = "2"; - editedCabalFile = "1vi9rr5zdk9mjpmgk27wcrdddv7rzmh94s30nc20987iqf3sc6ck"; + version = "0.10.1.1"; + sha256 = "0788dvmzpw51fwb3flpvmacky3qvh7kd0h8lv4nwjzqlj7l1n2dq"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -218551,6 +219253,24 @@ self: { mainProgram = "eventlog-to-lightstep"; }) {}; + "opentelemetry-plugin" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc + , hs-opentelemetry-api, hs-opentelemetry-propagator-w3c + , hs-opentelemetry-sdk, mwc-random, text, unordered-containers + }: + mkDerivation { + pname = "opentelemetry-plugin"; + version = "1.0.0"; + sha256 = "10j37spgz06xa7n16bbqx9zwhh9yc7avbhmwlvhraikpcjfmz7j9"; + libraryHaskellDepends = [ + base bytestring containers ghc hs-opentelemetry-api + hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk mwc-random + text unordered-containers + ]; + description = "GHC plugin for open telemetry"; + license = lib.licenses.bsd3; + }) {}; + "opentelemetry-wai" = callPackage ({ mkDerivation, base, bytestring, http-types, opentelemetry, text , wai @@ -218808,8 +219528,8 @@ self: { }: mkDerivation { pname = "opentracing"; - version = "0.2.2"; - sha256 = "0d2zxq6y943kwpis9nbbj7cn8amy315bxy56mjj54bkg3jm43jn7"; + version = "0.3.0"; + sha256 = "1bbs2rv0rfsz3mmi04qxjirmbm9ghsx8cffa15lm4n8sxpkafz82"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring case-insensitive clock containers http-types iproute lens mtl mwc-random network @@ -218826,8 +219546,8 @@ self: { ({ mkDerivation, base, http-client, lens, mtl, opentracing, text }: mkDerivation { pname = "opentracing-http-client"; - version = "0.2.2"; - sha256 = "03adv17m82imw7bq618zm6x79gq6avvhcz3i0jak4157f3lwdq6b"; + version = "0.3.0"; + sha256 = "1wjhb15ay6l5ynby90abrlkw7i9iwnkifzfpi39bbk7884wkl6a7"; libraryHaskellDepends = [ base http-client lens mtl opentracing text ]; @@ -218844,8 +219564,8 @@ self: { }: mkDerivation { pname = "opentracing-jaeger"; - version = "0.2.2"; - sha256 = "1wy8n4ci3hs2glwahhgzzl6g4dw370ay2dg8bf1af8a27sl3dhjn"; + version = "0.3.0"; + sha256 = "0a1kk98ab98pwkh9znssz8s2yfg660n509rkiwslarm910lyqmvp"; libraryHaskellDepends = [ base bytestring exceptions hashable http-client http-types lens mtl network opentracing pinch QuickCheck safe-exceptions text @@ -218860,8 +219580,8 @@ self: { ({ mkDerivation, base, lens, opentracing, text, wai }: mkDerivation { pname = "opentracing-wai"; - version = "0.2.2"; - sha256 = "1yfbh7pp2rp16xm5bqij9f6m0cm23zrd0jsndkngl1mxjkv6l24i"; + version = "0.3.0"; + sha256 = "1j9bamsy6yflxhk6xy1li2a1jqva07r7w3jf509wfiq4474i345k"; libraryHaskellDepends = [ base lens opentracing text wai ]; description = "Middleware adding OpenTracing tracing for WAI applications"; license = lib.licenses.asl20; @@ -218872,8 +219592,8 @@ self: { ({ mkDerivation, aeson, base, opentracing, text }: mkDerivation { pname = "opentracing-zipkin-common"; - version = "0.2.2"; - sha256 = "1vridakdz07yfiyr92byd8kab2zc68izpv1j8dh4a0xnks8910wk"; + version = "0.3.0"; + sha256 = "1ha0f6y2rj5j7634z5pcas1425rlx0i94xiwiwqy9za54hhqaa3i"; libraryHaskellDepends = [ aeson base opentracing text ]; description = "Zipkin OpenTracing Backend Commons"; license = lib.licenses.asl20; @@ -218888,8 +219608,8 @@ self: { }: mkDerivation { pname = "opentracing-zipkin-v1"; - version = "0.2.2"; - sha256 = "0z263yksbcgyfzsb6fj6id3bdsbhb0b92bfjm0myclj8f703hxbj"; + version = "0.3.0"; + sha256 = "1hcpmr5nr7h045nf4m82q1j7xcqi8hrm6fdw4q2xx38vz3hnph9v"; libraryHaskellDepends = [ base bytestring exceptions hashable http-client http-types iproute lens opentracing opentracing-zipkin-common pinch QuickCheck text @@ -218907,8 +219627,8 @@ self: { }: mkDerivation { pname = "opentracing-zipkin-v2"; - version = "0.2.2"; - sha256 = "1hqbr4ifabyg6sr40jw9hqi2xq00wqy8srw9q6hj5qxqnvl39110"; + version = "0.3.0"; + sha256 = "1bkvg8krw9jv4c48an0g6z140ghln91vcc0igcxzj50y7vmczrh7"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring exceptions http-client http-types lens opentracing opentracing-zipkin-common text @@ -219208,8 +219928,8 @@ self: { pname = "optics-th"; version = "0.4.1"; sha256 = "05zxljfqmhr5if7l8gld5s864nql6kqjfizsf1z7r3ydknvmff6p"; - revision = "4"; - editedCabalFile = "0l9kafjxrqnkqqb2mdwc6rjhhyp7j5mabaxzmgq6fzl8cr9qbjfk"; + revision = "5"; + editedCabalFile = "0a9h1bll1m9v40cv7ifv2sy3k6sfcq325s7cpk33wh65awf5zpl7"; libraryHaskellDepends = [ base containers mtl optics-core template-haskell th-abstraction transformers @@ -220178,40 +220898,6 @@ self: { broken = true; }) {}; - "ormolu_0_5_0_1" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring - , Cabal, containers, Diff, directory, dlist, exceptions, filepath - , ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec - , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io - , QuickCheck, syb, template-haskell, temporary, text - , th-lift-instances - }: - mkDerivation { - pname = "ormolu"; - version = "0.5.0.1"; - sha256 = "1rnf4x352k856avfllk4rc9v0wwkydr030cmp7j29p0y9cwf5pkg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal array base bytestring Cabal containers Diff - directory dlist exceptions filepath ghc-lib-parser megaparsec - MemoTrie mtl syb template-haskell text th-lift-instances - ]; - executableHaskellDepends = [ - base containers filepath ghc-lib-parser gitrev optparse-applicative - text - ]; - testHaskellDepends = [ - base containers directory filepath ghc-lib-parser hspec - hspec-megaparsec megaparsec path path-io QuickCheck temporary text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "ormolu"; - }) {}; - "ormolu_0_5_2_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, binary, bytestring , Cabal-syntax, containers, Diff, directory, dlist, file-embed @@ -221826,6 +222512,8 @@ self: { pname = "pandoc-crossref"; version = "0.3.16.0"; sha256 = "1vp4x4vgc17y0c4grfffrw0nx5iiimj7jm00mwc2p4x8v3gvd1qr"; + revision = "1"; + editedCabalFile = "00ghadmbwv14vpc5fh85q1y06z5pzlwh6ryr68l5vg66dk2241g4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -221853,6 +222541,45 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "pandoc-crossref_0_3_17_0" = callPackage + ({ mkDerivation, base, containers, criterion, data-default, deepseq + , directory, filepath, gitrev, hspec, microlens, microlens-ghc + , microlens-mtl, microlens-th, mtl, open-browser + , optparse-applicative, pandoc, pandoc-cli, pandoc-types, syb + , template-haskell, temporary, text, utility-ht + }: + mkDerivation { + pname = "pandoc-crossref"; + version = "0.3.17.0"; + sha256 = "16kgnwylczhs126ivps56r667acln441srdasavvnk35hsvgmccf"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers data-default directory filepath microlens + microlens-ghc microlens-mtl microlens-th mtl pandoc pandoc-types + syb template-haskell text utility-ht + ]; + executableHaskellDepends = [ + base deepseq gitrev open-browser optparse-applicative pandoc + pandoc-types template-haskell temporary text + ]; + testHaskellDepends = [ + base containers data-default directory filepath hspec microlens mtl + pandoc pandoc-types text + ]; + testToolDepends = [ pandoc-cli ]; + benchmarkHaskellDepends = [ + base criterion pandoc pandoc-types text + ]; + doHaddock = false; + description = "Pandoc filter for cross-references"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "pandoc-crossref"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "pandoc-csv2table" = callPackage ({ mkDerivation, base, csv, pandoc, pandoc-types, text }: mkDerivation { @@ -223439,8 +224166,8 @@ self: { pname = "parallel"; version = "3.2.2.0"; sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; - revision = "6"; - editedCabalFile = "1f14frciafrs63a581lm7s1zxv71wa04ydzf80gldfi7x73c6ln6"; + revision = "7"; + editedCabalFile = "192gkkmr47vfqbb9yal9q38ps0v1wgkji7d6ykpjd4gyk1p414xr"; libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; license = lib.licenses.bsd3; @@ -223877,14 +224604,16 @@ self: { mainProgram = "parseargs-example"; }) {}; - "parsec_3_1_16_1" = callPackage - ({ mkDerivation, base, bytestring, mtl, tasty, tasty-hunit, text }: + "parsec_3_1_17_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, mtl, tasty, tasty-hunit + , text + }: mkDerivation { pname = "parsec"; - version = "3.1.16.1"; - sha256 = "0ihjbmsn9hrryjid0ydh6vryzq2mnzavhdb7hxc8d9kfszjn46d4"; + version = "3.1.17.0"; + sha256 = "0dlx2ypfbbddlv75m9axirxb30srb9kzvpa3haf88g7cq6z01iaq"; libraryHaskellDepends = [ base bytestring mtl text ]; - testHaskellDepends = [ base mtl tasty tasty-hunit ]; + testHaskellDepends = [ base deepseq mtl tasty tasty-hunit ]; description = "Monadic parser combinators"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; @@ -224249,8 +224978,8 @@ self: { pname = "parsers"; version = "0.12.11"; sha256 = "068k7fm0s13z0jkkffc149cqcxnzpk1m066lp4ccdfcb41km1zwi"; - revision = "1"; - editedCabalFile = "11slps7yccraacb67c862g2iv1sh7m09dnvbafhyw134krch0i5v"; + revision = "2"; + editedCabalFile = "1wx06q6hkib00brrf4rpvbgrcipjmb1g3xhwdqjhkh31skhlimii"; libraryHaskellDepends = [ attoparsec base base-orphans binary charset containers mtl parsec scientific text transformers unordered-containers @@ -224870,8 +225599,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.9.0.0"; - sha256 = "1g7i2mjrppnvz4c7v0w4a4c3s30b74s1adnssi1rmahm4qf1cqmn"; + version = "0.9.2.0"; + sha256 = "0qhgb8lmmbxdjwim0z1dc6jyzlcg01p9y8cbz8dn8pdzbjbaj8m5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224940,6 +225669,8 @@ self: { pname = "patch-image"; version = "0.3.3.2"; sha256 = "1kbd19vaizhbrpb4pa3py125kaw313yn3aq70yr7wygk1kk6v7ql"; + revision = "1"; + editedCabalFile = "0lkzfa4509id7xbnwmxb55p5dh5blz33dp3kv3c5j7yr6mdd10hs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -225070,6 +225801,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "path-extra_0_3_1" = callPackage + ({ mkDerivation, attoparsec, base, path, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "path-extra"; + version = "0.3.1"; + sha256 = "0si91qq7bssfpzsnqjwbgp4iifg5clsk4yyxd1yxrk9pxl5vc0wa"; + libraryHaskellDepends = [ attoparsec base path text ]; + testHaskellDepends = [ + attoparsec base path QuickCheck quickcheck-instances tasty + tasty-quickcheck text + ]; + description = "URLs without host information"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "path-formatting" = callPackage ({ mkDerivation, base, formatting, path }: mkDerivation { @@ -225129,6 +225878,19 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; + "path-sing" = callPackage + ({ mkDerivation, base, hashable, path }: + mkDerivation { + pname = "path-sing"; + version = "0.1.0.0"; + sha256 = "14d84jwa3gdxp0pjlnck870skmqilxn98ymi15n7wqbkhf6mi5aw"; + libraryHaskellDepends = [ base hashable path ]; + description = "A singleton wrapper for the `path` library"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "path-text-utf8" = callPackage ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: mkDerivation { @@ -225784,19 +226546,6 @@ self: { ({ mkDerivation, base, bytestring, containers, HUnit, mtl, pcre }: mkDerivation { pname = "pcre-light"; - version = "0.4.1.0"; - sha256 = "0lqvsmc6bfhdv6igm3fmw8nklyhw3j3jsl0s1k6r3fhb6ambzxhn"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ pcre ]; - testHaskellDepends = [ base bytestring containers HUnit mtl ]; - description = "Portable regex library for Perl 5 compatible regular expressions"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) pcre;}; - - "pcre-light_0_4_1_2" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, mtl, pcre }: - mkDerivation { - pname = "pcre-light"; version = "0.4.1.2"; sha256 = "0fmdb1kv7fyjvcii788cg95zb2bzrg851h42x5pgdcgp3m3lm4p4"; libraryHaskellDepends = [ base bytestring ]; @@ -225804,7 +226553,6 @@ self: { testHaskellDepends = [ base bytestring containers HUnit mtl ]; description = "Portable regex library for Perl 5 compatible regular expressions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) pcre;}; "pcre-light-extra" = callPackage @@ -227149,6 +227897,45 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; + "persistent_2_14_6_0" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , base64-bytestring, blaze-html, bytestring, conduit, containers + , criterion, deepseq, fast-logger, file-embed, hspec, http-api-data + , lift-type, monad-logger, mtl, path-pieces, QuickCheck + , quickcheck-instances, resource-pool, resourcet, scientific + , shakespeare, silently, template-haskell, text, th-lift-instances + , time, transformers, unliftio, unliftio-core, unordered-containers + , vault, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.14.6.0"; + sha256 = "0fz5ns6m677vrhmvzfgpmh0d5nmkn3ax3m7b4hb0j3h6jw3k0avf"; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-aeson base base64-bytestring blaze-html + bytestring conduit containers deepseq fast-logger http-api-data + lift-type monad-logger mtl path-pieces resource-pool resourcet + scientific silently template-haskell text th-lift-instances time + transformers unliftio unliftio-core unordered-containers vault + vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers deepseq fast-logger hspec http-api-data + monad-logger mtl path-pieces QuickCheck quickcheck-instances + resource-pool resourcet scientific shakespeare silently + template-haskell text th-lift-instances time transformers unliftio + unliftio-core unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq file-embed template-haskell text + ]; + description = "Type-safe, multi-backend data serialization"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.psibi ]; + }) {}; + "persistent-audit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , getopt-generics, hashable, hspec, mongoDB, persistent @@ -227243,6 +228030,36 @@ self: { mainProgram = "persistent-discover"; }) {}; + "persistent-discover_0_1_0_7" = callPackage + ({ mkDerivation, base, directory, discover-instances, dlist + , file-embed, filepath, hspec, hspec-discover, mtl, persistent + , some-dict-of, template-haskell, text + }: + mkDerivation { + pname = "persistent-discover"; + version = "0.1.0.7"; + sha256 = "0limmps83v9grv6j58vz996bafbxp267nv3s7mizmp1g68yvqcba"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory discover-instances dlist file-embed filepath mtl + persistent some-dict-of template-haskell text + ]; + executableHaskellDepends = [ + base directory discover-instances dlist file-embed filepath mtl + persistent some-dict-of template-haskell text + ]; + testHaskellDepends = [ + base directory discover-instances dlist file-embed filepath hspec + hspec-discover mtl persistent some-dict-of template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "Persistent module discover utilities"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "persistent-discover"; + }) {}; + "persistent-documentation" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover, mtl , persistent, persistent-template, template-haskell, text @@ -227650,8 +228467,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.13.5.2"; - sha256 = "0p8hikvynl6yfdv030pk6vpczpw52ys8m4vba1qb9h2w1vkr4a3i"; + version = "2.13.6.1"; + sha256 = "0mv7a2qrcn34996as1wqxwxlhyqfis0m6q4wkfzyrpmy881zc6lh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227728,6 +228545,28 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-qq_2_12_0_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, fast-logger + , haskell-src-meta, hspec, HUnit, monad-logger, mtl, persistent + , persistent-sqlite, resourcet, template-haskell, text, unliftio + }: + mkDerivation { + pname = "persistent-qq"; + version = "2.12.0.6"; + sha256 = "1z017xb7mq3npbz1jw7d9b2x8ylwr4qcpi7d87pi6dw89nwqcwwd"; + libraryHaskellDepends = [ + base haskell-src-meta mtl persistent template-haskell text + ]; + testHaskellDepends = [ + aeson base bytestring fast-logger haskell-src-meta hspec HUnit + monad-logger mtl persistent persistent-sqlite resourcet + template-haskell text unliftio + ]; + description = "Provides a quasi-quoter for raw SQL for persistent"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-ratelimit" = callPackage ({ mkDerivation, base, time, yesod }: mkDerivation { @@ -227854,6 +228693,39 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {inherit (pkgs) sqlite;}; + "persistent-sqlite_2_13_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th + , monad-logger, mtl, persistent, persistent-test, QuickCheck + , resource-pool, resourcet, sqlite, system-fileio, system-filepath + , temporary, text, time, transformers, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.13.2.0"; + sha256 = "1v846ymm46b1g1bv95brrnndp7vi3qkfjdfwjqxsdi9c9hixwq87"; + configureFlags = [ "-fsystemlib" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-logger + mtl persistent resource-pool resourcet text time transformers + unliftio-core unordered-containers + ]; + librarySystemDepends = [ sqlite ]; + testHaskellDepends = [ + base bytestring conduit containers exceptions fast-logger hspec + HUnit microlens monad-logger mtl persistent persistent-test + QuickCheck resourcet system-fileio system-filepath temporary text + time transformers unliftio-core + ]; + description = "Backend for the persistent library using sqlite3"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.psibi ]; + }) {inherit (pkgs) sqlite;}; + "persistent-stm" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , extra, filelock, filepath, focus, hspec, stm, stm-containers @@ -228440,8 +229312,8 @@ self: { ({ mkDerivation, base, criterion, transformers, vector }: mkDerivation { pname = "phantom-state"; - version = "0.2.1.3"; - sha256 = "0wqjjghsxjhqj4z6snqcc0lkx84d84qnxlpkc5nignxywksbka8x"; + version = "0.2.1.4"; + sha256 = "07gb7qiv3g2klqnhxnjj4rdvvhy72vvv92h7p88k6547la6znn40"; libraryHaskellDepends = [ base transformers ]; benchmarkHaskellDepends = [ base criterion transformers vector ]; description = "Phantom State Transformer. Like State Monad, but without values."; @@ -228541,12 +229413,23 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "phladiprelio-general-datatype" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "phladiprelio-general-datatype"; + version = "0.3.1.0"; + sha256 = "1pbd6hd1pb28shag6xa08caamz6f02dn71v9asyyqznxpljf4771"; + libraryHaskellDepends = [ base ]; + description = "Extended functionality of PhLADiPreLiO"; + license = lib.licenses.mit; + }) {}; + "phladiprelio-general-shared" = callPackage ({ mkDerivation, base, phonetic-languages-phonetics-basics }: mkDerivation { pname = "phladiprelio-general-shared"; - version = "0.1.0.0"; - sha256 = "08k08584ylmfflrv3wsm00j8gcd3mj8lkqpp2mw3mv0x0bdb7hmb"; + version = "0.1.1.0"; + sha256 = "1iwia8gs6pm7i7nz3a3kqnrmbmg3js1dq66g2s1li71p7gdn32ac"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics ]; @@ -228556,8 +229439,8 @@ self: { "phladiprelio-general-simple" = callPackage ({ mkDerivation, async, base, cli-arguments, directory, halfsplit - , phladiprelio-general-shared, phladiprelio-tests - , phonetic-languages-constraints-array + , phladiprelio-general-datatype, phladiprelio-general-shared + , phladiprelio-tests, phonetic-languages-constraints-array , phonetic-languages-permutations-array , phonetic-languages-phonetics-basics , phonetic-languages-simplified-base, rev-scientific @@ -228565,12 +229448,12 @@ self: { }: mkDerivation { pname = "phladiprelio-general-simple"; - version = "0.8.0.0"; - sha256 = "0bq82h7y2qd5kx3gig579v9n6znvyfz1bzkjjkcbp9rpywkk0gy8"; + version = "0.10.0.0"; + sha256 = "19sydm9r3ggkbkr53akzv8z504kv2dqcbncf86ivkv9qh56rxk3f"; libraryHaskellDepends = [ async base cli-arguments directory halfsplit - phladiprelio-general-shared phladiprelio-tests - phonetic-languages-constraints-array + phladiprelio-general-datatype phladiprelio-general-shared + phladiprelio-tests phonetic-languages-constraints-array phonetic-languages-permutations-array phonetic-languages-phonetics-basics phonetic-languages-simplified-base rev-scientific @@ -228619,7 +229502,8 @@ self: { "phladiprelio-ukrainian-simple" = callPackage ({ mkDerivation, async, base, cli-arguments, directory, halfsplit - , phladiprelio-tests, phladiprelio-ukrainian-shared + , phladiprelio-general-datatype, phladiprelio-tests + , phladiprelio-ukrainian-shared , phonetic-languages-constraints-array , phonetic-languages-permutations-array , phonetic-languages-simplified-base @@ -228628,12 +229512,13 @@ self: { }: mkDerivation { pname = "phladiprelio-ukrainian-simple"; - version = "0.10.0.0"; - sha256 = "01xxrhfcfcw9s0h2zyn3vbwvbidklygm5z46cbax2ks81qqd01mi"; + version = "0.11.0.1"; + sha256 = "166v5cpdyxs754pmhlm05sbbbvlys8bfmgjr0grrqw6f1rnm1x2d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base cli-arguments directory halfsplit phladiprelio-tests + async base cli-arguments directory halfsplit + phladiprelio-general-datatype phladiprelio-tests phladiprelio-ukrainian-shared phonetic-languages-constraints-array phonetic-languages-permutations-array phonetic-languages-simplified-base @@ -228641,7 +229526,8 @@ self: { rhythmic-sequences ukrainian-phonetics-basic-array ]; executableHaskellDepends = [ - async base cli-arguments directory halfsplit phladiprelio-tests + async base cli-arguments directory halfsplit + phladiprelio-general-datatype phladiprelio-tests phladiprelio-ukrainian-shared phonetic-languages-constraints-array phonetic-languages-permutations-array phonetic-languages-simplified-base @@ -228915,8 +229801,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.10.0.2"; - sha256 = "1crikva3lb3jhnfsaca6lv8fgbv56jn3f8zbfylfbb8hvqk507h3"; + version = "0.10.1.0"; + sha256 = "0i2mpfpycy004kc96ajraxrjzdzg1k04yjn18wf1k9x5q5n3xm24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229129,6 +230015,7 @@ self: { ]; description = "Some common code for phonetic languages generalized functionality"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-properties-array" = callPackage @@ -229148,6 +230035,8 @@ self: { ]; description = "Some 'properties' of the phonetic languages approach text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-simplified-lists-examples" = callPackage @@ -229303,8 +230192,8 @@ self: { ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "phonetic-languages-ukrainian-array"; - version = "0.10.0.0"; - sha256 = "0ska3m86vs4xab1skzgaqdihqsnz9ag471fns880hj2lgjxn7jzb"; + version = "0.11.0.0"; + sha256 = "0rijqyvavk2i7439n25wzb4dggz9xv2hfxw7557p5jqii15jxvcs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; @@ -232642,8 +233531,8 @@ self: { pname = "pointed"; version = "5.0.4"; sha256 = "1mv06x2hscs220w4acm5jwg96vi4faky6ir9hnljfry3n2r2xix3"; - revision = "1"; - editedCabalFile = "14w5w6z2zk494mz5h1bm21a5rj8wlkyy37vi944ix4r7nrylv8bl"; + revision = "2"; + editedCabalFile = "1ik9mdz5gdkw5bzj1ymsh8c6kihrl07j1imh1k5rwylnq1pmvlmc"; libraryHaskellDepends = [ base comonad containers data-default-class hashable kan-extensions semigroupoids semigroups stm tagged transformers @@ -233320,8 +234209,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.9.1.1"; - sha256 = "0k6nq182lx5yca3c7i24byq1aik1f09ydy6g34nfd27lraa31w2b"; + version = "1.9.1.2"; + sha256 = "0b1mlv4ny7kga8a9bk2gj9y39kjlf5vwbnp6zkx6i6wfjg1z1i4c"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb @@ -233434,15 +234323,15 @@ self: { }: mkDerivation { pname = "polysemy-chronos"; - version = "0.6.0.0"; - sha256 = "1zmq8pi0fdzbgz8nkfiwkn2vf6a6k5wgc7xc19v5xkmaps5aiwgp"; + version = "0.6.0.2"; + sha256 = "1d53m5i0v1g5c66wvy8ji7gmw0vzz9qh57hf0wx44kk45myva4ad"; libraryHaskellDepends = [ base chronos incipit-core polysemy-time ]; testHaskellDepends = [ base chronos incipit-core polysemy-test polysemy-time tasty ]; - description = "Polysemy effects for Chronos"; + description = "A Polysemy effect for Chronos"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -233455,16 +234344,15 @@ self: { }: mkDerivation { pname = "polysemy-conc"; - version = "0.12.1.0"; - sha256 = "0js5hl84nfmb2i5si67wrf9d0i69piaj44v3sbia6yncq85fj7vn"; + version = "0.13.0.1"; + sha256 = "15blkrrh27wadi746qn590agsp0xqrxd6cnvzr9wkfkvv9hcizvj"; libraryHaskellDepends = [ async base containers incipit-core polysemy polysemy-resume polysemy-time stm stm-chans torsor unagi-chan unix ]; testHaskellDepends = [ async base hedgehog incipit-core polysemy polysemy-plugin - polysemy-resume polysemy-test polysemy-time stm tasty - tasty-hedgehog time unix + polysemy-test polysemy-time stm tasty tasty-hedgehog time unix ]; description = "Polysemy effects for concurrency"; license = "BSD-2-Clause-Patent"; @@ -233590,8 +234478,8 @@ self: { }: mkDerivation { pname = "polysemy-http"; - version = "0.12.0.0"; - sha256 = "016z753yk9ix8vqbmkll67pp2w2qznnbbayvi7x8q6cwm464cavq"; + version = "0.13.0.1"; + sha256 = "15zcnskyy9c60lmidbvyg5rkmnvbbp62x9cix8p4cak19d6rqp1k"; libraryHaskellDepends = [ aeson base case-insensitive exon http-client http-client-tls http-types polysemy polysemy-plugin prelate time @@ -233667,8 +234555,8 @@ self: { }: mkDerivation { pname = "polysemy-log"; - version = "0.9.0.0"; - sha256 = "1sgmgbh7gkyhp7rmdx2rj6dibwhi6z2qzg4cbnjsx8asz6xa188h"; + version = "0.10.0.1"; + sha256 = "0wm7qzwaqyhrmwpxvshi5168sbzyb8vya1fmi58jz3plmyz9drws"; libraryHaskellDepends = [ ansi-terminal async base incipit-core polysemy polysemy-conc polysemy-time stm time @@ -233714,8 +234602,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.9.0.0"; - sha256 = "0zwcv6b0m5phwiy0c1z3wfnbw0976qg744dpb6k66wdr3yvpl05f"; + version = "0.10.0.1"; + sha256 = "1srydqn5snp8lqdvwixkh956isl58172syvk2k020knwji5qgw9z"; libraryHaskellDepends = [ base di-polysemy incipit-core polysemy polysemy-conc polysemy-log polysemy-time stm @@ -233723,7 +234611,7 @@ self: { testHaskellDepends = [ base incipit-core polysemy polysemy-log polysemy-test stm tasty ]; - description = "Di adapters for Polysemy.Log"; + description = "Di adapters for polysemy-log"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -233853,8 +234741,8 @@ self: { }: mkDerivation { pname = "polysemy-plugin"; - version = "0.4.5.0"; - sha256 = "1q06276pqw1zm4x5hq0ax7ia12d32cajvhwpmx2nwqj5yh7jyygh"; + version = "0.4.5.1"; + sha256 = "066ggw99m93xk9gk5ymmx1dpfwlq5anf9mgzv05lbzysg2v15b6p"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra polysemy syb transformers @@ -233877,8 +234765,8 @@ self: { }: mkDerivation { pname = "polysemy-process"; - version = "0.12.1.0"; - sha256 = "0009h21pwfkwfyb5qk6v9gw5gh2ksap3xbcbny2icn88dhqs42k6"; + version = "0.13.0.1"; + sha256 = "05n7k3jlssa448ixmxc9fmyb1szwfs9pcmvfg2ya40f2p5p8blkx"; libraryHaskellDepends = [ base incipit-core path path-io polysemy polysemy-conc polysemy-resume polysemy-time posix-pty process stm-chans @@ -233942,8 +234830,8 @@ self: { }: mkDerivation { pname = "polysemy-resume"; - version = "0.7.0.0"; - sha256 = "0f2hlccg7qpx9dd1k73ni59yl447m3v2s6r8h9n2k1klxc21jr07"; + version = "0.8.0.1"; + sha256 = "03qw5aivq39vjg88liz57pgw6frr68kx2lb8bfqxyjsf4anzg8nq"; libraryHaskellDepends = [ base incipit-core polysemy transformers ]; @@ -234010,8 +234898,9 @@ self: { }: mkDerivation { pname = "polysemy-test"; - version = "0.8.0.0"; - sha256 = "1i4nsl7vml8m2nca357bsp9yy92h74zl9k80jdv4kab5bk7l1avd"; + version = "0.9.0.0"; + sha256 = "09aysv1l95q3mx70n0bcnsanrvlynlnz2zl2zg6v2a8vdhnkw7s7"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hedgehog incipit-core path path-io polysemy tasty tasty-hedgehog transformers @@ -234031,15 +234920,15 @@ self: { }: mkDerivation { pname = "polysemy-time"; - version = "0.6.0.0"; - sha256 = "0kl5p1iwd0q7cm05zfvgq0nwhjds547p1mrzqzjwdcy8p4xflr2p"; + version = "0.6.0.2"; + sha256 = "1zg0xyhp7zn9hl76zag097cpdzs38iap3zkc3bpy5amkkbw05kax"; libraryHaskellDepends = [ aeson base incipit-core template-haskell time torsor ]; testHaskellDepends = [ base incipit-core polysemy-test tasty time ]; - description = "Polysemy effects for time"; + description = "A Polysemy effect for time"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -235149,8 +236038,8 @@ self: { }: mkDerivation { pname = "posix-api"; - version = "0.7.0.0"; - sha256 = "1wza7flfy2v5c44a0w1mr486ljba6n6wp2gn79zhknq8m0hd3q50"; + version = "0.7.1.0"; + sha256 = "1195h6g521235dsk3gcyj5f4vnh9y1shld8w70gvwrfz07g28fjp"; libraryHaskellDepends = [ base byte-order byteslice primitive primitive-addr primitive-offset run-st text-short @@ -235377,8 +236266,8 @@ self: { }: mkDerivation { pname = "postgres-options"; - version = "0.2.0.0"; - sha256 = "1dfr15bg77117y27rr1kvbxcsyh36ha30c8rgiqd15y7pjd4apy4"; + version = "0.2.1.0"; + sha256 = "0vck8hv2yry7yvvyg4gps17b0h1dfgjiv9zzl2fc9gks8ksarcha"; libraryHaskellDepends = [ base bytestring generic-monoid split uri-bytestring ]; @@ -236803,6 +237692,7 @@ self: { ]; description = "A Amazon SQS backend for powerqueue"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ppm" = callPackage @@ -237304,16 +238194,16 @@ self: { ({ mkDerivation, aeson, base, exon, extra, generic-lens, incipit , microlens, microlens-ghc, polysemy-chronos, polysemy-conc , polysemy-log, polysemy-process, polysemy-resume, polysemy-time - , template-haskell, zeugma + , template-haskell }: mkDerivation { pname = "prelate"; - version = "0.6.0.0"; - sha256 = "1scwlszwk0gscxwlpn31k1iqillfy0agp0pqpxnfp1z1krma5mjj"; + version = "0.7.0.1"; + sha256 = "0xbl3677vj3lf1lkp1whvmh50vx9b78j30k4flddcrziyivrfm6z"; libraryHaskellDepends = [ aeson base exon extra generic-lens incipit microlens microlens-ghc polysemy-chronos polysemy-conc polysemy-log polysemy-process - polysemy-resume polysemy-time template-haskell zeugma + polysemy-resume polysemy-time template-haskell ]; description = "A Prelude"; license = "BSD-2-Clause-Patent"; @@ -238120,8 +239010,8 @@ self: { pname = "prettyprinter-interp"; version = "0.2.0.0"; sha256 = "0ml068y49n0s6p0nq0qfv5dmpkpkbd9p06hkj582yn2a1h32x0ff"; - revision = "1"; - editedCabalFile = "0p820l7raf812kr66sk63fwg9y9r0wmwm70cg6mvqb4hzdcycwkh"; + revision = "2"; + editedCabalFile = "0fyb4rgxgavh1fwdc54fh5vl9wqynsqgf72dq1a0v6gmqb2aaqys"; libraryHaskellDepends = [ base prettyprinter string-interpolate template-haskell text ]; @@ -239135,14 +240025,14 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_17_0" = callPackage + "process_1_6_18_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.17.0"; - sha256 = "01mzhfsj0zmqkaisciby0g28lvdj0w1qbggsp5wlr1jw1x74ap2c"; + version = "1.6.18.0"; + sha256 = "0zm3v2m95a7bsnndl1pvdj9a7gd4v84pb34rmgsqjkwpwi7lqpxa"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -242251,8 +243141,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.15.10"; - sha256 = "08pashk8pm4yjsaq2g94sqa2yd3rfq9fwpxa9qccvjv6in9zybf1"; + version = "0.15.11"; + sha256 = "1zapnx6d7h4xas2mn6p2mq81gq7wr1zx9vd94xplmyghb1db1gcs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242452,24 +243342,26 @@ self: { }) {}; "purview" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover - , QuickCheck, raw-strings-qq, scotty, stm, text, time, wai - , wai-extra, wai-websockets, warp, websockets + ({ mkDerivation, aeson, base, blaze-builder, bytestring, hspec + , hspec-discover, http-types, QuickCheck, raw-strings-qq, stm + , template-haskell, text, time, wai, wai-websockets, warp + , websockets }: mkDerivation { pname = "purview"; - version = "0.1.0.0"; - sha256 = "1h3nyr3ka38vg9ydraa6yh0xzhh0nasj3d40l0jsfrvj2xpr72di"; + version = "0.2.0.2"; + sha256 = "0lp4b1qj3bchn046ilnx7zzisw1ydsdwci76glrhca7sbnw992ww"; libraryHaskellDepends = [ - aeson base bytestring raw-strings-qq scotty stm text wai wai-extra - wai-websockets warp websockets + aeson base blaze-builder bytestring http-types raw-strings-qq stm + template-haskell text wai wai-websockets warp websockets ]; testHaskellDepends = [ - aeson base bytestring hspec QuickCheck raw-strings-qq scotty stm - text time wai wai-extra wai-websockets warp websockets + aeson base blaze-builder bytestring hspec http-types QuickCheck + raw-strings-qq stm template-haskell text time wai wai-websockets + warp websockets ]; testToolDepends = [ hspec-discover ]; - description = "Build server rendered, interactive websites"; + description = "A simple, fun way to build websites"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -243565,8 +244457,8 @@ self: { pname = "quadratic-irrational"; version = "0.1.1"; sha256 = "11nksvr6wnbrphq3ymg93w2xpqw6in3j1qpgbl2f3x9bgiss2l7s"; - revision = "1"; - editedCabalFile = "0br41cjzrl08ma9kgnhh2vp3ixad0gvvvv9751wpc6chr7a59ic8"; + revision = "2"; + editedCabalFile = "1r6fjnjyncbcfvmgkfflmkmrs0gzr1a299pvnklh04bz1xgzbayy"; libraryHaskellDepends = [ arithmoi base containers integer-roots transformers ]; @@ -244007,8 +244899,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.1.5"; - sha256 = "1zpic6v03432hld44jldxh0j1fmb226qkgmjrydyybaxihkkkvj4"; + version = "0.1.6"; + sha256 = "0cxgwd3flwc2kyw4gj4ak6c12j89agka3z8mb8nllr5vi4ll4xi5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244190,12 +245082,17 @@ self: { }) {}; "quickcheck-combinators" = callPackage - ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: + ({ mkDerivation, base, QuickCheck, unfoldable-restricted + , unit-constraint + }: mkDerivation { pname = "quickcheck-combinators"; - version = "0.0.5"; - sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd"; - libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; + version = "0.0.6"; + sha256 = "1ya5qryz8am1xzniq68lacpzf45g8f8wsb4dyq5q210mj367rx48"; + libraryHaskellDepends = [ + base QuickCheck unfoldable-restricted unit-constraint + ]; + description = "Simple type-level combinators for augmenting QuickCheck instances"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -244317,6 +245214,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "quickcheck-instances_0_3_30" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, data-fix, hashable, integer-logarithms, old-time + , OneTuple, primitive, QuickCheck, scientific, splitmix, strict + , tagged, text, text-short, these, time, time-compat, transformers + , transformers-compat, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "quickcheck-instances"; + version = "0.3.30"; + sha256 = "07c4ipssd4q823x2biry43h182y3rg26yqsv14z4yiajmz9rlvmx"; + libraryHaskellDepends = [ + array base bytestring case-insensitive containers data-fix hashable + integer-logarithms old-time OneTuple primitive QuickCheck + scientific splitmix strict tagged text text-short these time + time-compat transformers transformers-compat unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + base containers primitive QuickCheck tagged uuid-types + ]; + benchmarkHaskellDepends = [ base bytestring QuickCheck ]; + description = "Common quickcheck instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "quickcheck-io" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { @@ -244821,8 +245745,8 @@ self: { }: mkDerivation { pname = "quickspec"; - version = "2.1.5"; - sha256 = "0j8mcn9616r40hdl0jy6mqac7i31mhlsgv421m1hc8pj1kabpc0i"; + version = "2.2"; + sha256 = "0ggqj7zl7ai1jn6jgb7y986f8vr76ln0dxn3nwbpgspvv6dngix8"; libraryHaskellDepends = [ base constraints containers data-lens-light dlist QuickCheck quickcheck-instances random spoon template-haskell transformers @@ -246024,6 +246948,8 @@ self: { pname = "random"; version = "1.2.1.1"; sha256 = "0xlv1k4sj87akwvj54kq4nrfkzi6qcz1941bf78pnkbaxpvp44iy"; + revision = "1"; + editedCabalFile = "12c7232yns0r38yxy72pvgq2zfj0yfwfi7lwc64cfp4x2n0zihg7"; libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; testHaskellDepends = [ base bytestring containers doctest smallcheck stm tasty tasty-hunit @@ -246255,8 +247181,8 @@ self: { }: mkDerivation { pname = "random-source"; - version = "0.3.0.12"; - sha256 = "0iv8n0xar8sxw01inbvm05cy5ccmlaf0dd044zlcq0977ynaj8f9"; + version = "0.3.0.13"; + sha256 = "10mxlfwakkpkc7rdk5wx5955d7xipakka4vikbvhk9gyhvphvn5q"; libraryHaskellDepends = [ base flexible-defaults mersenne-random-pure64 mtl mwc-random primitive random stateref syb template-haskell th-extras @@ -247659,8 +248585,8 @@ self: { pname = "reactive-banana"; version = "1.3.2.0"; sha256 = "0mrsw3hkl0sgwcbay4m1lzs4bilss80g9p6njbbhapbfjyzsr36k"; - revision = "1"; - editedCabalFile = "0p8f47drw5cfjhds3rz7kwl5ljp3rnmir4b1ngfcic2ryzpacj53"; + revision = "2"; + editedCabalFile = "0kynywzvkxwcmmfaxq1fdacsi53ml4gf17rb7ibwvc29wngbbbp3"; libraryHaskellDepends = [ base containers deepseq hashable pqueue semigroups stm these transformers unordered-containers vault @@ -249200,8 +250126,8 @@ self: { pname = "reducers"; version = "3.12.4"; sha256 = "0hsycdir52jdijnnvc77jj971fjrrc722v952wr62ivrvx2zarn0"; - revision = "5"; - editedCabalFile = "18b7vr5gzj2739wlxdb0qyzl2sd5y67mmwvkm27vlzvzbff61lxn"; + revision = "6"; + editedCabalFile = "02l86v7s9z8by8ym770q2c0wsi2vsic7kvsdqwzxba8krz52kc1b"; libraryHaskellDepends = [ array base bytestring containers fingertree hashable semigroupoids text transformers unordered-containers @@ -249505,6 +250431,8 @@ self: { pname = "reflection"; version = "2.1.7"; sha256 = "1z8mwkqb0ljxpc45hkj0jiyhjfl1frpxqhdnp0xm6w98n2l1ifvc"; + revision = "1"; + editedCabalFile = "011s5ci385yccv576d1mh0n7v5k2pbmqkx1swlb5sq1sk3qb7dgj"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base containers hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -249694,6 +250622,8 @@ self: { pname = "reflex-dom"; version = "0.6.3.1"; sha256 = "162nnk5vk115p06mlf0d3bsr295814jk6d61hi58k97axgrlb6sn"; + revision = "1"; + editedCabalFile = "188hri01svjh6f63a9iivzvfkda2mvnmvgwnm6nfbkd1ns88h0yd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249779,10 +250709,8 @@ self: { }: mkDerivation { pname = "reflex-dom-core"; - version = "0.8.0.0"; - sha256 = "17zj8a7wmbf4019gb6m9bb4nybbqmbc11qydc8l9h9p3kavhbd0j"; - revision = "1"; - editedCabalFile = "0ysr37d3paqjgbri8xk98w1a98pdq8ak1p1ddn2dayvk1w2s8q9c"; + version = "0.8.1.0"; + sha256 = "1sapgw5rdjh4c28249l7gdvz8598a14hsilr06ivqbsidn5xazia"; libraryHaskellDepends = [ aeson base bifunctors bimap blaze-builder bytestring case-insensitive commutative-semigroups constraints containers @@ -250654,8 +251582,8 @@ self: { pname = "regex-base"; version = "0.94.0.2"; sha256 = "1w9fxad1dwi040r3db9i2cjhhrl86p3hngj13ixbcnqgb27l16bv"; - revision = "2"; - editedCabalFile = "1q1h2001s1mpsp0yvpfb63d59xxsbgzing0h7h5qwpppz49w6xis"; + revision = "4"; + editedCabalFile = "09wbpmii665rphflaxnlr78i8yyjc3x8wq68w1ak73rms7yb48h3"; libraryHaskellDepends = [ array base bytestring containers text ]; description = "Common \"Text.Regex.*\" API for Regex matching"; license = lib.licenses.bsd3; @@ -250853,8 +251781,8 @@ self: { pname = "regex-pcre"; version = "0.95.0.0"; sha256 = "0nn76q4bsjnxim0j0d01jifmh36as9jdpcvm001a851vvq86zb8n"; - revision = "5"; - editedCabalFile = "0hc9833rwxq8g1x5bq0q4qwjp6w2qgs3fp7jpnlf6b7w5xvr72im"; + revision = "6"; + editedCabalFile = "1rlp866y6mcbgad2sa3qq9zw12np1h4jfc7c3yba5kmarblj4jid"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -250920,8 +251848,8 @@ self: { pname = "regex-posix"; version = "0.96.0.1"; sha256 = "1715b57z67q4hg0jz44wkxrxi3v7n5iagw6gw48pf8hr34wpr0n7"; - revision = "2"; - editedCabalFile = "1f2n45hv9m7vsc7b7izkiavn56rwi2p3vy392601ak17qqnclyfl"; + revision = "3"; + editedCabalFile = "1zdrsydysxj9kgkzjq6pdvidsy4m2bwbx9s7ydr6df0cav66lvc1"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -250988,8 +251916,8 @@ self: { pname = "regex-tdfa"; version = "1.3.2.2"; sha256 = "1dvmplkhma32y68v4vvpbwmjbg3hzd7qhsyq6pim1fs68b2xaglk"; - revision = "1"; - editedCabalFile = "03jwla88hxzf7mpp1pimjcfwfbm0icr3wbp4cjibl10853v65x6d"; + revision = "2"; + editedCabalFile = "165gd2gr0x9d3yvdzp8hdiapwz3cgdfbai15zbqdy0cq312d3bwj"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; @@ -252103,6 +253031,30 @@ self: { license = lib.licenses.mit; }) {}; + "relude_1_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty-bench, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "relude"; + version = "1.2.1.0"; + sha256 = "09fp8n2z6nz2yqkn8pgq56s6d971b4mgcaldkhc0ih3bz9dp8kvq"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable mtl stm text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bytestring containers doctest Glob hedgehog text + ]; + benchmarkHaskellDepends = [ + base tasty-bench unordered-containers + ]; + description = "Safe, performant, user-friendly and lightweight Haskell Standard Library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "remark" = callPackage ({ mkDerivation, base, GenericPretty, tasty, tasty-golden , tasty-hunit @@ -253182,12 +254134,12 @@ self: { }) {}; "require-callstack" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "require-callstack"; - version = "0.1.0.0"; - sha256 = "0c51v7zyd8r7winsw7q5xvswk7r34awfyg471dnq4zq52rmwdvx5"; - libraryHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "15zy46r66qslmqpirydnzkqy8s241kzzp6wiqksi29gzipbzgha3"; + libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ]; description = "Propagate HasCallStack with constraints"; license = lib.licenses.mit; @@ -253405,8 +254357,8 @@ self: { pname = "resolv"; version = "0.2.0.2"; sha256 = "0jz798kliih4lb16s9bjk7sa9034x1qhyrr8z9sp6ahkz4yjh3c8"; - revision = "2"; - editedCabalFile = "1pcprxb456s7l654l7rh2mx7ahxn0fjj8hqq1rjl08b29f50am8k"; + revision = "3"; + editedCabalFile = "0i9h81lrl0gdk6i1yrg2kqdx89fzr0wb29b6p7g2y3bnnmd2cs28"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -254833,8 +255785,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "rhythmic-sequences"; - version = "0.4.0.0"; - sha256 = "095x356x585f3vszgfwrffvdd47c2gpqvmypssx9g727vz38sf0i"; + version = "0.4.1.0"; + sha256 = "0giigbk8wsai1w32db3lakgbh8h60fa83mzq2h3mr4i3gr1syxii"; libraryHaskellDepends = [ base ]; description = "Improved library to deal with rhythmicity of short sequences"; license = lib.licenses.mit; @@ -255131,6 +256083,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "richenv" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover + , QuickCheck, quickcheck-instances, text, unordered-containers + , yaml + }: + mkDerivation { + pname = "richenv"; + version = "0.1.0.1"; + sha256 = "0jpj1xgwgw8lvah2jkmhvwiyx47n57bvayn5msyhqvrjsbdk90yk"; + libraryHaskellDepends = [ aeson base text unordered-containers ]; + testHaskellDepends = [ + aeson base bytestring hspec QuickCheck quickcheck-instances text + unordered-containers yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "Rich environment variable setup for Haskell"; + license = lib.licenses.mit; + }) {}; + "richreports" = callPackage ({ mkDerivation, ascetic, base, MissingH }: mkDerivation { @@ -255382,8 +256353,8 @@ self: { }: mkDerivation { pname = "rio-prettyprint"; - version = "0.1.5.0"; - sha256 = "03aihavij5i0r1h5wvc9q1bdqzpc4kd7cz8rklvhwgblr8fzxnxw"; + version = "0.1.7.0"; + sha256 = "04493n596jgj49wx9jgvfpjsfnmd37dqh497b6lbm67cp4nxb9p5"; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array base Cabal colour mtl path rio text @@ -255511,8 +256482,8 @@ self: { }: mkDerivation { pname = "risc386"; - version = "0.0.20220128"; - sha256 = "01bmmz6l5fq825ni1dk5d38x0p8k5fw2ingc3gzj8yzjmhfwp318"; + version = "0.0.20230928"; + sha256 = "139cxdvb9lg0p9nkqkrwicsiwlhq8vphq6l1dhv8s6aia556w6kw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers mtl pretty ]; @@ -256040,26 +257011,6 @@ self: { "rocksdb-haskell-jprupp" = callPackage ({ mkDerivation, base, bytestring, data-default, directory, hspec - , QuickCheck, resourcet, rocksdb, string-conversions, unliftio - }: - mkDerivation { - pname = "rocksdb-haskell-jprupp"; - version = "2.1.4"; - sha256 = "0c647kahnglwf881hd3ksan1p7j4m65s84wyw8i4jvikm4jzgqsh"; - libraryHaskellDepends = [ - base bytestring data-default directory resourcet unliftio - ]; - librarySystemDepends = [ rocksdb ]; - testHaskellDepends = [ - base bytestring data-default directory hspec QuickCheck resourcet - string-conversions unliftio - ]; - description = "Haskell bindings for RocksDB"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) rocksdb;}; - - "rocksdb-haskell-jprupp_2_1_6" = callPackage - ({ mkDerivation, base, bytestring, data-default, directory, hspec , QuickCheck, resourcet, rocksdb, unliftio }: mkDerivation { @@ -256076,7 +257027,6 @@ self: { ]; description = "Haskell bindings for RocksDB"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) rocksdb;}; "rocksdb-query" = callPackage @@ -256783,15 +257733,13 @@ self: { }: mkDerivation { pname = "rounded"; - version = "1.1"; - sha256 = "0hja4ak3qd80zg996jwyi1kndj2vfsp10vwr4wyrcvppzl4gj4a0"; - revision = "1"; - editedCabalFile = "02zrazan3ljalfy1cnr3d0cdw7n426k5wg5xkifk87vb8ds2wx1j"; + version = "1.1.1"; + sha256 = "0d3ybivsnd3ykxjss7aqby0b0qx8kjw07r7afqnicafmz2ccyzh4"; libraryHaskellDepends = [ base ghc-prim hgmp long-double reflection ]; librarySystemDepends = [ gmp mpfr ]; - libraryPkgconfigDepends = [ mpfr ]; + libraryPkgconfigDepends = [ gmp mpfr ]; testHaskellDepends = [ base long-double ]; description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; license = lib.licenses.bsd3; @@ -257958,31 +258906,35 @@ self: { }) {}; "rzk" = callPackage - ({ mkDerivation, aeson, alex, array, base, bifunctors, bytestring - , doctest, Glob, happy, mtl, optparse-generic, QuickCheck - , template-haskell, text + ({ mkDerivation, aeson, alex, array, base, bifunctors, BNFC + , bytestring, Cabal, co-log-core, data-default-class, directory + , doctest, filepath, Glob, happy, lens, lsp, lsp-types, mtl + , optparse-generic, process, QuickCheck, stm, template-haskell + , text, with-utf8, yaml }: mkDerivation { pname = "rzk"; - version = "0.5.4"; - sha256 = "1zyvhlncvibk50cm80wa9y6yrwk3wj50y80xhp7fjz5h88wvv04x"; - revision = "1"; - editedCabalFile = "193n0ix496s5jqha633n5siawmawskch5wil2jlls4kx97krw109"; + version = "0.6.5"; + sha256 = "04xvh3yymqhn3kr4h5q8cysww5f5bw0zr6n0m8wrp428s211iw0a"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - aeson array base bifunctors bytestring mtl optparse-generic - template-haskell text + aeson array base bifunctors bytestring co-log-core + data-default-class directory filepath Glob lens lsp lsp-types mtl + optparse-generic stm template-haskell text yaml ]; - libraryToolDepends = [ alex happy ]; + libraryToolDepends = [ alex BNFC happy ]; executableHaskellDepends = [ - aeson array base bifunctors bytestring mtl optparse-generic - template-haskell text + array base bifunctors bytestring directory Glob mtl + optparse-generic template-haskell text with-utf8 yaml ]; + executableToolDepends = [ alex BNFC happy ]; testHaskellDepends = [ - aeson array base bifunctors bytestring doctest Glob mtl - optparse-generic QuickCheck template-haskell text + array base bifunctors bytestring directory doctest Glob mtl + optparse-generic QuickCheck template-haskell text yaml ]; + testToolDepends = [ alex BNFC happy ]; description = "An experimental proof assistant for synthetic ∞-categories"; license = lib.licenses.bsd3; mainProgram = "rzk"; @@ -259305,49 +260257,6 @@ self: { "sandwich" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, brick - , bytestring, colour, containers, directory, exceptions, filepath - , free, haskell-src-exts, lifted-async, microlens, microlens-th - , monad-control, monad-logger, mtl, optparse-applicative - , pretty-show, process, safe, safe-exceptions, stm - , string-interpolate, template-haskell, text, time, transformers - , transformers-base, unix, unliftio-core, vector, vty - }: - mkDerivation { - pname = "sandwich"; - version = "0.1.5.0"; - sha256 = "0bv18q6cpfm7f4yp71b6wgp8i4ikcwwp74kz6ih8pv5lgl59j2rj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lifted-async - microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - executableHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lifted-async - microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - testHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lifted-async - microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - description = "Yet another test framework for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "sandwich_0_1_5_1" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, brick , bytestring, colour, containers, deepseq, directory, exceptions , filepath, free, haskell-src-exts, lifted-async, microlens , microlens-th, monad-control, monad-logger, mtl @@ -259357,8 +260266,8 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.1.5.1"; - sha256 = "1a4frv835zvflycbnbasj6pygzbnnvpsxl3ahp247zxap7v9gkch"; + version = "0.1.5.2"; + sha256 = "0xran6qv8nfv4yw55pncd12z7843f25y4sc94s5dd26kpvn78kr1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -259387,7 +260296,6 @@ self: { ]; description = "Yet another test framework for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sandwich-hedgehog" = callPackage @@ -259473,50 +260381,6 @@ self: { }: mkDerivation { pname = "sandwich-webdriver"; - version = "0.2.3.0"; - sha256 = "1220apnh5kj1y41b129rvawcj9yp3lgdlbwysr11wmah6ya9awy9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory exceptions - filepath http-client http-client-tls http-conduit lifted-base - microlens microlens-aeson monad-control monad-logger mtl network - process random regex-compat retry safe safe-exceptions sandwich - string-interpolate temporary text time transformers unix - unordered-containers vector webdriver - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory exceptions - filepath http-client http-client-tls http-conduit lifted-base - microlens microlens-aeson monad-control monad-logger mtl network - process random regex-compat retry safe safe-exceptions sandwich - string-interpolate temporary text time transformers unix - unordered-containers vector webdriver - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default directory exceptions - filepath http-client http-client-tls http-conduit lifted-base - microlens microlens-aeson monad-control monad-logger mtl network - process random regex-compat retry safe safe-exceptions sandwich - string-interpolate temporary text time transformers unix unliftio - unordered-containers vector webdriver - ]; - description = "Sandwich integration with Selenium WebDriver"; - license = lib.licenses.bsd3; - mainProgram = "sandwich-webdriver-exe"; - }) {}; - - "sandwich-webdriver_0_2_3_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, exceptions, filepath, http-client, http-client-tls - , http-conduit, lifted-base, microlens, microlens-aeson - , monad-control, monad-logger, mtl, network, process, random - , regex-compat, retry, safe, safe-exceptions, sandwich - , string-interpolate, temporary, text, time, transformers, unix - , unliftio, unordered-containers, vector, webdriver - }: - mkDerivation { - pname = "sandwich-webdriver"; version = "0.2.3.1"; sha256 = "15zpdv8mmzmgrr07m8as4alwxx2xw54vj8y39f5f3z58wg1q767c"; isLibrary = true; @@ -259547,7 +260411,6 @@ self: { ]; description = "Sandwich integration with Selenium WebDriver"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "sandwich-webdriver-exe"; }) {}; @@ -259917,15 +260780,19 @@ self: { }) {}; "sayable" = callPackage - ({ mkDerivation, base, bytestring, exceptions, prettyprinter, text + ({ mkDerivation, base, bytestring, exceptions, hspec, prettyprinter + , tasty, tasty-ant-xml, tasty-hspec, text }: mkDerivation { pname = "sayable"; - version = "1.1.1.0"; - sha256 = "0a44mx9mcjqx0mzrz3ppiwbn0gfcnrls4kczwppkh68lykbax68h"; + version = "1.2.0.0"; + sha256 = "1fdwhpmksqzhlhsk0i4nq7ng20j6b9pbq01fwpbnb5jsyw9wa9m5"; libraryHaskellDepends = [ base bytestring exceptions prettyprinter text ]; + testHaskellDepends = [ + base hspec prettyprinter tasty tasty-ant-xml tasty-hspec text + ]; description = "Data structures, classes and operators for constructing context-adjusted pretty output"; license = lib.licenses.isc; }) {}; @@ -260952,8 +261819,8 @@ self: { pname = "scientific"; version = "0.3.7.0"; sha256 = "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3"; - revision = "5"; - editedCabalFile = "149d776lnss2ggsv3qpsdbx1vvi57m2q2401d19k8fln0s8i1n16"; + revision = "6"; + editedCabalFile = "1clrcp8a20zg7iqrrg4agk5sblmz87fr4wq45v54n1inbf2ls508"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-logarithms primitive template-haskell text @@ -261186,6 +262053,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "scotty_0_20_1" = callPackage + ({ mkDerivation, aeson, async, base, blaze-builder, bytestring + , case-insensitive, cookie, data-default-class, directory + , exceptions, hspec, hspec-discover, hspec-wai, http-types + , lifted-base, lucid, monad-control, mtl, network, regex-compat + , stm, text, time, transformers, transformers-base + , transformers-compat, unliftio, wai, wai-extra, warp, weigh + }: + mkDerivation { + pname = "scotty"; + version = "0.20.1"; + sha256 = "1770kj78zdi137pskiyx28id64vilmhylnkgy139pvxa95n8i6kd"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive cookie + data-default-class exceptions http-types monad-control mtl network + regex-compat stm text time transformers transformers-base + transformers-compat unliftio wai wai-extra warp + ]; + testHaskellDepends = [ + async base bytestring directory hspec hspec-wai http-types + lifted-base network text wai + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring lucid mtl text transformers weigh + ]; + description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "scotty-binding-play" = callPackage ({ mkDerivation, base, bytestring, hspec, http-client, HUnit, mtl , scotty, template-haskell, text, transformers @@ -262528,15 +263426,15 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) secp256k1;}; - "secp256k1-haskell_1_0_0" = callPackage + "secp256k1-haskell_1_0_1" = callPackage ({ mkDerivation, base, base16, bytestring, deepseq, entropy , hashable, hspec, hspec-discover, HUnit, monad-par, mtl , QuickCheck, secp256k1, string-conversions, unliftio-core }: mkDerivation { pname = "secp256k1-haskell"; - version = "1.0.0"; - sha256 = "0pg6kb9xd0ihxc2bfjisbhln85rfww71yy3kx7shh0qyi02q81s7"; + version = "1.0.1"; + sha256 = "02mk6w2hkvd008f4wyz67n2bqp63dckyixnk0brpfvk29vm9my9m"; libraryHaskellDepends = [ base base16 bytestring deepseq entropy hashable QuickCheck string-conversions unliftio-core @@ -263048,6 +263946,8 @@ self: { pname = "semialign"; version = "1.3"; sha256 = "0v657hpbngbwygpmqz47dw7nwn5cbilf0khjdka8sjjqkwql73k2"; + revision = "1"; + editedCabalFile = "08sjh4vpkjc4mibrb34kn6rim7cbnsm57h383ycm5c6nl5ffzsbv"; libraryHaskellDepends = [ base containers hashable indexed-traversable indexed-traversable-instances semigroupoids tagged these @@ -263164,6 +264064,8 @@ self: { pname = "semigroupoids"; version = "6.0.0.1"; sha256 = "0d3rsxby1j4m0ak3v62jbjzw1f2n55qxnb2jsrgj1y5xj6c8m8vx"; + revision = "1"; + editedCabalFile = "1ia31jmv4m228j7mwcl58ala7z18d3iqygki3qv6akhi3i2kp8j7"; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant distributive foldable1-classes-compat hashable tagged @@ -264119,7 +265021,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "servant_0_20" = callPackage + "servant_0_20_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors , bytestring, case-insensitive, constraints, deepseq, hspec , hspec-discover, http-api-data, http-media, http-types, mmorph @@ -264129,10 +265031,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.20"; - sha256 = "09vmz4jy6968hq8bf2b43bzpca8h8sps1h2xqf9y6wcarxbws1pi"; - revision = "3"; - editedCabalFile = "01d2dddk6yrck2fl38fisracrw3wnf26ldvy0m06fd7ilyw4fifb"; + version = "0.20.1"; + sha256 = "1s8vapj8qb8l5snjzxd63d9rvxwa1vw6g77cg8nynrzzppwp7xwl"; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring case-insensitive constraints deepseq http-api-data http-media @@ -265866,8 +266766,8 @@ self: { pname = "servant-multipart"; version = "0.12.1"; sha256 = "1p55kb3zhq25ncp7wimhggssn68abfgsnlldk13rk1iajaj6y8y5"; - revision = "4"; - editedCabalFile = "0z4n3a1cdb082nwh3ig68wjk617cvwpq0n9ivsab55nvsr2wsm8q"; + revision = "5"; + editedCabalFile = "0pf761m9l6jnqhljjj4i6zr9il8r9ajpqfxzqjgjsnbsg6872ykg"; libraryHaskellDepends = [ base bytestring directory lens resourcet servant servant-docs servant-foreign servant-multipart-api servant-server @@ -265887,8 +266787,8 @@ self: { pname = "servant-multipart-api"; version = "0.12.1"; sha256 = "1gifa9g7ggs0plzffrd9a8j24dmqvgbkkdkfzyy7mpmwrjqw7mcj"; - revision = "4"; - editedCabalFile = "0fgkmnfz0mgld1rwdli05kx2wfdxy5fv37i73v3xyx65hn9hfcy0"; + revision = "5"; + editedCabalFile = "05243nl7sbc7p5rvqssiqha1qv38a0qp0ppb227pg0x748xh7ai4"; libraryHaskellDepends = [ base bytestring servant text transformers ]; @@ -265904,10 +266804,8 @@ self: { }: mkDerivation { pname = "servant-multipart-client"; - version = "0.12.1"; - sha256 = "07haaf9nq96lfv2dhqf4319vl321f53v0mypbbg3swzb6rrfkw9h"; - revision = "3"; - editedCabalFile = "1jq89aizhkdivmgj9gispipf2mdyq1fnlq102lr5jm1vgrmfmbpx"; + version = "0.12.2"; + sha256 = "0djvbfc1yk8dzadav3lfrq99m7grcxxgxaifj8nc173yfdjdq4y2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -266042,8 +266940,8 @@ self: { pname = "servant-openapi3"; version = "2.0.1.6"; sha256 = "1hxz3n6l5l8p9s58sjilrn4lv1z17kfik0xdh05v5v1bzf0j2aij"; - revision = "4"; - editedCabalFile = "1x3pbd5bix864xiavhsq72965ffzalifix0hkdr5gahqfjk088dc"; + revision = "5"; + editedCabalFile = "0jy5yp7ag9783mw09dln0jkjgrhy7li4ilgcmydgl4d84izy3zhn"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -266225,8 +267123,8 @@ self: { }: mkDerivation { pname = "servant-prometheus"; - version = "1.0.0"; - sha256 = "1m4kb6k4idlr9j1p72w041inhx9c3srxxxrnfj8fpywji6adxili"; + version = "1.1.0"; + sha256 = "0sykw9b5pkrccf4kdggg941dpafjfxsh0854f0v92c3582nr5xbq"; libraryHaskellDepends = [ base clock ghc-prim hashable http-types prometheus-client servant text wai @@ -267129,8 +268027,8 @@ self: { pname = "servant-swagger-ui"; version = "0.3.5.5.0.0"; sha256 = "1sjgakdln2nx9ki13vk557rfqwqjksagl32q7y3m8mc9y9s80py7"; - revision = "1"; - editedCabalFile = "1gagm56yy19lbwkcfx9jz7lkhvqxka0xy5pzqks1k2kbz16v8vvs"; + revision = "2"; + editedCabalFile = "0a2d33cc1zw2l4r5ay7022qqf2kzld8rpsy66ky5k9xcpfwgxwn1"; libraryHaskellDepends = [ aeson base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core text @@ -267148,8 +268046,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.5"; sha256 = "0ckvrwrb3x39hfl2hixcj3fhibh0vqsh6y7n1lsm25yvzfrg02zd"; - revision = "7"; - editedCabalFile = "157jdld3izr32m5fr2y7s8fw16hamh7hb8cm7ybry3fvmsj01zpc"; + revision = "8"; + editedCabalFile = "1bz2d1v43v0s41b547as0sarzfb3q4q20i15kgrlcbxvqdcrcbmk"; libraryHaskellDepends = [ aeson base blaze-markup bytestring http-media servant servant-blaze servant-server text transformers transformers-compat wai-app-static @@ -267166,8 +268064,8 @@ self: { pname = "servant-swagger-ui-jensoleg"; version = "0.3.4"; sha256 = "04s4syfmnjwa52xqm29x2sfi1ka6p7fpjff0pxry099rh0d59hkm"; - revision = "5"; - editedCabalFile = "1yb32cgkhydc9gpr22yzqkgmf8d6kvgvb8ypsmp81aiq3v94r2ki"; + revision = "6"; + editedCabalFile = "1mqbhf6yfraqlriq7l6yvi5hkf93fdb6cwks6s6pyf9qxvd6pn5c"; libraryHaskellDepends = [ aeson base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core text @@ -267184,8 +268082,8 @@ self: { pname = "servant-swagger-ui-redoc"; version = "0.3.4.1.22.3"; sha256 = "0ln2sz7ffhddk4dqvczpxb5g8f6bic7sandn5zifpz2jg7lgzy0f"; - revision = "5"; - editedCabalFile = "1jxsyi45892n4gg2ihhf66jarplvifm0hp66srzkc7lchhz9lzz2"; + revision = "6"; + editedCabalFile = "1p2086msm6zdlagb7l5zwm84cg8q74v10svw0q1hdjahn547n5zs"; libraryHaskellDepends = [ aeson base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core text @@ -269122,32 +270020,6 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.1.0"; - sha256 = "1qcz9v1dgpxfdn06zy1g064d7jmwadfz3b834n9rvmg5ssjd4n9z"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions file-embed ghc-prim parsec process scientific - template-haskell text th-lift time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - description = "A toolkit for making compile-time interpolated templates"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.psibi ]; - }) {}; - - "shakespeare_2_1_0_1" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, file-embed, ghc-prim, hspec - , HUnit, parsec, process, scientific, template-haskell, text - , th-lift, time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; version = "2.1.0.1"; sha256 = "0byj0zhxi1pr8l5f18phzkwcf7z38lyk2zznz8hbkqadfgrmbdkc"; libraryHaskellDepends = [ @@ -269163,7 +270035,6 @@ self: { ]; description = "A toolkit for making compile-time interpolated templates"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.psibi ]; }) {}; @@ -275298,8 +276169,8 @@ self: { pname = "snap-templates"; version = "1.0.0.2"; sha256 = "1gz410718j77plw4lx5l0ajgb6ics1nd6msdk88zj1lanbfwnz7l"; - revision = "1"; - editedCabalFile = "0p2vkq4d8wci18z7fqnhlz9k9zv5wgv1p95x5fcl0dafkyylgx41"; + revision = "2"; + editedCabalFile = "0iz7h7m4g8s126fqsnpcslpz6k2fznayzbn2zgb7s3fjl14fxnis"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -277184,12 +278055,13 @@ self: { }) {}; "sorted-list" = callPackage - ({ mkDerivation, base, criterion, deepseq }: + ({ mkDerivation, base, criterion, deepseq, QuickCheck }: mkDerivation { pname = "sorted-list"; - version = "0.2.1.0"; - sha256 = "1x2ygkh32q2kk5g7b7hnrl8z8azvgwsj36f3ndg79pzhghapdr5l"; + version = "0.2.1.2"; + sha256 = "0g4b8pcvqjx7qqrd4ga53n8ff2k0hcmkzj6wzq560i2lqiyzjpx5"; libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "Type-enforced sorted lists and related functions"; license = lib.licenses.bsd3; @@ -278767,6 +279639,31 @@ self: { license = lib.licenses.bsd3; }) {testu01 = null;}; + "splitmix_0_1_0_5" = callPackage + ({ mkDerivation, async, base, base-compat, base-compat-batteries + , bytestring, clock, containers, criterion, deepseq, HUnit + , math-functions, process, random, test-framework + , test-framework-hunit, testu01, tf-random, vector + }: + mkDerivation { + pname = "splitmix"; + version = "0.1.0.5"; + sha256 = "00ihw7vji8ydik7f5lk9iwj21j829lpl22wa4nqz2igg26b7mw4x"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + async base base-compat base-compat-batteries bytestring containers + deepseq HUnit math-functions process random test-framework + test-framework-hunit tf-random vector + ]; + testSystemDepends = [ testu01 ]; + benchmarkHaskellDepends = [ + base clock containers criterion random tf-random + ]; + description = "Fast Splittable PRNG"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {testu01 = null;}; + "splitmix-distributions" = callPackage ({ mkDerivation, base, containers, erf, exceptions, hspec, mtl , splitmix, transformers @@ -279469,7 +280366,9 @@ self: { testHaskellDepends = [ base ]; description = "Initial project template from stack"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "sqsd-local"; + broken = true; }) {}; "squares" = callPackage @@ -280140,30 +281039,24 @@ self: { }) {}; "stack" = callPackage - ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array + ({ mkDerivation, aeson, aeson-warning-parser, ansi-terminal, array , async, attoparsec, base, base64-bytestring, bytestring, Cabal - , casa-client, casa-types, colour, conduit, conduit-extra - , containers, cryptonite, cryptonite-conduit, deepseq, directory - , echo, exceptions, extra, file-embed, filelock, filepath, fsnotify - , generic-deriving, hackage-security, hashable, hi-file-parser + , casa-client, companion, conduit, conduit-extra, containers + , crypton, directory, echo, exceptions, extra, file-embed, filelock + , filepath, fsnotify, generic-deriving, ghc-boot, hi-file-parser , hpack, hpc, hspec, hspec-discover, http-client, http-client-tls - , http-conduit, http-download, http-types, memory, microlens - , mintty, mono-traversable, mtl, mustache, neat-interpolation - , network-uri, open-browser, optparse-applicative, pantry, path - , path-io, persistent, persistent-sqlite, persistent-template - , pretty, primitive, process, project-template, QuickCheck, random - , raw-strings-qq, retry, rio, rio-prettyprint, semigroups - , smallcheck, split, stm, streaming-commons, tar, template-haskell - , text, text-metrics, th-reify-many, time, tls, transformers - , typed-process, unicode-transforms, unix, unix-compat, unliftio - , unordered-containers, vector, yaml, zip-archive, zlib + , http-conduit, http-download, http-types, memory, microlens, mtl + , mustache, neat-interpolation, open-browser, optparse-applicative + , pantry, path, path-io, persistent, persistent-sqlite, pretty + , process, project-template, QuickCheck, random, raw-strings-qq + , rio, rio-prettyprint, split, stm, tar, template-haskell, text + , time, transformers, unix, unix-compat, unordered-containers + , vector, yaml, zlib }: mkDerivation { pname = "stack"; - version = "2.11.1"; - sha256 = "0qihckfj5p9xbq0d8xd9c7zy5jpdl2hrvcc0nq8x67k9a7vqwwx1"; - revision = "2"; - editedCabalFile = "11cjn404f7kmpmls01pq1j1xac838hv7x725fhvrz2w3fhphbbsp"; + version = "2.13.1"; + sha256 = "0qdhrm50g0gsyk2q7fxp40all42z3rn53qmfakc3qyj4p9rxdf20"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -280172,55 +281065,43 @@ self: { isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal casa-client casa-types colour - conduit conduit-extra containers cryptonite cryptonite-conduit - deepseq directory echo exceptions extra file-embed filelock - filepath fsnotify generic-deriving hackage-security hashable - hi-file-parser hpack hpc http-client http-client-tls http-conduit - http-download http-types memory microlens mintty mono-traversable - mtl mustache neat-interpolation network-uri open-browser - optparse-applicative pantry path path-io persistent - persistent-sqlite persistent-template pretty primitive process - project-template random retry rio rio-prettyprint semigroups split - stm streaming-commons tar template-haskell text text-metrics - th-reify-many time tls transformers typed-process - unicode-transforms unix unix-compat unliftio unordered-containers - vector yaml zip-archive zlib - ]; - executableHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal casa-client casa-types colour - conduit conduit-extra containers cryptonite cryptonite-conduit - deepseq directory echo exceptions extra file-embed filelock - filepath fsnotify generic-deriving hackage-security hashable - hi-file-parser hpack hpc http-client http-client-tls http-conduit - http-download http-types memory microlens mintty mono-traversable - mtl mustache neat-interpolation network-uri open-browser - optparse-applicative pantry path path-io persistent - persistent-sqlite persistent-template pretty primitive process - project-template random retry rio rio-prettyprint semigroups split - stm streaming-commons tar template-haskell text text-metrics - th-reify-many time tls transformers typed-process - unicode-transforms unix unix-compat unliftio unordered-containers - vector yaml zip-archive zlib - ]; - testHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal casa-client casa-types colour - conduit conduit-extra containers cryptonite cryptonite-conduit - deepseq directory echo exceptions extra file-embed filelock - filepath fsnotify generic-deriving hackage-security hashable - hi-file-parser hpack hpc hspec http-client http-client-tls - http-conduit http-download http-types memory microlens mintty - mono-traversable mtl mustache neat-interpolation network-uri - open-browser optparse-applicative pantry path path-io persistent - persistent-sqlite persistent-template pretty primitive process - project-template QuickCheck random raw-strings-qq retry rio - rio-prettyprint semigroups smallcheck split stm streaming-commons - tar template-haskell text text-metrics th-reify-many time tls - transformers typed-process unicode-transforms unix unix-compat - unliftio unordered-containers vector yaml zip-archive zlib + aeson aeson-warning-parser ansi-terminal array async attoparsec + base base64-bytestring bytestring Cabal casa-client companion + conduit conduit-extra containers crypton directory echo exceptions + extra file-embed filelock filepath fsnotify generic-deriving + ghc-boot hi-file-parser hpack hpc http-client http-client-tls + http-conduit http-download http-types memory microlens mtl mustache + neat-interpolation open-browser optparse-applicative pantry path + path-io persistent persistent-sqlite pretty process + project-template random rio rio-prettyprint split stm tar + template-haskell text time transformers unix unix-compat + unordered-containers vector yaml zlib + ]; + executableHaskellDepends = [ + aeson aeson-warning-parser ansi-terminal array async attoparsec + base base64-bytestring bytestring Cabal casa-client companion + conduit conduit-extra containers crypton directory echo exceptions + extra file-embed filelock filepath fsnotify generic-deriving + ghc-boot hi-file-parser hpack hpc http-client http-client-tls + http-conduit http-download http-types memory microlens mtl mustache + neat-interpolation open-browser optparse-applicative pantry path + path-io persistent persistent-sqlite pretty process + project-template random rio rio-prettyprint split stm tar + template-haskell text time transformers unix unix-compat + unordered-containers vector yaml zlib + ]; + testHaskellDepends = [ + aeson aeson-warning-parser ansi-terminal array async attoparsec + base base64-bytestring bytestring Cabal casa-client companion + conduit conduit-extra containers crypton directory echo exceptions + extra file-embed filelock filepath fsnotify generic-deriving + ghc-boot hi-file-parser hpack hpc hspec http-client http-client-tls + http-conduit http-download http-types memory microlens mtl mustache + neat-interpolation open-browser optparse-applicative pantry path + path-io persistent persistent-sqlite pretty process + project-template QuickCheck random raw-strings-qq rio + rio-prettyprint split stm tar template-haskell text time + transformers unix unix-compat unordered-containers vector yaml zlib ]; testToolDepends = [ hspec-discover ]; doCheck = false; @@ -280239,18 +281120,17 @@ self: { "stack-all" = callPackage ({ mkDerivation, aeson, base, cached-json-file, config-ini , directory, extra, filepath, http-query, process, simple-cmd - , simple-cmd-args, text, unordered-containers + , simple-cmd-args, text }: mkDerivation { pname = "stack-all"; - version = "0.4.1"; - sha256 = "11s886069z75abp7x0iqvbjfn4hhkzjj5d0mxbljwcfw6v8mq8c4"; + version = "0.4.2"; + sha256 = "0rgdfbsakkmd1nhx2mhwqsnrkpvfv1fhplh3aza0fz548s2zpshl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base cached-json-file config-ini directory extra filepath http-query process simple-cmd simple-cmd-args text - unordered-containers ]; description = "CLI tool for building across Stackage major versions"; license = lib.licenses.bsd3; @@ -280765,6 +281645,8 @@ self: { ]; description = "Tools for curating Stackage bundles"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "stackage-install" = callPackage @@ -281007,6 +281889,7 @@ self: { ]; description = "Convert Stack files into Nix build instructions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "stackage2nix"; }) {}; @@ -281045,13 +281928,14 @@ self: { , bytestring, cfn-flip, conduit, containers, envparse, errors , exceptions, extra, filepath, Glob, hspec, hspec-golden, lens , lens-aeson, monad-logger, mtl, optparse-applicative, QuickCheck - , resourcet, rio, semigroups, text, time, transformers - , typed-process, unliftio, unordered-containers, uuid, yaml + , resourcet, rio, semigroups, text, text-metrics, time + , transformers, typed-process, unliftio, unordered-containers, uuid + , yaml }: mkDerivation { pname = "stackctl"; - version = "1.5.0.0"; - sha256 = "1q60gi10aqr1f3baa02lg0r39gvvgqfdjr25pk2sy11n6dbcw19q"; + version = "1.5.0.1"; + sha256 = "0ncl4706np8zl739di6f4nyy44cm7pklppkvmjlsxzw6s6hgidsf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -281060,8 +281944,8 @@ self: { amazonka-sts base Blammo bytestring cfn-flip conduit containers envparse errors exceptions extra filepath Glob lens lens-aeson monad-logger mtl optparse-applicative QuickCheck resourcet rio - semigroups text time transformers typed-process unliftio - unordered-containers uuid yaml + semigroups text text-metrics time transformers typed-process + unliftio unordered-containers uuid yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -281702,8 +282586,8 @@ self: { }: mkDerivation { pname = "statistics"; - version = "0.16.2.0"; - sha256 = "1gsql118657j74v7r3yidzymzjvlcjvvs1pd37dg2lrz3xndyddk"; + version = "0.16.2.1"; + sha256 = "1r2ww0r7mki27830bfg3xf7s9pdv1yj4hdqncpc89xyil1lc1h57"; libraryHaskellDepends = [ aeson async base binary data-default-class deepseq dense-linear-algebra math-functions mwc-random parallel primitive @@ -284248,6 +285132,8 @@ self: { pname = "strict"; version = "0.5"; sha256 = "1zd0d59dfr23n0yn1azxb0v05b1d85qjym11wg821mf2vsahjkrz"; + revision = "1"; + editedCabalFile = "0zfqrgw7wn56yfdk164w5bw87zid6pbp84qygnmdylarcnrxfmxx"; libraryHaskellDepends = [ assoc base binary bytestring deepseq ghc-prim hashable text these transformers @@ -284306,6 +285192,8 @@ self: { pname = "strict-containers"; version = "0.2"; sha256 = "128aw17c2m3rh2v23c2vdgk7f7rk11plwkzq2carrm1x5nvhrki7"; + revision = "1"; + editedCabalFile = "0imlmrqsc3v341dvs5r9r6cynvn2szfy1a1ldxfs3axjzyszvsqv"; libraryHaskellDepends = [ array base binary containers deepseq hashable indexed-traversable primitive strict template-haskell unordered-containers vector @@ -285508,6 +286396,7 @@ self: { ]; description = "Structured editing Emacs mode for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "structured-haskell-mode"; maintainers = [ lib.maintainers.peti ]; }) {}; @@ -285686,42 +286575,7 @@ self: { broken = true; }) {}; - "stylish-haskell_0_14_3_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , directory, file-embed, filepath, ghc, ghc-boot, ghc-boot-th - , ghc-lib-parser-ex, HsYAML, HsYAML-aeson, HUnit, mtl - , optparse-applicative, random, regex-tdfa, strict, syb - , test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "stylish-haskell"; - version = "0.14.3.0"; - sha256 = "17w92v0qnwj7m6yqdq5cxbr04xiz0yfnnyx5q54218wdl7n5lf6d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring Cabal containers directory file-embed - filepath ghc ghc-boot ghc-boot-th ghc-lib-parser-ex HsYAML - HsYAML-aeson mtl regex-tdfa syb text - ]; - executableHaskellDepends = [ - aeson base bytestring Cabal containers directory file-embed - filepath ghc ghc-boot ghc-boot-th ghc-lib-parser-ex HsYAML - HsYAML-aeson mtl optparse-applicative regex-tdfa strict syb text - ]; - testHaskellDepends = [ - aeson base bytestring Cabal containers directory file-embed - filepath ghc ghc-boot ghc-boot-th ghc-lib-parser-ex HsYAML - HsYAML-aeson HUnit mtl random regex-tdfa syb test-framework - test-framework-hunit text - ]; - description = "Haskell code prettifier"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "stylish-haskell"; - }) {}; - - "stylish-haskell" = callPackage + "stylish-haskell_0_14_4_0" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, file-embed, filepath, ghc, ghc-boot, ghc-boot-th , ghc-lib-parser-ex, HsYAML, HsYAML-aeson, HUnit, mtl @@ -285752,10 +286606,11 @@ self: { ]; description = "Haskell code prettifier"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "stylish-haskell"; }) {}; - "stylish-haskell_0_14_5_0" = callPackage + "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, file-embed, filepath, ghc-lib-parser , ghc-lib-parser-ex, HsYAML, HsYAML-aeson, HUnit, mtl @@ -285785,7 +286640,6 @@ self: { ]; description = "Haskell code prettifier"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "stylish-haskell"; }) {}; @@ -287524,8 +288378,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.10.5.0"; - sha256 = "0q642rv2mcb228b99qc7l94m8hrdw5zqby14jzblr6c4wwcahh5a"; + version = "0.10.6.0"; + sha256 = "0c3vmlya7cyc5bx6qfrbhmizrpsaww8bn3mrqnn7jyrldnixi77x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -287740,6 +288594,35 @@ self: { license = "unknown"; }) {}; + "sydtest_0_15_1_1" = callPackage + ({ mkDerivation, async, autodocodec, autodocodec-yaml, base + , bytestring, containers, dlist, envparse, fast-myers-diff + , filepath, MonadRandom, mtl, optparse-applicative, path, path-io + , pretty-show, QuickCheck, quickcheck-io, random, random-shuffle + , safe, safe-coloured-text, safe-coloured-text-terminfo, stm + , svg-builder, sydtest-discover, text, vector + }: + mkDerivation { + pname = "sydtest"; + version = "0.15.1.1"; + sha256 = "01p49ijq32qrls94fgdjay95c826x3yvi13k2l0izimww5fhw9pi"; + libraryHaskellDepends = [ + async autodocodec autodocodec-yaml base bytestring containers dlist + envparse fast-myers-diff filepath MonadRandom mtl + optparse-applicative path path-io pretty-show QuickCheck + quickcheck-io random random-shuffle safe safe-coloured-text + safe-coloured-text-terminfo stm svg-builder text vector + ]; + testHaskellDepends = [ + base bytestring fast-myers-diff path path-io QuickCheck random + safe-coloured-text stm text vector + ]; + testToolDepends = [ sydtest-discover ]; + description = "A modern testing framework for Haskell with good defaults and advanced testing features"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq , directory, path, path-io, sydtest, sydtest-discover, text @@ -287816,6 +288699,26 @@ self: { mainProgram = "sydtest-discover"; }) {}; + "sydtest-discover_0_0_0_4" = callPackage + ({ mkDerivation, base, filepath, optparse-applicative, path + , path-io + }: + mkDerivation { + pname = "sydtest-discover"; + version = "0.0.0.4"; + sha256 = "1arg5451fvlfxs04ic22ivj424lpssbc5cgqxgl9kyhspxq77hcv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath optparse-applicative path path-io + ]; + executableHaskellDepends = [ base ]; + description = "Automatic test suite discovery for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + mainProgram = "sydtest-discover"; + }) {}; + "sydtest-hedgehog" = callPackage ({ mkDerivation, base, containers, hedgehog, stm, sydtest , sydtest-discover @@ -289151,8 +290054,8 @@ self: { }: mkDerivation { pname = "synthesizer-llvm"; - version = "1.0"; - sha256 = "1kkn0rdwidwrrx27bzj3d6hk273fl1v88c6bdqvw0hy3lqmrfvzb"; + version = "1.1"; + sha256 = "118z30dj8w9fbfv5q6i9yfm1d0zhmykavpdcn3sb60z8fpmx7vl1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -290494,39 +291397,38 @@ self: { "tahoe-chk" = callPackage ({ mkDerivation, aeson, async, base, base32, base64-bytestring - , binary, bytestring, cereal, cipher-aes128, concurrency - , containers, crypto-api, cryptonite, directory, extra, fec - , filepath, hedgehog, megaparsec, memory, monad-loops - , network-byte-order, optparse-applicative, parser-combinators - , primitive, scientific, tagged, tasty, tasty-hedgehog, tasty-hunit - , temporary, text, tree-diff, utility-ht, vector, yaml + , binary, bytestring, concurrency, containers, cryptonite, deepseq + , directory, extra, fec, filepath, hedgehog, lens, megaparsec + , memory, network-byte-order, optparse-applicative + , parser-combinators, primitive, scientific, tasty, tasty-hedgehog + , tasty-hunit, temporary, text, tree-diff, utility-ht, vector, yaml }: mkDerivation { pname = "tahoe-chk"; - version = "0.1.0.2"; - sha256 = "18gbk1zk11nq08vfxqjb9ayf1k1vhic21mdp7v4fwxjrqkvxlwpr"; + version = "0.2.0.0"; + sha256 = "0lpap46y47czds1l9rf5b45rhqaigypq8w5jnmds8jhi90x5cjzj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base base32 base64-bytestring binary bytestring cereal - cipher-aes128 concurrency containers crypto-api cryptonite - directory extra fec filepath megaparsec memory monad-loops - network-byte-order parser-combinators primitive tagged text - tree-diff utility-ht + aeson async base base32 base64-bytestring binary bytestring + concurrency containers cryptonite deepseq directory extra fec + filepath lens megaparsec memory network-byte-order + parser-combinators primitive text tree-diff utility-ht ]; executableHaskellDepends = [ base base32 bytestring optparse-applicative text ]; testHaskellDepends = [ - aeson base base32 base64-bytestring binary bytestring cereal - cipher-aes128 containers crypto-api cryptonite directory fec - filepath hedgehog megaparsec scientific tagged tasty tasty-hedgehog - tasty-hunit temporary text tree-diff vector yaml + aeson base base32 base64-bytestring binary bytestring containers + cryptonite directory fec filepath hedgehog lens megaparsec memory + scientific tasty tasty-hedgehog tasty-hunit temporary text + tree-diff vector yaml ]; description = "The Tahoe-LAFS' Content-Hash-Key (CHK) cryptographic protocol"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "tahoe-chk-encrypt"; + broken = true; }) {}; "tahoe-directory" = callPackage @@ -291022,8 +291924,8 @@ self: { pname = "tar"; version = "0.5.1.1"; sha256 = "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k"; - revision = "6"; - editedCabalFile = "0c1659c2jiiibzv3r24mqjh4w7z93wxc3r332crshwvja07wpnv3"; + revision = "9"; + editedCabalFile = "1bp2ql3z5pyswq9095pfmhink1awgmnsch3ps99vziqq61jcvg1v"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath time ]; @@ -291348,6 +292250,8 @@ self: { pname = "tasty"; version = "1.5"; sha256 = "1b19s0kf61z3zp7qx9m3j3iqmjvwvqsfwryf9lfnj3i15a2zfp6a"; + revision = "1"; + editedCabalFile = "1r6jld0az8pyycsn6z5jxz7yrhyi4k2ahv442fcvw54q6c0i3j9d"; libraryHaskellDepends = [ ansi-terminal base containers optparse-applicative stm tagged transformers unix @@ -291364,8 +292268,8 @@ self: { }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.1.8"; - sha256 = "0h9mllhw9cd0rn34xhj8grwmbny7z7hpd8qmp9lfcdj0s4qx9vx8"; + version = "1.1.9"; + sha256 = "00zgsd6jjfwasr69d0y781vhjr7d8p1jbaaz4pn75ljf33akd92l"; libraryHaskellDepends = [ base containers directory filepath generic-deriving ghc-prim mtl stm tagged tasty transformers xml @@ -291459,27 +292363,14 @@ self: { ({ mkDerivation, base, containers, deepseq, ghc-prim, tasty }: mkDerivation { pname = "tasty-bench"; - version = "0.3.4"; - sha256 = "07nfm7wahfybnlazisf4xn70l25c4lzm190lpakwprdgmzmp3rjd"; - libraryHaskellDepends = [ base containers deepseq ghc-prim tasty ]; - benchmarkHaskellDepends = [ base ]; - description = "Featherlight benchmark framework"; - license = lib.licenses.mit; - }) {}; - - "tasty-bench_0_3_5" = callPackage - ({ mkDerivation, base, containers, deepseq, ghc-prim, tasty }: - mkDerivation { - pname = "tasty-bench"; version = "0.3.5"; sha256 = "1xldjnm4wa16mcrrp09gi75c8n9b0pq9va3zf50m1smylhfh1hfw"; - revision = "1"; - editedCabalFile = "1q8yx3lm8wb75yn81rmxwi6d30xqcjkxdjjicfv5ipyb8xx0hnc6"; + revision = "2"; + editedCabalFile = "1paw2y3298519j7fkmq6gann4bmx0yynxb6nsfib11c6kg11djc1"; libraryHaskellDepends = [ base containers deepseq ghc-prim tasty ]; benchmarkHaskellDepends = [ base ]; description = "Featherlight benchmark framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-bench-fit" = callPackage @@ -291491,6 +292382,8 @@ self: { pname = "tasty-bench-fit"; version = "0.1"; sha256 = "0dn8zfiwrpw8f3q5lnb7n3rp5sazrfxbcfk3cffh7s55mgb74rbk"; + revision = "2"; + editedCabalFile = "1b779czhl7qh8ajagp13lvwrgmnbpvwyndn0rf0qmxq1bp6l2yj0"; libraryHaskellDepends = [ base containers deepseq infinite-list regression-simple tasty tasty-bench @@ -291524,12 +292417,12 @@ self: { }) {}; "tasty-coverage" = callPackage - ({ mkDerivation, base, filepath, hpc, tasty }: + ({ mkDerivation, base, containers, filepath, hpc, tasty }: mkDerivation { pname = "tasty-coverage"; - version = "0.1.2.0"; - sha256 = "1d302a16n06x61hlbi3654c808rij74rczpzarjq1mrna07fnh1f"; - libraryHaskellDepends = [ base filepath hpc tasty ]; + version = "0.1.3.0"; + sha256 = "00yzx1qw4bcdpa55ldjk2f284z2i46xlp8l6a9jpwcxndwv48raa"; + libraryHaskellDepends = [ base containers filepath hpc tasty ]; description = "Ingredient for tasty which generates per-test coverage reports"; license = lib.licenses.bsd3; }) {}; @@ -291538,23 +292431,11 @@ self: { ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "2.1.0.0"; - sha256 = "0pj7w81kcvbdk9fv10gwmjfivpa6a9m1ldvr9ck484lnb9684a9s"; - libraryHaskellDepends = [ base dejafu random tagged tasty ]; - description = "Deja Fu support for the Tasty test framework"; - license = lib.licenses.mit; - }) {}; - - "tasty-dejafu_2_1_0_1" = callPackage - ({ mkDerivation, base, dejafu, random, tagged, tasty }: - mkDerivation { - pname = "tasty-dejafu"; version = "2.1.0.1"; sha256 = "0rzlqn6176mdaj3yybw2hjjx3lrx621jvh7vvxkkmh655jbkmjhb"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-discover" = callPackage @@ -291817,6 +292698,8 @@ self: { pname = "tasty-hspec"; version = "1.2.0.4"; sha256 = "1hk1nkjvhp89xxgzj6dhbgw0fknnghpng6afq4i39hjkwv5p78ni"; + revision = "1"; + editedCabalFile = "1wlaxalc750k1g5iqvkrwi2mfcblr9pk0jfc2qbkhhldajcl2wir"; libraryHaskellDepends = [ base hspec hspec-api hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -291854,23 +292737,11 @@ self: { ({ mkDerivation, base, call-stack, tasty }: mkDerivation { pname = "tasty-hunit"; - version = "0.10.0.3"; - sha256 = "0gz6zz3w7s44pymw33xcxnawryl27zk33766sab96nz2xh91kvxp"; - libraryHaskellDepends = [ base call-stack tasty ]; - description = "HUnit support for the Tasty test framework"; - license = lib.licenses.mit; - }) {}; - - "tasty-hunit_0_10_1" = callPackage - ({ mkDerivation, base, call-stack, tasty }: - mkDerivation { - pname = "tasty-hunit"; version = "0.10.1"; sha256 = "10r05j6cl5clxzi2y2gxg9y4izxpa17l6hwb7f4lrc2qs8xl5sww"; libraryHaskellDepends = [ base call-stack tasty ]; description = "HUnit support for the Tasty test framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-hunit-adapter" = callPackage @@ -292191,33 +293062,16 @@ self: { }: mkDerivation { pname = "tasty-rerun"; - version = "1.1.18"; - sha256 = "0sccp5zx9v2rx741nbmgd8mzjhy5m4v74hk26d23xz93ph8aqx7s"; - revision = "4"; - editedCabalFile = "1i2van23247h62sz94kjiyyb6xvz88z6kkjqqsbxi4m74pga27hn"; - libraryHaskellDepends = [ - base containers mtl optparse-applicative split stm tagged tasty - transformers - ]; - description = "Rerun only tests which failed in a previous test run"; - license = lib.licenses.bsd3; - }) {}; - - "tasty-rerun_1_1_19" = callPackage - ({ mkDerivation, base, containers, mtl, optparse-applicative, split - , stm, tagged, tasty, transformers - }: - mkDerivation { - pname = "tasty-rerun"; version = "1.1.19"; sha256 = "0dbj5jyms4rkb241dw2vgkzk442zga58zhg8mmw0ksi4yw0z8gbg"; + revision = "1"; + editedCabalFile = "1qi6rwnyrddk58b5mh9a2zh3af39kdl71f65ajlvbsh6y1n7fbkr"; libraryHaskellDepends = [ base containers mtl optparse-applicative split stm tagged tasty transformers ]; description = "Rerun only tests which failed in a previous test run"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-silver" = callPackage @@ -292228,31 +293082,6 @@ self: { }: mkDerivation { pname = "tasty-silver"; - version = "3.3.1.1"; - sha256 = "13j0zs0ciijv9q2nncna1gbgsgw2g7xc228hzmqic1750n3ybz9m"; - revision = "1"; - editedCabalFile = "0bnpygmlz5qbjymyngcn19bnhn57m2p6m62f0r8pmrs1q7h4l7aq"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring containers deepseq directory - filepath mtl optparse-applicative process process-extras regex-tdfa - silently stm tagged tasty temporary text transformers - ]; - testHaskellDepends = [ - base directory filepath process silently tasty tasty-hunit - temporary transformers - ]; - description = "A fancy test runner, including support for golden tests"; - license = lib.licenses.mit; - }) {}; - - "tasty-silver_3_3_1_2" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, regex-tdfa, silently, stm, tagged, tasty - , tasty-hunit, temporary, text, transformers - }: - mkDerivation { - pname = "tasty-silver"; version = "3.3.1.2"; sha256 = "11smy3kwr8w4m4xk229lch6s17h7jp55nzx4pw51rx1xmqfgfx14"; libraryHaskellDepends = [ @@ -292266,7 +293095,6 @@ self: { ]; description = "A fancy test runner, including support for golden tests"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-smallcheck" = callPackage @@ -292488,8 +293316,8 @@ self: { ({ mkDerivation, base, lens, tax, time }: mkDerivation { pname = "tax-ato"; - version = "2023.1"; - sha256 = "0qh547w29ll5792dxsqa1vnkmwviamwrnq1kkr9p05ipgp5n5bh3"; + version = "2023.2"; + sha256 = "0gycqjcswlh5gcrxjrkcvib7af8w2n5biy9yrwzmd6hvd4dj97dz"; libraryHaskellDepends = [ base lens tax time ]; description = "Tax types and computations for Australia"; license = lib.licenses.agpl3Plus; @@ -293292,6 +294120,8 @@ self: { pname = "template"; version = "0.2.0.10"; sha256 = "10mcnhi2rdflmv79z0359nn5sylifvk9ih38xnjqqby6n4hs7mcg"; + revision = "1"; + editedCabalFile = "15i6342smkak53fycln810pq59qyb330f656l95kbxzx5zdpzz1r"; libraryHaskellDepends = [ base mtl text ]; description = "Simple string substitution"; license = lib.licenses.bsd3; @@ -293476,6 +294306,38 @@ self: { license = lib.licenses.mit; }) {}; + "templatise" = callPackage + ({ mkDerivation, base, bytestring, Cabal-syntax, directory + , exceptions, extra, filepath, hspec, http-client, http-conduit + , mtl, network-uri, optparse-applicative, parsec, process, tasty + , tasty-golden, tasty-hspec, temporary, text, time + }: + mkDerivation { + pname = "templatise"; + version = "0.1.0.3"; + sha256 = "0fxwmvyr9rslr0jbji98xhz2zdk46xznnhavzfa0d3nl4kglkp1q"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring Cabal-syntax exceptions extra filepath http-client + http-conduit mtl network-uri optparse-applicative parsec process + text time + ]; + executableHaskellDepends = [ base filepath optparse-applicative ]; + testHaskellDepends = [ + base bytestring Cabal-syntax directory filepath hspec mtl + network-uri optparse-applicative process tasty tasty-golden + tasty-hspec temporary text + ]; + doHaddock = false; + description = "You can use template.hs to create a new Haskell GitHub repository."; + license = lib.licenses.unlicense; + hydraPlatforms = lib.platforms.none; + mainProgram = "initialise"; + broken = true; + }) {}; + "tempo" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, ConfigFile , directory, filepath, http-conduit, MissingH, mtl, process @@ -295190,8 +296052,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.8.2"; - sha256 = "0g004qg97wyvaw3zd47mlb1xclf8jniwgfmvd1q8m3y958np81qp"; + version = "0.12.8.3"; + sha256 = "0lmzvh0izx192h1gik9vfs24xp13mpw2bwagmdd57sr7gpyln9zp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -295333,6 +296195,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-ansi_0_3_0" = callPackage + ({ mkDerivation, base, text, text-builder-linear }: + mkDerivation { + pname = "text-ansi"; + version = "0.3.0"; + sha256 = "0l2539rjhpmiw2is2wcqydql4j5wqmqccg8qdq172fc09fp87crm"; + libraryHaskellDepends = [ base text text-builder-linear ]; + description = "Text styling for ANSI terminals"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-ascii" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, deepseq , hashable, megaparsec, optics-core, optics-extra, template-haskell @@ -295597,8 +296471,8 @@ self: { }: mkDerivation { pname = "text-icu"; - version = "0.8.0.2"; - sha256 = "0frxrsj580ipgb3pdvw1msdz8d63j02vvrqhzjja3ixlq24am69d"; + version = "0.8.0.3"; + sha256 = "0mv8pxrc65yrrh2mxksxribd7ihnn0rx2il5kxfxm5zn4fa2nvqc"; libraryHaskellDepends = [ base bytestring deepseq text time ]; librarySystemDepends = [ icu ]; libraryPkgconfigDepends = [ icu ]; @@ -296043,8 +296917,8 @@ self: { pname = "text-short"; version = "0.1.5"; sha256 = "1nid00c1rg5c1z7l9mwk3f2izc2sps2mip2hl30q985dwb6wcpm3"; - revision = "2"; - editedCabalFile = "0lkh1sl8vx11vjjkxs2fz3jmmw1fp1f2k74q2acz6nywi4ifp5n2"; + revision = "3"; + editedCabalFile = "1471cn6gd4kgqk4cr0nqcz8qq1qwbd8qyxg35klrx9ic334wjwww"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable template-haskell text @@ -296069,8 +296943,8 @@ self: { pname = "text-show"; version = "3.10.4"; sha256 = "0kjpl9wbvn5zcpwjyrvdnkcp260rizff598cmqh4py8225fl5bmz"; - revision = "1"; - editedCabalFile = "0ac5v51am20ni6ddkppzzhzynlnyn0d51gwxc47rmy8dsh22y72a"; + revision = "2"; + editedCabalFile = "1wwpgl9y775604ypx86p8kya4xsin7h9bl21b6ris74k6lnabsrz"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -296102,6 +296976,8 @@ self: { pname = "text-show-instances"; version = "3.9.6"; sha256 = "1xmifjcx52jpa3qlmd5v11x429kn5qm64k2a7ai1lwpmy3mvpa90"; + revision = "1"; + editedCabalFile = "1bxyiy1x83mc3zmim27plcp4x9i6sg1xgl33q1zgfdd8n1m8jpv5"; libraryHaskellDepends = [ aeson base base-compat bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -296511,6 +297387,8 @@ self: { pname = "th-abstraction"; version = "0.6.0.0"; sha256 = "0c0sqn9bz2rgrqdfkricbs2p6vn7is89qcpqw7hvc00c3z56xsk9"; + revision = "1"; + editedCabalFile = "0z7cn1qcnkslajjqcma23sh0qglbpvb5y9bgbzfzqal1lak9z5fq"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -296686,6 +297564,8 @@ self: { pname = "th-desugar"; version = "1.15"; sha256 = "167ybxp9233xlihmj28hmqmd82liyhjgl17310nn9bximgfjr7hp"; + revision = "1"; + editedCabalFile = "1mpig192p595d3961w1x35w50h8i6c9zp0h4d44mnjy2wd7hb99j"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb template-haskell th-abstraction th-orphans transformers-compat @@ -297387,6 +298267,8 @@ self: { pname = "these"; version = "1.2"; sha256 = "1f6lmjmy3yl1d2ycfsfk7q4sd0m3zrrap2plc11pd47pnxs73vd8"; + revision = "1"; + editedCabalFile = "0vpcgbyrykzzyycwda8k6dcjvjcncrwlish4gkw2i80wi7v247h1"; libraryHaskellDepends = [ assoc base binary deepseq foldable1-classes-compat hashable ]; @@ -297411,8 +298293,8 @@ self: { pname = "these-optics"; version = "1.0.1.2"; sha256 = "06jxv320a8f94zjjsqrh072vz2dkzhwgcmpbdy1prgvypiynm4zd"; - revision = "2"; - editedCabalFile = "02nq13avrvv0vqvhn9pa8jsnkbi1d40644ig1w83rz64y092dbwk"; + revision = "3"; + editedCabalFile = "0srsap1s1vi96xbw9vzpk14jyxajqlpmwn1bw190qjqnilxkqg48"; libraryHaskellDepends = [ base optics-core these ]; description = "Optics for These"; license = lib.licenses.bsd3; @@ -297663,16 +298545,13 @@ self: { }) {}; "threads" = callPackage - ({ mkDerivation, base, Cabal, concurrent-extra, HUnit, stm - , test-framework, test-framework-hunit + ({ mkDerivation, base, concurrent-extra, HUnit, stm, test-framework + , test-framework-hunit }: mkDerivation { pname = "threads"; - version = "0.5.1.7"; - sha256 = "1l226792dqlp772aaxqr3qzz8yq72702g708k16gi8lrkfhgxxp0"; - revision = "1"; - editedCabalFile = "18xxmb0x8lr6c90jc1vv078jm932aia9hm722l5wxmwly4a2n4wp"; - setupHaskellDepends = [ base Cabal ]; + version = "0.5.1.8"; + sha256 = "17jaq8gn5p3pgvwvswam379vdmdcq2241n3kwy6mmrisa45db564"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base concurrent-extra HUnit stm test-framework test-framework-hunit @@ -298499,8 +299378,8 @@ self: { pname = "time-compat"; version = "1.9.6.1"; sha256 = "103b3vpn277kkccv6jv54b2wpi5c00mpb01ndl9w4y4nxc0bn1xd"; - revision = "5"; - editedCabalFile = "0ryv5p2hgq5a6iyvh2r30sdlr7jn70cw8ypw5sc0hwbb1pxf2kfx"; + revision = "6"; + editedCabalFile = "0lpv1x3q4j7h0rn9pjdcf8armvkdgzw905hkprgzb9h33bq1wqqp"; libraryHaskellDepends = [ base base-orphans deepseq hashable time ]; @@ -300927,8 +301806,8 @@ self: { pname = "toml-reader"; version = "0.2.1.0"; sha256 = "1nq4f1a1gkm0xv1crq3fwp6xmr79kz6m4ls0nkj75mkcqk0mpd05"; - revision = "2"; - editedCabalFile = "13vd6wrm3nvlxnjyzlcqd7bylfznjxl5nv1f2b4yh004ii7vn7fk"; + revision = "3"; + editedCabalFile = "1q6fgn4xcssp1q819igbiihjhwfkb6jzaxsd5h35jr847lmw9mjw"; libraryHaskellDepends = [ base containers megaparsec parser-combinators text time ]; @@ -301256,6 +302135,18 @@ self: { broken = true; }) {}; + "toolbox" = callPackage + ({ mkDerivation, base, containers, template-haskell, time }: + mkDerivation { + pname = "toolbox"; + version = "0.5.0.0"; + sha256 = "1z6rcs85nykz92m59ny2xbj3w78ix6xxlmm1nvsigdn7fwq6kb0h"; + libraryHaskellDepends = [ base containers template-haskell time ]; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "toolshed" = callPackage ({ mkDerivation, array, base, containers, data-default, deepseq , directory, extra, filepath, HUnit, QuickCheck, random @@ -301717,8 +302608,8 @@ self: { }: mkDerivation { pname = "tpdb"; - version = "2.3.0"; - sha256 = "0gn07n03brkfab7c6sq3227k8b3i4v0k83lhxqxsgwz80i0mkx5i"; + version = "2.7.1"; + sha256 = "0l48j4f4skzgag07qjcgsckv2xiygf8pghqjn72ah7c0yr9ghx4z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -303448,6 +304339,8 @@ self: { pname = "trifecta"; version = "2.1.3"; sha256 = "05jnq2q27ichv9x6g9dx7ljppy3mkyv8ppzb0ynmfmpkcbghpbrf"; + revision = "1"; + editedCabalFile = "1rgx5415y996vbpfpnkjf48hgfjvid6wbzhfq88zqf0j4kbi7m75"; libraryHaskellDepends = [ ansi-terminal array base blaze-builder blaze-html blaze-markup bytestring charset comonad containers deepseq fingertree ghc-prim @@ -304011,6 +304904,23 @@ self: { license = lib.licenses.mit; }) {}; + "ttc_1_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "ttc"; + version = "1.3.0.0"; + sha256 = "16px3ws0bzkzpf1hy7il40p7shv8w093fjim0rc1c45y40jp7p09"; + libraryHaskellDepends = [ base bytestring template-haskell text ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit template-haskell text + ]; + description = "Textual Type Classes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ttl-hashtables" = callPackage ({ mkDerivation, base, clock, containers, data-default, failable , hashable, hashtables, hspec, mtl, transformers @@ -305704,8 +306614,8 @@ self: { ({ mkDerivation, base, persistent, text, type-level-kv-list }: mkDerivation { pname = "type-level-kv-list-persistent"; - version = "0.2.0.0"; - sha256 = "1n9niak3d4vnrpfsr7ydnbphlgviqwwzrnjg84grjx0rfm2ffxy2"; + version = "0.2.0.1"; + sha256 = "1rz68s1npb716ixkvq306yw5fm65ybkq5a9lzfginm3z5fhq8qh8"; libraryHaskellDepends = [ base persistent text type-level-kv-list ]; @@ -306677,8 +307587,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.10.0.1"; - sha256 = "0ynmmxry5wqpjak0dj3pv6j0cpv8865v10s7bcr1sbbzr00nsci9"; + version = "0.10.1.1"; + sha256 = "11116iqgdpqpmzj0rjqg7bmfyg3zgvwp2ndh4q8m7cy9gcwab734"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -306918,8 +307828,8 @@ self: { pname = "tz"; version = "0.1.3.6"; sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd"; - revision = "3"; - editedCabalFile = "03viai54yr4m59vavvgf070q50nsnpwxnzjnj3sbbxxs1sg3ncpv"; + revision = "4"; + editedCabalFile = "1yfriqm5xfmynx6vszs72h2kic69zx1xp5fl51dys28s0yna9alf"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -306945,8 +307855,8 @@ self: { pname = "tzdata"; version = "0.2.20230322.0"; sha256 = "1qir5cy2cyk4p923l3ibimvc0rn4h5pwx0wmjarx69bmxzm7jib7"; - revision = "1"; - editedCabalFile = "0xzpdsgzfqbhr5xk6k26rdkd18js08dc0vwbh2v3fbshf97nfr02"; + revision = "3"; + editedCabalFile = "05z8d4l8pizzrs3rldhn8abyfaf263mx25y2z5l34bcj006iqgnm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers deepseq vector @@ -306966,8 +307876,8 @@ self: { }: mkDerivation { pname = "tztime"; - version = "0.1.0.0"; - sha256 = "0d605i6q281cmr3zxrhh51cahlgc4v0sdbzzrzyjwzdnf8rhj5nl"; + version = "0.1.1.0"; + sha256 = "00jnfqmnqvg67wdc5h59a34sjfpbdwcscwgsbhm5488sn1201hm0"; libraryHaskellDepends = [ base deepseq directory filepath mtl safe-exceptions template-haskell text time time-compat tz @@ -307942,6 +308852,8 @@ self: { pname = "unfoldable"; version = "1.0.1"; sha256 = "1h1zps55adzhfsfq1bgwc235qywpad9z7rfqid81l4405pi5zw83"; + revision = "1"; + editedCabalFile = "1hl63gcidca977jbjj37vwkd96v4bjgvdpjm8xz33g8jcs7f9a8m"; libraryHaskellDepends = [ base containers ghc-prim one-liner QuickCheck random transformers ]; @@ -309469,19 +310381,17 @@ self: { license = lib.licenses.mit; }) {}; - "unix_2_8_2_0" = callPackage + "unix_2_8_2_1" = callPackage ({ mkDerivation, base, bytestring, filepath, tasty, tasty-hunit - , time + , tasty-quickcheck, time }: mkDerivation { pname = "unix"; - version = "2.8.2.0"; - sha256 = "1z2dp2lakl07m2vjcxaljbb4p581b64r6w55lghpm2vsggqvf8fl"; - revision = "1"; - editedCabalFile = "1ljvvq4fc7nqiyk6zy5svqcds2xnb3lc419q266ivr2345hp59bj"; + version = "2.8.2.1"; + sha256 = "0hzffcmz5ga9lcpfw5gh6h5902bpwrh3kjjhm3jha08085a1apmx"; libraryHaskellDepends = [ base bytestring filepath time ]; testHaskellDepends = [ - base bytestring filepath tasty tasty-hunit + base bytestring filepath tasty tasty-hunit tasty-quickcheck ]; description = "POSIX functionality"; license = lib.licenses.bsd3; @@ -309660,24 +310570,6 @@ self: { }: mkDerivation { pname = "unix-time"; - version = "0.4.10"; - sha256 = "1g196sh2jj0mhk6jh9pmsrh06y6p8j5cd9x1wfqwfyx8rgw4njky"; - libraryHaskellDepends = [ base binary bytestring old-time ]; - testHaskellDepends = [ - base bytestring hspec old-locale old-time QuickCheck - template-haskell time - ]; - testToolDepends = [ hspec-discover ]; - description = "Unix time parser/formatter and utilities"; - license = lib.licenses.bsd3; - }) {}; - - "unix-time_0_4_11" = callPackage - ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover - , old-locale, old-time, QuickCheck, template-haskell, time - }: - mkDerivation { - pname = "unix-time"; version = "0.4.11"; sha256 = "147hzx3gkqx1j2gr200fjgvl6dr2f9290dcimqyzrwscihbikmxb"; libraryHaskellDepends = [ base binary bytestring old-time ]; @@ -309688,7 +310580,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Unix time parser/formatter and utilities"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unjson" = callPackage @@ -309729,6 +310620,29 @@ self: { mainProgram = "unlambda"; }) {}; + "unleash-client-haskell-core" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , containers, hspec, murmur3, random, record-dot-preprocessor + , record-hasfield, text, text-show, time, versions + }: + mkDerivation { + pname = "unleash-client-haskell-core"; + version = "0.8.9"; + sha256 = "0jq1dyzr882jfdykys6kkr2gkxv5gp7xyqdm1p69zlzsi6rrzq40"; + libraryHaskellDepends = [ + aeson base containers murmur3 random record-dot-preprocessor + record-hasfield text text-show time versions + ]; + testHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring hspec + record-dot-preprocessor record-hasfield text + ]; + description = "Unleash feature toggle client core"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "unlift" = callPackage ({ mkDerivation, base, stm, transformers, transformers-base }: mkDerivation { @@ -310989,8 +311903,8 @@ self: { }: mkDerivation { pname = "urlpath"; - version = "9.0.1"; - sha256 = "0acflpvb0imf2qc2gqbqziv4lk6a5p9gxkvbm0mv3kszqslh7rrg"; + version = "11.0.0"; + sha256 = "1qndb850ghicp0iyc4rpw6zz0ms18lj4zsclhzhyrnm60h85jin7"; libraryHaskellDepends = [ attoparsec-uri base exceptions mmorph monad-control monad-control-aligned monad-logger mtl path path-extra resourcet @@ -311750,8 +312664,8 @@ self: { pname = "uuid"; version = "1.3.15"; sha256 = "0r05h16gd7fgfpq9iz43jcn9jzrgfa0gk4cv1xy0p4rli66rb1gq"; - revision = "2"; - editedCabalFile = "06j1hk4alypnwd4v55w6lfm1jrsaqh85k350qmymw0sqbrd9rmx3"; + revision = "3"; + editedCabalFile = "089q2i4rmw8iqzjn2fif4yarnbb7gsnsa4c4zhl24l2hlyakymbx"; libraryHaskellDepends = [ base binary bytestring cryptohash-md5 cryptohash-sha1 entropy network-info random text time uuid-types @@ -311878,6 +312792,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "uuid-types_1_0_5_1" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, hashable + , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text + }: + mkDerivation { + pname = "uuid-types"; + version = "1.0.5.1"; + sha256 = "0b6a5mvc6bc10lgiyfick9mnkdnlw8xj27dbbvx2pjdkh9lnvv0b"; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable random template-haskell + text + ]; + testHaskellDepends = [ + base binary bytestring QuickCheck tasty tasty-hunit + tasty-quickcheck template-haskell + ]; + description = "Type definitions for Universally Unique Identifiers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "uulib" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -312423,8 +313359,8 @@ self: { ({ mkDerivation, base, network-uri, validity }: mkDerivation { pname = "validity-network-uri"; - version = "0.0.0.0"; - sha256 = "01ni4i1i16p20s2yx5pqlk4yw1byki04wb4vafx57n84fyd629mp"; + version = "0.0.0.1"; + sha256 = "15y3bs6kglfdv3dzdiczl2jzq5krklv7wlap71b6gzddwlmzmglr"; libraryHaskellDepends = [ base network-uri validity ]; description = "Validity instances for URI"; license = lib.licenses.mit; @@ -314809,8 +315745,8 @@ self: { pname = "visualize-cbn"; version = "0.1.0.2"; sha256 = "1vlidljhy0ykflgf7k8gawlqazcrkvcs7r8wbv7h9x6wfnx0w334"; - revision = "2"; - editedCabalFile = "1c50m624jqyhr7hx75vsik2z2h3hj5f0jpim156hwiirdi266d9n"; + revision = "3"; + editedCabalFile = "0318c6m8226183wlx0hvkrzldvdfh9f358hz4xxfm28jg44i2vb2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -315821,26 +316757,6 @@ self: { }: mkDerivation { pname = "wai-feature-flags"; - version = "0.1.0.6"; - sha256 = "1djmzcl6bdjdvljzjjgj3avr8cd0cbrfshj1zrhzf0829v4viq9s"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring splitmix text unordered-containers wai - ]; - executableHaskellDepends = [ base wai warp ]; - description = "Feature flag support for WAI applications"; - license = lib.licenses.bsd3; - mainProgram = "example-app"; - }) {}; - - "wai-feature-flags_0_1_0_7" = callPackage - ({ mkDerivation, aeson, base, bytestring, splitmix, text - , unordered-containers, wai, warp - }: - mkDerivation { - pname = "wai-feature-flags"; version = "0.1.0.7"; sha256 = "0pqi45lf7pzad3d2l10hizsxwpjpj06m0z8di43vblb150z6y3my"; isLibrary = true; @@ -315852,7 +316768,6 @@ self: { executableHaskellDepends = [ base wai warp ]; description = "Feature flag support for WAI applications"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "example-app"; }) {}; @@ -316500,8 +317415,8 @@ self: { }: mkDerivation { pname = "wai-middleware-content-type"; - version = "0.6.2"; - sha256 = "18ay8ng3gmyn25iziwlw82z5vbbkc6pgp5d0iz29qmc2lm6y6wgw"; + version = "0.7.0"; + sha256 = "1gh4fgc9c4cy32ifq7wxmxk3px2827bji7159xmh06n41c1bv14s"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html bytestring clay exceptions extractable-singleton hashable http-media http-types lucid mmorph @@ -316854,8 +317769,8 @@ self: { pname = "wai-middleware-static"; version = "0.9.2"; sha256 = "1ynm0xcr3pj5bbph78p1kpyxvd0n3a0gfdbm6yb7i004ixaqf33c"; - revision = "3"; - editedCabalFile = "055n8krn781qd7mb4lclkfkhw43flkvkg93bpljj1b23wnaaxxf9"; + revision = "4"; + editedCabalFile = "0kmy18qq2mc5mlmnx6xaj1wkk63jl0s4fn16zbd6cyb6jb8n2lq4"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash-sha1 directory expiring-cache-map filepath http-types mime-types @@ -317948,15 +318863,15 @@ self: { license = lib.licenses.mit; }) {}; - "warp-tls_3_4_2" = callPackage + "warp-tls_3_4_3" = callPackage ({ mkDerivation, base, bytestring, data-default-class, network , recv, streaming-commons, tls, tls-session-manager, unliftio, wai , warp }: mkDerivation { pname = "warp-tls"; - version = "3.4.2"; - sha256 = "0aarqazsfihz8qd2kjkg6b0g2li2k72423n7sb3ff8mdkblh7zri"; + version = "3.4.3"; + sha256 = "1fldcdd7x2r1vl7qjycrlfwk10z58ap15najlbfdfa1lnvwc50jd"; libraryHaskellDepends = [ base bytestring data-default-class network recv streaming-commons tls tls-session-manager unliftio wai warp @@ -321046,8 +321961,8 @@ self: { pname = "wl-pprint-annotated"; version = "0.1.0.1"; sha256 = "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb"; - revision = "1"; - editedCabalFile = "1qizgsiqsraj8w0qndcyw7grcmiylx63vp3lgw2dplchva8p3hp7"; + revision = "2"; + editedCabalFile = "19l3d82cpw14ph253xhapvcm1f3pzik2nkrrvpizp3yx6hw049gn"; libraryHaskellDepends = [ base containers deepseq text ]; testHaskellDepends = [ base containers deepseq tasty tasty-hunit text @@ -321932,23 +322847,22 @@ self: { "wraxml" = callPackage ({ mkDerivation, base, containers, data-accessor - , explicit-exception, HaXml, hxt, hxt-filter, polyparse, tagchup + , explicit-exception, HaXml, hxt, hxt-unicode, polyparse, tagchup , tagsoup, transformers, utility-ht, xml-basic }: mkDerivation { pname = "wraxml"; - version = "0.4.4.3"; - sha256 = "11b48rjpj2glm5bxg8mw9m73qfprb2a8gc57s06sh0n50295di2z"; + version = "0.5"; + sha256 = "1zzslycz4hzg2l3pma0yfwdnqf08cw14b1ac5lzjm4z548bhzg0h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers data-accessor explicit-exception HaXml hxt - hxt-filter polyparse tagchup tagsoup transformers utility-ht + hxt-unicode polyparse tagchup tagsoup transformers utility-ht xml-basic ]; description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "wrecker" = callPackage @@ -322361,7 +323275,9 @@ self: { ]; description = "A simple CLI utility for interacting with a websocket"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "ws"; + broken = true; }) {}; "ws-chans" = callPackage @@ -322573,6 +323489,8 @@ self: { pname = "wuerfelschlange"; version = "0.1"; sha256 = "1vgz6mz0cxc4hgp80v51qac306yikgixqwv1zcsjcnrmnz2qqy44"; + revision = "1"; + editedCabalFile = "17gh2xifinjj30mmknl63rffllysqlbdlcj7js9x6szb8scapdax"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -326947,28 +327865,29 @@ self: { }) {}; "yesod-auth" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, bytestring, conduit, conduit-extra, containers - , cryptonite, data-default, email-validate, file-embed, http-client - , http-client-tls, http-conduit, http-types, memory, network-uri - , nonce, persistent, random, safe, shakespeare, template-haskell - , text, time, transformers, unliftio, unliftio-core - , unordered-containers, wai, yesod-core, yesod-form + ({ mkDerivation, aeson, attoparsec-aeson, authenticate, base + , base16-bytestring, base64-bytestring, binary, blaze-builder + , blaze-html, blaze-markup, bytestring, conduit, conduit-extra + , containers, cryptonite, data-default, email-validate, file-embed + , http-client, http-client-tls, http-conduit, http-types, memory + , network-uri, nonce, persistent, random, safe, shakespeare + , template-haskell, text, time, transformers, unliftio + , unliftio-core, unordered-containers, wai, yesod-core, yesod-form , yesod-persistent }: mkDerivation { pname = "yesod-auth"; - version = "1.6.11.1"; - sha256 = "01ljcqmn0s79a77ry25q4333ni4w5swacah3rwhnhhrd5xnv1jxx"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup bytestring conduit - conduit-extra containers cryptonite data-default email-validate - file-embed http-client http-client-tls http-conduit http-types - memory network-uri nonce persistent random safe shakespeare - template-haskell text time transformers unliftio unliftio-core - unordered-containers wai yesod-core yesod-form yesod-persistent + version = "1.6.11.2"; + sha256 = "0yqyggdvfi0kg4qa0is3lqifz40kgyjll445yxcpv6m8vcd2r1a1"; + libraryHaskellDepends = [ + aeson attoparsec-aeson authenticate base base16-bytestring + base64-bytestring binary blaze-builder blaze-html blaze-markup + bytestring conduit conduit-extra containers cryptonite data-default + email-validate file-embed http-client http-client-tls http-conduit + http-types memory network-uri nonce persistent random safe + shakespeare template-haskell text time transformers unliftio + unliftio-core unordered-containers wai yesod-core yesod-form + yesod-persistent ]; description = "Authentication for Yesod"; license = lib.licenses.mit; @@ -327594,28 +328513,28 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, bytestring, case-insensitive, cereal, clientsession - , conduit, conduit-extra, containers, cookie, deepseq, entropy - , fast-logger, gauge, hspec, hspec-expectations, http-types, HUnit - , memory, monad-logger, mtl, network, parsec, path-pieces - , primitive, random, resourcet, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 + ({ mkDerivation, aeson, async, attoparsec-aeson, auto-update, base + , blaze-html, blaze-markup, bytestring, case-insensitive, cereal + , clientsession, conduit, conduit-extra, containers, cookie + , deepseq, entropy, fast-logger, gauge, hspec, hspec-expectations + , http-types, HUnit, memory, monad-logger, mtl, network, parsec + , path-pieces, primitive, random, resourcet, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , unix-compat, unliftio, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 }: mkDerivation { pname = "yesod-core"; - version = "1.6.24.4"; - sha256 = "1r7jpilg42jn1hyg8wxg92jh496c9jhghkrxh8fi0x4rbrcswxj3"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq entropy fast-logger http-types memory - monad-logger mtl parsec path-pieces primitive random resourcet - shakespeare template-haskell text time transformers unix-compat - unliftio unordered-containers vector wai wai-extra wai-logger warp - word8 + version = "1.6.24.5"; + sha256 = "08w8rd69hswj9swi8krbfc063hvnm3vvn5n5vlx025xrgy5jfky2"; + libraryHaskellDepends = [ + aeson attoparsec-aeson auto-update base blaze-html blaze-markup + bytestring case-insensitive cereal clientsession conduit + conduit-extra containers cookie deepseq entropy fast-logger + http-types memory monad-logger mtl parsec path-pieces primitive + random resourcet shakespeare template-haskell text time + transformers unix-compat unliftio unordered-containers vector wai + wai-extra wai-logger warp word8 ]; testHaskellDepends = [ async base bytestring clientsession conduit conduit-extra @@ -328916,8 +329835,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.15"; - sha256 = "16q4f1l3m4l8iy5vmaa8c0vm2iiqhpghf3kykymlh41xy96mqpn3"; + version = "1.6.16"; + sha256 = "12kvr7z81sfla7kc32iw9qsfhxps1mhairmwayi9x0vg6mxf7vs1"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive conduit containers cookie hspec-core @@ -330675,8 +331594,8 @@ self: { }: mkDerivation { pname = "zeugma"; - version = "0.8.1.0"; - sha256 = "0cgfz01cjdnj04i33rh62gzmdhl9x2f2hbr3nry8avvkl657spd3"; + version = "0.9.0.1"; + sha256 = "1idiinilcxw97fff6yq59a4472y8qy7b28gx2nnzsi6ajq9azazk"; libraryHaskellDepends = [ base chronos hedgehog incipit polysemy polysemy-chronos polysemy-test tasty tasty-expected-failure tasty-hedgehog diff --git a/pkgs/development/haskell-modules/package-list.nix b/pkgs/development/haskell-modules/package-list.nix index 50daaf136231f..bde8daed6f355 100644 --- a/pkgs/development/haskell-modules/package-list.nix +++ b/pkgs/development/haskell-modules/package-list.nix @@ -10,12 +10,13 @@ let let version = pkg.version or ""; in - lib.optionalString (isPvpVersion version) + lib.optionalString (isPvpVersion version && (pkg.meta.hydraPlatforms or null) != lib.platforms.none) ''"${name}","${version}","http://hydra.nixos.org/job/nixpkgs/trunk/haskellPackages.${name}.x86_64-linux"''; all-haskellPackages = builtins.toFile "all-haskellPackages" (lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.mapAttrsToList pkgLine haskellPackages))); in runCommand "hackage-package-list" { } # This command will make a join between all packages on hackage and haskellPackages.*. + # It ignores packages marked as broken (according to hydraPlatforms) # It creates a valid csv file which can be uploaded to hackage.haskell.org. # The call is wrapped in echo $(...) to trim trailing newline, which hackage requires. '' diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 21fba0864ad5f..7b1a9b8b08351 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/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/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index 918735517ea34..617658e748b98 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -34,9 +34,9 @@ builder rec { outputs = [ "out" "dev" "info" ]; setOutputFlags = false; # $dev gets into the library otherwise - depsBuildBuild = [ - buildPackages.stdenv.cc - ] + depsBuildBuild = if stdenv.buildPlatform.isDarwin + then [ buildPackages.darwin.apple_sdk_11_0.stdenv.cc ] + else [ buildPackages.stdenv.cc ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_2_2; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 7b45ba50dedf5..818377912808e 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -36,9 +36,10 @@ builder rec { outputs = [ "out" "dev" "info" ]; setOutputFlags = false; # $dev gets into the library otherwise - depsBuildBuild = [ - buildPackages.stdenv.cc - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + depsBuildBuild = if stdenv.buildPlatform.isDarwin + then [ buildPackages.darwin.apple_sdk_11_0.stdenv.cc ] + else [ buildPackages.stdenv.cc ] + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_3_0; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index 93aece0389803..16a5f4a855b29 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/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/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 4d6a6630d6604..eac1ba98beed1 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -303,9 +303,12 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch # Use sysconfigdata to find headers. Fixes cross-compilation of extension modules. ./3.7/fix-finding-headers-when-cross-compiling.patch - ] ++ optionals stdenv.hostPlatform.isLoongArch64 [ + ] ++ optionals (pythonOlder "3.12") [ # https://github.com/python/cpython/issues/90656 ./loongarch-support.patch + ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [ + # backport fix for https://github.com/python/cpython/issues/95855 + ./platform-triplet-detection.patch ] ++ optionals (stdenv.hostPlatform.isMinGW) (let # https://src.fedoraproject.org/rpms/mingw-python3 mingw-patch = fetchgit { diff --git a/pkgs/development/interpreters/python/cpython/platform-triplet-detection.patch b/pkgs/development/interpreters/python/cpython/platform-triplet-detection.patch new file mode 100644 index 0000000000000..ec76546f54ee8 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/platform-triplet-detection.patch @@ -0,0 +1,295 @@ +diff --git a/configure.ac b/configure.ac +index ba768aea93..621ac166bd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -936,125 +936,192 @@ cat > conftest.c <<EOF + #if defined(__ANDROID__) + # Android is not a multiarch system. + #elif defined(__linux__) ++# include <features.h> ++# if defined(__UCLIBC__) ++# error uclibc not supported ++# elif defined(__dietlibc__) ++# error dietlibc not supported ++# elif defined(__GLIBC__) ++# define LIBC gnu ++# define LIBC_X32 gnux32 ++# if defined(__ARM_PCS_VFP) ++# define LIBC_ARM gnueabihf ++# else ++# define LIBC_ARM gnueabi ++# endif ++# if defined(__loongarch__) ++# if defined(__loongarch_soft_float) ++# define LIBC_LA gnusf ++# elif defined(__loongarch_single_float) ++# define LIBC_LA gnuf32 ++# elif defined(__loongarch_double_float) ++# define LIBC_LA gnu ++# else ++# error unknown loongarch floating-point base abi ++# endif ++# endif ++# if defined(_MIPS_SIM) ++# if defined(__mips_hard_float) ++# if _MIPS_SIM == _ABIO32 ++# define LIBC_MIPS gnu ++# elif _MIPS_SIM == _ABIN32 ++# define LIBC_MIPS gnuabin32 ++# elif _MIPS_SIM == _ABI64 ++# define LIBC_MIPS gnuabi64 ++# else ++# error unknown mips sim value ++# endif ++# else ++# if _MIPS_SIM == _ABIO32 ++# define LIBC_MIPS gnusf ++# elif _MIPS_SIM == _ABIN32 ++# define LIBC_MIPS gnuabin32sf ++# elif _MIPS_SIM == _ABI64 ++# define LIBC_MIPS gnuabi64sf ++# else ++# error unknown mips sim value ++# endif ++# endif ++# endif ++# if defined(__SPE__) ++# define LIBC_PPC gnuspe ++# else ++# define LIBC_PPC gnu ++# endif ++# else ++# include <stdarg.h> ++# ifdef __DEFINED_va_list ++# define LIBC musl ++# define LIBC_X32 muslx32 ++# if defined(__ARM_PCS_VFP) ++# define LIBC_ARM musleabihf ++# else ++# define LIBC_ARM musleabi ++# endif ++# if defined(__loongarch__) ++# if defined(__loongarch_soft_float) ++# define LIBC_LA muslsf ++# elif defined(__loongarch_single_float) ++# define LIBC_LA muslf32 ++# elif defined(__loongarch_double_float) ++# define LIBC_LA musl ++# else ++# error unknown loongarch floating-point base abi ++# endif ++# endif ++# if defined(_MIPS_SIM) ++# if defined(__mips_hard_float) ++# if _MIPS_SIM == _ABIO32 ++# define LIBC_MIPS musl ++# elif _MIPS_SIM == _ABIN32 ++# define LIBC_MIPS musln32 ++# elif _MIPS_SIM == _ABI64 ++# define LIBC_MIPS musl ++# else ++# error unknown mips sim value ++# endif ++# else ++# if _MIPS_SIM == _ABIO32 ++# define LIBC_MIPS muslsf ++# elif _MIPS_SIM == _ABIN32 ++# define LIBC_MIPS musln32sf ++# elif _MIPS_SIM == _ABI64 ++# define LIBC_MIPS muslsf ++# else ++# error unknown mips sim value ++# endif ++# endif ++# endif ++# if defined(_SOFT_FLOAT) || defined(__NO_FPRS__) ++# define LIBC_PPC muslsf ++# else ++# define LIBC_PPC musl ++# endif ++# else ++# error unknown libc ++# endif ++# endif + # if defined(__x86_64__) && defined(__LP64__) +- x86_64-linux-gnu ++ x86_64-linux-LIBC + # elif defined(__x86_64__) && defined(__ILP32__) +- x86_64-linux-gnux32 ++ x86_64-linux-LIBC_X32 + # elif defined(__i386__) +- i386-linux-gnu ++ i386-linux-LIBC + # elif defined(__aarch64__) && defined(__AARCH64EL__) + # if defined(__ILP32__) +- aarch64_ilp32-linux-gnu ++ aarch64_ilp32-linux-LIBC + # else +- aarch64-linux-gnu ++ aarch64-linux-LIBC + # endif + # elif defined(__aarch64__) && defined(__AARCH64EB__) + # if defined(__ILP32__) +- aarch64_be_ilp32-linux-gnu ++ aarch64_be_ilp32-linux-LIBC + # else +- aarch64_be-linux-gnu ++ aarch64_be-linux-LIBC + # endif + # elif defined(__alpha__) +- alpha-linux-gnu +-# elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP) ++ alpha-linux-LIBC ++# elif defined(__ARM_EABI__) + # if defined(__ARMEL__) +- arm-linux-gnueabihf ++ arm-linux-LIBC_ARM + # else +- armeb-linux-gnueabihf +-# endif +-# elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP) +-# if defined(__ARMEL__) +- arm-linux-gnueabi +-# else +- armeb-linux-gnueabi ++ armeb-linux-LIBC_ARM + # endif + # elif defined(__hppa__) +- hppa-linux-gnu ++ hppa-linux-LIBC + # elif defined(__ia64__) +- ia64-linux-gnu +-# elif defined(__loongarch__) +-# if defined(__loongarch_lp64) +-# if defined(__loongarch_soft_float) +- loongarch64-linux-gnusf +-# elif defined(__loongarch_single_float) +- loongarch64-linux-gnuf32 +-# elif defined(__loongarch_double_float) +- loongarch64-linux-gnu ++ ia64-linux-LIBC ++# elif defined(__loongarch__) && defined(__loongarch_lp64) ++ loongarch64-linux-LIBC_LA ++# elif defined(__m68k__) && !defined(__mcoldfire__) ++ m68k-linux-LIBC ++# elif defined(__mips__) ++# if defined(__mips_isa_rev) && (__mips_isa_rev >=6) ++# if defined(_MIPSEL) && defined(__mips64) ++ mipsisa64r6el-linux-LIBC_MIPS ++# elif defined(_MIPSEL) ++ mipsisa32r6el-linux-LIBC_MIPS ++# elif defined(__mips64) ++ mipsisa64r6-linux-LIBC_MIPS + # else +-# error unknown platform triplet ++ mipsisa32r6-linux-LIBC_MIPS + # endif + # else +-# error unknown platform triplet +-# endif +-# elif defined(__m68k__) && !defined(__mcoldfire__) +- m68k-linux-gnu +-# elif defined(__mips_hard_float) && defined(__mips_isa_rev) && (__mips_isa_rev >=6) && defined(_MIPSEL) +-# if _MIPS_SIM == _ABIO32 +- mipsisa32r6el-linux-gnu +-# elif _MIPS_SIM == _ABIN32 +- mipsisa64r6el-linux-gnuabin32 +-# elif _MIPS_SIM == _ABI64 +- mipsisa64r6el-linux-gnuabi64 +-# else +-# error unknown platform triplet +-# endif +-# elif defined(__mips_hard_float) && defined(__mips_isa_rev) && (__mips_isa_rev >=6) +-# if _MIPS_SIM == _ABIO32 +- mipsisa32r6-linux-gnu +-# elif _MIPS_SIM == _ABIN32 +- mipsisa64r6-linux-gnuabin32 +-# elif _MIPS_SIM == _ABI64 +- mipsisa64r6-linux-gnuabi64 +-# else +-# error unknown platform triplet +-# endif +-# elif defined(__mips_hard_float) && defined(_MIPSEL) +-# if _MIPS_SIM == _ABIO32 +- mipsel-linux-gnu +-# elif _MIPS_SIM == _ABIN32 +- mips64el-linux-gnuabin32 +-# elif _MIPS_SIM == _ABI64 +- mips64el-linux-gnuabi64 +-# else +-# error unknown platform triplet +-# endif +-# elif defined(__mips_hard_float) +-# if _MIPS_SIM == _ABIO32 +- mips-linux-gnu +-# elif _MIPS_SIM == _ABIN32 +- mips64-linux-gnuabin32 +-# elif _MIPS_SIM == _ABI64 +- mips64-linux-gnuabi64 +-# else +-# error unknown platform triplet ++# if defined(_MIPSEL) && defined(__mips64) ++ mips64el-linux-LIBC_MIPS ++# elif defined(_MIPSEL) ++ mipsel-linux-LIBC_MIPS ++# elif defined(__mips64) ++ mips64-linux-LIBC_MIPS ++# else ++ mips-linux-LIBC_MIPS ++# endif + # endif + # elif defined(__or1k__) +- or1k-linux-gnu +-# elif defined(__powerpc__) && defined(__SPE__) +- powerpc-linux-gnuspe ++ or1k-linux-LIBC + # elif defined(__powerpc64__) + # if defined(__LITTLE_ENDIAN__) +- powerpc64le-linux-gnu ++ powerpc64le-linux-LIBC + # else +- powerpc64-linux-gnu ++ powerpc64-linux-LIBC + # endif + # elif defined(__powerpc__) +- powerpc-linux-gnu ++ powerpc-linux-LIBC_PPC + # elif defined(__s390x__) +- s390x-linux-gnu ++ s390x-linux-LIBC + # elif defined(__s390__) +- s390-linux-gnu ++ s390-linux-LIBC + # elif defined(__sh__) && defined(__LITTLE_ENDIAN__) +- sh4-linux-gnu ++ sh4-linux-LIBC + # elif defined(__sparc__) && defined(__arch64__) +- sparc64-linux-gnu ++ sparc64-linux-LIBC + # elif defined(__sparc__) +- sparc-linux-gnu ++ sparc-linux-LIBC + # elif defined(__riscv) + # if __riscv_xlen == 32 +- riscv32-linux-gnu ++ riscv32-linux-LIBC + # elif __riscv_xlen == 64 +- riscv64-linux-gnu ++ riscv64-linux-LIBC + # else + # error unknown platform triplet + # endif +@@ -1102,12 +1169,7 @@ cat > conftest.c <<EOF + EOF + + if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then +- PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '` +- case "$build_os" in +- linux-musl*) +- PLATFORM_TRIPLET=`echo "$PLATFORM_TRIPLET" | sed 's/linux-gnu/linux-musl/'` +- ;; +- esac ++ PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | grep -v typedef | tr -d ' '` + AC_MSG_RESULT([$PLATFORM_TRIPLET]) + else + AC_MSG_RESULT([none]) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 5d36f80cdcf32..2d293bb29a0e5 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -20,20 +20,20 @@ sourceVersion = { major = "3"; minor = "10"; - patch = "12"; + patch = "13"; suffix = ""; }; - hash = "sha256-r7dL8ZEw56R9EDEsj154TyTgUnmB6raOIFRs+4ZYMLg="; + hash = "sha256-XIiEhmhkDT4VKzW0U27xwjsspL0slX7x7LsFP1cd0/Y="; }; python311 = { sourceVersion = { major = "3"; minor = "11"; - patch = "4"; + patch = "5"; suffix = ""; }; - hash = "sha256-Lw5AnfKrV6qfxMvd+5dq9E5OVb9vYZ7ua8XCKXJkp/Y="; + hash = "sha256-hc0S6c8dbVpF8X96/hzr5+5ijTKCKBxJLoat9jbe+j8="; }; }; @@ -139,7 +139,7 @@ in { enableOptimizations = false; enableLTO = false; mimetypesSupport = false; - } // sources.python310)).overrideAttrs(old: { + } // sources.python311)).overrideAttrs(old: { # TODO(@Artturin): Add this to the main cpython expr strictDeps = true; pname = "python3-minimal"; diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 71f3f8be9b013..e40ccb5908db6 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.4.19"; + version = "3.4.20"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-+ZYpS9UOB16qCjhrKwFGBn43t3KNOv/QIrLKIPAywWs="; + hash = "sha256-9jKKef7KPnSYgKb3zf1LaulFBJuDpY6pWOJHSpG6Hzs="; }; patches = [ diff --git a/pkgs/development/interpreters/starlark-rust/default.nix b/pkgs/development/interpreters/starlark-rust/default.nix index c83f6195bc64f..bd30fb4f85ae6 100644 --- a/pkgs/development/interpreters/starlark-rust/default.nix +++ b/pkgs/development/interpreters/starlark-rust/default.nix @@ -1,31 +1,19 @@ { lib , rustPlatform , fetchCrate -, fetchpatch -, stdenv }: rustPlatform.buildRustPackage rec { - pname = "starlark"; - version = "0.9.0"; + pname = "starlark-rust"; + version = "0.10.0"; src = fetchCrate { - inherit pname version; - hash = "sha256-h8TBWWw94Ka9C0W0i0aHACq6jO0QOLnLW+wTRzorHcc="; + pname = "starlark_bin"; + inherit version; + hash = "sha256-7AoNRTLyTYsUass9bMJMBUN+GrfUzEGM9cED5VsRESs="; }; - cargoHash = "sha256-OLzotKyiG0JmtjH0ckRImHMPPxfQZ+8IHZtXlo1f8+Y="; - - patches = [ - # fix test broken due to using `fetchCrate` - # https://github.com/facebookexperimental/starlark-rust/pull/78 - (fetchpatch { - name = "fix-test-rust-loc-when-tested-from-the-crate.patch"; - url = "https://github.com/facebookexperimental/starlark-rust/commit/0e4f90c77868e506268fcb6c9d37368e5b2b8cf5.patch"; - hash = "sha256-c8irAyS2IQ5C6s+0t4+hbW8aFptkwvCu9JHLyZqZsW4="; - stripLen = 1; - }) - ]; + cargoHash = "sha256-Q00JJRiubrxnI0nFQqUTbxTTB70XV93HJycjdlvV+74="; meta = with lib; { description = "A Rust implementation of the Starlark language"; @@ -33,6 +21,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/facebookexperimental/starlark-rust/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ figsoda ]; - broken = stdenv.isAarch64 || stdenv.isDarwin; + mainProgram = "starlark"; }; } diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 8d4903add8999..5ee967161f832 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -62,7 +62,10 @@ let libdir = "lib/${libPrefix}"; tclPackageHook = callPackage ({ buildPackages }: makeSetupHook { name = "tcl-package-hook"; - propagatedBuildInputs = [ buildPackages.makeWrapper ]; + propagatedBuildInputs = [ buildPackages.makeBinaryWrapper ]; + meta = { + inherit (meta) maintainers platforms; + }; } ./tcl-package-hook.sh) {}; # verify that Tcl's clock library can access tzdata tests.tzdata = runCommand "${pname}-test-tzdata" {} '' diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index f9202514f800e..e2e75a80cebe6 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/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/pkgs/development/libraries/argagg/0001-catch.diff b/pkgs/development/libraries/argagg/0001-catch.diff deleted file mode 100644 index f99649d568124..0000000000000 --- a/pkgs/development/libraries/argagg/0001-catch.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- old/test/doctest.h 2019-03-05 18:04:06.143740733 +0300 -+++ new/test/doctest.h 2019-03-05 18:04:43.577284916 +0300 -@@ -1307,7 +1307,7 @@ - __FILE__, __LINE__, #expr, #as); \ - try { \ - expr; \ -- } catch(as) { \ -+ } catch(as e) { \ - _DOCTEST_RB.m_threw = true; \ - _DOCTEST_RB.m_threw_as = true; \ - } catch(...) { _DOCTEST_RB.m_threw = true; } \ -@@ -1332,7 +1332,7 @@ - #define DOCTEST_REQUIRE_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_REQUIRE_THROWS) - - #define DOCTEST_WARN_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_WARN_THROWS_AS) --#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_CHECK_THROWS_AS) -+#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, const ex &, DT_CHECK_THROWS_AS) - #define DOCTEST_REQUIRE_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_REQUIRE_THROWS_AS) - - #define DOCTEST_WARN_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_WARN_NOTHROW) diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 2e8bdc50ca63d..89f81e26de407 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -18,6 +18,13 @@ stdenv.mkDerivation rec { dontAddWafCrossFlags = true; wafFlags = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-tests"; + postPatch = '' + # U was removed in python 3.11 because it had no effect + substituteInPlace waflib/*.py \ + --replace "m='rU" "m='r" \ + --replace "'rU'" "'r'" + ''; + meta = with lib; { description = "Library for audio labelling"; homepage = "https://aubio.org/"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 9f5a68187c02b..944182e141245 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/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/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/development/libraries/aws-c-sdkutils/default.nix index df43976e6cf00..2c76371955cb7 100644 --- a/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - sha256 = "sha256-xwPMuaaKzypxJK9mTKD4tJZjzl19pu60seGtS2QFjgI="; + sha256 = "sha256-4YuOC90FBcuNYGBsqw3wKYNGkg3MssezvR8bu6BNGeM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index f3b138d27487c..e473fa97a0ea5 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/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/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index d8c3309acb9f0..e9f0f013fe29f 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "dbus"; - version = "1.14.8"; + version = "1.14.10"; src = fetchurl { url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"; - sha256 = "sha256-pr1brFzxnww8WUva4lZaCVaWmApoOg7zfLYhLgk73jU="; + sha256 = "sha256-uh8h0r2dM52i1KqHgMCd8y/qh5mLc9ok9Jq53x42pQ8="; }; patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index ea152c0cc099d..c9f6711780b0b 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-EKvDH7RwOC4Gu/lturrfnGpzXnJ9azIwAFeuVoa6L/Y="; + hash = "sha256-UG/vV/6WxVLq9mdze8pSDFJIekOgGsg93dzMq6eP6Dg="; }; patches = [ ./version.patch ]; @@ -106,10 +106,12 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/duckdb/duckdb"; + changelog = "https://github.com/duckdb/duckdb/releases/tag/v${version}"; description = "Embeddable SQL OLAP Database Management System"; + homepage = "https://duckdb.org/"; license = licenses.mit; - platforms = platforms.all; + mainProgram = "duckdb"; maintainers = with maintainers; [ costrouc cpcloud ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/duckdb/version.patch b/pkgs/development/libraries/duckdb/version.patch index 9b368eac5dbc6..f40785b430797 100644 --- a/pkgs/development/libraries/duckdb/version.patch +++ b/pkgs/development/libraries/duckdb/version.patch @@ -56,25 +56,3 @@ index 2b49e11288..0a4a69b9a0 100644 message(STATUS "git hash ${GIT_COMMIT_HASH}, version ${DUCKDB_VERSION}") -diff --git a/tools/pythonpkg/setup.py b/tools/pythonpkg/setup.py -index fdf2911019..c363cc518a 100644 ---- a/tools/pythonpkg/setup.py -+++ b/tools/pythonpkg/setup.py -@@ -163,8 +163,6 @@ if 'BUILD_HTTPFS' in os.environ: - for ext in extensions: - toolchain_args.extend(['-DDUCKDB_EXTENSION_{}_LINKED'.format(ext.upper())]) - --toolchain_args.extend(['-DDUCKDB_EXTENSION_AUTOLOAD_DEFAULT=1', '-DDUCKDB_EXTENSION_AUTOINSTALL_DEFAULT=1']) -- - - class get_pybind_include(object): - def __init__(self, user=False): -@@ -343,7 +341,7 @@ setup( - packages=packages, - include_package_data=True, - python_requires='>=3.7.0', -- setup_requires=setup_requires + ["setuptools_scm<7.0.0", 'pybind11>=2.6.0'], -+ setup_requires=setup_requires + ["setuptools_scm", 'pybind11>=2.6.0'], - use_scm_version=setuptools_scm_conf, - tests_require=['google-cloud-storage', 'mypy', 'pytest'], - classifiers=[ diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 6e6989d9304e4..1687bf5c516be 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "freetype"; - version = "2.13.1"; + version = "2.13.2"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-6mfjsBmxEE0WZ6onT13DB9jL1gazmbwy3zCKd/GlZL8="; + sha256 = "sha256-EpkcTlXFBt1/m3ZZM+Yv0r4uBtQhUF15UKEy5PG7SE0="; }; propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype @@ -101,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: { fonts. ''; homepage = "https://www.freetype.org/"; + changelog = "https://gitlab.freedesktop.org/freetype/freetype/-/raw/VER-${builtins.replaceStrings ["."] ["-"] finalAttrs.version}/docs/CHANGES"; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) platforms = platforms.all; pkgConfigModules = [ "freetype2" ]; diff --git a/pkgs/development/libraries/glibc/2.37-master.patch.gz b/pkgs/development/libraries/glibc/2.37-master.patch.gz deleted file mode 100644 index 04b4e264751ed..0000000000000 --- a/pkgs/development/libraries/glibc/2.37-master.patch.gz +++ /dev/null Binary files differdiff --git a/pkgs/development/libraries/glibc/2.38-master.patch.gz b/pkgs/development/libraries/glibc/2.38-master.patch.gz new file mode 100644 index 0000000000000..4eb3c7b2cdb32 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.38-master.patch.gz Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index f98c0eb1c3487..51d8a4dbe05c0 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -43,9 +43,9 @@ } @ args: let - version = "2.37"; - patchSuffix = "-8"; - sha256 = "sha256-Ilfv8RGhgV109GhW2q9AsBnB5VMVbGnUi6DL/Bu5GkM="; + version = "2.38"; + patchSuffix = "-23"; + sha256 = "sha256-+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I="; in assert withLinuxHeaders -> linuxHeaders != null; @@ -59,14 +59,14 @@ stdenv.mkDerivation ({ patches = [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. - $ git fetch --all -p && git checkout origin/release/2.36/master && git describe - glibc-2.37-8-g590d0e089b - $ git show --minimal --reverse glibc-2.37.. | gzip -9n --rsyncable - > 2.37-master.patch.gz + $ git fetch --all -p && git checkout origin/release/2.38/master && git describe + glibc-2.38-23-g0e1ef6779a + $ git show --minimal --reverse glibc-2.38.. | gzip -9n --rsyncable - > 2.38-master.patch.gz To compare the archive contents zdiff can be used. - $ zdiff -u 2.37-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.37-master.patch.gz + $ zdiff -u 2.38-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.38-master.patch.gz */ - ./2.37-master.patch.gz + ./2.38-master.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch @@ -89,10 +89,11 @@ stdenv.mkDerivation ({ ./0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch - /* Patch derived from archlinux (at the time of adding they're at 2.37), - https://github.com/archlinux/svntogit-packages/blob/packages/glibc/trunk/reenable_DT_HASH.patch + /* Patch derived from archlinux, + https://gitlab.archlinux.org/archlinux/packaging/packages/glibc/-/blob/e54d98e2d1aae4930ecad9404ef12234922d9dfd/reenable_DT_HASH.patch - See https://github.com/NixOS/nixpkgs/pull/188492#issuecomment-1233802991 for context. + See also https://github.com/ValveSoftware/Proton/issues/6051 + & https://github.com/NixOS/nixpkgs/pull/188492#issuecomment-1233802991 */ ./reenable_DT_HASH.patch ] @@ -135,6 +136,7 @@ stdenv.mkDerivation ({ "--enable-bind-now" (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include") (lib.enableFeature profilingLibraries "profile") + "--enable-fortify-source" ] ++ lib.optionals (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) [ # This feature is currently supported on # i386, x86_64 and x32 with binutils 2.29 or later, @@ -159,7 +161,7 @@ stdenv.mkDerivation ({ "libc_cv_as_needed=no" ] ++ lib.optional withGd "--with-gd" - ++ lib.optional (!withLibcrypt) "--disable-crypt"; + ++ lib.optional withLibcrypt "--enable-crypt"; makeFlags = (args.makeFlags or []) ++ [ "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" diff --git a/pkgs/development/libraries/glibc/reenable_DT_HASH.patch b/pkgs/development/libraries/glibc/reenable_DT_HASH.patch index f828b011bd9fe..87a2329d82406 100644 --- a/pkgs/development/libraries/glibc/reenable_DT_HASH.patch +++ b/pkgs/development/libraries/glibc/reenable_DT_HASH.patch @@ -1,145 +1,28 @@ -From e47de5cb2d4dbecb58f569ed241e8e95c568f03c Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Fri, 29 Apr 2022 16:37:51 +0200 -Subject: [PATCH] Do not use --hash-style=both for building glibc shared - objects +From 31915e55f9c34f6137ab1c5ac002375a2d5d4589 Mon Sep 17 00:00:00 2001 +From: Frederik Schwan <frederik.schwan@linux.com> +Date: Fri, 4 Aug 2023 15:19:57 +0200 +Subject: [PATCH] force --hash-style=both to keep compatibility with old niche + software -The comment indicates that --hash-style=both was used to maintain -compatibility with static dlopen, but we had many internal ABI -changes since then, so this compatiblity does not add value anymore. - -Reviewed-by: Carlos O'Donell <carlos@redhat.com> --- - Makeconfig | 9 +++++++++ - Makerules | 7 +++++++ - config.make.in | 1 + - configure | 28 ++++++++++++++++++++++++++++ - configure.ac | 16 ++++++++++++++++ - 5 files changed, 61 insertions(+) + Makeconfig | 4 ++++ + 1 file changed, 4 insertions(+) -diff --git b/Makeconfig a/Makeconfig -index 760f14e92f..0aa5fb0099 100644 ---- b/Makeconfig -+++ a/Makeconfig -@@ -362,6 +362,15 @@ relro-LDFLAGS = -Wl,-z,relro +diff --git a/Makeconfig b/Makeconfig +index 77d7fd14df..2ae67c4beb 100644 +--- a/Makeconfig ++++ b/Makeconfig +@@ -378,6 +378,10 @@ relro-LDFLAGS = -Wl,-z,relro LDFLAGS.so += $(relro-LDFLAGS) LDFLAGS-rtld += $(relro-LDFLAGS) -+ifeq (yes,$(have-hash-style)) -+# For the time being we unconditionally use 'both'. At some time we -+# should declare statically linked code as 'out of luck' and compile -+# with --hash-style=gnu only. +hashstyle-LDFLAGS = -Wl,--hash-style=both +LDFLAGS.so += $(hashstyle-LDFLAGS) +LDFLAGS-rtld += $(hashstyle-LDFLAGS) -+endif -+ - ifeq (no,$(build-pie-default)) - pie-default = $(no-pie-ccflag) - else # build-pie-default -diff --git b/Makerules a/Makerules -index 354528b8c7..428464f092 100644 ---- b/Makerules -+++ a/Makerules -@@ -557,6 +557,13 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules - -Wl,--verbose 2>/dev/null | \ - sed > $@T \ - -e '/^=========/,/^=========/!d;/^=========/d' \ -+ $(if $(filter yes,$(have-hash-style)), \ -+ -e 's/^.*\.gnu\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ -+ -e '/^[ ]*\.hash[ ]*:.*$$/{h;d;}' \ -+ -e '/DATA_SEGMENT_ALIGN/{H;g}' \ -+ , \ -+ -e 's/^.*\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ -+ ) \ - -e 's/^.*\*(\.dynbss).*$$/& \ - PROVIDE(__start___libc_freeres_ptrs = .); \ - *(__libc_freeres_ptrs) \ -diff --git b/config.make.in a/config.make.in -index fff4c78dd0..bf728c71c0 100644 ---- b/config.make.in -+++ a/config.make.in -@@ -70,6 +70,7 @@ have-libcap = @have_libcap@ - have-cc-with-libunwind = @libc_cv_cc_with_libunwind@ - fno-unit-at-a-time = @fno_unit_at_a_time@ - bind-now = @bindnow@ -+have-hash-style = @libc_cv_hashstyle@ - use-default-link = @use_default_link@ - have-cxx-thread_local = @libc_cv_cxx_thread_local@ - have-loop-to-function = @libc_cv_cc_loop_to_function@ -diff --git b/configure a/configure -index 716dc041b6..5a730dc5fc 100755 ---- b/configure -+++ a/configure -@@ -622,6 +622,7 @@ libc_cv_cc_nofma - libc_cv_mtls_dialect_gnu2 - fno_unit_at_a_time - libc_cv_has_glob_dat -+libc_cv_hashstyle - libc_cv_fpie - libc_cv_z_execstack - ASFLAGS_config -@@ -6193,6 +6194,33 @@ $as_echo "$libc_cv_fpie" >&6; } - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --hash-style option" >&5 -+$as_echo_n "checking for --hash-style option... " >&6; } -+if ${libc_cv_hashstyle+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat > conftest.c <<EOF -+int _start (void) { return 42; } -+EOF -+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS $no_ssp -+ -fPIC -shared -o conftest.so conftest.c -+ -Wl,--hash-style=both -nostdlib 1>&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; } -+then -+ libc_cv_hashstyle=yes -+else -+ libc_cv_hashstyle=no -+fi -+rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_hashstyle" >&5 -+$as_echo "$libc_cv_hashstyle" >&6; } -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLOB_DAT reloc" >&5 - $as_echo_n "checking for GLOB_DAT reloc... " >&6; } - if ${libc_cv_has_glob_dat+:} false; then : -diff --git b/configure.ac a/configure.ac -index d08ad4d64e..a045f6608e 100644 ---- b/configure.ac -+++ a/configure.ac -@@ -1360,6 +1360,22 @@ LIBC_TRY_CC_OPTION([-fpie], [libc_cv_fpie=yes], [libc_cv_fpie=no]) - - AC_SUBST(libc_cv_fpie) - -+AC_CACHE_CHECK(for --hash-style option, -+ libc_cv_hashstyle, [dnl -+cat > conftest.c <<EOF -+int _start (void) { return 42; } -+EOF -+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS $no_ssp -+ -fPIC -shared -o conftest.so conftest.c -+ -Wl,--hash-style=both -nostdlib 1>&AS_MESSAGE_LOG_FD]) -+then -+ libc_cv_hashstyle=yes -+else -+ libc_cv_hashstyle=no -+fi -+rm -f conftest*]) -+AC_SUBST(libc_cv_hashstyle) + - AC_CACHE_CHECK(for GLOB_DAT reloc, - libc_cv_has_glob_dat, [dnl - cat > conftest.c <<EOF + # Linker options to enable and disable DT_RELR. + ifeq ($(have-dt-relr),yes) + dt-relr-ldflag = -Wl,-z,pack-relative-relocs -- -2.37.1 +2.41.0 diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 276f2d192ef7d..72c8b76e59f52 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -109,13 +109,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.22.5"; + version = "1.22.6"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-5k51za/X/y/H/DToVbBrHj7SJ8wG+jeNF7vNdngMM4w="; + hash = "sha256-tAKc0pCKCJxV8dkCpWXQB0lclbFELYOEhdxH+xLfcTc="; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 449873bc7c58b..d9b624a59943e 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.22.5"; + version = "1.22.6"; outputs = [ "out" "dev" ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-7dQzi0XCapryjA01qrlkoCTDiEum9SDYQo3wQhLIyTo="; + hash = "sha256-UPK00XwC7v5DC776jFzRNLG+eKU8D2DpURNtls9J/Us="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index ed7396f291cc2..96899b63e5b39 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.22.5"; + version = "1.22.6"; outputs = [ "bin" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-RAjXkw84GAnoWReswZcS8XMmG6hb3yDFVnsqIbEZO2E="; + hash = "sha256-9QDmz93/VZCPk3cR/CaghA3iih6exJYhwLbxrb2PgY4="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 5b1396f35d51a..917a5041eeee4 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.22.5"; + version = "1.22.6"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-Kt0VGapu6wHVRMuUKTaI7jvCB59rymB1v1wj0AoJIb4="; + hash = "sha256-iShWDvrxYTfDAoXnGHCOXQurB3frTvgSfgJ04SDT2Gs="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index a8bbb63205554..93ddc619a5731 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.22.5"; + version = "1.22.6"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-vM3TvWHYaCmxbODiBtthsz95SsF5JCP558xl110aMbU="; + hash = "sha256-dI1CNnLFl/h24TCAT7mEhI9bS4nv14pQbLF/dkZ5UwE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index f967e2e0ce1b2..9599da0fdf529 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -52,26 +52,15 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.22.5"; + version = "1.22.6"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-tnsxMTpUxpKbgpadQdPP3y9Y21c/tfSR5rul2ErqB3g="; + hash = "sha256-s7B/4/HOf+k6qb5yF4ZgRFSPNcSneSKA7sfhCKMvmBc="; }; - # TODO: Patch is conditional to spare rebuilds during the current staging-next cycle and should be removed during the next bump - patches = lib.optionals qt5Support [ - # Needed until https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5083 is merged and released - (fetchpatch { - name = "gst-plugins-good-fix-qt5-without-viv-fb.patch"; - url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/03d8ef0b7c6e70eb936de0514831c1aafc763dcf.diff"; - hash = "sha256-17XU/W/TMPg5669O1EBXByAN/VwFu/0idTg5ze3M/D4="; - stripLen = 2; - }) - ]; - strictDeps = true; depsBuildBuild = [ pkg-config ]; @@ -90,6 +79,7 @@ stdenv.mkDerivation rec { hotdoc ] ++ lib.optionals qt5Support (with qt5; [ qtbase + qttools ]) ++ lib.optionals qt6Support (with qt6; [ qtbase qttools diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 2309e8717e2b2..7dbd9b61cbc3b 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.22.5"; + version = "1.22.6"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-hYPwwfT8sB7tEfoePCESZUOovXOe1Pwdsx91alqwHZo="; + hash = "sha256-d4nmQIOIol8jy/lIz8XGIw1zW7zYt/N/SgHJ40ih46c="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 885726ee2ac73..aa211eb51a50d 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.22.5"; + version = "1.22.6"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-80PrVJZOvU2MBxvl7srVhvKP6wFW4DbgaxSNDn/rscA="; + hash = "sha256-CuM6i1BEO2LxFYGpGB6Qa0HNOHey15nb6nKRLD7aS7M="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 2392d7f341d73..cf5f93707cca8 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.22.5"; + version = "1.22.6"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-JoBHOyGBWPGEZ8rD4cUCkbf/TgcQ3TUKWeqsvCnAmlQ="; + hash = "sha256-PjFFTJjLL39tLTVezrkzqJL6Dx3Am8NsmryTDY4pykg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index c5d400048dfc0..d2227763f4e85 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.22.5"; + version = "1.22.6"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-qaVQJnyVhN8OjHBDTTBHbo/QAYtzPBwe4z3q9CK9sks="; + hash = "sha256-2bovwmvvmMeOmCxZn1hdRru2X+Ei2onC16tB9GilLHs="; }; outputs = [ diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 539cfc37051ba..b2afb21b6214e 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/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/pkgs/development/libraries/gtk/patches/2.0-clang.patch b/pkgs/development/libraries/gtk/patches/2.0-clang.patch new file mode 100644 index 0000000000000..1e2e73b9833d7 --- /dev/null +++ b/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/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 18c492dc93b83..b4625abcd692a 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { ; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds"; + env.NIX_LDFLAGS = lib.optionalString (stdenv.cc.libcxx != null) "-l${stdenv.cc.libcxx.cxxabi.libName}"; doCheck = true; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index aefbaa6d41df6..08d0ffae8f9da 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "${type}krb5"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz"; - sha256 = "sha256-cErtSbGetacXizSyhzYg7CmdsIdS1qhXT5XUGHmriFE="; + sha256 = "sha256-fY1ofUKu01DCUly2mk/DqnkWlNpnYdzMHELC7neWtd0="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 95547fb6382a3..de1af1f447e81 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "2.7.2"; + version = "2.8.0"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - hash = "sha256-Ju5y1keFTmYtmWQ+srLTQWVavzH0mQg41mUPtc+SCcg="; + hash = "sha256-NY3KEPzScgeshXoNf0NaRtvGzR98ENu4QMGTG/GWXwg="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index de305474a3abc..d58ba0bc5c5c1 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -23,36 +23,31 @@ , cmake , nix , samba -, buildPackages }: -let - autoreconfHook = buildPackages.autoreconfHook269; -in assert xarSupport -> libxml2 != null; stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.6.2"; + version = "3.7.2"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${finalAttrs.version}"; - hash = "sha256-wQbA6vlXH8pnpY7LJLkjrRFEBpcaPR1SqxnK71UVwxg="; + hash = "sha256-p2JgJ/rvqaQ6yyXSh+ehScUH565ud5bQncl+lOnsWfc="; }; - outputs = [ "out" "lib" "dev" ]; - patches = [ - # fixes static linking; upstream in releases after 3.6.2 - # https://github.com/libarchive/libarchive/pull/1825 merged upstream - (assert finalAttrs.version == "3.6.2"; fetchpatch { - name = "001-only-add-iconv-to-pc-file-if-needed.patch"; - url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch"; - hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY="; + # Pull fix for test failure on 32-bit systems: + (fetchpatch { + name = "32-bit-tests-fix.patch"; + url = "https://github.com/libarchive/libarchive/commit/3bd918d92f8c34ba12de9c6604d96f9e262a59fc.patch"; + hash = "sha256-RM3xFM6S2DkM5DJ0kAba8eLzEXuY5/7AaU06maHJ6rM="; }) ]; + outputs = [ "out" "lib" "dev" ]; + postPatch = let skipTestPaths = [ # test won't work in nix sandbox diff --git a/pkgs/development/libraries/libcdada/default.nix b/pkgs/development/libraries/libcdada/default.nix index 6fb8caa4746a2..e78d845cf5be9 100644 --- a/pkgs/development/libraries/libcdada/default.nix +++ b/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/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index ab8f187bf9eea..065d412c91e14 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/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/pkgs/development/libraries/libdovi/default.nix b/pkgs/development/libraries/libdovi/default.nix index e8b4bbc88bf3c..cf1a9a561f375 100644 --- a/pkgs/development/libraries/libdovi/default.nix +++ b/pkgs/development/libraries/libdovi/default.nix @@ -28,19 +28,19 @@ rustPlatform.buildRustPackage rec { buildPhase = '' runHook preBuild - cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} runHook postBuild ''; installPhase = '' runHook preInstall - cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} runHook postInstall ''; checkPhase = '' runHook preCheck - cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} runHook postCheck ''; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 7b7721197f829..31b284861d1b9 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.115"; + version = "2.4.116"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VUz7/gVCvds5G04+Bb+7/D4oK5Vb1WIY0hwGFkgfZes="; + sha256 = "sha256-RsU/QHNeo9JtYUKX8VX2ExpRBiSiQnT2VPZGnKkFM5o="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix index 55191fff89991..49c2ab1bdfa72 100644 --- a/pkgs/development/libraries/libdv/default.nix +++ b/pkgs/development/libraries/libdv/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3"; }; - # This fixes an undefined symbol: _sched_setscheduler error on compile. - # See the apple docs: http://cl.ly/2HeF bottom of the "Finding Imported Symbols" section - LDFLAGS = lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup"; + # Disable priority scheduling on Darwin because it doesn’t support sched_setscheduler. + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace encodedv/dvconnect.c \ + --replace '#ifdef _SC_PRIORITY_SCHEDULING' '#if 0' + ''; configureFlags = [ "--disable-asm" diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 9041b373edffb..5792170b9f094 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage rec { postBuild = '' pushd imagequant-sys - cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} popd ''; postInstall = '' pushd imagequant-sys - cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} popd ''; diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix index 58a701bc15cc1..9f530271771ac 100644 --- a/pkgs/development/libraries/libredwg/default.nix +++ b/pkgs/development/libraries/libredwg/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { in '' # avoid git dependency cp ${printVersion} build-aux/git-version-gen + # failing to build otherwise since glibc-2.38 + sed '1i#include <string.h>' -i programs/dwg2SVG.c ''; preConfigure = lib.optionalString (stdenv.isDarwin && enablePython) '' diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 2d1755945bf31..ba4d1b0cd8a61 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { # HSTS tests fail. doCheck = false; + separateDebugInfo = true; postPatch = '' patchShebangs libsoup/ diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 5f6e200b183a4..6d5b0183cddae 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-lpthread"; doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) + separateDebugInfo = true; postPatch = '' # fixes finding vapigen when cross-compiling diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index b7bef29735232..997e89b82397c 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -1,23 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libspf2"; - version = "2.2.12"; + version = "2.2.13"; src = fetchFromGitHub { owner = "helsinki-systems"; repo = "libspf2"; rev = "v${version}"; - sha256 = "03iiaafdcwh220pqignk407h6klrakwz0zkb8iwk6nkwipkwvhsx"; + hash = "sha256-tkCHP3B1sBb0+scHBjX5lCvaeSrZryfaGKye02LFlYs="; }; - patches = [ - # glibc-2.34 compat - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/dbb8a5c9f749cc11e61cfe558f164b165cbc30cb/mail-filter/libspf2/files/libspf2-1.2.11-undefined-dn_.patch"; - sha256 = "sha256-6JVVkVGCcFJsNeBdVTPcLhW4KoHLY4ai/KXDMliXgPA="; - }) - ]; + nativeBuildInputs = [ autoreconfHook ]; + strictDeps = true; postPatch = '' # disable static bins compilation @@ -28,9 +23,6 @@ stdenv.mkDerivation rec { -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am ''; - # autoreconf necessary because we modified automake files - nativeBuildInputs = [ autoreconfHook ]; - doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index 1feafabfd4df9..c1e0881bf3ff2 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libunarr"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "https://github.com/selmf/unarr/releases/download/v${version}/unarr-${version}.tar.xz"; - hash = "sha256-5wCnhjoj+GTmaeDTCrUnm1Wt9SsWAbQcPSYM//FNeOA="; + hash = "sha256-Mo76BOqZbdOJFrEkeozxdqwpuFyvkhdONNMZmN5BdNI="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 3df8cce6f4b47..eb5b320b317b9 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, yasm +{ lib, stdenv, fetchFromGitHub, perl, yasm , vp8DecoderSupport ? true # VP8 decoder , vp8EncoderSupport ? true # VP8 encoder , vp9DecoderSupport ? true # VP9 decoder @@ -75,27 +75,15 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { pname = "libvpx"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IH+ZWbBUlU5fbciYe+dNGnTFFCte2BXxAlLcvmzdAeY="; + hash = "sha256-KTbzZ5/qCH+bCvatYZhFiWcT+L2duD40E2w/BUaRorQ="; }; - patches = [ - (fetchpatch { - # https://www.openwall.com/lists/oss-security/2023/09/28/5 - name = "CVE-2023-5217.patch"; - url = "https://github.com/webmproject/libvpx/commit/3fbd1dca6a4d2dad332a2110d646e4ffef36d590.patch"; - hash = "sha256-1hHUd/dNGm8dmdYYN60j1aOgC2pdIIq7vqJZ7mTXfps="; - includes = [ - "vp8/encoder/onyx_if.c" - ]; - }) - ]; - postPatch = '' patchShebangs --build \ build/make/*.sh \ diff --git a/pkgs/development/libraries/lzlib/default.nix b/pkgs/development/libraries/lzlib/default.nix index 4e28fc3a5b0d2..b8c86221b489d 100644 --- a/pkgs/development/libraries/lzlib/default.nix +++ b/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/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index b7bec7e8930c4..ea0059e34b612 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -86,8 +86,8 @@ */ let - version = "23.1.7"; - hash = "sha256-QJZB6t8O0cd5R5em9aCwGVtVgLKCFm5exWKca82mrNM="; + version = "23.1.9"; + hash = "sha256-KVuifCgUbtCSFOjOea+hZZ7fnRQt7MPJH4BFUtZPdRA="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index e26fe4fa00346..b208607f7b1b6 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -32,11 +32,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.54.0"; + version = "1.57.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-nZ0esJm0kvr6Gtn31pZZU3WP3vmtDPZaTQvcI3OAPa0="; + sha256 = "sha256-xjdnfLrESU6q+LDgOGFzFGhFgw76/+To3JL7O0KOWtI="; }; outputs = [ "out" "dev" "lib" "doc" "man" ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2be34feeaa8ff..2b0d778ef3d72 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -255,8 +255,8 @@ in { }; openssl_3 = common { - version = "3.0.10"; - sha256 = "sha256-F2HU9bE6ECi5tvPUuOF/6wztyTcPav5h1xk9LNzoMyM="; + version = "3.0.11"; + sha256 = "sha256-s0JdO7SiIY0Gl+tB9/wM3t4BbtGcpJ0Wi3jo2UeIf1U="; patches = [ ./3.0/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 1abc8a2633c69..53bfa41a8e253 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.30"; + version = "1.0.31"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-lF8Pauyi+zSNVnpHqq86J3SGUTM6AhFmnT48eyFoYco="; + sha256 = "sha256-qK8l/v6nLuMAitz7DfVDjJyVjEmkeD2jgJkG5qOMCcQ="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/paho-mqtt-c/default.nix b/pkgs/development/libraries/paho-mqtt-c/default.nix index 836f9fe625dfb..1494327882218 100644 --- a/pkgs/development/libraries/paho-mqtt-c/default.nix +++ b/pkgs/development/libraries/paho-mqtt-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "paho.mqtt.c"; - version = "1.3.12"; + version = "1.3.13"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.c"; rev = "v${version}"; - hash = "sha256-LxyMbMA6Antt8Uu4jCvmvYT9+Vm4ZUVz4XXFdd0O7Kk="; + hash = "sha256-dKQnepQAryAjImh2rX1jdgiKBtJQy9wzk/7rGQjUtPg="; }; postPatch = '' diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix deleted file mode 100644 index c45a8e03fd167..0000000000000 --- a/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/pkgs/development/libraries/pdf2xml/pdf2xml.patch b/pkgs/development/libraries/pdf2xml/pdf2xml.patch deleted file mode 100644 index 596a3aea67497..0000000000000 --- a/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/pkgs/development/libraries/piper-phonemize/default.nix b/pkgs/development/libraries/piper-phonemize/default.nix index fd1c1ae34b4c5..af05a28b5b1c3 100644 --- a/pkgs/development/libraries/piper-phonemize/default.nix +++ b/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/pkgs/development/libraries/qt-5/modules/qt3d.nix b/pkgs/development/libraries/qt-5/modules/qt3d.nix index 98d11864e452c..f394ff6627e0c 100644 --- a/pkgs/development/libraries/qt-5/modules/qt3d.nix +++ b/pkgs/development/libraries/qt-5/modules/qt3d.nix @@ -2,7 +2,7 @@ qtModule { pname = "qt3d"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; diff --git a/pkgs/development/libraries/qt-5/modules/qtcharts.nix b/pkgs/development/libraries/qt-5/modules/qtcharts.nix index f5d034bcc3272..75766649a4048 100644 --- a/pkgs/development/libraries/qt-5/modules/qtcharts.nix +++ b/pkgs/development/libraries/qt-5/modules/qtcharts.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtcharts"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix index 9725b7babe079..81efb4bee04b5 100644 --- a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix @@ -2,8 +2,12 @@ qtModule { pname = "qtconnectivity"; - qtInputs = [ qtbase qtdeclarative ]; buildInputs = lib.optional stdenv.isLinux bluez; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ IOBluetooth ]; + propagatedBuildInputs = [ + qtbase + qtdeclarative + ] ++ lib.optionals stdenv.isDarwin [ + IOBluetooth + ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix b/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix index 80a98f24be149..d79320ea139fe 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtdatavis3d"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index f19074e08a0cb..892498da43b29 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtdeclarative"; - qtInputs = [ qtbase qtsvg ]; + propagatedBuildInputs = [ qtbase qtsvg ]; nativeBuildInputs = [ python3 ]; outputs = [ "out" "dev" "bin" ]; preConfigure = '' diff --git a/pkgs/development/libraries/qt-5/modules/qtdoc.nix b/pkgs/development/libraries/qt-5/modules/qtdoc.nix index 4ef4915000e56..93620e42667e0 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdoc.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdoc.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtdoc"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; outputs = [ "out" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix index 147fb0745dbdc..3985726731710 100644 --- a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix +++ b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtgamepad"; - qtInputs = [ qtbase qtdeclarative ] + propagatedBuildInputs = [ qtbase qtdeclarative ] ++ lib.optional stdenv.isDarwin GameController; buildInputs = [ ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix index c90280090b8e1..2fe865492e369 100644 --- a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix +++ b/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtgraphicaleffects"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix index 402f2ce066297..f099fc6799b50 100644 --- a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix +++ b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix @@ -8,6 +8,5 @@ qtModule { pname = "qtimageformats"; - qtInputs = [ qtbase ]; - propagatedBuildInputs = [ libwebp jasper libmng libtiff ]; + propagatedBuildInputs = [ qtbase libwebp jasper libmng libtiff ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix index b5fdc918dc69a..a9897648d8e6f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtlocation"; - qtInputs = [ qtbase qtmultimedia ]; + propagatedBuildInputs = [ qtbase qtmultimedia ]; outputs = [ "bin" "out" "dev" ]; qmakeFlags = lib.optionals stdenv.isDarwin [ # boost uses std::auto_ptr which has been disabled in clang with libcxx diff --git a/pkgs/development/libraries/qt-5/modules/qtlottie.nix b/pkgs/development/libraries/qt-5/modules/qtlottie.nix index d94c289953d0b..4231fcb26b1c9 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlottie.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlottie.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtlottie"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix index 30e363cff59a7..da0f5f760bf71 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtmacextras"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; meta = with lib; { maintainers = with maintainers; [ periklis ]; platforms = platforms.darwin; diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index 704cb7881c710..d5dc16c528233 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -13,7 +13,7 @@ qtModule { pname = "qtmultimedia"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gstreamer gst-plugins-base ] # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio diff --git a/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix index 148ed890fc9ed..bec5f354a23a7 100644 --- a/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix +++ b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtnetworkauth"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtpim.nix b/pkgs/development/libraries/qt-5/modules/qtpim.nix index 702655c6e7fdc..01692d9f2ec3f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtpim.nix +++ b/pkgs/development/libraries/qt-5/modules/qtpim.nix @@ -12,7 +12,7 @@ qtModule { "dev" ]; - qtInputs = [ + propagatedBuildInputs = [ qtbase qtdeclarative ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtpositioning.nix b/pkgs/development/libraries/qt-5/modules/qtpositioning.nix index 99b06bbf2536b..20f059976323c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtpositioning.nix +++ b/pkgs/development/libraries/qt-5/modules/qtpositioning.nix @@ -8,7 +8,7 @@ qtModule { pname = "qtpositioning"; - qtInputs = [ qtbase qtdeclarative qtserialport ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtserialport ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix index 6c85a91fb78c0..3b78a2a6c87ed 100644 --- a/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix +++ b/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtquickcontrols"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix index a50ad9e2a3040..59070629ddc75 100644 --- a/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix +++ b/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtquickcontrols2"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix b/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix index a71f9e8e352d6..fde78848c854f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix +++ b/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtremoteobjects"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; # cycle is detected in build when adding "dev" "bin" too outputs = [ "out" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtscript.nix b/pkgs/development/libraries/qt-5/modules/qtscript.nix index e7ce86b74a68b..07993b72a6d3a 100644 --- a/pkgs/development/libraries/qt-5/modules/qtscript.nix +++ b/pkgs/development/libraries/qt-5/modules/qtscript.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtscript"; - qtInputs = [ qtbase qttools ]; + propagatedBuildInputs = [ qtbase qttools ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtscxml.nix b/pkgs/development/libraries/qt-5/modules/qtscxml.nix index cf9af0bc75435..3314934db2ff6 100644 --- a/pkgs/development/libraries/qt-5/modules/qtscxml.nix +++ b/pkgs/development/libraries/qt-5/modules/qtscxml.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtscxml"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtsensors.nix b/pkgs/development/libraries/qt-5/modules/qtsensors.nix index 3fbd032b968f4..fdea92035b90f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtsensors.nix +++ b/pkgs/development/libraries/qt-5/modules/qtsensors.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtsensors"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtserialbus.nix b/pkgs/development/libraries/qt-5/modules/qtserialbus.nix index 4fd6d7cb83c38..3a7285d0a8b03 100644 --- a/pkgs/development/libraries/qt-5/modules/qtserialbus.nix +++ b/pkgs/development/libraries/qt-5/modules/qtserialbus.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtserialbus"; - qtInputs = [ qtbase qtserialport ]; + propagatedBuildInputs = [ qtbase qtserialport ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/pkgs/development/libraries/qt-5/modules/qtserialport.nix index 93f3e130ee74b..7907f91b986b2 100644 --- a/pkgs/development/libraries/qt-5/modules/qtserialport.nix +++ b/pkgs/development/libraries/qt-5/modules/qtserialport.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtserialport"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\""; } diff --git a/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/pkgs/development/libraries/qt-5/modules/qtspeech.nix index 371162324c0b9..94e66cf400447 100644 --- a/pkgs/development/libraries/qt-5/modules/qtspeech.nix +++ b/pkgs/development/libraries/qt-5/modules/qtspeech.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtspeech"; - qtInputs = [ ]; + propagatedBuildInputs = [ ]; buildInputs = lib.optionals stdenv.isLinux [ speechd ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtsvg.nix b/pkgs/development/libraries/qt-5/modules/qtsvg.nix index 59c7cf67448c0..418c69fb2ebf6 100644 --- a/pkgs/development/libraries/qt-5/modules/qtsvg.nix +++ b/pkgs/development/libraries/qt-5/modules/qtsvg.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtsvg"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtsystems.nix b/pkgs/development/libraries/qt-5/modules/qtsystems.nix index 32974bdecc67f..921172c2856b1 100644 --- a/pkgs/development/libraries/qt-5/modules/qtsystems.nix +++ b/pkgs/development/libraries/qt-5/modules/qtsystems.nix @@ -20,7 +20,7 @@ qtModule { "bin" ]; - qtInputs = [ + propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/qt-5/modules/qttools.nix b/pkgs/development/libraries/qt-5/modules/qttools.nix index bac70d146bf91..37e4348ed2c23 100644 --- a/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -2,7 +2,7 @@ qtModule { pname = "qttools"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # fixQtBuiltinPaths overwrites a builtin path we should keep diff --git a/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix b/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix index 77f1948dbf43e..0bfc242d15b82 100644 --- a/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix +++ b/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtvirtualkeyboard"; - qtInputs = [ qtbase qtdeclarative qtsvg hunspell ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg hunspell ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index 0faabf3752a25..347a5cf643428 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtwayland"; - qtInputs = [ qtbase qtquickcontrols ]; + propagatedBuildInputs = [ qtbase qtquickcontrols ]; buildInputs = [ wayland ]; nativeBuildInputs = [ pkg-config wayland-scanner ]; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix b/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix index f49e9e234901c..118a5d4f96f69 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix @@ -2,7 +2,6 @@ qtModule { pname = "qtwebchannel"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } - diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 1794e3f8ca678..777430af0217f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -31,7 +31,6 @@ qtModule { pname = "qtwebengine"; - qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ bison flex git gperf ninja pkg-config python which gn nodejs ] ++ lib.optional stdenv.isDarwin xcbuild; @@ -58,6 +57,12 @@ qtModule { # TODO: be more precise patchShebangs . + + # Fix compatibility with python3.11 + substituteInPlace tools/metrics/ukm/ukm_model.py \ + --replace "r'^(?i)(|true|false)$'" "r'(?i)^(|true|false)$'" + substituteInPlace tools/grit/grit/util.py \ + --replace "mode = 'rU'" "mode = 'r'" ) '' # Prevent Chromium build script from making the path to `clang` relative to @@ -127,6 +132,8 @@ qtModule { ++ lib.optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ + qtdeclarative qtquickcontrols qtlocation qtwebchannel + # Image formats libjpeg libpng libtiff libwebp diff --git a/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix b/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix index d8fd7a692370c..b2d93300a664e 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtwebglplugin"; - qtInputs = [ qtbase qtwebsockets ]; + propagatedBuildInputs = [ qtbase qtwebsockets ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index fc1766488ecc8..9c5d347d110b0 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -22,7 +22,7 @@ let in qtModule { pname = "qtwebkit"; - qtInputs = [ qtbase qtdeclarative qtlocation qtsensors qtwebchannel ] + propagatedBuildInputs = [ qtbase qtdeclarative qtlocation qtsensors qtwebchannel ] ++ lib.optional stdenv.isDarwin qtmultimedia; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ] ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix b/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix index 540fcade73c9d..a355662aed6c4 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtwebsockets"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/pkgs/development/libraries/qt-5/modules/qtwebview.nix index dccc3d6f81ea5..fd8755390973d 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebview.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebview.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtwebview"; - qtInputs = [ qtdeclarative qtwebengine ]; + propagatedBuildInputs = [ qtdeclarative qtwebengine ]; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation WebKit diff --git a/pkgs/development/libraries/qt-5/modules/qtx11extras.nix b/pkgs/development/libraries/qt-5/modules/qtx11extras.nix index ad743523bb003..8d5aa2fd235f4 100644 --- a/pkgs/development/libraries/qt-5/modules/qtx11extras.nix +++ b/pkgs/development/libraries/qt-5/modules/qtx11extras.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtx11extras"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix index c602b1e39d2db..ae4ea52dcd8ab 100644 --- a/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix +++ b/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtxmlpatterns"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ]; } diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index bddbf254c5f7f..7322ed51e83e6 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -17,7 +17,9 @@ mkDerivation (args // { patches = (args.patches or []) ++ (patches.${pname} or []); nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; - propagatedBuildInputs = (args.qtInputs or []) ++ (args.propagatedBuildInputs or []); + propagatedBuildInputs = + (lib.warnIf (args ? qtInputs) "qt5.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++ + (args.propagatedBuildInputs or []); outputs = args.outputs or [ "out" "dev" ]; setOutputFlags = args.setOutputFlags or false; diff --git a/pkgs/development/libraries/qt-6/modules/qt3d.nix b/pkgs/development/libraries/qt-6/modules/qt3d.nix index 2f3a45f67d85d..f1df7f6fc254f 100644 --- a/pkgs/development/libraries/qt-6/modules/qt3d.nix +++ b/pkgs/development/libraries/qt-6/modules/qt3d.nix @@ -7,6 +7,5 @@ qtModule { pname = "qt3d"; - qtInputs = [ qtbase qtdeclarative qtmultimedia ]; - propagatedBuildInputs = [ assimp ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtmultimedia assimp ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qt5compat.nix b/pkgs/development/libraries/qt-6/modules/qt5compat.nix index f3a62b7b5ec98..d2049d7fc3e5b 100644 --- a/pkgs/development/libraries/qt-6/modules/qt5compat.nix +++ b/pkgs/development/libraries/qt-6/modules/qt5compat.nix @@ -8,6 +8,6 @@ qtModule { pname = "qt5compat"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ libiconv icu openssl ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtcharts.nix b/pkgs/development/libraries/qt-6/modules/qtcharts.nix index 917697c386233..e9b6c8d6b33fa 100644 --- a/pkgs/development/libraries/qt-6/modules/qtcharts.nix +++ b/pkgs/development/libraries/qt-6/modules/qtcharts.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtcharts"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix index 976fd626f5d1b..46d8f925beb0a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix @@ -11,8 +11,13 @@ qtModule { pname = "qtconnectivity"; - qtInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ bluez ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ IOBluetooth PCSC ]; + propagatedBuildInputs = [ + qtbase + qtdeclarative + ] ++ lib.optionals stdenv.isDarwin [ + IOBluetooth + PCSC + ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix b/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix index 1d0f9711e588d..e6c12508c9d0f 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtdatavis3d"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index d78a886109af5..afdb24d1d291a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -8,8 +8,7 @@ qtModule { pname = "qtdeclarative"; - qtInputs = [ qtbase qtlanguageserver qtshadertools ]; - propagatedBuildInputs = [ openssl python3 ]; + propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl python3 ]; patches = [ # prevent headaches from stale qmlcache data ../patches/qtdeclarative-default-disable-qmlcache.patch diff --git a/pkgs/development/libraries/qt-6/modules/qtdoc.nix b/pkgs/development/libraries/qt-6/modules/qtdoc.nix index 3bbe39e5ee201..555108caa01a5 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdoc.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdoc.nix @@ -14,7 +14,7 @@ qtModule { done ''; nativeBuildInputs = [ (qttools.override { withClang = true; }) ]; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; cmakeFlags = [ "-DCMAKE_MESSAGE_LOG_LEVEL=STATUS" ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtgraphs.nix b/pkgs/development/libraries/qt-6/modules/qtgraphs.nix index a56404f34b8c8..5cafb8d8d7fde 100644 --- a/pkgs/development/libraries/qt-6/modules/qtgraphs.nix +++ b/pkgs/development/libraries/qt-6/modules/qtgraphs.nix @@ -7,7 +7,7 @@ qtModule { pname = "qtgraphs"; - qtInputs = [ + propagatedBuildInputs = [ qtbase qtdeclarative qtquick3d diff --git a/pkgs/development/libraries/qt-6/modules/qtgrpc.nix b/pkgs/development/libraries/qt-6/modules/qtgrpc.nix index f2623dd3d566d..09ff7ee89196c 100644 --- a/pkgs/development/libraries/qt-6/modules/qtgrpc.nix +++ b/pkgs/development/libraries/qt-6/modules/qtgrpc.nix @@ -7,6 +7,6 @@ qtModule { pname = "qtgrpc"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ protobuf grpc ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qthttpserver.nix b/pkgs/development/libraries/qt-6/modules/qthttpserver.nix index cd2c9d2a803cb..cf32c8a7ea76a 100644 --- a/pkgs/development/libraries/qt-6/modules/qthttpserver.nix +++ b/pkgs/development/libraries/qt-6/modules/qthttpserver.nix @@ -5,5 +5,5 @@ qtModule { pname = "qthttpserver"; - qtInputs = [ qtbase qtwebsockets ]; + propagatedBuildInputs = [ qtbase qtwebsockets ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtimageformats.nix b/pkgs/development/libraries/qt-6/modules/qtimageformats.nix index b28adbc7295b9..50420aaa7e451 100644 --- a/pkgs/development/libraries/qt-6/modules/qtimageformats.nix +++ b/pkgs/development/libraries/qt-6/modules/qtimageformats.nix @@ -8,6 +8,6 @@ qtModule { pname = "qtimageformats"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; buildInputs = [ libwebp jasper libmng libtiff ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix b/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix index 07115d6755a56..b45ab11fc3ffb 100644 --- a/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix +++ b/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix @@ -4,7 +4,7 @@ qtModule { pname = "qtlanguageserver"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; # Doesn't have version set dontCheckQtModuleVersion = true; diff --git a/pkgs/development/libraries/qt-6/modules/qtlocation.nix b/pkgs/development/libraries/qt-6/modules/qtlocation.nix index 751a2e0915a36..12fa89b9aaead 100644 --- a/pkgs/development/libraries/qt-6/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-6/modules/qtlocation.nix @@ -6,5 +6,5 @@ qtModule { pname = "qtlocation"; - qtInputs = [ qtbase qtdeclarative qtpositioning ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtpositioning ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtlottie.nix b/pkgs/development/libraries/qt-6/modules/qtlottie.nix index d94c289953d0b..4231fcb26b1c9 100644 --- a/pkgs/development/libraries/qt-6/modules/qtlottie.nix +++ b/pkgs/development/libraries/qt-6/modules/qtlottie.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtlottie"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index 37a27b026b22a..5608a9a9156c4 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -12,5 +12,5 @@ qtModule rec { rev = "v${version}"; hash = "sha256-rFi1w0Z4jLvHvhu0/VOIT0MWmKjy51jSK5M56qLs0gI="; }; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index cb012ee8bef7b..538687dce58a0 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -22,12 +22,11 @@ qtModule { pname = "qtmultimedia"; - qtInputs = [ qtbase qtdeclarative qtsvg qtshadertools ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libunwind orc ] ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland ]; - propagatedBuildInputs = - lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools ] + ++ lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin diff --git a/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix b/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix index 148ed890fc9ed..bec5f354a23a7 100644 --- a/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix +++ b/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtnetworkauth"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtpositioning.nix b/pkgs/development/libraries/qt-6/modules/qtpositioning.nix index 99b06bbf2536b..20f059976323c 100644 --- a/pkgs/development/libraries/qt-6/modules/qtpositioning.nix +++ b/pkgs/development/libraries/qt-6/modules/qtpositioning.nix @@ -8,7 +8,7 @@ qtModule { pname = "qtpositioning"; - qtInputs = [ qtbase qtdeclarative qtserialport ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtserialport ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtquick3d.nix b/pkgs/development/libraries/qt-6/modules/qtquick3d.nix index d19a8e725a16a..1c84856c0c129 100644 --- a/pkgs/development/libraries/qt-6/modules/qtquick3d.nix +++ b/pkgs/development/libraries/qt-6/modules/qtquick3d.nix @@ -6,6 +6,6 @@ qtModule { pname = "qtquick3d"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ openssl ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix index 34c17fc034538..05d121cd9b78c 100644 --- a/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix +++ b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix @@ -7,7 +7,7 @@ qtModule { pname = "qtquick3dphysics"; - qtInputs = [ qtbase qtquick3d ]; + propagatedBuildInputs = [ qtbase qtquick3d ]; env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-faligned-allocation"; } diff --git a/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix b/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix index c86fc92218f32..213814a017e23 100644 --- a/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix +++ b/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtquickeffectmaker"; - qtInputs = [ qtbase qtquick3d ]; + propagatedBuildInputs = [ qtbase qtquick3d ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix b/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix index 7458515dba267..9ac9c1f093934 100644 --- a/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix +++ b/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtquicktimeline"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix b/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix index 888ec33b461a8..1fd3b1b7a2534 100644 --- a/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix +++ b/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtremoteobjects"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtscxml.nix b/pkgs/development/libraries/qt-6/modules/qtscxml.nix index c49064c5e5794..ece975f59e8db 100644 --- a/pkgs/development/libraries/qt-6/modules/qtscxml.nix +++ b/pkgs/development/libraries/qt-6/modules/qtscxml.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtscxml"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtsensors.nix b/pkgs/development/libraries/qt-6/modules/qtsensors.nix index 73ddc394cc46d..bc49c7a77f583 100644 --- a/pkgs/development/libraries/qt-6/modules/qtsensors.nix +++ b/pkgs/development/libraries/qt-6/modules/qtsensors.nix @@ -6,5 +6,5 @@ qtModule { pname = "qtsensors"; - qtInputs = [ qtbase qtdeclarative qtsvg ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtserialbus.nix b/pkgs/development/libraries/qt-6/modules/qtserialbus.nix index 4fd6d7cb83c38..3a7285d0a8b03 100644 --- a/pkgs/development/libraries/qt-6/modules/qtserialbus.nix +++ b/pkgs/development/libraries/qt-6/modules/qtserialbus.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtserialbus"; - qtInputs = [ qtbase qtserialport ]; + propagatedBuildInputs = [ qtbase qtserialport ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtserialport.nix b/pkgs/development/libraries/qt-6/modules/qtserialport.nix index 2d23ae17cc5f0..27b9eb9c1915a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtserialport.nix +++ b/pkgs/development/libraries/qt-6/modules/qtserialport.nix @@ -8,7 +8,6 @@ qtModule { pname = "qtserialport"; - qtInputs = [ qtbase ]; nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = lib.optionals stdenv.isLinux [ udev ]; + propagatedBuildInputs = [ qtbase ] ++ lib.optionals stdenv.isLinux [ udev ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtshadertools.nix b/pkgs/development/libraries/qt-6/modules/qtshadertools.nix index 47102896f7e69..5a4b894b9abd6 100644 --- a/pkgs/development/libraries/qt-6/modules/qtshadertools.nix +++ b/pkgs/development/libraries/qt-6/modules/qtshadertools.nix @@ -4,5 +4,5 @@ qtModule { pname = "qtshadertools"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtspeech.nix b/pkgs/development/libraries/qt-6/modules/qtspeech.nix index ec713bc98c688..77c08fa91951a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtspeech.nix +++ b/pkgs/development/libraries/qt-6/modules/qtspeech.nix @@ -12,8 +12,8 @@ qtModule { pname = "qtspeech"; - qtInputs = [ qtbase qtmultimedia ]; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ flite alsa-lib speechd ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa ]; + propagatedBuildInputs = [ qtbase qtmultimedia ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtsvg.nix b/pkgs/development/libraries/qt-6/modules/qtsvg.nix index 2f2355bad598c..699b35b270424 100644 --- a/pkgs/development/libraries/qt-6/modules/qtsvg.nix +++ b/pkgs/development/libraries/qt-6/modules/qtsvg.nix @@ -10,7 +10,7 @@ qtModule { pname = "qtsvg"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; buildInputs = [ libwebp jasper libmng zlib ]; nativeBuildInputs = [ pkg-config ]; patches = [ diff --git a/pkgs/development/libraries/qt-6/modules/qttools.nix b/pkgs/development/libraries/qt-6/modules/qttools.nix index c79d18f7b9ad4..a1aa1026e57b3 100644 --- a/pkgs/development/libraries/qt-6/modules/qttools.nix +++ b/pkgs/development/libraries/qt-6/modules/qttools.nix @@ -15,8 +15,8 @@ qtModule { llvmPackages.libclang llvmPackages.llvm ]; - qtInputs = [ qtbase qtdeclarative ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ cups ]; + propagatedBuildInputs = [ qtbase qtdeclarative ] + ++ lib.optionals stdenv.isDarwin [ cups ]; patches = [ ../patches/qttools-paths.patch ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix b/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix index 9c53f11e1a3cb..9f067900dc068 100644 --- a/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix +++ b/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix @@ -8,7 +8,6 @@ qtModule { pname = "qtvirtualkeyboard"; - qtInputs = [ qtbase qtdeclarative qtsvg ]; - propagatedBuildInputs = [ hunspell ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg hunspell ]; nativeBuildInputs = [ pkg-config ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index e28cdb438e5e6..ddd402f3c2221 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -9,7 +9,7 @@ qtModule { pname = "qtwayland"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix b/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix index 49b959c5dea73..bf0ba0f633858 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix @@ -7,6 +7,6 @@ qtModule { pname = "qtwebchannel"; - qtInputs = [ qtbase qtdeclarative qtwebsockets ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtwebsockets ]; buildInputs = [ openssl ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 9614dc2831b46..8670fba6bb2a6 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -93,7 +93,6 @@ qtModule { pname = "qtwebengine"; - qtInputs = [ qtdeclarative qtwebchannel qtwebsockets qtpositioning ]; nativeBuildInputs = [ bison coreutils @@ -201,6 +200,11 @@ qtModule { ]; propagatedBuildInputs = [ + qtdeclarative + qtwebchannel + qtwebsockets + qtpositioning + # Image formats libjpeg libpng diff --git a/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix b/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix index f81cd64596eb7..c3a346a8d78a6 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix @@ -6,6 +6,6 @@ qtModule { pname = "qtwebsockets"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ openssl ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebview.nix b/pkgs/development/libraries/qt-6/modules/qtwebview.nix index 1e7c423977929..e8ebea932f039 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebview.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebview.nix @@ -8,7 +8,7 @@ qtModule { pname = "qtwebview"; - qtInputs = [ qtdeclarative ] - ++ lib.optionals (!stdenv.isDarwin) [ qtwebengine ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ WebKit ]; + propagatedBuildInputs = [ qtdeclarative ] + ++ lib.optionals (!stdenv.isDarwin) [ qtwebengine ] + ++ lib.optionals stdenv.isDarwin [ WebKit ]; } diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index ce917a2741591..5434be84fa595 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation (args // { buildInputs = args.buildInputs or [ ]; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ] ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; - propagatedBuildInputs = (args.qtInputs or [ ]) ++ (args.propagatedBuildInputs or [ ]); + propagatedBuildInputs = + (lib.warnIf (args ? qtInputs) "qt6.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++ + (args.propagatedBuildInputs or []); moveToDev = false; diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix index b5da1ad6e198a..4e85b3688ab7e 100644 --- a/pkgs/development/libraries/randomx/default.nix +++ b/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/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index 0a6a7a9b97042..b200193aa2114 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch?id=9e5eefc7a5fcf5938a8dc8a3be8c75e9e6809909"; hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; }) + # One of these three tests reports memcpy overlap after update to glibc-2.38 + ./test-skip-valgrind.diff ]; postPatch = '' diff --git a/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff b/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff new file mode 100644 index 0000000000000..a791d88699ff3 --- /dev/null +++ b/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff @@ -0,0 +1,7 @@ +--- a/test/unittest/CMakeLists.txt ++++ b/test/unittest/CMakeLists.txt +@@ -82,3 +81,0 @@ +- add_test(NAME valgrind_unittest +- COMMAND valgrind --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.* +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) + diff --git a/pkgs/development/libraries/rure/Cargo.lock b/pkgs/development/libraries/rure/Cargo.lock index 89fefcd9072e3..68a1719d08014 100644 --- a/pkgs/development/libraries/rure/Cargo.lock +++ b/pkgs/development/libraries/rure/Cargo.lock @@ -4,30 +4,42 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] name = "libc" -version = "0.2.140" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "regex" -version = "1.7.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -36,9 +48,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rure" diff --git a/pkgs/development/libraries/science/chemistry/tblite/default.nix b/pkgs/development/libraries/science/chemistry/tblite/default.nix index 0f05315b9d88c..7cc64937dc131 100644 --- a/pkgs/development/libraries/science/chemistry/tblite/default.nix +++ b/pkgs/development/libraries/science/chemistry/tblite/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , gfortran , blas @@ -26,6 +27,14 @@ stdenv.mkDerivation rec { hash = "sha256-R7CAFG/x55k5Ieslxeq+DWq1wPip4cI+Yvn1cBbeVNs="; }; + patches = [ + # toml-f 0.4 compatibility + (fetchpatch { + url = "https://github.com/tblite/tblite/commit/da759fd02b8fbf470a5c6d3df9657cca6b1d0a9a.diff"; + hash = "sha256-VaeA2VyK+Eas432HMSpJ0lXxHBBNGpfkUO1eHeWpYl0="; + }) + ]; + nativeBuildInputs = [ cmake gfortran ]; buildInputs = [ diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 0ef61ca360bfc..c66dfb3fdcc89 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.18"; + version = "2020.3.19"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-bMHPJVaxckB5KezyurJDLG+wXuFt0ZAm6QNp8lc2Nso="; + sha256 = "sha256-O5N8W5RCJHjl15EUvc1seOQ6Cm/7qXVEqG1EHD+ejDo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 411622c26a444..8ef0e5e39a559 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/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/pkgs/development/libraries/toml-f/default.nix b/pkgs/development/libraries/toml-f/default.nix index d28447c400467..696e41ac71cc4 100644 --- a/pkgs/development/libraries/toml-f/default.nix +++ b/pkgs/development/libraries/toml-f/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "toml-f"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-8FbnUkeJUP4fiuJCroAVDo6U2M7ZkFLpG2OYrapMYtU="; + hash = "sha256-sCU0uMdcXIA5O964hlK37cOrLTlk1CJeTcWD9FhevOs="; }; nativeBuildInputs = [ gfortran cmake ]; diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 42ce297d45638..f64de57fcb89d 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,23 +1,21 @@ -{ lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3 , libGLU, libepoxy, libX11, libdrm, mesa }: stdenv.mkDerivation rec { pname = "virglrenderer"; - version = "0.10.4"; + version = "1.0.0"; src = fetchurl { - url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2"; - sha256 = "sha256-qqvnko2sN4bdm9+F0PVjDW5FsiL5k3UAfjPSTqG+73c="; + url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/${version}/virglrenderer-${version}.tar.bz2"; + hash = "sha256-KMGPP2MeuATHFXKr5oW9HuFOMmmYpmkVLvMvQi0cEdg="; }; separateDebugInfo = true; buildInputs = [ libGLU libepoxy libX11 libdrm mesa ]; - nativeBuildInputs = [ cmake meson ninja pkg-config python3 ]; - - dontUseCmakeConfigure = true; + nativeBuildInputs = [ meson ninja pkg-config python3 ]; meta = with lib; { description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index e2a90d2e284d9..b24c8262794f3 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/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/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index 4af4ba65a395f..2d83211ac0d6c 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/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/pkgs/development/libraries/zlib-ng/default.nix b/pkgs/development/libraries/zlib-ng/default.nix index 3f2ba22ea430c..2d3ba583cfd5b 100644 --- a/pkgs/development/libraries/zlib-ng/default.nix +++ b/pkgs/development/libraries/zlib-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - hash = "sha256-DC4KPPaMuqML0HEhWJmWjyox4WEbExPDfNnpnWzoaHc="; + hash = "sha256-okNmobCVAC9y7tjZqFd0DBhOjs3WWRPK8jvK1j9G29k="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 590a1ea7797bf..b0847ebebedc8 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -329,23 +329,28 @@ let lispLibs = with self; [ bordeaux-threads closer-mop serapeum ]; }; - nkeymaps = build-asdf-system { + nkeymaps = build-asdf-system rec { pname = "nkeymaps"; - version = "20230214-git"; - src = pkgs.fetchzip { - url = "http://beta.quicklisp.org/archive/nhooks/2023-02-14/nkeymaps-20230214-git.tgz"; - sha256 = "197vxqby87vnpgcwchs3dqihk1gimp2cx9cc201pkdzvnbrixji6"; + version = "1.1.0"; + src = pkgs.fetchFromGitHub { + owner = "atlas-engineer"; + repo = "nkeymaps"; + rev = version; + hash = "sha256-ewMu2IgEzCYY72vG91IA7l8X78Ph6jpQvbKeOFZdAyM="; }; - lispLibs = with self; [ alexandria fset trivial-package-local-nicknames ]; + lispLibs = with self; [ alexandria fset trivial-package-local-nicknames + str ]; }; - history-tree = build-asdf-system { + history-tree = build-asdf-system rec { pname = "history-tree"; - version = "20230214-git"; - src = pkgs.fetchzip { - url = "http://beta.quicklisp.org/archive/history-tree/2023-02-14/history-tree-20230214-git.tgz"; - sha256 = "12kvnc8vcvg7nmgl5iqgbr4pj0vgb8f8avk9l5czz7f2hj91ysdp"; + version = "0.1.1"; + src = pkgs.fetchFromGitHub { + owner = "atlas-engineer"; + repo = "history-tree"; + rev = version; + hash = "sha256-lOORalyTybdut/If+dBXS4PlZt2AnZrEI/qjQWS03pk="; }; lispLibs = with self; [ alexandria @@ -359,7 +364,7 @@ let nyxt-gtk = build-asdf-system { pname = "nyxt"; - version = "3.7.0"; + version = "3.9.0"; lispLibs = (with super; [ alexandria @@ -449,8 +454,8 @@ let src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nyxt"; - rev = "3.7.0"; - sha256 = "sha256-viiyO4fX3uyGuvojQ1rYYKBldRdVNzeJX1KYlYwfWVU="; + rev = "3.9.0"; + sha256 = "sha256-bZoAE0FErgXPylOzh6AfMq3befms9dHms8+slbYdctk="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 636c411acca4d..1f4baeaa61855 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2790,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/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 74801b581eaa7..f0e9b379f4292 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -166,6 +166,7 @@ , "markdown-link-check" , "mastodon-bot" , "mathjax" +, "mathjax-node-cli" , "meat" , "mocha" , "multi-file-swagger" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 2035839ec0fa7..2686f65e3b21d 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -19057,6 +19057,15 @@ let sha512 = "0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w=="; }; }; + "cliui-4.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; + sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ=="; + }; + }; "cliui-5.0.0" = { name = "cliui"; packageName = "cliui"; @@ -32416,6 +32425,15 @@ let sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ=="; }; }; + "invert-kv-2.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; + sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; + }; + }; "iota-array-1.0.0" = { name = "iota-array"; packageName = "iota-array"; @@ -34720,6 +34738,15 @@ let sha512 = "SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g=="; }; }; + "jsdom-11.12.0" = { + name = "jsdom"; + packageName = "jsdom"; + version = "11.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz"; + sha512 = "y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw=="; + }; + }; "jsdom-14.1.0" = { name = "jsdom"; packageName = "jsdom"; @@ -35917,6 +35944,15 @@ let sha512 = "YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw=="; }; }; + "lcid-2.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; + sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; + }; + }; "ldap-filter-0.3.3" = { name = "ldap-filter"; packageName = "ldap-filter"; @@ -35971,6 +36007,15 @@ let sha512 = "IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow=="; }; }; + "left-pad-1.3.0" = { + name = "left-pad"; + packageName = "left-pad"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz"; + sha512 = "XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA=="; + }; + }; "less-4.2.0" = { name = "less"; packageName = "less"; @@ -38528,6 +38573,33 @@ let sha512 = "rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="; }; }; + "mathjax-2.7.9" = { + name = "mathjax"; + packageName = "mathjax"; + version = "2.7.9"; + src = fetchurl { + url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.9.tgz"; + sha512 = "NOGEDTIM9+MrsqnjPEjVGNx4q0GQxqm61yQwSK+/5S59i26wId5IC5gNu9/bu8+CCVl5p9G2IHcAl/wJa+5+BQ=="; + }; + }; + "mathjax-node-2.1.1" = { + name = "mathjax-node"; + packageName = "mathjax-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mathjax-node/-/mathjax-node-2.1.1.tgz"; + sha512 = "i29tvqD8yHPB2WhrGV5rvliYnKwTT8a/TO8SCnuYtatpSHxLGy3aF7lDTVLD6B1bfuVMTFB6McZu2TBxk0XGeg=="; + }; + }; + "mathjax-node-sre-3.0.3" = { + name = "mathjax-node-sre"; + packageName = "mathjax-node-sre"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mathjax-node-sre/-/mathjax-node-sre-3.0.3.tgz"; + sha512 = "SBwqD3DEgdYyPQv7vUBqH/uCr0eOI23PbffzmhelFPY8KdVANZkE2hssJA0Dfl23y7uEefsoVOryckMLEmmzaw=="; + }; + }; "mathml-tag-names-2.1.3" = { name = "mathml-tag-names"; packageName = "mathml-tag-names"; @@ -43272,6 +43344,15 @@ let sha512 = "PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g=="; }; }; + "os-locale-3.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; + sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; + }; + }; "os-paths-4.4.0" = { name = "os-paths"; packageName = "os-paths"; @@ -44271,6 +44352,15 @@ let sha512 = "rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA=="; }; }; + "parse5-4.0.0" = { + name = "parse5"; + packageName = "parse5"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz"; + sha512 = "VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="; + }; + }; "parse5-5.1.0" = { name = "parse5"; packageName = "parse5"; @@ -52254,6 +52344,15 @@ let sha512 = "1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg=="; }; }; + "speech-rule-engine-2.4.0" = { + name = "speech-rule-engine"; + packageName = "speech-rule-engine"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/speech-rule-engine/-/speech-rule-engine-2.4.0.tgz"; + sha512 = "7IXDmpGiQOJWUPVy/rcayqi1aTCrhcQ/bVACu2oyueEuiYzPW8GebYRF4LeyMROL/E0kxkO5U66t0aFWCv0QCQ=="; + }; + }; "speed-limiter-1.0.2" = { name = "speed-limiter"; packageName = "speed-limiter"; @@ -59455,6 +59554,15 @@ let sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; }; }; + "whatwg-url-6.5.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz"; + sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ=="; + }; + }; "whatwg-url-7.1.0" = { name = "whatwg-url"; packageName = "whatwg-url"; @@ -59590,6 +59698,15 @@ let sha512 = "qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew=="; }; }; + "wicked-good-xpath-1.3.0" = { + name = "wicked-good-xpath"; + packageName = "wicked-good-xpath"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wicked-good-xpath/-/wicked-good-xpath-1.3.0.tgz"; + sha512 = "Gd9+TUn5nXdwj/hFsPVx5cuHHiF5Bwuc30jZ4+ronF1qHK5O7HD0sgmXWSEgwKquT3ClLoKPVbO6qGwVwLzvAw=="; + }; + }; "wide-align-1.1.5" = { name = "wide-align"; packageName = "wide-align"; @@ -60094,6 +60211,15 @@ let sha512 = "61a+9LgtYZxTq1hAonhX8Xwpo2riK4IOR/BIVxioFbCfc3QFKmpE4x9dLExfLHKtUfVZigYa36tThVhO57erEw=="; }; }; + "ws-5.2.3" = { + name = "ws"; + packageName = "ws"; + version = "5.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz"; + sha512 = "jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA=="; + }; + }; "ws-6.1.4" = { name = "ws"; packageName = "ws"; @@ -60472,6 +60598,15 @@ let sha512 = "yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="; }; }; + "xmldom-sre-0.1.31" = { + name = "xmldom-sre"; + packageName = "xmldom-sre"; + version = "0.1.31"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom-sre/-/xmldom-sre-0.1.31.tgz"; + sha512 = "f9s+fUkX04BxQf+7mMWAp5zk61pciie+fFLC9hX9UVvCeJQfNHRHXpeo5MPcR0EUf57PYLdt+ZO4f3Ipk2oZUw=="; + }; + }; "xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" = { name = "xmlhttprequest"; packageName = "xmlhttprequest"; @@ -60680,6 +60815,15 @@ let sha512 = "C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ=="; }; }; + "yargs-12.0.5" = { + name = "yargs"; + packageName = "yargs"; + version = "12.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz"; + sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; + }; + }; "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; @@ -60788,6 +60932,15 @@ let sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="; }; }; + "yargs-parser-11.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "11.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz"; + sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ=="; + }; + }; "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -86065,6 +86218,212 @@ in bypassCache = true; reconstructLock = true; }; + mathjax-node-cli = nodeEnv.buildNodePackage { + name = "mathjax-node-cli"; + packageName = "mathjax-node-cli"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mathjax-node-cli/-/mathjax-node-cli-1.0.1.tgz"; + sha512 = "p1OB9zalQZkKYumfx+8mSX59MysF2Ox2H88gHSUQpdjpuMISwIPfw0MQmsvcS00hntSX05uEDa3uzo+1SgSk5w=="; + }; + dependencies = [ + sources."abab-2.0.6" + sources."acorn-5.7.4" + (sources."acorn-globals-4.3.4" // { + dependencies = [ + sources."acorn-6.4.2" + ]; + }) + sources."acorn-walk-6.2.0" + sources."ajv-6.12.6" + sources."ansi-regex-3.0.1" + sources."ansi-styles-4.3.0" + sources."array-equal-1.0.0" + sources."asn1-0.2.6" + sources."assert-plus-1.0.0" + sources."async-limiter-1.0.1" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.12.0" + sources."bcrypt-pbkdf-1.0.2" + sources."browser-process-hrtime-1.0.0" + sources."camelcase-5.3.1" + sources."caseless-0.12.0" + sources."cliui-4.1.0" + sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."combined-stream-1.0.8" + sources."commander-11.0.0" + sources."core-util-is-1.0.2" + sources."cross-spawn-6.0.5" + sources."cssom-0.3.8" + sources."cssstyle-1.4.0" + sources."dashdash-1.14.1" + (sources."data-urls-1.1.0" // { + dependencies = [ + sources."whatwg-url-7.1.0" + ]; + }) + sources."decamelize-1.2.0" + sources."deep-is-0.1.4" + sources."delayed-stream-1.0.0" + sources."domexception-1.0.1" + sources."ecc-jsbn-0.1.2" + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" + sources."escalade-3.1.1" + sources."escodegen-1.14.3" + sources."esprima-4.0.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."execa-1.0.0" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."find-up-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" + sources."getpass-0.1.7" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."html-encoding-sniffer-1.0.2" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.24" + sources."invert-kv-2.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."jsdom-11.12.0" + sources."json-schema-0.4.0" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.2" + sources."lcid-2.0.0" + sources."left-pad-1.3.0" + sources."levn-0.3.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.21" + sources."lodash.sortby-4.7.0" + sources."map-age-cleaner-0.1.3" + sources."mathjax-2.7.9" + sources."mathjax-node-2.1.1" + (sources."mathjax-node-sre-3.0.3" // { + dependencies = [ + sources."yargs-12.0.5" + ]; + }) + sources."mem-4.3.0" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."mimic-fn-2.1.0" + sources."nice-try-1.0.5" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."nwsapi-2.2.7" + sources."oauth-sign-0.9.0" + sources."once-1.4.0" + sources."optionator-0.8.3" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.1.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."parse5-4.0.0" + sources."path-exists-3.0.0" + sources."path-key-2.0.1" + sources."performance-now-2.1.0" + sources."pn-1.1.0" + sources."prelude-ls-1.1.2" + sources."psl-1.9.0" + sources."pump-3.0.0" + sources."punycode-2.3.0" + sources."qs-6.5.3" + sources."request-2.88.2" + sources."request-promise-core-1.1.4" + sources."request-promise-native-1.0.9" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."sax-1.3.0" + sources."semver-5.7.2" + sources."set-blocking-2.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.7" + sources."source-map-0.6.1" + sources."speech-rule-engine-2.4.0" + sources."sshpk-1.17.0" + sources."stealthy-require-1.1.1" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."symbol-tree-3.2.4" + sources."tough-cookie-2.5.0" + sources."tr46-1.0.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."uri-js-4.4.1" + sources."uuid-3.4.0" + sources."verror-1.10.0" + sources."w3c-hr-time-1.0.2" + sources."webidl-conversions-4.0.2" + sources."whatwg-encoding-1.0.5" + sources."whatwg-mimetype-2.3.0" + sources."whatwg-url-6.5.0" + sources."which-1.3.1" + sources."which-module-2.0.1" + sources."wicked-good-xpath-1.3.0" + sources."word-wrap-1.2.5" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."wrappy-1.0.2" + sources."ws-5.2.3" + sources."xml-name-validator-3.0.0" + sources."xmldom-sre-0.1.31" + sources."y18n-4.0.3" + (sources."yargs-17.7.2" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."cliui-8.0.1" + sources."get-caller-file-2.0.5" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" + sources."yargs-parser-21.1.1" + ]; + }) + sources."yargs-parser-11.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CLI tools for calling mathjax-node"; + homepage = "https://github.com/mathjax/mathjax-node-cli#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; meat = nodeEnv.buildNodePackage { name = "meat"; packageName = "meat"; diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index 727d407ac5423..7ba02d68ff5f4 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/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/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index f9612c0c011d1..ccd2d4eab299f 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/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/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index ca7b893ebc8ed..38a920ae865cc 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/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/pkgs/development/php-packages/grumphp/composer-json.patch b/pkgs/development/php-packages/grumphp/composer-json.patch new file mode 100644 index 0000000000000..7fd7441612cc2 --- /dev/null +++ b/pkgs/development/php-packages/grumphp/composer-json.patch @@ -0,0 +1,27 @@ +From 2f53794374e0d32e1f322202c6668655792f745d Mon Sep 17 00:00:00 2001 +From: Pol Dellaiera <pol.dellaiera@protonmail.com> +Date: Sat, 21 Oct 2023 16:46:59 +0200 +Subject: [PATCH] composer.json + +--- + composer.json | 5 +- + 1 file changed, 4 insertion(+), 1 deletion(-) + +diff --git i/composer.json w/composer.json +index 6ac54420..69b75a51 100644 +--- i/composer.json ++++ w/composer.json +@@ -96,7 +96,10 @@ + "bin/grumphp" + ], + "config": { +- "sort-packages": true ++ "sort-packages": true, ++ "platform": { ++ "php": "8.1" ++ } + }, + "extra": { + "class": "GrumPHP\\Composer\\GrumPHPPlugin" +-- +2.42.0 diff --git a/pkgs/development/php-packages/grumphp/composer-lock.patch b/pkgs/development/php-packages/grumphp/composer-lock.patch new file mode 100644 index 0000000000000..2fc801557c4f8 --- /dev/null +++ b/pkgs/development/php-packages/grumphp/composer-lock.patch @@ -0,0 +1,24 @@ +From 2f53794374e0d32e1f322202c6668655792f745d Mon Sep 17 00:00:00 2001 +From: Pol Dellaiera <pol.dellaiera@protonmail.com> +Date: Sat, 21 Oct 2023 16:46:59 +0200 +Subject: [PATCH] composer.lock + +--- + phar.composer.lock | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/phar.composer.lock b/phar.composer.lock +index 96b692c3..a8cb2a87 100644 +--- a/phar.composer.lock ++++ b/phar.composer.lock +@@ -4,7 +4,7 @@ + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], +- "content-hash": "8a069c630e6ddbc4475db9a992430539", ++ "content-hash": "0474062650b24a22c63007631cf35f1e", + "packages": [ + { + "name": "amphp/amp", +-- +2.42.0 diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index c7c2d9fc323e5..6367dd996bf20 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -1,32 +1,48 @@ -{ mkDerivation, fetchurl, makeWrapper, lib, php }: +{ fetchFromGitHub, stdenvNoCC, lib, php }: -mkDerivation (finalAttrs: { +php.buildComposerProject (finalAttrs: { pname = "grumphp"; - version = "1.15.0"; + version = "2.1.0"; - src = fetchurl { - url = "https://github.com/phpro/grumphp/releases/download/v${finalAttrs.version}/grumphp.phar"; - sha256 = "sha256-EqzJb7DYZb7PnebErLVI/EZLxj0m26cniZlsu1feif0="; + src = fetchFromGitHub { + owner = "phpro"; + repo = "grumphp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-RVgreCspdz+A6mdE2H4i8ajmdH8AZ9BOIw2OqLw7HfI="; }; - dontUnpack = true; + patches = [ + ./composer-json.patch + ]; - nativeBuildInputs = [ makeWrapper ]; + composerLock = stdenvNoCC.mkDerivation (finalComposerLockAttrs: { + name = "grumphp-composer-lock"; - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -D $src $out/libexec/grumphp/grumphp.phar - makeWrapper ${php}/bin/php $out/bin/grumphp \ - --add-flags "$out/libexec/grumphp/grumphp.phar" - runHook postInstall - ''; + src = fetchFromGitHub { + owner = "phpro"; + repo = "grumphp-shim"; + rev = "v${finalAttrs.version}"; + hash = "sha256-JxgRd0p/o3ouZ4MPke8cHqvAPuepY8ax0wx4t8+2dME="; + }; - meta = with lib; { + patches = [ + ./composer-lock.patch + ]; + + installPhase = '' + runHook preInstall + cp phar.composer.lock $out + runHook postInstall + ''; + }); + + vendorHash = "sha256-yefamPAzIabDCzZ9ghKq9iPH7AoCdgCCQ8PKrUN9ifQ="; + + meta = { changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}"; description = "A PHP code-quality tool"; homepage = "https://github.com/phpro/grumphp"; - license = licenses.mit; - maintainers = teams.php.members; + license = lib.licenses.mit; + maintainers = lib.teams.php.members; }; }) diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 9aefa22948783..de51ac1269509 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -2,7 +2,6 @@ , lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonAtLeast , pythonOlder , pytestCheckHook @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.21.0"; + version = "0.23.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,18 +26,9 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BwM3gyNhsRkxtxLNrycUGwBmXf8eq/7b56/ykMryt5w="; + hash = "sha256-pFkEgE1NGLPBW1CeGU0RJr+1Nj/y58ZcljyOnJuR47A="; }; - patches = [ - # fix import error when torch>=2.0.1 and torch.distributed is disabled - # https://github.com/huggingface/accelerate/pull/1800 - (fetchpatch { - url = "https://github.com/huggingface/accelerate/commit/32701039d302d3875c50c35ab3e76c467755eae9.patch"; - hash = "sha256-Hth7qyOfx1sC8UaRdbYTnyRXD/VRKf41GtLc0ee1t2I="; - }) - ]; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ @@ -64,6 +54,19 @@ buildPythonPackage rec { # try to download data: "FeatureExamplesTests" "test_infer_auto_device_map_on_t0pp" + + # require socket communication + "test_explicit_dtypes" + "test_gated" + "test_invalid_model_name" + "test_invalid_model_name_transformers" + "test_no_metadata" + "test_no_split_modules" + "test_remote_code" + "test_transformers_model" + + # set the environment variable, CC, which conflicts with standard environment + "test_patch_environment_key_exists" ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "CheckpointTest" diff --git a/pkgs/development/python-modules/adafruit-nrfutil/default.nix b/pkgs/development/python-modules/adafruit-nrfutil/default.nix index 43071fa93f0e4..0197bf21927fd 100644 --- a/pkgs/development/python-modules/adafruit-nrfutil/default.nix +++ b/pkgs/development/python-modules/adafruit-nrfutil/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adafruit-nrfutil"; - version = "0.5.3.post17"; + version = "1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adafruit"; repo = "Adafruit_nRF52_nrfutil"; - rev = version; - hash = "sha256-mHHKOQE9AGBX8RAyaPOy+JS3fTs98+AFdq9qsVy7go4="; + rev = "refs/tags/appveyor-test-release-${version}"; + hash = "sha256-wsspDg8XwEtJwJye6Z3TXaIN1TcfI7gYDah3L/xiiLo="; }; patches = [ diff --git a/pkgs/development/python-modules/adguardhome/default.nix b/pkgs/development/python-modules/adguardhome/default.nix index 5c32d588428f8..78b2cba4d4829 100644 --- a/pkgs/development/python-modules/adguardhome/default.nix +++ b/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/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index ba7fcaa46e640..d1ff94519646b 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aenum"; - version = "3.1.12"; + version = "3.1.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PlMckYYKgfiF9+bpfSGa6XcsuJlYAIR4iTXa19l0LvA="; + hash = "sha256-jL12zRjE+HD/ObJChNPqAo++hzGljfOqWB5DTFdblVk="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 214a85f8c9152..a821e9d878903 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "afdko"; - version = "3.9.3"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-v0fIhf3P5Xjdn5/ryRNj0Q2YHAisMqi5RTmJQabaUO0="; + hash = "sha256-66faoWBuCW0lQZP8/mBJLT+ErRGBl396HdG1RfPOYcM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 2b5863d198373..a6c515d1d1ccd 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "agate-sql"; - version = "0.5.9"; + version = "0.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-MLZCoypbZxFhq++ejsNjUvLniiTOhJBU7axpRti53cY="; + hash = "sha256-uyHkkc3KzuYulOtod9KkHQmszVh2mrrCOLwvQt6JTMk="; }; propagatedBuildInputs = [ agate sqlalchemy ]; @@ -27,8 +27,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "agatesql" ]; meta = with lib; { - # https://github.com/wireservice/agate-sql/commit/74af1badd85408909ea72cb6ca8c0b223d178c6f - broken = lib.versionAtLeast sqlalchemy.version "2.0"; description = "Adds SQL read/write support to agate."; homepage = "https://github.com/wireservice/agate-sql"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/aioairq/default.nix b/pkgs/development/python-modules/aioairq/default.nix index 342a2fc978f3b..73be4e3f64cfa 100644 --- a/pkgs/development/python-modules/aioairq/default.nix +++ b/pkgs/development/python-modules/aioairq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairq"; - version = "0.2.4"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CorantGmbH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+5FyBfsB3kjyX/V9CdZ072mZ3THyvALyym+uk7/kZLo="; + hash = "sha256-9OO3ox6q08QQcYfz4ArsKy/6jR329bAQPUo+mVYuhJs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index bdc21d70892f7..11ba9a203237b 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.2.4"; + 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-7sjiY20jDUHtEnqAMwEHsBboK9XCH5XjE0sHR82YvEA="; + hash = "sha256-tsx98DG/TvTrVwUy9fscErf+3zUC5XVs50lHKW/9pdQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index ac094571d087d..39c12ac6e2c08 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.6.8"; + version = "0.6.9"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-aCf0IO70t/QMmDmIwBKN3Um1HgHjHn1r6Dze/pWaQ5M="; + hash = "sha256-0nbH0pnTYRuSOkzG5Yn/fJmRKtXBMd6ti6Z+AW72j3Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioapns/default.nix b/pkgs/development/python-modules/aioapns/default.nix index 2b48f96ae2b54..4b6c4faa123ad 100644 --- a/pkgs/development/python-modules/aioapns/default.nix +++ b/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/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 6f7ef895c373f..9de5593a25626 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.5.2"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-twIo5qJht7oZye5lbiPwLFa/5dCwgCm+OkwuCuWU0cU="; + hash = "sha256-e8FBUG08yWNL9B51Uv4ftYx1C0kcdoweOreUtvvvTAk="; }; # Relax version constraints: aiobotocore works with newer botocore versions diff --git a/pkgs/development/python-modules/aioelectricitymaps/default.nix b/pkgs/development/python-modules/aioelectricitymaps/default.nix new file mode 100644 index 0000000000000..502363de13c3a --- /dev/null +++ b/pkgs/development/python-modules/aioelectricitymaps/default.nix @@ -0,0 +1,55 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, dataclasses-json +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, syrupy +}: + +buildPythonPackage rec { + pname = "aioelectricitymaps"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "jpbede"; + repo = "aioelectricitymaps"; + rev = "refs/tags/v${version}"; + hash = "sha256-2Ou3obpGRJ/iUPuaoBGlmDTJLx6+S8ivK9PbrbSvYyg="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + dataclasses-json + ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ + "aioelectricitymaps" + ]; + + meta = with lib; { + description = "Module for interacting with Electricity maps"; + homepage = "https://github.com/jpbede/aioelectricitymaps"; + changelog = "https://github.com/jpbede/aioelectricitymaps/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 79ef028fd36ee..2f703049c0acd 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "17.2.0"; + version = "18.0.12"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+yPHIXJ0vHaFO2X3xN+7WIQUlCvoYlGi1N7W+H/ng/0="; + hash = "sha256-tTDeJJ/TscUttURftVHOCx2wDc6yLEuFxESrQR2l8hg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 28d4f5f368dc8..fe72ff28c78b6 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -2,7 +2,7 @@ , lib , buildPythonPackage , fetchFromGitHub -, poetry-core +, hatchling , pytest-asyncio , pytestCheckHook , pythonOlder @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiofiles"; - version = "23.1.0"; + version = "23.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,11 +19,11 @@ buildPythonPackage rec { owner = "Tinche"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ouBqqt0CJYxxQqbG9jn4p8zO+nKjqZgPjZpiZic67ss="; + hash = "sha256-EbRQD/AoTMWAlPOMWmD0UdFjRyjt5MUBkJtcydUCdHM="; }; nativeBuildInputs = [ - poetry-core + hatchling ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index ceb3f9603ede8..7638c4efb48fd 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "2.25.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aiogram"; repo = "aiogram"; - rev = "v${version}"; - hash = "sha256-g8nuvna7DpXElvjBehnGKHUsrf+nyQcoKNnyR59RALo="; + rev = "refs/tags/v${version}"; + hash = "sha256-bWwK761gn7HsR9ObcBDfvQH0fJfTAo0QAcL/HcNdHik="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 9b157264a7e9e..0a60d0af28014 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.8.1"; + version = "0.8.3"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - hash = "sha256-duWEJDS5Ts3EWNRZ8MJcD7buMh3FRKA+bJiO3P7QWz0="; + hash = "sha256-aqtSj2aeCHMBj9N3c7gzouK6KEJDvmcoF/pAG8eUHsY="; }; propagatedBuildInputs = [ aiohttp attrs python-socks ]; diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index a3b982e22d5a9..094e7509ee3cc 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiojobs"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FHdEVt/XXmuTrPAETyod3fHJIK1wg957/+QMAhZG1xk="; + hash = "sha256-/+PTHLrZyf2UuYkLWkNgzf9amFywDJnP2OKVWvARcAA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index 88a1c7aa37ca5..d7d87003e1a71 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiosql"; - version = "8.0"; + version = "9.0"; outputs = [ "out" "doc" ]; format = "pyproject"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "nackjicholson"; repo = "aiosql"; rev = "refs/tags/${version}"; - hash = "sha256-cE89w1CbDqlkryRr3yAdSxAtWzV1+O+n41ihTwYWelE="; + hash = "sha256-AwuZ3y/qAyZzffTG6mHLk0b+zFB9307VjAX8g1pvWto="; }; sphinxRoot = "docs/source"; diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix index bc6e695343422..19d9997ed8d7c 100644 --- a/pkgs/development/python-modules/aiowithings/default.nix +++ b/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/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix index edc9b8def3da9..6c7660f9f3e14 100644 --- a/pkgs/development/python-modules/aioxmpp/default.nix +++ b/pkgs/development/python-modules/aioxmpp/default.nix @@ -60,6 +60,11 @@ buildPythonPackage rec { "benchmarks" ]; + disabledTests = [ + # AttributeError: 'zoneinfo.ZoneInfo' object has no attribute 'normalize' + "test_convert_field_datetime_default_locale" + ]; + meta = { changelog = "https://github.com/horazont/aioxmpp/blob/${src.rev}/docs/api/changelog.rst"; description = "Pure-python XMPP library for asyncio"; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 4a60bfca201fd..c1bb0f1d3c7d1 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.9.4"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-TTvTLs27e7+0ip/p5tb9aoMaG1nQPibikiECNzc+fbU="; + hash = "sha256-jnZFwy5PIAZ15p8HRUFTNetZo2Y/X+tIer+gswxFiIs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix index 2dc57281e8f3d..a67ff5e98d9b5 100644 --- a/pkgs/development/python-modules/allure-behave/default.nix +++ b/pkgs/development/python-modules/allure-behave/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "allure-behave"; - version = "2.12.0"; + version = "2.13.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CxdB1gliajS6dUUhnD+yRMVj0zglGEwZC6RDmirH+pg="; + hash = "sha256-mxXb7+1tvf5EmVbD6eOmGfza9lAjbEVoxWZBSeZmPxQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/allure-pytest/default.nix b/pkgs/development/python-modules/allure-pytest/default.nix index a08f4bc93a43a..cdfbf4c142c52 100644 --- a/pkgs/development/python-modules/allure-pytest/default.nix +++ b/pkgs/development/python-modules/allure-pytest/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "allure-pytest"; - version = "2.12.0"; + version = "2.13.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hbc7Hb6ZCLpPhLgBGKk+EEnALdWTIJJg2MHJUM8ob2w="; + hash = "sha256-IiQxWejsgc4rUlS0ATgCGYghsbQvEY9p1KKJOWYHx7M="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/allure-python-commons-test/default.nix b/pkgs/development/python-modules/allure-python-commons-test/default.nix index aaba8d9fccf75..c358a2f14d7fe 100644 --- a/pkgs/development/python-modules/allure-python-commons-test/default.nix +++ b/pkgs/development/python-modules/allure-python-commons-test/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "allure-python-commons-test"; - version = "2.12.0"; + version = "2.13.2"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - hash = "sha256-TaeQF9EZ5tLMmVSwnWgrxsRz5lh0O3BZLLEUawd8BeI="; + hash = "sha256-Xh6NtqiuTg7UxKqJ7/p45rCUQGWiGDEaNAslzeYtgfg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/allure-python-commons/default.nix b/pkgs/development/python-modules/allure-python-commons/default.nix index b92ee139b6ba4..0b50f23f77c4b 100644 --- a/pkgs/development/python-modules/allure-python-commons/default.nix +++ b/pkgs/development/python-modules/allure-python-commons/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "allure-python-commons"; - version = "2.12.0"; + version = "2.13.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1cNi3QEWfwhjMYIumxkS1Ob9bLwtGgBt0EjnfoKnrnM="; + hash = "sha256-igNoEzAjGx3q3Ya5f/aIQcZZEyARSuY4Vw8e1g16IDM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index 21db575097453..0a2479dd38f43 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amazon-ion"; - version = "0.9.3"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,9 +18,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amzn"; repo = "ion-python"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-FLwzHcge+vLcRY4gOzrxS3kWlprCkRXX5KeGOoTJDSw="; + hash = "sha256-pCm3jd/dVqO/uIvT5N/w5yoUWU6ni62Pl2A862e+qSk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/amazon-kclpy/default.nix b/pkgs/development/python-modules/amazon-kclpy/default.nix index 623ab60ed63a4..fca55e3bc0dc0 100644 --- a/pkgs/development/python-modules/amazon-kclpy/default.nix +++ b/pkgs/development/python-modules/amazon-kclpy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "amazon-kclpy"; - version = "2.1.1"; + version = "2.1.3"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-kinesis-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Z0MC4SbZS82beMA7UunEfs4KvrmhW5xAhFeb7WXA7DM="; + hash = "sha256-3BhccRJd6quElXZSix1aVIqWr9wdcTTziDhnIOLiPPo="; }; # argparse is just required for python2.6 diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index f7c41aa12ba2a..71bd13c7ab492 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -21,7 +21,7 @@ let pname = "ansible"; - version = "8.3.0"; + version = "8.4.0"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-XlgAHX1twz5dFWyjQ4g7YT7JiPaTZLCkP3Ek/ktb4vI="; + hash = "sha256-8zxJJpBZL60SaE6Yl/beLaFcn24ey3kTdwOgZHCvLOY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 8344af4390704..ef0ffe778e462 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.3.11"; + version = "0.3.13"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-bjagT0I0/N76CGf1b8EBNyOTzPBWybr2I2yO5NWO3po="; + hash = "sha256-2sw/tzbKd0d4sSHM+PYTE/XeqkycFFLfG1c/lyrU4Jc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 3508554d308d3..06112cccdc3fb 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.7.1"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,8 +36,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "agronholm"; repo = pname; - rev = version; - hash = "sha256-9/pAcVTzw9v57E5l4d8zNyBJM+QNGEuLKrQ0WUBW5xw="; + rev = "refs/tags/${version}"; + hash = "sha256-gUFd2gHWIElYfzOvg7Yx7iJyhU6+iAcJpHTVsJtxTsk="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -84,6 +84,10 @@ buildPythonPackage rec { "test_exception_group_children" "test_exception_group_host" "test_exception_group_filtering" + # timing sensitive + # assert threading.active_count() == initial_count + 1 + # assert 4 == (4 + 1) + "test_run_sync_from_thread_pooling" ] ++ lib.optionals stdenv.isDarwin [ # PermissionError: [Errno 1] Operation not permitted: '/dev/console' "test_is_block_device" diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix index b58c31ea73208..f1a31ee243b88 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/aocd/default.nix @@ -10,6 +10,9 @@ , pytest-raisin , pytest-socket , requests-mock +, pook +, numpy +, rich , pebble , python-dateutil , termcolor @@ -20,8 +23,8 @@ buildPythonPackage rec { pname = "aocd"; - version = "1.3.2"; - format = "setuptools"; + version = "2.0.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +32,7 @@ buildPythonPackage rec { owner = "wimglenn"; repo = "advent-of-code-data"; rev = "refs/tags/v${version}"; - hash = "sha256-yY8ItXZZp0yVs4viJzduMPq8Q8NKd34uvlGaVUE2GjQ="; + hash = "sha256-YZvcR97uHceloqwoP+azaBmj3GLusYNbItLIaeJ3QD0="; }; propagatedBuildInputs = [ @@ -40,6 +43,7 @@ buildPythonPackage rec { pebble tzlocal setuptools + rich # for example parser aoce. must either be here or checkInputs ]; # Too many failing tests @@ -52,6 +56,33 @@ buildPythonPackage rec { "test_run_and_autosubmit" "test_run_and_no_autosubmit" "test_load_input_from_file" + "test_examples_cache" # IndexError: list index out of range + "test_example_partial" # ValueError: not enough values to unpack (expected 1, got 0) + "test_run_against_examples" # AssertionError: assert '2022/25 - The Puzzle Title' in '' + "test_aocd_no_examples" # SystemExit: 2 + "test_aocd_examples" # SystemExit: 2 + "test_aoce" # SystemExit: 1 + + # TypeError: sequence item 0: expected str instance, bool found + # Likely because they use `pook.get` to get a webpage + "test_submit_prevents_bad_guesses_too_high" + "test_submit_prevents_bad_guesses_too_low" + "test_submit_prevents_bad_guesses_known_incorrect" + "test_submit_correct_answer" + "test_correct_submit_reopens_browser_on_answer_page" + "test_server_error" + "test_submit_when_already_solved" + "test_submitted_too_recently_autoretry" + "test_submitted_too_recently_autoretry_quiet" + "test_submit_when_submitted_too_recently_no_autoretry" + "test_submit_wrong_answer " + "test_correct_submit_records_good_answer" + "test_submits_for_partb_when_already_submitted_parta" + "test_submit_when_parta_solved_but_answer_unsaved" + "test_submit_saves_both_answers_if_possible" + "test_submit_puts_level1_by_default" + "test_cannot_submit_same_bad_answer_twice" + "test_submit_float_warns" ]; nativeCheckInputs = [ @@ -60,6 +91,11 @@ buildPythonPackage rec { pytest-freezegun pytest-raisin pytest-socket + ]; + + checkInputs = [ + pook + numpy requests-mock ]; diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 92a9203a93f6b..d0e36a989b94d 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -48,13 +48,13 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.45.0"; + version = "2.50.0"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "refs/tags/v${version}"; - hash = "sha256-e+6Vt+SlOxi16udsdx7WFoDWYupuXhggpoEZPe4tPr0="; + hash = "sha256-qaxYWPVdMlegvH/W66UBoQbcQ5Ac/3DNoQs8xo+KfLc="; }; patches = [ diff --git a/pkgs/development/python-modules/aprslib/default.nix b/pkgs/development/python-modules/aprslib/default.nix index ce73dadd8d669..ab56bf58b8e3b 100644 --- a/pkgs/development/python-modules/aprslib/default.nix +++ b/pkgs/development/python-modules/aprslib/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, mox3 , pytestCheckHook }: @@ -24,8 +23,9 @@ buildPythonPackage rec { }) ]; + doCheck = false; # mox3 is disabled on python311 + nativeCheckInputs = [ - mox3 pytestCheckHook ]; diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 5964274881c60..59576a129d68d 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.42.0.0"; + version = "3.43.1.0"; format = "setuptools"; disabled = isPyPy; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-pLkYTyf2BGRLs4bChb+eo2i5gRRUUJDFyfCBTSJ1RkQ="; + hash = "sha256-x+bSft37DgF2tXXCL6ac86g1+mj/wJeDLoCSiVSXedA="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix index 3f1f3f86666cf..77182cbd6a436 100644 --- a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix +++ b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, libargon2 , cffi , setuptools-scm }: @@ -14,14 +15,19 @@ buildPythonPackage rec { sha256 = "bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3"; }; + buildInputs = [ libargon2 ]; + nativeBuildInputs = [ setuptools-scm + cffi ]; propagatedBuildInputs = [ cffi ]; + env.ARGON2_CFFI_USE_SYSTEM = 1; + # tarball doesn't include tests, but the upstream tests are minimal doCheck = false; pythonImportsCheck = [ "_argon2_cffi_bindings" ]; diff --git a/pkgs/development/python-modules/argon2-cffi/default.nix b/pkgs/development/python-modules/argon2-cffi/default.nix index 2282a06e5c646..da9022c93f192 100644 --- a/pkgs/development/python-modules/argon2-cffi/default.nix +++ b/pkgs/development/python-modules/argon2-cffi/default.nix @@ -1,46 +1,32 @@ -{ cffi -, six -, enum34 -, hypothesis -, pytest -, wheel +{ hypothesis +, pytestCheckHook , buildPythonPackage , fetchPypi -, flit-core -, isPy3k , lib -, stdenv +, hatchling +, hatch-vcs +, hatch-fancy-pypi-readme , argon2-cffi-bindings }: buildPythonPackage rec { pname = "argon2-cffi"; - version = "21.3.0"; + version = "23.1.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b"; + pname = "argon2_cffi"; + inherit version; + hash = "sha256-h5w+eaJynOdo67fTbUYJ46eKTKLsOp8SKGygV+PQ2wg="; }; - nativeBuildInputs = [ - flit-core - ]; + nativeBuildInputs = [ hatchling hatch-vcs hatch-fancy-pypi-readme ]; - propagatedBuildInputs = [ cffi six argon2-cffi-bindings ] - ++ lib.optional (!isPy3k) enum34; + propagatedBuildInputs = [ argon2-cffi-bindings ]; - propagatedNativeBuildInputs = [ - argon2-cffi-bindings - cffi - ]; + nativeCheckInputs = [ hypothesis pytestCheckHook ]; - ARGON2_CFFI_USE_SSE2 = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) "0"; - - nativeCheckInputs = [ hypothesis pytest wheel ]; - checkPhase = '' - pytest tests - ''; + pythonImportsCheck = [ "argon2" ]; meta = with lib; { description = "Secure Password Hashes for Python"; diff --git a/pkgs/development/python-modules/argos-translate-files/default.nix b/pkgs/development/python-modules/argos-translate-files/default.nix index 1acab31b723cd..0f0e3ea223549 100644 --- a/pkgs/development/python-modules/argos-translate-files/default.nix +++ b/pkgs/development/python-modules/argos-translate-files/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "argos-translate-files"; - version = "1.1.3"; + version = "1.1.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "c6931ea8fbabdc24903ceaabfe848be0fa4a0477d00451a8dfbc1525b623f0ba"; + sha256 = "sha256-YSTqqd+Kv2QVlAjA0lf4IRx7rJ1DmvB0JIReBv3yZcM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/argostranslate/default.nix b/pkgs/development/python-modules/argostranslate/default.nix index 8a1cadfb88033..2347730ad4cba 100644 --- a/pkgs/development/python-modules/argostranslate/default.nix +++ b/pkgs/development/python-modules/argostranslate/default.nix @@ -18,13 +18,13 @@ let in buildPythonPackage rec { pname = "argostranslate"; - version = "1.8.0"; + version = "1.8.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "9b109255d6a2c692c6f3bfbde494d1a27b3d5ed1c1d1d78711cdc1b1e3744c64"; + sha256 = "sha256-8eVmEHwsQ9/5NPmKJzZ4aX4nkh4+mna5K1BC+lXLXcE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix index 23d45893fe4f8..3810934eefebd 100644 --- a/pkgs/development/python-modules/ariadne/default.nix +++ b/pkgs/development/python-modules/ariadne/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ariadne"; - version = "0.18.1"; + version = "0.20.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mirumee"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-E7uC+l0Yjol8UPLF4CV+PN49tOUJXNUS5yYdF1oyfwU="; + hash = "sha256-v3CaLMTo/zbNEoE3K+aWnFTCgLetcnN7vOU/sFqLq2k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix index f278c34fbe1d6..1c82445f0e4f8 100644 --- a/pkgs/development/python-modules/array-record/default.nix +++ b/pkgs/development/python-modules/array-record/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "array-record"; - version = "0.4.0"; + version = "0.4.1"; format = "wheel"; disabled = python.pythonVersion != "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "array_record"; dist = "py310"; python = "py310"; - hash = "sha256-VHDU6RLR/z3/tNxJiDdAruz1cva6cHu5NzMlsKrLYXg="; + hash = "sha256-agyO1v36ryzs09XGucE+EWrTKZZJYRyP0YTWRVf7q6g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index fee3f12b80caf..b37e7d9a8a189 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -32,16 +32,16 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.15.1"; - format = "setuptools"; + version = "0.16.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "arviz-devs"; - repo = pname; + repo = "arviz"; rev = "refs/tags/v${version}"; - hash = "sha256-jjA+yltvpPZldIxXXqu1bXCLqpiU5/NBYTPlI9ImGVs="; + hash = "sha256-kixWGj0M0flTq5rXSiPB0nfZaGYRvvMBGAJpehdW8KY="; }; propagatedBuildInputs = [ @@ -93,6 +93,10 @@ buildPythonPackage rec { "test_plot_pair" # Array mismatch "test_plot_ts" + # The following two tests fail in a common venv-based setup. + # An issue has been opened upstream: https://github.com/arviz-devs/arviz/issues/2282 + "test_plot_ppc_discrete" + "test_plot_ppc_discrete_save_animation" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 410c8d6a24f19..f3b6787dd66bb 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "asana"; - version = "3.2.1"; + version = "4.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asana"; repo = "python-asana"; - rev = "refs/tags/v${version}"; - hash = "sha256-hvAyKGoNkX3bs7Mz2h7SnOa5T6J88c0YiTR/L8fgfi8="; + rev = "refs/tags/${version}"; + hash = "sha256-B98X8ErmoMIpXu4KKvRGgtElPs/va2+UIR+ARUgafgo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 3fd0437667781..a5177a6b7e187 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "6.3.1"; + version = "6.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-9mhb8PEpRdFjbPBZ/B8he/UcRSLryBQU0Dgjcii7LGY="; + hash = "sha256-w4xpCqNal0BHsmf1cL4k/DKzs/e9WQXTQNJNs8puJUU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix index 8bc58e992c860..89abcb1526392 100644 --- a/pkgs/development/python-modules/asn1tools/default.nix +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -7,6 +7,7 @@ , pyparsing , python , pythonOlder +, pytestCheckHook }: buildPythonPackage rec { @@ -25,14 +26,22 @@ buildPythonPackage rec { propagatedBuildInputs = [ bitstruct - diskcache - prompt-toolkit pyparsing ]; - checkPhase = '' - ${python.interpreter} setup.py test - ''; + passthru.optional-depdendencies = { + shell = [ + prompt-toolkit + ]; + cache = [ + diskcache + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-depdendencies); + pythonImportsCheck = [ "asn1tools" diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index 7b5a24378dde4..610238559a2ce 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -53,6 +53,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # DeprecationWarning: 'cgi' is deprecated and slated for removal in Python 3.13 + "-W" "ignore::DeprecationWarning" + ]; + # Tests must be run in the build directory. The tests create files # in $HOME/.astropy so we need to set HOME to $TMPDIR. preCheck = '' @@ -66,8 +71,6 @@ buildPythonPackage rec { description = "Functions and classes to access online data resources"; homepage = "https://astroquery.readthedocs.io/"; license = licenses.bsd3; - # Broken since a certain astropy update, due to API incompatibility - broken = true; maintainers = [ maintainers.smaret ]; }; } diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 89c959293df33..452abd626e0bd 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "asttokens"; - version = "2.2.1"; + version = "2.4.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-RiIRCypvMLd+FHOv+ql+cRvC8H0/EISEIP8YmO2+lPM="; + hash = "sha256-LgFxuZGyyVmsxsSTGASSNoRKXaHWW6JnLEiAwciUg04="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/async-timeout/default.nix b/pkgs/development/python-modules/async-timeout/default.nix index 55297bea9cbd5..59c8b51fbb672 100644 --- a/pkgs/development/python-modules/async-timeout/default.nix +++ b/pkgs/development/python-modules/async-timeout/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "async-timeout"; - version = "4.0.2"; + version = "4.0.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IWPhZA3bUreoyA0KZ6CFh+XSRcycVTp0qEcFa8KXaxU="; + hash = "sha256-RkDZa+hNgtAu1Z6itxBaD3szq+hwNwPNCrC/h8QnUi8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 03b7e8664c467..c51c99d00f0b4 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.36.1"; + version = "0.36.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-NFSJlBRVgeuhK7IXjNz2g6SbSgveSjaJpSQrxSACG04="; + hash = "sha256-f3x5adxLHT/C5dXfdBH6stKv0y2nuhbpe8jkJex1DKU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index 25cb21e7e2464..e462a0d0b49c1 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "1.0.8"; + version = "1.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = "asyncwhois"; rev = "refs/tags/v${version}"; - hash = "sha256-fYXxoS4bGTat5QT98ETmWk/VKXJmg9mtkUu02SZT4Eo="; + hash = "sha256-5T/h4YzODH7zFyQpG8qVZetTK7V+Ii9jc+MQFgMUA8w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index fd389308c9315..fd389308c9315 100755..100644 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index d856aa544cb17..20fc37d459991 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -3,25 +3,25 @@ , fetchPypi , pytestCheckHook , pythonOlder -, pdm-pep517 +, pdm-backend , sybil , typing-extensions }: buildPythonPackage rec { pname = "atpublic"; - version = "3.1.1"; + version = "4.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-MJjuEtAQfMUAnWH06A5e3PrEzaK9qgRkSvdYJ8sSGxg="; + hash = "sha256-D0BDMhnhJO3xFcbDY4CMpvDhz6fRYNhrL7lHkwhtEpQ="; }; nativeBuildInputs = [ - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 06313ed12ce11..b40a680fb381d 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -5,6 +5,8 @@ , callee , fetchFromGitHub , mock +, poetry-core +, poetry-dynamic-versioning , pyjwt , pytestCheckHook , pythonOlder @@ -14,7 +16,7 @@ buildPythonPackage rec { pname = "auth0-python"; version = "4.4.2"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,6 +27,11 @@ buildPythonPackage rec { hash = "sha256-RBkAuZQx7mBxVCpo5PoBiEge8+yTmp0XpcnxCkOsM6U="; }; + nativeBuildInputs = [ + poetry-core + poetry-dynamic-versioning + ]; + propagatedBuildInputs = [ requests pyjwt diff --git a/pkgs/development/python-modules/autoflake/default.nix b/pkgs/development/python-modules/autoflake/default.nix index 9446a6dc2b4c2..0897abe77b849 100644 --- a/pkgs/development/python-modules/autoflake/default.nix +++ b/pkgs/development/python-modules/autoflake/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { pname = "autoflake"; - version = "2.0.1"; + version = "2.2.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-HOUgExt/OWkVJC/pHlciH01CQIUpu+Ouk62v7ShlkeA="; + hash = "sha256-Yre2RJppLDybDJFpGbvCFkjacoHoUGvPjT+CgOQx68E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index b34a78351bd90..9a177d7b49366 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "autopep8"; - version = "2.0.2"; + version = "2.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "hhatto"; repo = "autopep8"; rev = "refs/tags/v${version}"; - hash = "sha256-+EZgo7xtYKMgpcntU5FtPrfikDDpnvGHhorhtoqDsvE="; + hash = "sha256-TuaDnZqn9mRUsoDJkj9JK4ztvzl9JTwAk8nghIkZBvw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 64f12ed24a1ac..b930fd80b99de 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -9,7 +9,7 @@ , setuptools # runtime -, ffmpeg-headless +, ffmpeg_5-headless # tests , numpy @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; buildInputs = [ - ffmpeg-headless + ffmpeg_5-headless ]; preCheck = '' diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index a8107fac2b843..b55977ffdb61e 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/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 = "22"; - format = "pyproject"; + version = "24"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IWeWNvshz+NxX4ijIyaleRmThNstpKYplcMQUC1/6F8="; + hash = "sha256-KJE/zw9+5NaZNXQsED+kIu1R+Ng7ZOywy+mebmY/SwY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 81881d5193925..48218451a5ab1 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -1,28 +1,36 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder -, awkward-cpp +, fetchPypi , hatch-fancy-pypi-readme , hatchling -, numba +, awkward-cpp +, importlib-metadata , numpy , packaging -, setuptools , typing-extensions +, fsspec +, jax +, jaxlib +, numba +, setuptools +, numexpr +, pandas +, pyarrow +, pytest-xdist , pytestCheckHook }: buildPythonPackage rec { pname = "awkward"; - version = "2.3.1"; - format = "pyproject"; + version = "2.4.6"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NLROXEbh4MKvBFuj+4+Wa2u37P9vuQ0Ww8kK+CYWt5E="; + hash = "sha256-MRnrPChX3a26JELh4oH5nefwoQurpvpprZXeNnz1Cwo="; }; nativeBuildInputs = [ @@ -32,26 +40,36 @@ buildPythonPackage rec { propagatedBuildInputs = [ awkward-cpp + importlib-metadata numpy packaging - ] ++ lib.optionals (pythonOlder "3.11") [ + ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions + ] ++ lib.optionals (pythonOlder "3.12") [ + importlib-metadata ]; dontUseCmakeConfigure = true; + pythonImportsCheck = [ "awkward" ]; + nativeCheckInputs = [ - 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/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 3a32d82ec9357..7dc2a217987fd 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "2.8.1"; + version = "2.8.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "venth"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-tpCDP924lNSaPJggj3A94U2Ur+TgxTXtV660OyQJEeY="; + hash = "sha256-hMM7Z0s9t5vetgskiy7nb1W/kKCKHe0Q3kT2ngUVADA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 7fe9fdac96ebf..5a7b1af3e8f17 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -2,6 +2,7 @@ , boto3 , buildPythonPackage , fetchFromGitHub +, fetchpatch , jsonschema , parameterized , pydantic @@ -28,6 +29,13 @@ buildPythonPackage rec { hash = "sha256-uOfBR0bvLVyBcfSAkSqOx4KjmSYbfktpJlxKjipfj50="; }; + patches = [ + (fetchpatch { + url = "https://github.com/aws/serverless-application-model/commit/e41b0f02204635a655100b68dd38220af32a2728.patch"; + hash = "sha256-V6KXdXQUr9fvLzxI6sUMrSRnGX5SrAaDygcaQ87FaQ8="; + }) + ]; + postPatch = '' substituteInPlace pytest.ini \ --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" @@ -57,6 +65,26 @@ buildPythonPackage rec { sed -i '2ienv =\n\tAWS_DEFAULT_REGION=us-east-1' pytest.ini ''; + disabledTests = [ + # urllib3 2.0 compat + "test_plugin_accepts_different_sar_client" + "test_plugin_accepts_flags" + "test_plugin_accepts_parameters" + "test_plugin_default_values" + "test_plugin_invalid_configuration_raises_exception" + "test_plugin_must_setup_correct_name" + "test_must_process_applications" + "test_must_process_applications_validate" + "test_process_invalid_applications" + "test_process_invalid_applications_validate" + "test_resolve_intrinsics" + "test_sar_service_calls" + "test_sar_success_one_app" + "test_sar_throttling_doesnt_stop_processing" + "test_sleep_between_sar_checks" + "test_unexpected_sar_error_stops_processing" + ]; + meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; homepage = "https://github.com/awslabs/serverless-application-model"; diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 3be1c09b5fbeb..e2fb2414a2c0d 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.11.0"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - hash = "sha256-eINfyEHwPlUIWPGKmXPquGGPR/ItL1nt8TBXj6VFqGc="; + hash = "sha256-KVr8I3BzqAlW19TyfDGDDty5qMzKnviqRJkLre8V5bc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index d79b3448f2121..1d89f2e932417 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "awslambdaric"; - version = "2.0.0"; + version = "2.0.7"; disabled = isPy27; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; - rev = version; - sha256 = "1amlaq119mk8fa3fxi3d6vgp83vcd81mbk53jzbixacklmcsp50k"; + rev = "refs/tags/${version}"; + sha256 = "sha256-9PgdLzeSafglguXksMetzopbDlBWlGDSSXiZHfuWgE8="; }; patches = [ diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 806016afbffc1..65f5bcf36e94b 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "awswrangler"; - version = "3.3.0"; + version = "3.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-Sb5yqbEqGmwhPoG21+uMnl8Jdn3Gc455guceQhAflWY="; + hash = "sha256-ZHEWG/A3lNwSw3MxguqjvgAOx5IHei43ku7GVJh8tLY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix index 9cbbd8e64b062..f41bc696d56f8 100644 --- a/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/pkgs/development/python-modules/azure-cosmos/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "3.2.0"; + version = "4.5.1"; pname = "azure-cosmos"; src = fetchPypi { inherit pname version; - sha256 = "4f77cc558fecffac04377ba758ac4e23f076dc1c54e2cf2515f85bc15cbde5c6"; + sha256 = "sha256-xK2oOBMG7sQTwBvFCneOJk3D9Pr6nWlvnfhDYUjSrqg="; }; propagatedBuildInputs = [ six requests ]; diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix index a0da387c627a3..c5190b6d33687 100644 --- a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-trafficmanager"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-R0F2HoA0bE7dTLPycTaOqYBj+ATQFeJFwv4EjtK1lqg="; + hash = "sha256-Nb8ZAr8VidYm41lx5aqgCeiECUZytHm3mM0buNTy/fk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix index 582e7c5dccf18..331b9c91707a2 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "bash_kernel"; - version = "0.9.0"; - format = "pyproject"; + version = "0.9.1"; + format = "flit"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-BCPwUS72+DplThQ5o2lxiJmjjyeUj+IbZlst8dvzp8c="; + sha256 = "sha256-AYPVPjYP+baEcQUqmiiagWIXMlFrA04njpcgtdFaFis="; }; patches = [ diff --git a/pkgs/development/python-modules/bbox/default.nix b/pkgs/development/python-modules/bbox/default.nix index 88a019dda8e99..4f1d0cef7fd0e 100644 --- a/pkgs/development/python-modules/bbox/default.nix +++ b/pkgs/development/python-modules/bbox/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "bbox"; - version = "0.9.2"; + version = "0.9.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ucR7mg9eubEefjC7ratEgrb9h++a26z8KV38n3N2kcw="; + hash = "sha256-GGQhKkdwmrYPEhtldPY3WUInSniU/B40NZvt1gXEuzg="; }; propagatedBuildInputs = [ pyquaternion numpy ]; diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index 62dbfd059b110..42b3ea063de5d 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -3,22 +3,24 @@ , fetchPypi , pytestCheckHook , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "beartype"; - version = "0.14.0"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VG5ujc3aHW2fkG6k6xUYqgHJxfWkQOSVkXstr1PL1Zg="; + hash = "sha256-Kvao2KcmfM99Jx4aO9kIr7wCXSoJqlESNWfX17N0ON8="; }; nativeCheckInputs = [ pytestCheckHook + typing-extensions ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index d6827f5b50bad..a5bf6608fe061 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -12,6 +12,7 @@ , cloudpickle , deepmerge , fs +, httpx , inflection , jinja2 , numpy @@ -68,7 +69,7 @@ }: let - version = "1.1.6"; + version = "1.1.7"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -104,9 +105,15 @@ buildPythonPackage { owner = "bentoml"; repo = "BentoML"; rev = "refs/tags/v${version}"; - hash = "sha256-SDahF4oAewWzCofErgYJDId/TBv74gLCxYT/jKEAgpU="; + hash = "sha256-xuUfdVa0d4TzJqPBNJvUikIPsjSgn+VdhdZidHMnAxA="; }; + # https://github.com/bentoml/BentoML/pull/4227 should fix this test + postPatch = '' + substituteInPlace tests/unit/_internal/utils/test_analytics.py \ + --replace "requests" "httpx" + ''; + pythonRelaxDeps = [ "opentelemetry-semantic-conventions" ]; @@ -126,6 +133,7 @@ buildPythonPackage { cloudpickle deepmerge fs + httpx inflection jinja2 numpy diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 40f7ad7cf8ab4..470eaf376a771 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.14.1"; + version = "0.14.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-Fo30qDBqVxVuD/Ow0jsvN20Hx7Zhvie47CE+1ys1ewU="; + hash = "sha256-69H0hB+yVmyzJ5A2Cb7ZcaaoRzMt618U+TUHYQ03/cY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix index 037ea8b5ebfe0..3b1ead8d8962b 100644 --- a/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "bitcoinlib"; - version = "0.12.0"; + version = "0.12.2"; disabled = !isPy3k; @@ -10,12 +10,12 @@ buildPythonPackage rec { owner = "petertodd"; repo = "python-bitcoinlib"; rev = "refs/tags/python-bitcoinlib-v${version}"; - hash = "sha256-jguybrH86z6NWLaucQEYjvH2Gkoh3Aqh/PLZ6l8Qel4="; + hash = "sha256-jfd2Buy6GSCH0ZeccRREC1NmlS6Mq1qtNv/NLNJOsX0="; }; postPatch = '' substituteInPlace bitcoin/core/key.py --replace \ - "ctypes.util.find_library('ssl.35') or ctypes.util.find_library('ssl') or 'libeay32'" \ + "ctypes.util.find_library('ssl.35') or ctypes.util.find_library('ssl') or ctypes.util.find_library('libeay32')" \ "'${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index a61a159a71ec3..55a6094c131bf 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -2,13 +2,14 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, bitarray , setuptools , unittestCheckHook }: buildPythonPackage rec { pname = "bitstring"; - version = "4.0.2"; + version = "4.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,14 +17,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scott-griffiths"; repo = pname; - rev = "bitstring-${version}"; - hash = "sha256-LghfDjf/Z1dEU0gjH1cqMb04ChnW+aGDjmN+RAhMWW8="; + rev = "refs/tags/bitstring-${version}"; + hash = "sha256-e4OnXwEuXz5m8d2PZOL5zDw8iGEzUg8LLk+xs/eGleA="; }; nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + bitarray + ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "bitstring" ]; diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 61a069305d136..f53f614867ec1 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -25,6 +25,12 @@ buildPythonPackage rec { hash = "sha256-T0im8zKyNLbskAEDeUUFS/daJtvttlHlttjscqP8iSk="; }; + postPatch = '' + # bleak checks BlueZ's version with a call to `bluetoothctl --version` + substituteInPlace bleak/backends/bluezdbus/version.py \ + --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -40,12 +46,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # bleak checks BlueZ's version with a call to `bluetoothctl --version` - substituteInPlace bleak/backends/bluezdbus/__init__.py \ - --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" - ''; - pythonImportsCheck = [ "bleak" ]; diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index 88bd08c925543..9864bbae3c616 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -2,24 +2,37 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pytest-asyncio +, setuptools }: buildPythonPackage rec { pname = "blinker"; - version = "1.5"; + version = "1.6.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-kj5eL2nBVfLMQtr7vXDhbj/eJNLUqiq3L744YjiJJGI="; + hash = "sha256-Sv095m7zqfgGdVn7ehy+VVwX3L4VlxsF0bYlw+er4hM="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + setuptools + ]; - pythonImportsCheck = [ "blinker" ]; + pythonImportsCheck = [ + "blinker" + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; meta = with lib; { - homepage = "https://pythonhosted.org/blinker/"; - description = "Fast, simple object-to-object and broadcast signaling"; + changelog = "https://github.com/pallets-eco/blinker/releases/tag/${version}"; + description = "Fast Python in-process signal/event dispatching system"; + homepage = "https://github.com/pallets-eco/blinker/"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 51e5e3b0f4724..f40eb9b0b44fb 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -1,19 +1,21 @@ { lib , buildPythonPackage , fetchFromGitHub +, aiofiles +, aiohttp , pytestCheckHook , python-dateutil , python-slugify -, pythonAtLeast , pythonOlder , requests +, setuptools , sortedcontainers }: buildPythonPackage rec { pname = "blinkpy"; - version = "0.21.0"; - format = "setuptools"; + version = "0.22.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -21,10 +23,16 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-0sEZlnS6CJj8nMyjtSFZRALRKdmY0Uu5N6sozPiDG6w="; + hash = "sha256-r8kf5L6bvtivqd9dSi8om1wIi8IHmipKFckNMPT515I="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + aiofiles + aiohttp python-dateutil python-slugify requests @@ -45,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/pkgs/development/python-modules/blinkstick/default.nix b/pkgs/development/python-modules/blinkstick/default.nix index d3de7561bec2e..bafd5254b9683 100644 --- a/pkgs/development/python-modules/blinkstick/default.nix +++ b/pkgs/development/python-modules/blinkstick/default.nix @@ -1,35 +1,27 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pyusb -}: +{ lib, buildPythonPackage, fetchFromGitHub, pyusb }: buildPythonPackage rec { pname = "blinkstick"; - version = "1.2.0"; + version = "unstable-2023-05-04"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "0rdk3i81s6byw23za0bxvkh7sj5l16qxxgc2c53qjg3klc24wcm9"; + src = fetchFromGitHub { + owner = "arvydas"; + repo = "blinkstick-python"; + rev = "8140b9fa18a9ff4f0e9df8e70c073f41cb8f1d35"; + hash = "sha256-9bc7TD/Ilc952ywLauFd0+3Lh64lQlYuDC1KG9eWDgs="; }; - # Upstream fix https://github.com/arvydas/blinkstick-python/pull/54 - # https://github.com/arvydas/blinkstick-python/pull/54/commits/b9bee2cd72f799f1210e5d9e13207f93bbc2d244.patch - # has line ending issues after 1.2.0 - postPatch = '' - substituteInPlace setup.py --replace "pyusb==1.0.0" "pyusb>=1.0.0" - ''; - propagatedBuildInputs = [ pyusb ]; # Project has no tests doCheck = false; pythonImportsCheck = [ "blinkstick" ]; - meta = with lib; { + meta = { description = "Python package to control BlinkStick USB devices"; homepage = "https://github.com/arvydas/blinkstick-python"; - license = licenses.bsd3; - maintainers = with maintainers; [ np ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ np perstark ]; }; } diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix index 80cec5ca1ec35..a4c1db3d7b700 100644 --- a/pkgs/development/python-modules/blosc2/default.nix +++ b/pkgs/development/python-modules/blosc2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "blosc2"; - version = "2.1.1"; + version = "2.2.7"; format = "pyproject"; src = fetchFromGitHub { @@ -34,7 +34,7 @@ buildPythonPackage rec { repo = "python-blosc2"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-nbPMLkTye0/Q05ubE35LssN677sUIQErPTxjAtSuGgI="; + hash = "sha256-5a94Zm6sYl/nSfkcFbKG7PkyXwLB6bAoIvfaq0yVGHo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix index 41d8c13dc56ef..929f1c90b7ce7 100644 --- a/pkgs/development/python-modules/blspy/default.nix +++ b/pkgs/development/python-modules/blspy/default.nix @@ -48,6 +48,13 @@ buildPythonPackage rec { }) ]; + # ImportError: cannot import name 'setuptools' from 'setuptools' + # this is resolved in the next release, v2 + postPatch = '' + substituteInPlace setup.py \ + --replace "from setuptools import Extension, setup, setuptools" "from setuptools import Extension, setup" + ''; + nativeBuildInputs = [ cmake setuptools-scm ]; buildInputs = [ boost gmp.static pybind11 ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 1693f2258bccb..3dac327a48bef 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.31.9"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.31.48"; # N.B: if you change this, change boto3 and awscli to a matching version format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-vYSdOslfF4E4Xtgx11OgSj7IcKWdZZgXWq7dcdwrr18="; + hash = "sha256-btFvZqpu1gcP7SbWl2TLFMd1nkzAscGRKDzEiwXWXek="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 7a97b99902302..e64883140316a 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "bottle"; - version = "0.12.24"; + version = "0.12.25"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-JIASGnPoc4CYm3fjK9IJLRkOfqfXHm8bj3r36rnVTqM="; + hash = "sha256-4anJSXCubXELP7RSYpTf64byy0qB7/OkuY3ED7Dl4CE="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/bottombar/default.nix b/pkgs/development/python-modules/bottombar/default.nix index e3e9bb38cc118..ab7a9b06d64f4 100644 --- a/pkgs/development/python-modules/bottombar/default.nix +++ b/pkgs/development/python-modules/bottombar/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bottombar"; - version = "1.0"; + version = "2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "evalf"; repo = "bottombar"; rev = "refs/tags/v${version}"; - hash = "sha256-/3m34HcYmmEf92H3938dYV1Q6k44KaCb9TDx9nDNPnM="; + hash = "sha256-W+Cbcgb664nVT/nsFdDruT688JWG2NZnF5hDDezTgnw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bqplot/default.nix b/pkgs/development/python-modules/bqplot/default.nix index 5695be669bbc7..a1737d339a3d0 100644 --- a/pkgs/development/python-modules/bqplot/default.nix +++ b/pkgs/development/python-modules/bqplot/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "bqplot"; - version = "0.12.39"; + version = "0.12.40"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-FNjeb5pNGUW76mwTIOpNHJMlb3JoN3T24AINzFefPdI="; + hash = "sha256-7L/ovwTwRFju5G3Cwvgla0wVIdRvlEOOm+GTieT4b7k="; }; # upstream seems in flux for 0.13 release. they seem to want to migrate from diff --git a/pkgs/development/python-modules/bqscales/default.nix b/pkgs/development/python-modules/bqscales/default.nix index 8b0ebb610ad9d..c8fa7879bd754 100644 --- a/pkgs/development/python-modules/bqscales/default.nix +++ b/pkgs/development/python-modules/bqscales/default.nix @@ -3,6 +3,8 @@ , pythonOlder , fetchPypi , hatchling +, hatch-jupyter-builder +, jupyterlab , jupyter-packaging , ipywidgets , numpy @@ -12,13 +14,13 @@ buildPythonPackage rec { pname = "bqscales"; - version = "0.3.1"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-C+/GLpqYpePngbn5W0MwvpdmVgFZF7aGHyKMgO5XM90="; + hash = "sha256-SlnNw4dWOzRedwIN3kCyl95qVqkY92QGOMS3Eyoqk0I="; }; # We relax dependencies here instead of pulling in a patch because upstream @@ -35,7 +37,9 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + hatch-jupyter-builder hatchling + jupyterlab jupyter-packaging ]; diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index cfb919682e444..81068d4c07962 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , docutils , fetchFromGitHub -, fetchpatch , pytestCheckHook , pythonOlder , sphinx @@ -10,7 +9,7 @@ buildPythonPackage rec { pname = "breathe"; - version = "4.34.0"; + version = "4.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,16 +18,9 @@ buildPythonPackage rec { owner = "michaeljones"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OOc3XQjqQa0cVpA+/HHco+koL+0whUm5qC7x3xiEdwQ="; + hash = "sha256-LJXvtScyWRL8zfj877bJ4xuIbLV9IN3Sn9KPUTLMjMI="; }; - patches = [ - (fetchpatch { - url = "https://github.com/breathe-doc/breathe/commit/de3504c81c7cefc87c8229743f93232ca00a685d.patch"; - hash = "sha256-UGld5j0F/hnTuS7KUFvgQL52xCUdaJ3/NeuEuHhpCxI="; - }) - ]; - propagatedBuildInputs = [ docutils sphinx diff --git a/pkgs/development/python-modules/brian2/default.nix b/pkgs/development/python-modules/brian2/default.nix index 6ebd89a7b3464..2b3bcbff5076a 100644 --- a/pkgs/development/python-modules/brian2/default.nix +++ b/pkgs/development/python-modules/brian2/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "brian2"; - version = "2.5.1"; + version = "2.5.4"; src = fetchPypi { pname = "Brian2"; inherit version; - hash = "sha256-x1EcS7PFCsjPYsq3Lt87SJRW4J5DE/OfdFs3NuyHiLw="; + hash = "sha256-XMXSOwcH8fLgzXCcT+grjYxhBdtF4H/Vr+S7J4GYZSw="; }; patches = [ diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index b70302fe9ea69..91e907c3af335 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "brotli"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "v${version}"; - hash = "sha256-tFnXSXv8t3l3HX6GwWLhEtgpqz0c7Yom5U3k47pWM7o="; + rev = "refs/tags/v${version}"; + hash = "sha256-MvceRcle2dSkkucC2PlsCizsIf8iv95d8Xjqew266wc="; # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data forceFetchGit = true; }; diff --git a/pkgs/development/python-modules/brotlicffi/default.nix b/pkgs/development/python-modules/brotlicffi/default.nix index 5e0600d343a84..fd30ab86c07c9 100644 --- a/pkgs/development/python-modules/brotlicffi/default.nix +++ b/pkgs/development/python-modules/brotlicffi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "brotlicffi"; - version = "1.0.9.2"; - disabled = pythonOlder "3.6"; + version = "1.1.0.0"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-hyper"; repo = pname; rev = "v${version}"; - sha256 = "0qx7an7772brmx1rbbrqzqnkqqvicc70mx740nl31kzzyv4jjs00"; + sha256 = "sha256-oW4y1WBJ7+4XwNwwSSR0qUqN03cZYXUYQ6EAwce9dzI="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index f86f47e2bd852..4b06298f1d26f 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -13,22 +13,22 @@ , pytestCheckHook , pythonOlder , setuptools -, toml , tomli +, wheel }: buildPythonPackage rec { pname = "build"; - version = "0.10.0"; + version = "1.0.3"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pypa"; - repo = pname; - rev = version; - hash = "sha256-kXFrfTb7+68EV+gSENL81IFSR+ue7Fl6R2gsuFFBJhI="; + repo = "build"; + rev = "refs/tags/${version}"; + hash = "sha256-SGWpm+AGIfqKMpDfmz2aMYmcs+XVREbHIXSuU4R7U/k="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { passthru.tests = { pytest = buildPythonPackage { pname = "${pname}-pytest"; - inherit version; + inherit src version; format = "other"; dontBuild = true; @@ -63,7 +63,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook setuptools - toml + wheel ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/bytewax/default.nix b/pkgs/development/python-modules/bytewax/default.nix index 61e6b3142fb96..c27d756070de4 100644 --- a/pkgs/development/python-modules/bytewax/default.nix +++ b/pkgs/development/python-modules/bytewax/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bytewax"; - version = "0.16.2"; + version = "0.17.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bytewax"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PHjKEZMNhtLliOSGt4XHQFDm8Rc4TejQUVSqFN6Au38="; + hash = "sha256-Cv2bTgs3XfYOcHK628/RgGol7S6E4WfHb7gHXXjBhig="; }; env = { diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix new file mode 100644 index 0000000000000..3cb260dd8d1bb --- /dev/null +++ b/pkgs/development/python-modules/cantools/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, argparse-addons +, bitstruct +, can +, crccheck +, diskcache +, matplotlib +, parameterized +, pytestCheckHook +, pythonOlder +, textparser +}: + +buildPythonPackage rec { + pname = "cantools"; + version = "38.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-k7/m9L1lLzaXY+qRYrAnpi9CSoQA8kI9QRN5GM5oxo4="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + argparse-addons + bitstruct + can + crccheck + diskcache + matplotlib + textparser + ]; + + nativeCheckInputs = [ + parameterized + pytestCheckHook + ]; + + pythonImportsCheck = [ + "cantools" + ]; + + meta = with lib; { + homepage = "https://github.com/cantools/cantools"; + description = "CAN bus tools."; + license = licenses.mit; + maintainers = with maintainers; [ gray-heron ]; + }; +} diff --git a/pkgs/development/python-modules/castepxbin/default.nix b/pkgs/development/python-modules/castepxbin/default.nix index b02cac817fe2b..007a9543d6f18 100644 --- a/pkgs/development/python-modules/castepxbin/default.nix +++ b/pkgs/development/python-modules/castepxbin/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zhubonan"; repo = "castepxbin"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-6kumVnm4PLRxuKO6Uz0iHzfYuu21hFC7EPRsc3S1kxE="; }; diff --git a/pkgs/development/python-modules/catppuccin/default.nix b/pkgs/development/python-modules/catppuccin/default.nix index 5a53233fff877..3c86e97f49f97 100644 --- a/pkgs/development/python-modules/catppuccin/default.nix +++ b/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.1.1"; + version = "1.3.2"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-mHNuV3yIuFL2cixDOr+//+/b9iD2fN82cfLzZkegxKc="; + 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/pkgs/development/python-modules/cepa/default.nix b/pkgs/development/python-modules/cepa/default.nix index 708decb2964fd..67c45a26665ba 100644 --- a/pkgs/development/python-modules/cepa/default.nix +++ b/pkgs/development/python-modules/cepa/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, python, mock }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, python +, mock +}: buildPythonPackage rec { pname = "cepa"; @@ -9,6 +15,14 @@ buildPythonPackage rec { hash = "sha256-P7xwGsP8ic1/abxYptDXNbAU+kC2Hiwu/Tge0g21ipY="; }; + patches = [ + (fetchpatch { + name = "python-3.11-compatibility.patch"; + url = "https://github.com/onionshare/cepa/commit/0bf9aee7151e65594c532826bb04636e1d80fb6f.patch"; + hash = "sha256-roSt9N5OvnOOxKZUee86zGXt0AsZCcbBdV2cLz1MB2k="; + }) + ]; + postPatch = '' rm test/unit/installation.py sed -i "/test.unit.installation/d" test/settings.cfg diff --git a/pkgs/development/python-modules/certbot-dns-ovh/default.nix b/pkgs/development/python-modules/certbot-dns-ovh/default.nix new file mode 100644 index 0000000000000..da0dd57cff874 --- /dev/null +++ b/pkgs/development/python-modules/certbot-dns-ovh/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage +, acme +, certbot +, dns-lexicon +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "certbot-dns-ovh"; + + inherit (certbot) src version; + disabled = pythonOlder "3.6"; + + sourceRoot = "${src.name}/certbot-dns-ovh"; + + propagatedBuildInputs = [ + acme + certbot + dns-lexicon + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "-o cache_dir=$(mktemp -d)" + + # Monitor https://github.com/certbot/certbot/issues/9606 for a solution + "-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'" + "-W 'ignore:Package lexicon.providers is deprecated and will be removed in Lexicon 4>=.:DeprecationWarning'" + "-W 'ignore:Legacy configuration object has been used to load the ConfigResolver.:DeprecationWarning'" + ]; + + meta = certbot.meta // { + description = "OVH DNS Authenticator plugin for Certbot"; + }; +} diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 7931432bd5e1d..8a2fd3bb88cf4 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "certifi"; - version = "2023.05.07"; + version = "2023.07.22"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "python-certifi"; rev = version; - hash = "sha256-KXm0CtuZJL9VgFeY+DV0rdjaKqPQCqcoGPCkeGieTX8="; + hash = "sha256-V3bptJDNMGXlCMg6GHj792IrjfsG9+F/UpQKxeM0QOc="; }; patches = [ diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index ed5377d9783a7..f52bf2f667aeb 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.79.6"; + version = "0.79.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "refs/tags/v${version}"; - hash = "sha256-5Lb8dA8HqDdEO/Ehv5y/JlP+te46mzrTw/kNHBb9l38="; + hash = "sha256-dVLKMoZzP2q3bejEIslgpQgkPJOJUeEsXyyk8HRP6h0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 8b5ff73d1faa3..5237fe31f3704 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/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/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 69353dcaec289..7c78de37d36d5 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "chardet"; - version = "5.1.0"; + version = "5.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DWJxK5VrwVT4X7CiZuKjxZE8KWfgA0hwGzJBHW3vMeU="; + hash = "sha256-Gztv9HmoxBS8P6LAhSmVaVxKAm3NbQYzst0JLKOcHPc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index d567c41dbe6f5..c2856a49060fc 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -1,17 +1,15 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub , pytestCheckHook , pythonOlder - - # popular downstream dependencies -, aiohttp , requests }: buildPythonPackage rec { pname = "charset-normalizer"; - version = "3.0.1"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -20,18 +18,18 @@ buildPythonPackage rec { owner = "Ousret"; repo = "charset_normalizer"; rev = "refs/tags/${version}"; - hash = "sha256-2kXs6ZdemA6taV4aa9xBKLmhbSgpybjg3Z61EUFabrk="; + hash = "sha256-CfL5rlrwJs9453z+1xPUzs1B3OyjFBaU6klzY7gJCzA="; }; - nativeCheckInputs = [ - pytestCheckHook - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace " --cov=charset_normalizer --cov-report=term-missing" "" ''; + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "charset_normalizer" ]; @@ -41,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for encoding and language detection"; homepage = "https://charset-normalizer.readthedocs.io/"; + changelog = "https://github.com/Ousret/charset_normalizer/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 11ce178e69062..679c5464b8f57 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "cheroot"; - version = "9.0.0"; + version = "10.0.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PUetnuGey+wUS0dYOZA2aS/b9npAuW7vH7FFQ2ez0zg="; + hash = "sha256-WcShh3/vmWmzw8CAyqrzd+J4CRlDeFP8DTKp30CzEfA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/chia-rs/default.nix b/pkgs/development/python-modules/chia-rs/default.nix index b8ce9ce755bce..7afec2e1a4265 100644 --- a/pkgs/development/python-modules/chia-rs/default.nix +++ b/pkgs/development/python-modules/chia-rs/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "chia-rs"; - version = "0.2.0"; + version = "0.2.10"; src = fetchFromGitHub { owner = "chia-network"; repo = "chia_rs"; - rev = version; - hash = "sha256-kjURkzynrrb5iD5s77Q3nETt71SCGGazm/2lt9HS5JU="; + rev = "refs/tags/${version}"; + hash = "sha256-MFVWdpfvmvGfWIuVdrigGucP52/dB4xCO4Pn1RvUJnM="; }; patches = [ diff --git a/pkgs/development/python-modules/circuitbreaker/default.nix b/pkgs/development/python-modules/circuitbreaker/default.nix index 05fce26d6e658..9218d82847ccc 100644 --- a/pkgs/development/python-modules/circuitbreaker/default.nix +++ b/pkgs/development/python-modules/circuitbreaker/default.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub -, mock , pytestCheckHook +, pytest-asyncio +, pytest-mock , pythonOlder }: buildPythonPackage rec { pname = "circuitbreaker"; - version = "1.4.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,12 +18,13 @@ buildPythonPackage rec { owner = "fabfuel"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-l0ASt9CQmgJmWpRrghElbff/gaNOmxNh+Wj0C0p4jE0="; + hash = "sha256-jaDCMGCZZu3STluYeHDNgdEPf2DNq7bXJ0LPV3JZdk0="; }; nativeCheckInputs = [ - mock pytestCheckHook + pytest-asyncio + pytest-mock ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index bc3a92fe4ac50..fe6a04480f666 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ --replace "matplotlib~=3.0" "matplotlib" - ''; + ''; propagatedBuildInputs = [ duet diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix index 0ac79e306c17e..f1de682c40b53 100644 --- a/pkgs/development/python-modules/cleanlab/default.nix +++ b/pkgs/development/python-modules/cleanlab/default.nix @@ -16,7 +16,7 @@ }: let pname = "cleanlab"; - version = "2.4.0"; + version = "2.5.0"; in buildPythonPackage { inherit pname version; @@ -27,8 +27,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "cleanlab"; repo = pname; - rev = "v${version}"; - hash = "sha256-XFrjjBJA0OQEAspnQQiSIW4td0USJDXTp9C/91mobp8="; + rev = "refs/tags/v${version}"; + hash = "sha256-5XQQVrhjpvjwtFM79DqttObmw/GQLkMQVXb5jhiC8e0="; }; # postPatch = '' diff --git a/pkgs/development/python-modules/click-odoo-contrib/default.nix b/pkgs/development/python-modules/click-odoo-contrib/default.nix index b0ddaef004b93..ced0f66784071 100644 --- a/pkgs/development/python-modules/click-odoo-contrib/default.nix +++ b/pkgs/development/python-modules/click-odoo-contrib/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "click-odoo-contrib"; - version = "1.16.1"; + version = "1.17.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-VFoS/lOw/jbJNj9xfgZHKzR6JDTwnlCAItq4mZ3RA6I="; + hash = "sha256-my6dWmAqvelihtB9SzFje01dZenkkNneKqcgwKtbOuA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 6d748af8b5a2b..8569eede0bbb8 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub , importlib-metadata , pytestCheckHook @@ -15,12 +15,16 @@ buildPythonPackage rec { pname = "click"; - version = "8.1.6"; + version = "8.1.7"; + format = "setuptools"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-SO6EmVGRlSegRb/jv3uqipWcQjE04aW5jAXCC6daHL0="; + src = fetchFromGitHub { + owner = "pallets"; + repo = "click"; + rev = "refs/tags/${version}"; + hash = "sha256-8YqIKRyw5MegnRwAO7YTCZateEFQFTH2PHpE8gTPTow="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/clickhouse-cli/default.nix b/pkgs/development/python-modules/clickhouse-cli/default.nix index 9e986383dc572..3c807716e03de 100644 --- a/pkgs/development/python-modules/clickhouse-cli/default.nix +++ b/pkgs/development/python-modules/clickhouse-cli/default.nix @@ -10,11 +10,12 @@ buildPythonPackage rec { pname = "clickhouse-cli"; - version = "0.3.8"; + version = "0.3.9"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-pa3vkIyNblS1LOwBReTqg8JAR2Ii32a2QIHWjau0uZE="; + hash = "sha256-gkgLAedUtzGv/4P+D56M2Pb5YecyqyVYp06ST62sjdY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index e2a2915fe38b1..1d693b3629f3d 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -23,7 +23,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.6.8"; + version = "0.6.11"; format = "setuptools"; @@ -32,8 +32,8 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "clickhouse-connect"; owner = "ClickHouse"; - rev = "v${version}"; - hash = "sha256-T1vUXhOngPvA4wrg5jVzIiqj0B0gEnk/BS5OdopHgkA="; + rev = "refs/tags/v${version}"; + hash = "sha256-1ItHRbfV8tSH5h0f+/bXIBIWfAxh4Umxqm4N4MT7oek="; }; nativeBuildInputs = [ cython_3 ]; diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index f6feaaf39562e..978c1c3f62f8b 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "4.2.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - hash = "sha256-l/wx6TVS477GZL6dVa1/kNwqtCqtjfKaW5hbZEybjPI="; + hash = "sha256-/FtuvI+4FTMncLJIXuNsCXU5N8N8zk8yJ83U4Qsz6sw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index dbc75a3bb12f1..47f98327cb375 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/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/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 29ec01f238230..0966ba8ae28c0 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "4.21"; + version = "4.26.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9hFDj0Cd/F1aChU6WFNJ9agLFpxxArWZTZmZ7PhECGY="; + hash = "sha256-kiU5VooOWhqnjdhSHAIGV+D4pm9Qupz2oo0TZz9ASY8="; }; patches = [ diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index 1a8c55dfde09f..af696f384f158 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -1,24 +1,33 @@ { lib , buildPythonPackage -, fetchPypi -, nose +, fetchFromGitLab +, flit-core +, unittestCheckHook }: buildPythonPackage rec { pname = "colored"; - version = "1.4.4"; - format = "setuptools"; + version = "2.2.3"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-BP9NTdUUJ0/juZohu1L7lvJojAHpP7p77zciHny1bOA="; + src = fetchFromGitLab { + owner = "dslackw"; + repo = "colored"; + rev = "refs/tags/${version}"; + hash = "sha256-4APFAIN+cmPPd6qbqVC9iU4YntNEjoPbJXZywG1hsBY="; }; - nativeCheckInputs = [ nose ]; + nativeBuildInputs = [ + flit-core + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; - checkPhase = '' - nosetests - ''; + unittestFlagsArray = [ + "unittests" + ]; pythonImportsCheck = [ "colored" diff --git a/pkgs/development/python-modules/comm/default.nix b/pkgs/development/python-modules/comm/default.nix index 2f42ef87e928c..627c1630489d2 100644 --- a/pkgs/development/python-modules/comm/default.nix +++ b/pkgs/development/python-modules/comm/default.nix @@ -8,7 +8,7 @@ let pname = "comm"; - version = "0.1.3"; + version = "0.1.4"; in buildPythonPackage { inherit pname version; @@ -18,7 +18,7 @@ buildPythonPackage { owner = "ipython"; repo = "comm"; rev = "refs/tags/v${version}"; - hash = "sha256-5IUE2g00GT231hjuM7mLPst0QTk2Y+Re302FRDq65C8="; + hash = "sha256-6GvAyiTm+zQ5sSynuJhAg50PaMTY9EFqVVsD3K2wTkY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/compreffor/default.nix b/pkgs/development/python-modules/compreffor/default.nix index 0b5e684fdf910..f587a2963800d 100644 --- a/pkgs/development/python-modules/compreffor/default.nix +++ b/pkgs/development/python-modules/compreffor/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "compreffor"; - version = "0.5.4"; + version = "0.5.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-MGulQEUGPrQ30T3VYzwRRlvzvWkFqNzqsNzAjtjX9xU="; + hash = "sha256-9NMmIJC8Q4hRC/H2S7OrgoWSQ9SRIPHxHvZpPrPCvHo="; }; patches = [ diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index b703e5de599be..9dc6d16097a2b 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "configparser"; - version = "5.3.0"; + version = "6.0.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-i+JngktUHAmwjbEkkX9Iq1JabD6DcBHzEweBoiTFcJA="; + hash = "sha256-7JFKseVsZy3h9cNIOWTmj3GzTkV5BLe3bga5Iq7AZ6g="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -18,6 +18,12 @@ buildPythonPackage rec { export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 ''; + preCheck = '' + # avoid FileNotFoundError + # FileNotFoundError: [Errno 2] No such file or directory: 'cfgparser.3' + cd tests + ''; + meta = with lib; { description = "Updated configparser from Python 3.7 for Python 2.6+."; homepage = "https://github.com/jaraco/configparser"; diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix index dfefc1b4486e3..f5af82e55ff31 100644 --- a/pkgs/development/python-modules/contourpy/default.nix +++ b/pkgs/development/python-modules/contourpy/default.nix @@ -4,8 +4,10 @@ , pythonOlder # build +, meson +, meson-python +, ninja , pybind11 -, setuptools # propagates , numpy @@ -23,7 +25,7 @@ let countourpy = buildPythonPackage rec { pname = "contourpy"; - version = "1.0.7"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,12 +34,14 @@ let countourpy = buildPythonPackage rec { owner = "contourpy"; repo = "contourpy"; rev = "refs/tags/v${version}"; - hash = "sha256-n04b9yUoUMH2H7t8um/8h5XaL3hzY/uNMYmOKTVKEPA="; + hash = "sha256-7M+5HMDqQI4UgVfW/MXsVyz/yM6wjTcJEdw7vPvzuNY="; }; nativeBuildInputs = [ + meson + meson-python + ninja pybind11 - setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix index 2156bd9782294..1f63ed4197348 100644 --- a/pkgs/development/python-modules/correctionlib/default.nix +++ b/pkgs/development/python-modules/correctionlib/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , cmake , numpy @@ -10,36 +9,23 @@ , wheel , pybind11 , pydantic -, pytestCheckHook , rich +, awkward +, pytestCheckHook , scipy , zlib }: buildPythonPackage rec { pname = "correctionlib"; - version = "2.2.2"; - format = "pyproject"; + version = "2.3.3"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-h3eggtPLSF/8ShQ5xzowZW1KSlcI/YBsPu3lsSyzHkw="; + 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/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 4e1f780e3613c..2bcfe6c346558 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "coverage"; - version = "7.2.1"; + version = "7.3.1"; # uses f strings disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-x38qkJPM8yndUjqbKzyFTCDSo9lott7zuCAnLKZzIkI="; + hash = "sha256-bLf+FYHetnt4LBUxNlQeIJAaoxLO7a8UZ9yzUlV4eVI="; }; # No tests in archive diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 6535ab5f6c8d6..2a6b5a1fc1ee8 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -1,25 +1,26 @@ { lib , fetchPypi , buildPythonPackage +, dask , urllib3 , geojson +, pandas , pythonOlder , sqlalchemy , pytestCheckHook , pytz -, stdenv }: buildPythonPackage rec { pname = "crate"; - version = "0.31.1"; + version = "0.33.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SYjzyPqKR6BpC5z3P/ASDXe0mwi8Hz413b8Fm7cc5zo="; + hash = "sha256-bzsJnWw4rLjl1VrjmfNq4PudrnWPB1FzIuWAc9WmT6M="; }; propagatedBuildInputs = [ @@ -29,6 +30,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + dask + pandas pytestCheckHook pytz ]; diff --git a/pkgs/development/python-modules/cronsim/default.nix b/pkgs/development/python-modules/cronsim/default.nix index ef4e533a977ca..098dbe711d9d5 100644 --- a/pkgs/development/python-modules/cronsim/default.nix +++ b/pkgs/development/python-modules/cronsim/default.nix @@ -1,20 +1,22 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "cronsim"; - version = "2.3"; + version = "2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ebFYIOANXZLmM6cbovwBCJH8Wr/HlJbOR9YGp8Jw7pc="; + src = fetchFromGitHub { + owner = "cuu508"; + repo = "cronsim"; + rev = "refs/tags/${version}"; + hash = "sha256-TSVFkMCMmrMXaPJPPNjIML+z98i1iIYuKH7hHiZnJkg="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/cryptodatahub/default.nix b/pkgs/development/python-modules/cryptodatahub/default.nix new file mode 100644 index 0000000000000..7345692977969 --- /dev/null +++ b/pkgs/development/python-modules/cryptodatahub/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab + +# build-system +, setuptools + +# dependencies +, asn1crypto +, attrs +, pathlib2 +, python-dateutil +, six +, urllib3 + +# tests +, beautifulsoup4 +, pyfakefs +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "cryptodatahub"; + version = "0.10.1"; + format = "pyproject"; + + src = fetchFromGitLab { + owner = "coroner"; + repo = "cryptodatahub"; + rev = "v${version}"; + hash = "sha256-eLdK5gFrLnbIBB1NTeQzpdCLPdATVjzPn5LhhUsDuwo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + asn1crypto + attrs + pathlib2 + python-dateutil + six + urllib3 + ]; + + pythonImportsCheck = [ "cryptodatahub" ]; + + nativeCheckInputs = [ + beautifulsoup4 + pyfakefs + unittestCheckHook + ]; + + preCheck = '' + # failing tests + rm test/updaters/test_common.py + ''; + + meta = with lib; { + description = "Repository of cryptography-related data"; + homepage = "https://gitlab.com/coroner/cryptodatahub"; + changelog = "https://gitlab.com/coroner/cryptodatahub/-/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.mpl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix index f25c46907b61b..da45bb33ffc0b 100644 --- a/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cryptolyzer"; - version = "0.8.4"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "CryptoLyzer"; inherit version; - hash = "sha256-7qMNz8F0B3bph/nHkS1VrkcF1bETWAklXFOlMWu3K9s="; + hash = "sha256-jb2yin3W+VfqFWJbQOXNml0xJEbSr1SfSSFupfxBHRs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index afbbe513b21bc..1eab372381bc0 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , attrs -, six , asn1crypto +, cryptodatahub , python-dateutil +, urllib3 +, pytestCheckHook }: buildPythonPackage rec { pname = "cryptoparser"; - version = "0.8.4"; + version = "0.10.0"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-Sn4sfzu1Y1gC+4K9WdiZW92cYuVbUsBXcNbNQOv0BRw="; + pname = "CryptoParser"; + inherit version; + hash = "sha256-43V82/nxtOa9y4fVOMsxhoSQpDxTyOcHIGsbRr0euAk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - attrs - six asn1crypto + attrs + cryptodatahub python-dateutil + urllib3 ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 8c1da0f7f5c4c..0a2b13ad4c811 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -21,13 +21,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); buildPythonPackage rec { pname = "cvxopt"; - version = "1.3.0"; + version = "1.3.2"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - hash = "sha256-ALGyMvnR+QLVeKnXWBS2f6AgdY1a5CLijKjO9iafpcY="; + hash = "sha256-NGH6QsGyJAuk2h2YXKc1A5FBV/xMd0FzJ+1tfYWs2+Y="; }; buildInputs = (if stdenv.isDarwin then [ openblas ] else [ blas lapack ]); diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 3d15d8d7776cb..0fb8be981e101 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -67,6 +67,8 @@ buildPythonPackage rec { "test_diffcp_sdp_example" "test_huber" "test_partial_problem" + # https://github.com/cvxpy/cvxpy/issues/2174 + "test_scipy_mi_time_limit_reached" ] ++ lib.optionals stdenv.isAarch64 [ "test_ecos_bb_mi_lp_2" # https://github.com/cvxpy/cvxpy/issues/1241#issuecomment-780912155 ]; diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index b30fa8e5659fc..db03a359a6bd0 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "6.14.4"; + version = "6.15.7"; format = "pyproject"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cx_Freeze"; inherit version; - hash = "sha256-ydox+o4B0t/dYD+nDiY5CmWupt1iMzyU2fA4tCqgVcg="; + hash = "sha256-+X9FWkpG7gwHbZIqKftT7/RioWXdBCP6J+J8KkRTtAs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cython-test-exception-raiser/default.nix b/pkgs/development/python-modules/cython-test-exception-raiser/default.nix new file mode 100644 index 0000000000000..e6f3f8b451b36 --- /dev/null +++ b/pkgs/development/python-modules/cython-test-exception-raiser/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "cython-test-exception-raiser"; + version = "1.0.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "twisted"; + repo = "cython-test-exception-raiser"; + rev = "v${version}"; + hash = "sha256-fwMq0pOrFUJnPndH/a6ghoo6mlcVSxtsWazqE9mCx3M="; + }; + + nativeBuildInputs = [ + cython + setuptools + wheel + ]; + + pythonImportsCheck = [ + "cython_test_exception_raiser" + ]; + + meta = with lib; { + description = "Testing only. A cython simple extension which is used as helper for twisted/twisted Failure tests"; + homepage = "https://github.com/twisted/cython-test-exception-raiser"; + changelog = "https://github.com/twisted/cython-test-exception-raiser/blob/${src.rev}/CHANGELOG.rst"; + license = with licenses; [ publicDomain mit ]; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 768950237acba..ce24c505b83b8 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.12.1"; + version = "0.12.2"; disabled = isPy27 || isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-/DOQk5dIHJDePOyDG/uI2X4iDckZOdmWkgIC8YS0ZI4="; + hash = "sha256-MdSwRV1y2RRkX4A9kX2vTzFNEVxw3gV404IN64sQH2Y="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/dalle-mini/default.nix b/pkgs/development/python-modules/dalle-mini/default.nix index 0f5a0f07e06d2..f20b693d38707 100644 --- a/pkgs/development/python-modules/dalle-mini/default.nix +++ b/pkgs/development/python-modules/dalle-mini/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "dalle-mini"; - version = "0.1.4"; + version = "0.1.5"; src = fetchPypi { inherit pname version; - hash = "sha256-UwCcoKbGxZT5XB+Mtv8kAHFdj0iLw8U1Ayo60y3Tm7U="; + hash = "sha256-k4XILjNNz0FPcAzwPEeqe5Lj24S2Y139uc9o/1IUS1c="; }; format = "setuptools"; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index d990d710d6396..5d99a40c004b6 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.10.2"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OcY4nEtIfR9nvBaBwpHeUJkHXwWZp+LZxjhEkwjRC9k="; + hash = "sha256-+pTxEPuXtcu+ZekphqXD/k2tQ5werH/1ueGJOxA8pZw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index a0ae12d7c13e3..0890d5d0b0093 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , dask , fetchFromGitHub -, fetchpatch , hatch-vcs , hatchling , pyarrow @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2023.8.1"; + version = "2023.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,17 +22,9 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sSsd35Psf3VEydkNxtd9mSBzV23S7fRM/jhbC9T62kY="; + hash = "sha256-02TOUET8frAg8puUmZfB1fRV0s85+Gl/GVgFvGvtBYQ="; }; - 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/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix index 1d144b3db5f0a..98e955894f2ca 100644 --- a/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/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/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 355e16553be04..706dd76a1da33 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -38,16 +38,16 @@ buildPythonPackage rec { pname = "dask"; - version = "2023.8.0"; - 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-ZKjfxTJCu3EUOKz16+VP8+cPqQliFNc7AU1FPC1gOXw="; + hash = "sha256-u7KuZT0uH833zqLNBfqRLU7EcMrUmXgszevYA3Z7G1Y="; }; nativeBuildInputs = [ @@ -140,6 +140,12 @@ buildPythonPackage rec { "test_dot" "test_dot_nan" "test_merge_column_with_nulls" + # 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/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index 2f731daa11316..bbd16ffb126d9 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "databases"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3RRHXkM8/GoIcO6Y1EZGbnp/X5gzYkW/PV4bzGay6ZI="; + hash = "sha256-e3iMZBPdldZFuS7FyhbGj9SufnH5hBBt8MEUjixXfqA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index 8d087712a5393..f47949a6198ed 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "2.4.0"; + version = "2.9.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-V8Nl6xr96Xnd1gkw9R0aqXkitLESsAyW7ufTYn6ttLg="; + hash = "sha256-y4Pmkgq3hv6mVu0zBsoiqNOcsHM0mxTNiJOCCZ+rwA8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dataset/default.nix b/pkgs/development/python-modules/dataset/default.nix index a3f2d67d35a78..9446920d0b051 100644 --- a/pkgs/development/python-modules/dataset/default.nix +++ b/pkgs/development/python-modules/dataset/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "dataset"; - version = "1.6.0"; + version = "1.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fNvJBdZjtYKvhGzwULfP2iDNUrqhxiwRlhlFrHfmGdU="; + hash = "sha256-d9NiEY9nqMu0hI29MKs2K5+nz+vb+vQmycUAyziWmpk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index eae7b663dd996..0802ae5cf6f60 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.14.4"; + version = "2.14.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2XC5k546JvqUV4xeL1SRQOHDzItL1CE3bJQMjva3IkY="; + hash = "sha256-oLB6laY/Si071mBKoWlZpd1fqr/wNtAnhRvBKLjeEuE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 55c9cd652aa89..e5d169b6d3cc1 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace '"pytest-runner"' " + --replace '"pytest-runner"' "" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datauri/default.nix b/pkgs/development/python-modules/datauri/default.nix index 4c89eb9ba279a..d5ed9bf0525e9 100644 --- a/pkgs/development/python-modules/datauri/default.nix +++ b/pkgs/development/python-modules/datauri/default.nix @@ -1,31 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools +, pydantic , pytestCheckHook }: buildPythonPackage rec { pname = "datauri"; - version = "1.1.0"; + version = "2.0.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "fcurella"; repo = "python-datauri"; - rev = "v${version}"; - hash = "sha256-Eevd/xxKgxvvsAfI/L/KShH+PfxffBGyVwKewLgyEu0="; + rev = "refs/tags/v${version}"; + hash = "sha256-k4tlWRasGa2oQykCD9QJl65UAoZQMJVdyCfqlUBBgqY="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "datauri" ]; nativeCheckInputs = [ + pydantic pytestCheckHook ]; - disabledTestPaths = [ - # UnicodeDecodeError: 'utf-8' codec can't decode - "tests/test_file_ebcdic.txt" + disabledTests = [ + "test_pydantic" # incompatible with pydantic v2 ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dbt-bigquery/default.nix b/pkgs/development/python-modules/dbt-bigquery/default.nix index 9d456c84d22c4..5b1e9aeeb9463 100644 --- a/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dbt-bigquery"; - version = "1.5.3"; + version = "1.6.4"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mzqUdT+dI7U0tHHcr0joIB1UCfKXrDdqhtVFShjIKus="; + hash = "sha256-m458gg5TQ7jznhA9QNi8KQ+ICxdQn58mS0jvyZ88Fmg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index e927665bdc85f..930dd5618ccf3 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.5.5"; + version = "1.6.2"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aAe3sNa4CxqynsFHoTLEYWo12jEF/LAyYMqnpy5cTbg="; + hash = "sha256-zmZdFOB0jQHamRJ7Zuzr/augP6Y2smAdUvqSXDZDuwo="; }; sourceRoot = "${src.name}/core"; diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index b757683e95160..46f62dcafd7ea 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.5.8"; + version = "1.6.1"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-T7cNszIroOT8TNfOzZpdJDR1+5ybhkXvyvvM5zokVgo="; + hash = "sha256-5sgge55BwvC00Gj3UvLS/uzCgNSi4j4YdVlg/LuJI+s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix index b32f7fbd9a6b5..dccf0ed7f989a 100644 --- a/pkgs/development/python-modules/dbt-snowflake/default.nix +++ b/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "dbt-snowflake"; - version = "1.5.2"; + version = "1.6.2"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Oz9BDvxSG4kOteuwKiPccxlsmQtOEwDLVyirDSWy1kY="; + hash = "sha256-AOO3VbU1R3/snH7U7K9XXokBGXtf9Udpv7eR5HCBxss="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dbus-deviation/default.nix b/pkgs/development/python-modules/dbus-deviation/default.nix index 016b18f25081f..164c543a5ed79 100644 --- a/pkgs/development/python-modules/dbus-deviation/default.nix +++ b/pkgs/development/python-modules/dbus-deviation/default.nix @@ -9,12 +9,17 @@ buildPythonPackage rec { pname = "dbus-deviation"; version = "0.6.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-4GuI7+IjiF0nJd9Rz3ybe0Y9HG8E6knUaQh0MY0Ot6M="; }; + postPatch = '' + sed -i "/'sphinx',/d" setup.py + ''; + nativeBuildInputs = [ setuptools-git sphinx diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index b5d2ce8eef71d..4394271f7ebd2 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.11.1"; + version = "2.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oYBk+Rko5qK1k2TJdDNiN0rWdx7sdy6UpxMlDynKZ9Y="; + hash = "sha256-ZeDQn+/b6WBCodZ7Ow5IlC9XlWieAifCMJtM1yse5P8="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix index 861f9c6847ce1..0333bb37ce3ba 100644 --- a/pkgs/development/python-modules/deal/default.nix +++ b/pkgs/development/python-modules/deal/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "deal"; - version = "4.24.0"; + version = "4.24.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "life4"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5gd46SMucH0rek9talMJ74TMRRvUm5Up6pCusUIHDjE="; + hash = "sha256-bdIoKOOC7qSer9Cp9A55HG960xunKXT2WiXp0UC6tsI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index a6e901199204e..4f0d493c0f80c 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deap"; - version = "1.3.3"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - hash = "sha256-h3LxsP/wQtXlFrCuusLHBiQwRap9DejguGWPOAGBzzE="; + hash = "sha256-zAHemJLfp9G8mAPasoiS/q0XfwGCyB20c2CiQOrXeP8="; }; propagatedBuildInputs = [ numpy matplotlib ]; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 2cf3658462467..85389fba2fb2f 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -2,10 +2,8 @@ , stdenv , buildPythonPackage , pythonOlder -, pythonAtLeast , fetchFromGitHub , substituteAll -, fetchpatch , gdb , django , flask @@ -23,7 +21,7 @@ buildPythonPackage rec { version = "1.8.0"; format = "setuptools"; - disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "microsoft"; @@ -110,13 +108,8 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; disabledTests = [ - # https://github.com/microsoft/debugpy/issues/1241 - "test_flask_breakpoint_multiproc" - - # DeprecationWarning: pkg_resources is deprecated as an API - # Supposedly fixed in https://github.com/microsoft/debugpy/pull/1374, - # but still fails for a nix build - "test_gevent" + # testsuite gets stuck at this one + "test_attach_pid_client" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 7f1f0481d2287..93deb8c10b815 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -11,12 +11,13 @@ , python-dateutil , pyyaml , toml +, tomli-w , pythonOlder }: buildPythonPackage rec { pname = "deepdiff"; - version = "6.3.0"; + version = "6.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = "refs/tags/${version}"; - hash = "sha256-txZ1X1J8DwueDRpLP3OuRA+S9hc5G3YCmEG+AS6ZAkI="; + hash = "sha256-oO5+ZCDgqonxaHR95tSrPkZDar/fzr1FXtl6J2W3PeU="; }; postPatch = '' @@ -52,8 +53,15 @@ buildPythonPackage rec { numpy pytestCheckHook python-dateutil + tomli-w ] ++ passthru.optional-dependencies.cli; + disabledTests = [ + # not compatible with pydantic 2.x + "test_pydantic1" + "test_pydantic2" + ]; + pythonImportsCheck = [ "deepdiff" ]; diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 8d5d9da29a023..3203f0bb973e9 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "defcon"; - version = "0.10.2"; + version = "0.10.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ruOW5taeRa5lyCZHgTktTCkRaTSyc3rXbYIwtAwYKkQ="; + hash = "sha256-Vt4m18dfFk7qA+KLwRtMdpxo1wX6GG38rrVsJ/mkzAw="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index 4c8dae04e7bd6..ed2cf8a011710 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "deprecated"; - version = "1.2.13"; + version = "1.2.14"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { owner = "tantale"; repo = "deprecated"; - rev = "v${version}"; - hash = "sha256-rCDUY/TVmJqhrxDah62lEhqpr05JNZSyiFNTlHvSnmw="; + rev = "refs/tags/v${version}"; + hash = "sha256-H5Gp2F/ChMeEH4fSYXIB34syDIzDymfN949ksJnS0k4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix index ec386f8e0b296..08a5f2e7f50c6 100644 --- a/pkgs/development/python-modules/devtools/default.nix +++ b/pkgs/development/python-modules/devtools/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "devtools"; - version = "0.11.0"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-ogogXZnuSFkWktCin+cyefjqIbGFRBVIeOrZJAa3hOE="; + hash = "sha256-1HFbNswdKa/9cQX0Gf6lLW1V5Kt/N4X6/5kQDdzp1Wo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix index 3e05deb5e2d32..93d9e3288ddae 100644 --- a/pkgs/development/python-modules/diff-match-patch/default.nix +++ b/pkgs/development/python-modules/diff-match-patch/default.nix @@ -1,21 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, python }: +{ lib +, buildPythonPackage +, fetchPypi +, flit-core +, unittestCheckHook +}: buildPythonPackage rec { pname = "diff-match-patch"; - version = "20200713"; - - meta = { - homepage = "https://github.com/diff-match-patch-python/diff-match-patch"; - description = "Diff, Match and Patch libraries for Plain Text"; - license = lib.licenses.asl20; - }; + version = "20230430"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "da6f5a01aa586df23dfc89f3827e1cafbb5420be9d87769eeb079ddfd9477a18"; + hash = "sha256-lTAZzbnJ0snke1sSvP889HRvxFmOtAYHb6H8J+ah8Vw="; }; - checkPhase = '' - ${python.interpreter} -m unittest -v diff_match_patch.tests - ''; + nativeBuildInputs = [ + flit-core + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + meta = with lib; { + homepage = "https://github.com/diff-match-patch-python/diff-match-patch"; + description = "Diff, Match and Patch libraries for Plain Text"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 3caf068a1270d..d6fdd2b97d2d2 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , python +, pythonOlder , setuptools # passthru tests @@ -11,14 +12,16 @@ buildPythonPackage rec { pname = "dill"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; rev = "refs/tags/dill-${version}"; - hash = "sha256-lh1o/TqnqtYN9xTZom33y1/7ZhMEAFpheLdtalwgObQ="; + hash = "sha256-1cRGA5RuNjlpc3jq9SAsUYgmPauIV8zRF9SxOmveljI="; }; nativeBuildInputs = [ @@ -40,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Serialize all of python (almost)"; homepage = "https://github.com/uqfoundation/dill/"; + changelog = "https://github.com/uqfoundation/dill/releases/tag/dill-${version}"; license = licenses.bsd3; maintainers = with maintainers; [ tjni ]; }; diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/development/python-modules/dinghy/default.nix index aea49cde6f180..cae8c8abcc665 100644 --- a/pkgs/development/python-modules/dinghy/default.nix +++ b/pkgs/development/python-modules/dinghy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dinghy"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "nedbat"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xtcNcykfgcWvifso0xaeMT31+G5x4HCp+tLAIEEq4cw="; + hash = "sha256-a1CHbPSoiR3JbuAXYPJc1EsSq13DbrOttk9zLFF9+cM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix index 5d0c94686926c..9f40226e6bb36 100644 --- a/pkgs/development/python-modules/dirty-equals/default.nix +++ b/pkgs/development/python-modules/dirty-equals/default.nix @@ -9,43 +9,48 @@ , pytz }: -buildPythonPackage rec { - pname = "dirty-equals"; - version = "0.7.0"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "samuelcolvin"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-ShbkPGj1whOQ11bFLUSTfvVEVlvc3JUzRDICbBohgMM="; +let + dirty-equals = buildPythonPackage rec { + pname = "dirty-equals"; + version = "0.7.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "samuelcolvin"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-ShbkPGj1whOQ11bFLUSTfvVEVlvc3JUzRDICbBohgMM="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + pytz + ]; + + doCheck = false; + passthru.tests.pytest = dirty-equals.overrideAttrs { doCheck = true; }; + + nativeCheckInputs = [ + pydantic + pytest-examples + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dirty_equals" + ]; + + meta = with lib; { + description = "Module for doing dirty (but extremely useful) things with equals"; + homepage = "https://github.com/samuelcolvin/dirty-equals"; + changelog = "https://github.com/samuelcolvin/dirty-equals/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; }; - - nativeBuildInputs = [ - hatchling - ]; - - propagatedBuildInputs = [ - pytz - ]; - - nativeCheckInputs = [ - pydantic - pytest-examples - pytestCheckHook - ]; - - pythonImportsCheck = [ - "dirty_equals" - ]; - - meta = with lib; { - description = "Module for doing dirty (but extremely useful) things with equals"; - homepage = "https://github.com/samuelcolvin/dirty-equals"; - changelog = "https://github.com/samuelcolvin/dirty-equals/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} +in dirty-equals diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index f9668720653b5..ca91e77a6672c 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-FLrS2bBNOjYSesl/MLEqGSaPIRBj2PjuT0cQiJbhG0Y="; + hash = "sha256-na/lSzSgKOr9lQOdXl1IUaE3NFQPEzEGDTHJkW5xR6g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix index 69679a8bbf7f5..80dc392c603d3 100644 --- a/pkgs/development/python-modules/distrax/default.nix +++ b/pkgs/development/python-modules/distrax/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "distrax"; - version = "0.1.3"; + version = "0.1.4"; src = fetchPypi { inherit pname version; - hash = "sha256-x9ORfhGX5catEZMfR+iXkZSRa/wIb0B3CrCWOWf35Ks="; + hash = "sha256-klXT5wfnWUGMrf5sQhYqz7Foc/Ou5y4GIFgtTff1ZFQ="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index fc52b3b9fc5b4..55d5dabdd009c 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/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/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index a2219ae22cc5c..116e3085d9085 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , django , django-allauth , djangorestframework @@ -12,15 +13,23 @@ buildPythonPackage rec { pname = "dj-rest-auth"; - version = "4.0.1"; + version = "5.0.1"; src = fetchFromGitHub { owner = "iMerica"; repo = "dj-rest-auth"; rev = "refs/tags/${version}"; - hash = "sha256-+ladx0b/bvvUW8zLjtG8IiWWdfPTqqm/KYbEK9uiFaU="; + 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/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 439c4c2cb564f..49864b0b9bbb5 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -1,18 +1,35 @@ { lib , buildPythonPackage -, django , fetchFromGitHub -, python3-openid , pythonOlder + +# build-system +, setuptools + +# dependencies +, django +, python3-openid , requests , requests-oauthlib , pyjwt + +# optional-dependencies +, python3-saml +, qrcode + +# tests +, pillow +, pytestCheckHook +, pytest-django + +# passthru tests +, dj-rest-auth }: buildPythonPackage rec { pname = "django-allauth"; - version = "0.54.0"; - format = "setuptools"; + version = "0.57.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,13 +37,12 @@ buildPythonPackage rec { owner = "pennersr"; repo = pname; rev = version; - hash = "sha256-0yJsHJhYeiCHQg/QzFD/metb97rcUJ+LYlsl7fGYmuM="; + hash = "sha256-zhKqvm43rw28UKNFdfJ2C1dIeZfPqmchb1rJykm1lx4="; }; - postPatch = '' - chmod +x manage.py - patchShebangs manage.py - ''; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ django @@ -37,19 +53,34 @@ buildPythonPackage rec { ] ++ pyjwt.optional-dependencies.crypto; - checkPhase = '' - # test is out of date - rm allauth/socialaccount/providers/cern/tests.py - - ./manage.py test - ''; + passthru.optional-dependencies = { + saml = [ + python3-saml + ]; + mfa = [ + qrcode + ]; + }; pythonImportsCheck = [ "allauth" ]; + nativeCheckInputs = [ + pillow + pytestCheckHook + pytest-django + ] + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + passthru.tests = { + inherit dj-rest-auth; + }; + meta = with lib; { + changelog = "https://github.com/pennersr/django-allauth/blob/${version}/ChangeLog.rst"; description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication"; + downloadPage = "https://github.com/pennersr/django-allauth"; homepage = "https://www.intenct.nl/projects/django-allauth"; license = licenses.mit; maintainers = with maintainers; [ derdennisop ]; diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index fb8ca502695d4..50b86d7fb90a5 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "9.0"; + version = "10.1"; src = fetchFromGitHub { owner = "anymail"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qEYBHsaHo1gmrsa6q7DQiUJurC7cXhv5e/SQ7R3Tkzc="; + hash = "sha256-unmbYQFLeqfqE1uFLMPLUad1UqA+sgbTzwRfpRhM3ik="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-environ/default.nix b/pkgs/development/python-modules/django-environ/default.nix index bb3cd1acf7ced..b0e3f6eb0c40b 100644 --- a/pkgs/development/python-modules/django-environ/default.nix +++ b/pkgs/development/python-modules/django-environ/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-environ"; - version = "0.9.0"; + version = "0.11.2"; src = fetchPypi { inherit pname version; - hash = "sha256-v/U4FTMFYyjJrAL3F5C9W/HOqBsb7rZI8ouByeg+CiE="; + hash = "sha256-8yqHqgiZiUwn1OF3b6a0d+gWTtf2s+QQpiptcsqvZL4="; }; # The testsuite fails to modify the base environment diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 99e9fe078ff4f..eb46b6b869206 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , django , factory-boy , mock @@ -16,23 +15,15 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "3.2.1"; + version = "3.2.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-i8A/FMba1Lc3IEBzefP3Uu23iGcDGYqo5bNv+u6hKQI="; + hash = "sha256-A2+5FBv0IhTJPkwgd7je+B9Ac64UHJEa3HRBbWr2FxM="; }; - patches = [ - (fetchpatch { - # pygments 2.14 compat for tests - url = "https://github.com/django-extensions/django-extensions/commit/61ebfe38f8fca9225b41bec5418e006e6a8815e1.patch"; - hash = "sha256-+sxaQMmKi/S4IlfHqARPGhaqc+F1CXUHVFyeU/ArW2U="; - }) - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace "--cov=django_extensions --cov-report html --cov-report term" "" diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index 1225a3301a101..dcbcede305631 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -1,43 +1,44 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , django -, djangorestframework, python, mock +, djangorestframework +, pytestCheckHook +, pytest-django +, python }: buildPythonPackage rec { pname = "django-filter"; - version = "22.1"; + version = "23.3"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-7Uc7duhPfoOyURuyBQw++zbRNSB9ASjf465LNuNZS6U="; + hash = "sha256-AV/hVVguGAW0Bik0Tkps88xARQgn0pTQQLS4wXSan6Y="; }; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ django ]; pythonImportsCheck = [ "django_filters" ]; - # Tests fail (needs the 'crispy_forms' module not packaged on nixos) - doCheck = false; - nativeCheckInputs = [ djangorestframework - django - mock + pytestCheckHook + pytest-django ]; - checkPhase = '' - runHook preCheck - ${python.interpreter} runtests.py tests - runHook postCheck - ''; + env.DJANGO_SETTINGS_MODULE = "tests.settings"; meta = with lib; { description = "Reusable Django application for allowing users to filter querysets dynamically"; - homepage = "https://pypi.org/project/django-filter/"; + homepage = "https://github.com/carltongibson/django-filter"; + changelog = "https://github.com/carltongibson/django-filter/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index ef77abefeeae0..01e1593a82cea 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.3.0"; + version = "3.4.1"; format = "setuptools"; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; rev = "refs/tags/${version}"; - hash = "sha256-ytQ4xxkBAC3amQbenD8RO5asrbfNAjOspWUY3c2hkig="; + hash = "sha256-y8KT/Fbk2eQDbGzcJtLdwS6jPCNoTWXousvqY+GlFnQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index bc87f6f5dfd61..5f68c82b1f566 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "3.2.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ws9gUPCr5nM8HGbCt9+6IFjLgAKiCMQRkY/yfIb2mng="; + hash = "sha256-9eFBFTx+M28tbIKflldvDJW1po5ht/5FBX5ImfHGFuk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 6639257740bc9..c68c554b9b9e6 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch # propagates , django-gravatar2 @@ -24,6 +25,17 @@ buildPythonPackage rec { hash = "sha256-GpI1W0O9aJpLF/mcS23ktJDZsP69S2zQy7drOiWBnTM="; }; + patches = [ + (fetchpatch { + url = "https://gitlab.com/mailman/django-mailman3/-/commit/840d0d531a0813de9a30e72427e202aea21b40fe.patch"; + hash = "sha256-vltvsIP/SWpQZeXDUB+GWlTu+ghFMUqIT8i6CrYcmGo="; + }) + (fetchpatch { + url = "https://gitlab.com/mailman/django-mailman3/-/commit/25c55e31d28f2fa8eb23f0e83c12f9b0a05bfbf0.patch"; + hash = "sha256-ug5tBmnVfJTn5ufDDVg/cEtsZM59jQYJpQZV51T3qIc="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace 'django>=3.2,<4.2' 'django>=3.2,<4.3' diff --git a/pkgs/development/python-modules/django-markup/default.nix b/pkgs/development/python-modules/django-markup/default.nix index e373fa30a526f..ed33d09372365 100644 --- a/pkgs/development/python-modules/django-markup/default.nix +++ b/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/pkgs/development/python-modules/django-mysql/default.nix b/pkgs/development/python-modules/django-mysql/default.nix index 1995574762dd7..9db6be33ed0dc 100644 --- a/pkgs/development/python-modules/django-mysql/default.nix +++ b/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/pkgs/development/python-modules/django-pattern-library/default.nix b/pkgs/development/python-modules/django-pattern-library/default.nix index 00b6fe9c978f6..76d376d11c092 100644 --- a/pkgs/development/python-modules/django-pattern-library/default.nix +++ b/pkgs/development/python-modules/django-pattern-library/default.nix @@ -1,47 +1,59 @@ -{ beautifulsoup4 -, buildPythonPackage -, django +{ buildPythonPackage , fetchFromGitHub +, fetchpatch , lib -, markdown + +# build-system , poetry-core -, python + +# dependencies +, django +, markdown , pyyaml + +# tests +, beautifulsoup4 +, pytestCheckHook +, pytest-django }: buildPythonPackage rec { pname = "django-pattern-library"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; src = fetchFromGitHub { - repo = pname; owner = "torchbox"; + repo = "django-pattern-library"; rev = "v${version}"; - sha256 = "sha256-V299HpbfNLa9cpVhBfzD41oe95xqh+ktQVMMVvm5Xao="; + hash = "sha256-Q8rv7RDlstTSlwmbmHV0vrnCV/lwz6VJf27BUllA34Y="; }; + patches = [ + (fetchpatch { + # https://github.com/torchbox/django-pattern-library/pull/232 + url = "https://github.com/torchbox/django-pattern-library/commit/e7a9a8928a885941391fb584eba81578a292ee7d.patch"; + hash = "sha256-3uUoxdVYEiF+to88qZRhOkh1++RfmsqCzO9JNMDqz6g="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ django pyyaml markdown ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace poetry.masonry.api poetry.core.masonry.api - ''; - - nativeBuildInputs = [ poetry-core ]; - - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 + pytestCheckHook + pytest-django ]; - checkPhase = '' - export DJANGO_SETTINGS_MODULE=tests.settings.dev - ${python.interpreter} -m django test - ''; + env.DJANGO_SETTINGS_MODULE = "tests.settings.dev"; pythonImportsCheck = [ "pattern_library" ]; @@ -51,7 +63,5 @@ buildPythonPackage rec { changelog = "https://github.com/torchbox/django-pattern-library/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ sephi ]; - # https://github.com/torchbox/django-pattern-library/issues/212 - broken = lib.versionAtLeast django.version "4.2"; }; } diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix index e7aed3f22b591..26a9c784f88d0 100644 --- a/pkgs/development/python-modules/django-redis/default.nix +++ b/pkgs/development/python-modules/django-redis/default.nix @@ -20,7 +20,7 @@ let pname = "django-redis"; - version = "5.3.0"; + version = "5.4.0"; in buildPythonPackage { inherit pname version; @@ -30,8 +30,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "jazzband"; repo = "django-redis"; - rev = version; - hash = "sha256-eX9rUUvpkRrkZ82YalWn8s9DTw6nsbGzi1A6ibRoQGw="; + rev = "refs/tags/${version}"; + hash = "sha256-m7z3c7My24vrSSnyfDQ/LlWhy7pV4U0L8LATMvkfczc="; }; postPatch = '' @@ -71,12 +71,12 @@ buildPythonPackage { # ModuleNotFoundError: No module named 'test_cache_options' "test_custom_key_function" # ModuleNotFoundError: No module named 'test_client' + "test_delete_pattern_calls_delete_for_given_keys" "test_delete_pattern_calls_get_client_given_no_client" "test_delete_pattern_calls_make_pattern" - "test_delete_pattern_calls_scan_iter_with_count_if_itersize_given" "test_delete_pattern_calls_pipeline_delete_and_execute" "test_delete_pattern_calls_scan_iter" - "test_delete_pattern_calls_delete_for_given_keys" + "test_delete_pattern_calls_scan_iter_with_count_if_itersize_given" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/django-shortuuidfield/default.nix b/pkgs/development/python-modules/django-shortuuidfield/default.nix new file mode 100644 index 0000000000000..dd999963a1150 --- /dev/null +++ b/pkgs/development/python-modules/django-shortuuidfield/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, django +, fetchPypi +, shortuuid +, six +}: + +buildPythonPackage rec { + pname = "django-shortuuidfield"; + version = "0.1.3"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-opLA/lU4q+lHsTHiuRTt2axEr8xqQOrscUSOYjGj7wA="; + }; + + propagatedBuildInputs = [ + django + shortuuid + six + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ + "shortuuidfield" + ]; + + meta = with lib; { + description = "Short UUIDField for Django. Good for use in urls & file names"; + homepage = "https://github.com/benrobster/django-shortuuidfield"; + license = licenses.bsd3; + maintainers = with maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 5b638aa05b347..1bce8c0d751e1 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -1,53 +1,90 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub + +# build-system +, setuptools + +# dependencies , django + +# optional-dependencies , azure-storage-blob , boto3 , dropbox , google-cloud-storage , libcloud , paramiko + +# tests +, cryptography +, moto +, pytestCheckHook +, rsa }: buildPythonPackage rec { pname = "django-storages"; - version = "1.13.2"; + version = "1.14"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-y63RXJCc63JH1P/FA/Eqm+w2mZ340L73wx5XF31RJog="; + src = fetchFromGitHub { + owner = "jschneier"; + repo = "django-storages"; + rev = "refs/tags/${version}"; + hash = "sha256-q+vQm1T5/ueGPfwzuUOmSI/nESchqJc4XizJieBsLWc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ django ]; - preCheck = '' - export DJANGO_SETTINGS_MODULE=tests.settings - # timezone issues https://github.com/jschneier/django-storages/issues/1171 - substituteInPlace tests/test_sftp.py \ - --replace 'test_accessed_time' 'dont_test_accessed_time' \ - --replace 'test_modified_time' 'dont_test_modified_time' - ''; - - nativeCheckInputs = [ - azure-storage-blob - boto3 - dropbox - google-cloud-storage - libcloud - paramiko - ]; + passthru.optional-dependencies = { + azure = [ + azure-storage-blob + ]; + boto3 = [ + boto3 + ]; + dropbox = [ + dropbox + ]; + google = [ + google-cloud-storage + ]; + libcloud = [ + libcloud + ]; + s3 = [ + boto3 + ]; + sftp = [ + paramiko + ]; + }; pythonImportsCheck = [ "storages" ]; + env.DJANGO_SETTINGS_MODULE = "tests.settings"; + + nativeCheckInputs = [ + cryptography + moto + pytestCheckHook + rsa + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + meta = with lib; { + changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; description = "Collection of custom storage backends for Django"; + downloadPage = "https://github.com/jschneier/django-storages/"; homepage = "https://django-storages.readthedocs.io"; - changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index fe7e96579cdbb..6dcc875884e0b 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "4.2.3"; + version = "4.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2tqzm0bZro83qOh5xZDzmp4EK1ZcA/oMWo91S0QbHyM="; + hash = "sha256-fUoTLDgVGYFehlwnqJ7KQby9BgVoMlByJIFqQ9dcYBw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-taggit/default.nix b/pkgs/development/python-modules/django-taggit/default.nix index 4260f76e03c5c..81326d195a2d2 100644 --- a/pkgs/development/python-modules/django-taggit/default.nix +++ b/pkgs/development/python-modules/django-taggit/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch , django , djangorestframework , python @@ -10,24 +9,16 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "3.1.0"; + version = "4.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yPLk6uOHk5CJs9ddHYZJ4AiICXDAaM6dDoL4f9XilQg="; + hash = "sha256-TVLenTckWpufmMDscf3M8dIoPjjohm1Ap65qO2eHoWE="; }; - patches = [ - (fetchpatch { - # Django 4.2 support; https://github.com/jazzband/django-taggit/pull/850 - url = "https://github.com/jazzband/django-taggit/commit/5f19cfbaa14e8d6d4d1679529eb168a87ca97908.patch"; - hash = "sha256-KcsiACLy3+1JoFquu//Kz+iAySZQAVIuBEKzNZaaR9s="; - }) - ]; - propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 9c8e13842422f..7796c31ebd0e1 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "django"; - version = "3.2.20"; + version = "3.2.22"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Django"; inherit version; - hash = "sha256-3sKhFnh7jhSWIBS/eOEgu6RUE1EI4a+em5Gt57KWTEA="; + hash = "sha256-g7bWawbkhIB9d4Jj/cf5GG1NwYYvz6ZQeDBEasawYLo="; }; patches = [ diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index d694ff7fb0338..582a2fab79c25 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.2.5"; + version = "4.2.6"; format = "pyproject"; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-XlwclUj/t3lrSopHgumi5aPfNhUln8G/0+vHO2RhRsE="; + hash = "sha256-CPQfRotjM1rqDZBMVyngJQMA9qGQe/KTplSZSWzbxo8="; }; patches = [ diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix new file mode 100644 index 0000000000000..f17a961db6555 --- /dev/null +++ b/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/pkgs/development/python-modules/django/django_5_disable_failing_tests.patch b/pkgs/development/python-modules/django/django_5_disable_failing_tests.patch new file mode 100644 index 0000000000000..dd4b3f6ac72a0 --- /dev/null +++ b/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/pkgs/development/python-modules/django/django_5_set_geos_gdal_lib.patch b/pkgs/development/python-modules/django/django_5_set_geos_gdal_lib.patch new file mode 100644 index 0000000000000..c1fdcdc4e92e5 --- /dev/null +++ b/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/pkgs/development/python-modules/django/django_5_set_zoneinfo_dir.patch b/pkgs/development/python-modules/django/django_5_set_zoneinfo_dir.patch new file mode 100644 index 0000000000000..166cc56281cf1 --- /dev/null +++ b/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/pkgs/development/python-modules/django/django_5_tests_pythonpath.patch b/pkgs/development/python-modules/django/django_5_tests_pythonpath.patch new file mode 100644 index 0000000000000..8355d267a73ff --- /dev/null +++ b/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/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index f4c59515315ce..80c73f2fe0a61 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "docker"; - version = "6.0.1"; + version = "6.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iWxCguXHr1xF6LaDsLDDOTKXT+blD8aQagqDYWqz2pc="; + hash = "sha256-qm0XgwBFul7wFo1eqjTTe+6xE5SMQTr/4dWZH8EfmiA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/docopt-ng/default.nix b/pkgs/development/python-modules/docopt-ng/default.nix index a6297780a83a6..cdeda778e0dc0 100644 --- a/pkgs/development/python-modules/docopt-ng/default.nix +++ b/pkgs/development/python-modules/docopt-ng/default.nix @@ -1,17 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, pdm-backend }: buildPythonPackage rec { pname = "docopt-ng"; - version = "0.8.1"; + version = "0.9.0"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-6mphooj8hk7uayLW/iiqIC1Z/Ib60F8W/145zE6n9uM="; + pname = "docopt_ng"; + inherit version; + hash = "sha256-kcbaELW7by6eJTRYKfuCeMeK8Bn2/ECIetSbBgSDsdc="; }; + nativeBuildInputs = [ + pdm-backend + ]; + pythonImportsCheck = [ "docopt" ]; doCheck = false; # no tests in the package diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index ca7fcae7406e6..136f679fcf6e2 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "docutils"; - version = "0.19"; + version = "0.20.1"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-M5laZ1PDC39Xf+v8LFBBH+xqrH9//rfEz+WZEHLc+eY="; + hash = "sha256-8IpOJ2w6FYOobc4+NKuj/gTQK7ot1R7RYQYkToqSPjs="; }; # Only Darwin needs LANG, but we could set it in general. diff --git a/pkgs/development/python-modules/dogpile-cache/default.nix b/pkgs/development/python-modules/dogpile-cache/default.nix index 4f5337fdb04c8..069d08f4d551f 100644 --- a/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/pkgs/development/python-modules/dogpile-cache/default.nix @@ -2,41 +2,45 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools , pytestCheckHook -, mock , mako , decorator , stevedore +, typing-extensions }: buildPythonPackage rec { pname = "dogpile-cache"; - version = "1.2.0"; + version = "1.2.2"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "dogpile.cache"; inherit version; - hash = "sha256-R1VMhgzrSE3Vrvn/H4j+yz1K72u5IRlFD1vLqgJrv7E="; + hash = "sha256-/ZAiwNnLra3yCUI5GpWtrylr6AtC2qjiAvjeHCHxmLI="; }; - preCheck = '' - # Disable concurrency tests that often fail, - # probably some kind of timing issue. - rm tests/test_lock.py - # Failing tests. https://bitbucket.org/zzzeek/dogpile.cache/issues/116 - rm tests/cache/test_memcached_backend.py - ''; - - dontUseSetuptoolsCheck = true; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ pytestCheckHook mock mako ]; + propagatedBuildInputs = [ + decorator + stevedore + typing-extensions + ]; - propagatedBuildInputs = [ decorator stevedore ]; + nativeCheckInputs = [ + pytestCheckHook + mako + ]; meta = with lib; { description = "A caching front-end based on the Dogpile lock"; - homepage = "https://bitbucket.org/zzzeek/dogpile.cache"; + homepage = "https://github.com/sqlalchemy/dogpile.cache"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/draftjs-exporter/default.nix b/pkgs/development/python-modules/draftjs-exporter/default.nix index aac2ed2f6baf5..ef94901e9aac1 100644 --- a/pkgs/development/python-modules/draftjs-exporter/default.nix +++ b/pkgs/development/python-modules/draftjs-exporter/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "draftjs-exporter"; - version = "2.1.7"; + version = "5.0.0"; src = fetchFromGitHub { repo = "draftjs_exporter"; owner = "springload"; - rev = "v${version}"; - sha256 = "sha256-tw0r9RnQdIwcY+pqnW8fcV0o2LzmxW0MZPn5drNgK80="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-4MmCVRx350p6N9XqTZSo8ROI/OJ0s4aKSYH9+Oxgvf4="; }; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index 9e476ad5c188d..253604370cbc8 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/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/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index e9aac74d835e7..5ff9956849926 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -13,17 +13,19 @@ }: buildPythonPackage rec { - inherit (duckdb) pname version src patches; + inherit (duckdb) pname version src; format = "setuptools"; - postPatch = '' + # 1. let nix control build cores + # 2. default to extension autoload & autoinstall disabled + # 3. unconstrain setuptools_scm version + patches = (duckdb.patches or []) ++ [ ./setup.patch ]; + + postPatch = (duckdb.postPatch or "") + '' # we can't use sourceRoot otherwise patches don't apply, because the patches apply to the C++ library cd tools/pythonpkg - # 1. let nix control build cores - # 2. unconstrain setuptools_scm version - substituteInPlace setup.py \ - --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" + substituteInPlace setup.py --subst-var NIX_BUILD_CORES # avoid dependency on mypy rm tests/stubs/test_stubs.py @@ -54,6 +56,8 @@ buildPythonPackage rec { disabledTests = [ # tries to make http request "test_install_non_existent_extension" + # test is racy and interrupt can be delivered before or after target point + "test_connection_interrupt" ]; preCheck = '' diff --git a/pkgs/development/python-modules/duckdb/setup.patch b/pkgs/development/python-modules/duckdb/setup.patch new file mode 100644 index 0000000000000..8c8f790a66a1d --- /dev/null +++ b/pkgs/development/python-modules/duckdb/setup.patch @@ -0,0 +1,30 @@ +diff --git a/tools/pythonpkg/setup.py b/tools/pythonpkg/setup.py +index 30f1e1ccdd..6784169fcb 100644 +--- a/tools/pythonpkg/setup.py ++++ b/tools/pythonpkg/setup.py +@@ -96,7 +96,7 @@ def parallel_cpp_compile( + return + self._compile(obj, src, ext, cc_args, extra_postargs, pp_opts) + +- list(multiprocessing.pool.ThreadPool(multiprocessing.cpu_count()).imap(_single_compile, objects)) ++ list(multiprocessing.pool.ThreadPool(@NIX_BUILD_CORES@).imap(_single_compile, objects)) + return objects + + +@@ -163,7 +163,6 @@ if 'BUILD_HTTPFS' in os.environ: + for ext in extensions: + toolchain_args.extend(['-DDUCKDB_EXTENSION_{}_LINKED'.format(ext.upper())]) + +-toolchain_args.extend(['-DDUCKDB_EXTENSION_AUTOLOAD_DEFAULT=1', '-DDUCKDB_EXTENSION_AUTOINSTALL_DEFAULT=1']) + + + class get_pybind_include(object): +@@ -348,7 +347,7 @@ setup( + packages=packages, + include_package_data=True, + python_requires='>=3.7.0', +- setup_requires=setup_requires + ["setuptools_scm<7.0.0", 'pybind11>=2.6.0'], ++ setup_requires=setup_requires + ["setuptools_scm", 'pybind11>=2.6.0'], + use_scm_version=setuptools_scm_conf, + tests_require=['google-cloud-storage', 'mypy', 'pytest'], + classifiers=[ diff --git a/pkgs/development/python-modules/duo-client/default.nix b/pkgs/development/python-modules/duo-client/default.nix index 088e9dc844cba..05f9f0c9a4062 100644 --- a/pkgs/development/python-modules/duo-client/default.nix +++ b/pkgs/development/python-modules/duo-client/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "duo-client"; - version = "4.7.1"; + version = "5.0.1"; src = fetchFromGitHub { owner = "duosecurity"; repo = "duo_client_python"; rev = "refs/tags/${version}"; - hash = "sha256-nnKujvhOtuNnlFrbmYtD7L++S7DK0Qqrc0LyAVYe7Xg="; + hash = "sha256-G0XLZZaQTPD64WXN34wq2z+YtzECgtC2nJXzDxAlgyg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix index cb899bb04c07a..7066271182ef4 100644 --- a/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "dynalite-devices"; - version = "0.1.48"; + version = "0.47"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ziv1234"; repo = "python-dynalite-devices"; rev = "refs/tags/v${version}"; - hash = "sha256-i88aIsRNsToSceQdwfspJg+Y5MO5zC4O6EkyhrYR27g="; + hash = "sha256-kJo4e5vhgWzijLUhQd9VBVk1URpg9SXhOA60dJYashM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/editables/default.nix b/pkgs/development/python-modules/editables/default.nix index 0211a855b3b48..f3db3a96d26fd 100644 --- a/pkgs/development/python-modules/editables/default.nix +++ b/pkgs/development/python-modules/editables/default.nix @@ -1,18 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , pytestCheckHook }: buildPythonPackage rec { pname = "editables"; - version = "0.3"; + version = "0.5"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-FnUk43c1jtHxN05hwmjw16S/fb0EbGVve0EM3hYWGxo="; + hash = "sha256-MJYn2bXErcDmaNjG+nusG6fIxdQVwtJ/YPCB+OgNHeI="; }; + nativeBuildInputs = [ + flit-core + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix index 03c67d7ce5273..a1e0b65aec203 100644 --- a/pkgs/development/python-modules/einops/default.nix +++ b/pkgs/development/python-modules/einops/default.nix @@ -3,16 +3,18 @@ , chainer , fetchFromGitHub , hatchling +, jupyter , nbconvert , numpy , parameterized +, pillow , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "einops"; - version = "0.6.0"; + version = "0.6.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,21 +23,22 @@ buildPythonPackage rec { owner = "arogozhnikov"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/bnp8IhDxp8EB/PoW5Dz+7rOru0/odOrts84aq4qyJw="; + hash = "sha256-+TaxaxOc5jAm79tIK0NHZ58HgcgdCANrSo/602YaF8E="; }; nativeBuildInputs = [ hatchling ]; nativeCheckInputs = [ chainer + jupyter nbconvert numpy parameterized + pillow pytestCheckHook ]; - # No CUDA in sandbox - EINOPS_SKIP_CUPY = 1; + env.EINOPS_TEST_BACKENDS = "numpy,chainer"; preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 2fe746ea7f389..e5bdc6571cc9c 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "7.4.0"; + version = "8.9.0"; src = fetchPypi { inherit pname version; - sha256 = "c4a7b93882918a413b63bed54018a1685d7410ffd8facbc860ee7fd57f214a6d"; + sha256 = "sha256-ZkEK34gfArigMuilsqPuCT/e7eS4FPvwTA9s4EmbdHI="; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ]; diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index b8c25ce5ac31d..a07ba8c6d1880 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.16.3"; + version = "8.9.0"; src = fetchPypi { inherit pname version; - sha256 = "8adf8bc351ed55df7296be1009d38a1c999c0abc7d8700fa88533f1ad6087c5e"; + sha256 = "sha256-0zZ/wBPgT8eq00mm3p+tHuBPttYnsOeJaqUFwS/eXgQ="; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix index 92b4cad66b5cd..3aeab819b76a5 100644 --- a/pkgs/development/python-modules/elgato/default.nix +++ b/pkgs/development/python-modules/elgato/default.nix @@ -13,18 +13,25 @@ buildPythonPackage rec { pname = "elgato"; - version = "4.0.1"; + version = "5.0.0"; format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-elgato"; rev = "refs/tags/v${version}"; - hash = "sha256-kyFnc/lMxgYy8s/gAP5vpEPV8a+dphOummr6G7deGQ4="; + hash = "sha256-TI5wu2FYVUMvgDkbktcwPLnTSD8XUSy8qwOCdrsiopk="; }; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -41,13 +48,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" - ''; - pythonImportsCheck = [ "elgato" ]; @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for Elgato Key Lights"; homepage = "https://github.com/frenck/python-elgato"; + changelog = "https://github.com/frenck/python-elgato/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index 76b5b6fbe34a7..99ae071f4ae3c 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "email-validator"; - version = "1.3.1"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "JoshData"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-JW6Yrotm3HjUOUtNFxRorkrJKjzuwIXwjpUuMWEyLV0="; + hash = "sha256-o7UREa+IBiFjmqx0p+4XJCcoHQ/R6r2RtoezEcWvgbg="; }; propagatedBuildInputs = [ @@ -30,18 +30,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # fails with dns.resolver.NoResolverConfiguration due to network sandboxing - "test_deliverability_no_records" - "test_deliverability_found" - "test_deliverability_fails" - "test_deliverability_dns_timeout" - "test_email_example_reserved_domain" - "test_main_single_good_input" - "test_main_multi_input" - "test_main_input_shim" - "test_validate_email__with_caching_resolver" - "test_validate_email__with_configured_resolver" + disabledTestPaths = [ + # dns.resolver.NoResolverConfiguration: cannot open /etc/resolv.conf + "tests/test_deliverability.py" + "tests/test_main.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index c49579a03fe1f..74f70ee4979b3 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -13,25 +13,16 @@ buildPythonPackage rec { pname = "envisage"; - version = "6.1.0"; - format = "setuptools"; + version = "7.0.3"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-AATsUNcYLB4vtyvuooAMDZx8p5fayijb6yJoUKTCW40="; + hash = "sha256-97GviL86j/8qmsbja7SN6pkp4/YSIEz+lK7WKwMWyeM="; }; - patches = [ - # TODO: remove on next release - (fetchpatch { - name = "fix-mistake-in-menu-group-specification.patch"; - url = "https://github.com/enthought/envisage/commit/f23ea3864a5f6ffca665d47dec755992e062029b.patch"; - hash = "sha256-l4CWB4jRkSmoTDoV8CtP2w87Io2cLINKfOSaSPy7cXE="; - }) - ]; - # for the optional dependency ipykernel, only versions < 6 are # supported, so it's not included in the tests, and not propagated propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix index cddeddfef8c2d..511f8d17ecbe1 100644 --- a/pkgs/development/python-modules/eradicate/default.nix +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "eradicate"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "wemake-services"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pVjvzW3UVeLMLLYcU0SIE19GEHFmouoA/JKSweTZSGo="; + hash = "sha256-ikiqNe1a+OeRraNBbtAx6v3LsTajWlgxm4wR2Tcbmjk="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 528e849290db9..eb184c180d5b9 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -2,31 +2,22 @@ , buildPythonPackage , isPyPy , fetchPypi -, fetchpatch +, hatchling +, hatch-vcs +, gevent , pytestCheckHook -, setuptools-scm -, apipkg -, py }: buildPythonPackage rec { pname = "execnet"; - version = "1.9.0"; - format = "setuptools"; + version = "2.0.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"; + hash = "sha256-zFm8RCN0L9ca0icSLrDdRNtR77PcQJW0WsmgjHcAlq8="; }; - patches = [ - (fetchpatch { - # Fix test compat with pytest 7.2.0 - url = "https://github.com/pytest-dev/execnet/commit/c0459b92bc4a42b08281e69b8802d24c5d3415d4.patch"; - hash = "sha256-AT2qr7AUpFXcPps525U63A7ARcEVmf0HM6ya73Z2vi0="; - }) - ]; - postPatch = '' # remove vbox tests rm testing/test_termination.py @@ -38,21 +29,27 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - setuptools-scm - ]; - - propagatedBuildInputs = [ - apipkg + hatchling + hatch-vcs ]; # sometimes crashes with: OSError: [Errno 9] Bad file descriptor doCheck = !isPyPy; nativeCheckInputs = [ - py # no longer required with 1.10.0 + gevent pytestCheckHook ]; + disabledTests = [ + # gets stuck + "test_popen_io" + # OSError: [Errno 9] Bad file descriptor + "test_stdouterrin_setnull" + ]; + + pytestFlagsArray = [ "-vvv" ]; + pythonImportsCheck = [ "execnet" ]; diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix index f6d9ecaf876af..aaeda3f40e736 100644 --- a/pkgs/development/python-modules/ezyrb/default.nix +++ b/pkgs/development/python-modules/ezyrb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ezyrb"; - version = "1.3.0.post2305"; + version = "1.3.0.post2309"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "EZyRB"; rev = "refs/tags/v${version}"; - hash = "sha256-uYwLz5NY+8lO8hZnAhqv+5PlcCSm6OOFWra47pwQhxg="; + hash = "sha256-9g7FCyGZc9TDR9MummM1KJJZs31Oo50N/U6HjKM90Nw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 7e26264bc3e7b..4f0a1e7013527 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "faker"; - version = "17.3.0"; + version = "19.6.1"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-JrKGSlMyCU8sfzlo3uurzmm+Oe1dtNvyK0+guj0aza4="; + hash = "sha256-XWt4gLO+pwgHXd+Rk4QkRT8HBTpZ+PoEU8GHDfb/MpI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index c0c4b36d34399..553f313bd0b64 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -1,27 +1,41 @@ { lib , buildPythonPackage , fetchFromGitHub -, pydantic +, pythonOlder + +# build-system +, hatchling + +# dependencies , starlette -, pytestCheckHook -, pytest-asyncio -, aiosqlite -, databases +, pydantic +, typing-extensions + +# tests +, dirty-equals , flask -, httpx -, hatchling -, orjson , passlib -, peewee +, pytest-asyncio +, pytestCheckHook , python-jose , sqlalchemy , trio -, pythonOlder + +# optional-dependencies +, httpx +, jinja2 +, python-multipart +, itsdangerous +, pyyaml +, ujson +, orjson +, email-validator +, uvicorn }: buildPythonPackage rec { pname = "fastapi"; - version = "0.95.2"; + version = "0.103.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,40 +44,43 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wD39CqUZOgwpG/NEGz/pXgQsadzUoM/elxfEXthOlHo="; + hash = "sha256-2J8c3S4Ca+c5bI0tyjMJArJKux9qPmu+ohqve5PhSGI="; }; nativeBuildInputs = [ hatchling ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"databases[sqlite] >=0.3.2,<0.7.0",' "" \ - --replace "starlette==" "starlette>=" - ''; - propagatedBuildInputs = [ starlette pydantic + typing-extensions ]; - nativeCheckInputs = [ - aiosqlite - # databases FIXME incompatible with SQLAlchemy 2.0 - flask + passthru.optional-dependencies.all = [ httpx + jinja2 + python-multipart + itsdangerous + pyyaml + ujson orjson + email-validator + uvicorn + # pydantic-settings + # pydantic-extra-types + ] ++ uvicorn.optional-dependencies.standard; + + nativeCheckInputs = [ + dirty-equals + flask passlib - peewee - python-jose pytestCheckHook pytest-asyncio - sqlalchemy + python-jose trio - ] - ++ passlib.optional-dependencies.bcrypt - ++ pydantic.optional-dependencies.email; + sqlalchemy + ] ++ passthru.optional-dependencies.all; pytestFlagsArray = [ # ignoring deprecation warnings to avoid test failure from @@ -92,6 +109,8 @@ buildPythonPackage rec { "test_trace" # Unexpected number of warnings caught "test_warn_duplicate_operation_id" + # assert state["except"] is True + "test_dependency_gets_exception" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 85b9eecb57e88..54a475c08b017 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UPnWVYiZJdP6r7Bm1H9DMXpLi26c9tpXeEkLXVJxWdM="; + hash = "sha256-W+fFZAQU7W6gDqB6LOrG8se6mBATFZWmepTt1HSphbE="; }; preBuild = '' diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix index 563c4b7e4f488..b632f9f287729 100644 --- a/pkgs/development/python-modules/faster-whisper/default.nix +++ b/pkgs/development/python-modules/faster-whisper/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "0.7.1"; + version = "0.8.0"; format = "setuptools"; src = fetchFromGitHub { owner = "guillaumekln"; repo = "faster-whisper"; - rev = "v${version}"; - hash = "sha256-NTk0S+dMChygnC7Wix62AFO4NNSPJuKXyqoEyWiQhII="; + rev = "refs/tags/v${version}"; + hash = "sha256-MVcopBIwmgoklVROfIp35uvFgNQDVDNDfJwITV9sLSQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 3215a90108821..74cd6e727dbd6 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.12.2"; + version = "3.12.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ACdAUY2KpZomsMduEPuMbhXq6CXTS2/fZwMz/XuTjYE="; + hash = "sha256-Lm8knx82VCkWBuBGsJ8f1erDmzYGZMJ/Wq0HIBL4vL0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/finvizfinance/default.nix b/pkgs/development/python-modules/finvizfinance/default.nix index 064b8291b8ce7..1491b254e835e 100644 --- a/pkgs/development/python-modules/finvizfinance/default.nix +++ b/pkgs/development/python-modules/finvizfinance/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "finvizfinance"; - version = "0.14.5"; + version = "0.14.6"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "lit26"; repo = "finvizfinance"; rev = "refs/tags/v${version}"; - hash = "sha256-yhOa/CS+9UdI+TVMObBsOqIp9XggMJvNjteSMa5DJcM="; + hash = "sha256-YRdOj0n2AUGRicQCENoXWad5MnRyTqQFxqisTFnClac="; }; postPatch = '' diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 860f449fd8b3f..4a05efc146baf 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flake8"; - version = "6.0.0"; + version = "6.1.0"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "flake8"; rev = version; - hash = "sha256-dN9LlLpQ/ZoVIFrAQ1NxMvsHqWsgdJVLUIAFwkheEL4="; + hash = "sha256-N8bufkn1CUREHusVc2mQ1YlNr7lrESEZGmlN68bhgbE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flasgger/default.nix b/pkgs/development/python-modules/flasgger/default.nix new file mode 100644 index 0000000000000..4bb5e9fe30d96 --- /dev/null +++ b/pkgs/development/python-modules/flasgger/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch + +# dependencies +, flask +, jsonschema +, mistune +, pyyaml +, six +, werkzeug + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "flasgger"; + version = "0.9.5"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "flasgger"; + repo = "flasgger"; + rev = version; + hash = "sha256-cYFMKZxpi69gVWqyZUltCL0ZwcfIABNsJKqAhN2TTSg="; + }; + + patches = [ + (fetchpatch { + # flask 2.3 compat + url = "https://github.com/flasgger/flasgger/commit/ab77be7c6de1d4b361f0eacfa37290239963f890.patch"; + hash = "sha256-ZbE5pPUP23nZAP/qcdeWkwzrZgqJSRES7oFta8U1uVQ="; + }) + ]; + + propagatedBuildInputs = [ + flask + jsonschema + mistune + pyyaml + six + werkzeug + ]; + + pythonImportsCheck = [ + "flasgger" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + doCheck = false; # missing flex dependency + + meta = with lib; { + description = "Easy OpenAPI specs and Swagger UI for your Flask API"; + homepage = "https://github.com/flasgger/flasgger/"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index eaf132e943c36..6309e0ddd2c07 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "4.3.1"; + version = "4.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - hash = "sha256-FP92HEGOsufHtaIySqDiScD3QUu3iQhWdtvkOecUvuI="; + hash = "sha256-jKlxD6fScEdH0ZXhG0h9RaVx9AVZ2DmdnV36QuofPHg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 1305234e43f75..ff532ffd12d90 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "flask-limiter"; - version = "3.3.1"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = "flask-limiter"; rev = "refs/tags/${version}"; - hash = "sha256-UtmMd180bwFm426YevARq6r7DL182dI7dGAUPFKLWuM="; + hash = "sha256-ZaHw8+l1sBCeNj0tYdUw1f4BUvEj6plOSoH0GUzNg+0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index c1b8c15bea03d..1caf53c7a2d89 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -36,10 +36,20 @@ buildPythonPackage rec { semantic-version ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ + disabledTests = [ + # https://github.com/maxcountryman/flask-login/issues/747 + "test_remember_me_accepts_duration_as_int" + "test_remember_me_custom_duration_uses_custom_cookie" + "test_remember_me_refresh_every_request" + "test_remember_me_uses_custom_cookie_parameters" + ] ++ lib.optionals (pythonAtLeast "3.10") [ "test_hashable" ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + pythonImportsCheck = [ "flask_login" ]; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 819c9d2392313..a7a5da621630a 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "Flask-Migrate"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-fdnoX7ypTpH2mQ+7Xuhzdh706Of7PIVhHQGVbe0jv1s="; }; diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index 9db70e044e192..68072b7ddde98 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -48,6 +48,9 @@ buildPythonPackage rec { disabledTests = [ # Broke in flask 2.2 upgrade "test_exception_header_forwarded" + # Broke in werkzeug 2.3 upgrade + "test_media_types_method" + "test_media_types_q" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index cdee90d222a6b..42132b2da5399 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -58,6 +58,12 @@ buildPythonPackage rec { "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" ]; + disabledTests = [ + # broken in werkzeug 2.3 upgrade + "test_media_types_method" + "test_media_types_q" + ]; + pythonImportsCheck = [ "flask_restx" ]; diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index e18cc8579ba9d..529a1a63913aa 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "5.1.2"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -54,7 +54,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - hash = "sha256-lZzm43m30y+2qjxNddFEeg9HDlQP9afq5VtuR25zaLc="; + hash = "sha256-n12DCRPqxm8YhFeVrl99BEvdDYNq6rzP662rain3k1Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 550d9adf416f3..7146c38e5a30d 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -3,7 +3,7 @@ , fetchPypi , flask , mock -, pdm-pep517 +, flit-core , pytestCheckHook , pythonOlder , sqlalchemy @@ -11,19 +11,19 @@ buildPythonPackage rec { pname = "flask-sqlalchemy"; - version = "3.0.3"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { - pname = "Flask-SQLAlchemy"; + pname = "flask_sqlalchemy"; inherit version; - hash = "sha256-J2QzXzydfr3J7WBEr6+Yqun6UNegdM71Xd4wfslZA+w="; + hash = "sha256-5LaLuIGALdoafYeLL8hMBtHuV/tAuHTT3Jfav6NrgxI="; }; nativeBuildInputs = [ - pdm-pep517 + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 036b4dd5a05e4..a106945df060c 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -8,6 +8,7 @@ , wtforms , email-validator , pytestCheckHook +, setuptools }: buildPythonPackage rec { @@ -25,6 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling + setuptools ]; propagatedBuildInputs = [ @@ -41,6 +43,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + meta = with lib; { description = "Simple integration of Flask and WTForms."; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index b7914ad3777e1..154625f6c52a2 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -2,7 +2,9 @@ , buildPythonPackage , fetchPypi , asgiref +, blinker , click +, flit-core , importlib-metadata , itsdangerous , jinja2 @@ -19,16 +21,21 @@ buildPythonPackage rec { pname = "flask"; - version = "2.2.5"; + version = "2.3.3"; + format = "pyproject"; src = fetchPypi { - pname = "Flask"; - inherit version; - hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; + inherit pname version; + hash = "sha256-CcNHqSqn/0qOfzIGeV8w2CZlS684uHPQdEzVccpgnvw="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ click + blinker itsdangerous jinja2 werkzeug diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index bea9667a1a180..0a6b086fe516e 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "flax"; - version = "0.6.5"; + version = "0.7.4"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Vv68BK83gTIKj0r9x+twdhqmRYziD0vxQCdHkYSeTak="; + hash = "sha256-i48omag/1Si3mCCGfsUD9qeejyeCLWzvvwKJqH8vm8k="; }; nativeBuildInputs = [ jaxlib pythonRelaxDepsHook ]; diff --git a/pkgs/development/python-modules/flet-core/default.nix b/pkgs/development/python-modules/flet-core/default.nix index ed55629dca035..bf1e8b2d693af 100644 --- a/pkgs/development/python-modules/flet-core/default.nix +++ b/pkgs/development/python-modules/flet-core/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "flet-core"; - version = "0.7.4"; + version = "0.10.1"; format = "pyproject"; src = fetchPypi { pname = "flet_core"; inherit version; - hash = "sha256-8WG7odYiGrew4GwD+MUuzQPmDn7V/GmocBproqsbCNw="; + hash = "sha256-YLtHnKBlXkUJJkQzxnDkfl6+gSGm05GXYPGEU3XO/jI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index 4c41e5972600f..c6541372d66b0 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "flet"; - version = "0.7.4"; + version = "0.10.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-vFPjN+5wIygtP035odAOSdF9PQe6eXz6CJ9Q0d8ScFo="; + hash = "sha256-Ogy4F9/beSb3GCpwPsN+8hsVroRoHTSojqg+5eXwcRI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix index 1f684becb94ce..a6bd37c0153e3 100644 --- a/pkgs/development/python-modules/fontmake/default.nix +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "fontmake"; - version = "3.5.1"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - hash = "sha256-njJArNq7nhdoq0Si3+RUDE+VJSwuUvk+e7WeuNaluK0="; + hash = "sha256-Nb09/BRPR0H3rHrbDIhcrgOyJp55KCIdPvUr/vh2Z0U="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 845ca18e4a62f..3c167debba37c 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -24,7 +24,8 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.38.0"; + version = "4.42.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,7 +33,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cdZI2kwR3zzS6eiiXGpeHIp+kgPCPEsTOSTV60pODTM="; + hash = "sha256-fcFFJi9Hr0m74LwFIhhhm/bMfxepAvg4/ymU53MmsPg="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -60,6 +61,7 @@ buildPythonPackage rec { ] ++ lib.concatLists (lib.attrVals ([ "woff" "interpolatable" + "ufo" ] ++ lib.optionals (!skia-pathops.meta.broken) [ "pathops" # broken ] ++ [ diff --git a/pkgs/development/python-modules/formbox/default.nix b/pkgs/development/python-modules/formbox/default.nix index 098d13e87c985..418cd3d958cd4 100644 --- a/pkgs/development/python-modules/formbox/default.nix +++ b/pkgs/development/python-modules/formbox/default.nix @@ -1,26 +1,24 @@ -{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, flit-core, bleach, markdown }: +{ lib, buildPythonPackage, pythonOlder, fetchzip, flit-core, mistune, nh3 }: buildPythonPackage rec { pname = "formbox"; - version = "0.4.1"; + version = "0.4.3"; format = "pyproject"; disabled = pythonOlder "3.6"; - src = fetchFromSourcehut { - owner = "~cnx"; - repo = pname; - rev = version; - hash = "sha256-zOvXmSeBiwc0Z5mRMwMsHLU3A/iP7rpjXm0T0I2gUTk="; + src = fetchzip { + url = "https://trong.loang.net/~cnx/formbox/snapshot/formbox-${version}.tar.gz"; + hash = "sha256-sRu0otyeYpxot/Fyiz3wyQJsJvl8nsgIVitzT8frxLE="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ bleach markdown ]; + propagatedBuildInputs = [ mistune nh3 ]; doCheck = false; # there's no test pythonImportsCheck = [ "formbox" ]; meta = with lib; { description = "A script to format mbox as HTML/XML"; - homepage = "https://sr.ht/~cnx/formbox"; + homepage = "https://trong.loang.net/~cnx/formbox"; license = licenses.agpl3Plus; maintainers = [ maintainers.McSinyx ]; }; diff --git a/pkgs/development/python-modules/formulaic/default.nix b/pkgs/development/python-modules/formulaic/default.nix index 3cfe44c55d532..fcb8ddc1b00b2 100644 --- a/pkgs/development/python-modules/formulaic/default.nix +++ b/pkgs/development/python-modules/formulaic/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "formulaic"; - version = "0.5.2"; + version = "0.6.4"; format = "pyproject"; src = fetchFromGitHub { owner = "matthewwardrop"; repo = "formulaic"; - rev = "v${version}"; - hash = "sha256-sIvHTuUS/nkcDjRgZCoEOY2negIOsarzH0PeXJsavWc="; + rev = "refs/tags/v${version}"; + hash = "sha256-lpza5FDO/QOsiLYdxNT1o62lHfFeD6YahFz/zgH3K0I="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix index 957e9f5d057ae..06ff0d1c7dcc3 100644 --- a/pkgs/development/python-modules/frozenlist/default.nix +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -4,33 +4,32 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools +, wheel }: buildPythonPackage rec { pname = "frozenlist"; - version = "1.3.3"; - format = "setuptools"; + version = "1.4.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = "v${version}"; - hash = "sha256-lJWRdXvuzyvJwNSpv0+ojY4rwws3jwDtlLOqYyLPrZc="; + rev = "refs/tags/v${version}"; + hash = "sha256-sI6jnrTxDbW0sNVodpCjBnA31VAAmunwMp9s8GkoHGI="; }; nativeBuildInputs = [ cython - ]; - - nativeCheckInputs = [ - pytestCheckHook + setuptools + wheel ]; postPatch = '' - substituteInPlace pytest.ini \ - --replace "--cov=frozenlist" "" + sed -i "/addopts =/d" pytest.ini ''; preBuild = '' @@ -41,6 +40,10 @@ buildPythonPackage rec { "frozenlist" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Python module for list-like structure"; homepage = "https://github.com/aio-libs/frozenlist"; diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index e158692e9af78..89d493bc87d6b 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2023.4.0"; + version = "2023.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "filesystem_spec"; rev = version; - hash = "sha256-qkvhmXJNxA8v+kbZ6ulxJAQr7ReQpb+JkbhOUnL59KM="; + hash = "sha256-1ai+/8akUlP9kfzSKYEpDnobBfUC6EAPFPVVxh4jb/0="; }; propagatedBuildInputs = [ @@ -146,6 +146,11 @@ buildPythonPackage rec { "test_touch" ]; + disabledTestPaths = [ + # JSON decoding issues + "fsspec/implementations/tests/test_dbfs.py" + ]; + pythonImportsCheck = [ "fsspec" ]; diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix index 6a8c1ac9db2dc..264771ed5a4b3 100644 --- a/pkgs/development/python-modules/fugashi/default.nix +++ b/pkgs/development/python-modules/fugashi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "fugashi"; - version = "1.2.1"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "polm"; repo = "fugashi"; rev = "refs/tags/v${version}"; - hash = "sha256-VDqRhJiNDbKFE284EAUS0d5T9cl8kgyHjh+r/HjjDY8="; + hash = "sha256-4i7Q+TtXTQNSJ1EIcS8KHrVPdCJAgZh86Y6lB8772XU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/fypp/default.nix b/pkgs/development/python-modules/fypp/default.nix index 9504a5839e733..a75e141361a86 100644 --- a/pkgs/development/python-modules/fypp/default.nix +++ b/pkgs/development/python-modules/fypp/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "fypp"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "aradi"; repo = pname; rev = version; - hash = "sha256-iog5Gdcd1F230Nl4JDrKoyYr8JualVgNZQzHLzd4xe8="; + hash = "sha256-MgGVlOqOIrIVoDfBMVpFLT26mhYndxans2hfo/+jdoA="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix index d3f45cdea7f03..c53dd68fb815a 100644 --- a/pkgs/development/python-modules/gentools/default.nix +++ b/pkgs/development/python-modules/gentools/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "gentools"; - version = "1.1.0"; + version = "1.2.1"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "ariebovenberg"; repo = pname; - rev = "v${version}"; - sha256 = "1sm6cqi7fv2k3pc68r7wvvjjz8y6cjmz8bvxgqfa4v4wxibwnwrl"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-RBUIji3FOIRjfp4t7zBAVSeiWaYufz4ID8nTWmhDkf8="; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index d216f43f76acb..c29d6d4bec097 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.13.3"; + version = "0.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "GeoAlchemy2"; inherit version; - hash = "sha256-2Fp96qmiMJAXM/dBnWv/VnS4cwZR3hoH8rZCOqSSXQk="; + hash = "sha256-Ygsxy/l6NoskhtvPzTbaIIGCfpM9QWO8uUIEO3m1Reg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index b21e40c7a600b..938cb99cf8fa1 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -1,5 +1,6 @@ { lib , fetchPypi +, fetchpatch , buildPythonPackage , isPyPy , python @@ -7,6 +8,7 @@ , cffi , cython_3 , greenlet +, importlib-metadata , setuptools , wheel , zope_event @@ -26,6 +28,15 @@ buildPythonPackage rec { hash = "sha256-HKAdoXbuN7NSeicC99QNvJ/7jPx75aA7+k+e7EXlXEY="; }; + patches = [ + # Replace deprecated pkg_resources with importlib-metadata + (fetchpatch { + url = "https://github.com/gevent/gevent/commit/bd96d8e14dc99f757de22ab4bb98439f912dab1e.patch"; + hash = "sha256-Y+cxIScuEgAVYmmxBJ8OI+JuJ4G+iiROTcRdWglo3l0="; + includes = [ "src/gevent/events.py" ]; + }) + ]; + nativeBuildInputs = [ cython_3 setuptools @@ -39,6 +50,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + importlib-metadata zope_event zope_interface ] ++ lib.optionals (!isPyPy) [ @@ -50,6 +62,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "gevent" + "gevent.events" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 71ff271a1419f..7ab2855d8d730 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "7.2.1"; + version = "9.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-EUlqwAT+QhuRTH+9yaHWIOSCHVbh2fZVI9OFjNuQe70="; + hash = "sha256-dwBKds89CaanZA4b5I6u01Q2s23joQp5SOCjdTXn/Xc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index 12a2e40aecc5e..db9f369a3497a 100644 --- a/pkgs/development/python-modules/glfw/default.nix +++ b/pkgs/development/python-modules/glfw/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.5.9"; + version = "2.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - hash = "sha256-IQcUL+vVIjI/c8/GFkmw7kMmOJG/xAlxudgspC8pDvI="; + hash = "sha256-3K+mDSz4ifVYkUvhd2XDPbhh6UCY4y54YqNLoAYDsP0="; }; # Patch path to GLFW shared object diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 24bf908942fcc..ecf2b36ab9db5 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.97.0"; + version = "2.99.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SCdykYlIdqHKftQSfgVegfgeY0PO0bVEpyAK4sEZ3Nc="; + hash = "sha256-5zP9DyyHk7GgANXmmsgbG57AZltEW37YO9u7ADiXMwY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 29adb27c72bf7..2a24f4c04b03f 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-43UGSWSCC0ciGn4bfuH9dwUbYyPD+ePhl4X3irZ+z8U="; + hash = "sha256-g+qMOwiB5FN5C6/0RI6KYRKsh3jR3p2gtoAQuEOTevs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 13f0ea961f0de..4785bed59fb3a 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , cachetools , cryptography +, fetchpatch , fetchPypi , flask , freezegun @@ -37,6 +38,18 @@ buildPythonPackage rec { hash = "sha256-so6ASOV3J+fPDlvY5ydrISrvR2ZUoJURNUqoJ1O0XGY="; }; + patches = [ + # Although the migration to urllib3-2.0.0 is incomplete, + # the discussion in the following PR has addressed the concerns. + # https://github.com/googleapis/google-auth-library-python/pull/1290 + (fetchpatch { + name = "support-urllib3_2.patch"; + url = "https://github.com/googleapis/google-auth-library-python/commit/9ed006d02d7c9de3e6898ee819648c2fd3367c1d.patch"; + hash = "sha256-64g0GzZeyO8l/s1jqfsogr8pTOBbG9xfp/UeVZNA4q8="; + includes = [ "google/auth/transport/urllib3.py" ]; + }) + ]; + propagatedBuildInputs = [ cachetools pyasn1-modules diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 53b865bd75ad7..60988de324adb 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/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/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index d7c11e3cad3b9..ac134f2472ca9 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/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/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index dbf098fae7be9..64dc4d2c71822 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.58.0"; + version = "1.60.0"; src = fetchPypi { inherit pname version; - hash = "sha256-xyclHsAllH1UUYS6F+NXiED8OiSgUWoCBHntq2YEV98="; + hash = "sha256-5z67QECY20BbqV0eGuCqkcPhWnHaAxou62suI+e8Nwg="; }; propagatedBuildInputs = [ grpc protobuf ]; diff --git a/pkgs/development/python-modules/gpaw/default.nix b/pkgs/development/python-modules/gpaw/default.nix index 913f1616a07d4..e359c78c66f86 100644 --- a/pkgs/development/python-modules/gpaw/default.nix +++ b/pkgs/development/python-modules/gpaw/default.nix @@ -74,13 +74,13 @@ let in buildPythonPackage rec { pname = "gpaw"; - version = "22.8.0"; + version = "23.9.1"; src = fetchFromGitLab { owner = "gpaw"; repo = pname; rev = version; - hash = "sha256-Kgf8yuGua7mcGP+jVVmbE8JCsbrfzewRTRt3ihq9YX4="; + hash = "sha256-9nnK4ksTFATO6HexnxfMiih/yoY/noyJZXZOaDG/2kc="; }; # `inetutils` is required because importing `gpaw`, as part of diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index bea5b01ab1526..a9c49b57063da 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "2.3.4"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - hash = "sha256-mEbF/fOtw0cU/bx7DgQcmmJ/yqal8Hs/1KaLGC3e4/c="; + hash = "sha256-l9B6PEIGf8rkUlYApOytW2s9OhgcxMHVlDgfQR5ZnoA="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/gptcache/default.nix b/pkgs/development/python-modules/gptcache/default.nix index 9fd2c80c3c491..3172e8d7bc893 100644 --- a/pkgs/development/python-modules/gptcache/default.nix +++ b/pkgs/development/python-modules/gptcache/default.nix @@ -4,12 +4,14 @@ , cachetools , numpy , pythonOlder +, redis +, redis-om , requests }: buildPythonPackage rec { pname = "gptcache"; - version = "0.1.37"; + version = "0.1.41"; format = "setuptools"; disabled = pythonOlder "3.8.1"; @@ -18,12 +20,14 @@ buildPythonPackage rec { owner = "zilliztech"; repo = "GPTCache"; rev = "refs/tags/${version}"; - hash = "sha256-eQu3O6jPL1BRObA99XA2EOznn9NaArVRouqD1Ypz/4w="; + hash = "sha256-0jQziywoDQQuNaB1G7YovX7473PfI7u5fTRQMidf3NA="; }; propagatedBuildInputs = [ cachetools numpy + redis + redis-om requests ]; diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index c09b55496bef2..5d051ef80ec27 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "3.43.1"; + version = "3.44.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -62,7 +62,7 @@ buildPythonPackage rec { # and has more frequent releases compared to github tags src = fetchPypi { inherit pname version; - hash = "sha256-a8eHw8jedrse1dpgup9BL60oXx4wvOk8X5z5DP1DWOs="; + hash = "sha256-3mXs9PwlzUo89VosBWtnsOzDQf/T22Yv7s5j6OLLp3M="; }; # fix packaging.ParserSyntaxError, which can't handle comments diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 5ea1e5c55eb9b..afc5b2edad2e8 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "graspologic"; - version = "2.0.1"; + version = "3.2.0"; disabled = isPy27; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "graspologic"; rev = "refs/tags/v${version}"; - hash = "sha256-EmbCA4JpY2OIwXrRWjBxA4iNm0ddQODjoGmHIYgvAWs="; + hash = "sha256-yXhEI/8qm526D+Ehqqfb+j+sbbh83Q4OWC+UM7cgCjU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index c202a1f7c6592..ce1a78f02cfd0 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.56.2"; + version = "1.58.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-XNodihNovizaBPkoSotzzuCf8+J37sjd2avPL+92s3I="; + hash = "sha256-B9WGI/J77PGGyGLLrn39elS9Y/SzdZTHfIuPyTPxHC8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 991549ea9ed9f..c03c1faa9d4f2 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.57.0"; + version = "1.58.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-sJjamd8e6+WDN/j3jlDfmQJzzKzBIm/d60fFkOPfngI="; + hash = "sha256-C0LnDAQFpmqC2emGf6JV/lnmGJZKYJmyBWjDHdkJl2Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index 9e7b61e12b9e1..904c0b24a0abb 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.57.0"; + version = "1.58.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xFMqJlY+Ehn0K3bXqdiGEvL2X3Pm7IPhHHPWTi8ecOk="; + hash = "sha256-ABZMp+VTsyf2HE50cnHf9wdCOeGlAqpbuMWlbsWE/qY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 78e3cdaae7f1d..285f3477deaaf 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.57.0"; + version = "1.58.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-LxYTDYac4n7NYjGUVHtkndZXMz7H6GRMxXHGRXgam4U="; + hash = "sha256-b02AzrWR4xyk3O7HR9vlYTLhOSoKm7HI/gAdG1ysiYo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 30619532a4a54..56b79e8c08b61 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.8.2"; + version = "1.8.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-qz4EWAO++yq72/AGwyNOtH/fTRSFbiCo/K98htROUxI="; + hash = "sha256-H1JfdvxJvX5dmC9aTqIOkjAqFEL44KoUXEhoYj2uRY8="; }; # It's used to locate headers diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index efa4fba8513a6..2f9ced5aec75f 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.22.5"; + version = "1.22.6"; format = "other"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; - hash = "sha256-vwUjJBXPYBgUKuUd07iXu3NDJoe1zheGv0btximM5bA="; + hash = "sha256-Ud4tbROxLOCV6sl8C5TuWcKuujcSu3Rit4xNV93hdsU="; }; # Python 2.x is not supported. diff --git a/pkgs/development/python-modules/guppy3/default.nix b/pkgs/development/python-modules/guppy3/default.nix index c47fb6a80425c..65d7c2622a8ef 100644 --- a/pkgs/development/python-modules/guppy3/default.nix +++ b/pkgs/development/python-modules/guppy3/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "guppy3"; - version = "3.1.3"; + version = "3.1.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "zhuyifei1999"; repo = pname; rev = "v${version}"; - hash = "sha256-i3WqXlNnNhBVw9rdnxnzQISFkZHBpc/gqG+rxOWPiyc="; + hash = "sha256-RMWIP4tVSCCEQpr0kZvsN1HwL6rBcLuubfBl175eSNg="; }; propagatedBuildInputs = [ tkinter ]; diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 680e94028c090..1c97861f1eee4 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -1,29 +1,30 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , h5py , pytestCheckHook , netcdf4 , pythonOlder +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "h5netcdf"; - version = "1.1.0"; - format = "setuptools"; + version = "1.2.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-kyw7Vzvtc3Dr/J6ALNYPGk2lI277EbNu7/iXMk12v1Y="; + hash = "sha256-f2snM73gbqJXW3mmRQ2b1cOJGP9MsqNVvyK76Mhsa88="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 427caf0211e60..3fb20fad4c3bb 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -21,7 +21,7 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.8.0"; + version = "3.9.0"; pname = "h5py"; format = "pyproject"; @@ -29,7 +29,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-b+rYLwxAAM841T+cAweA2Bv6AiAhiu4TuQt3Ack32V8="; + hash = "sha256-5gTbZSHB42fGvX+tI5yEf1PMRmRvLSZRNy0Frl6V+Bc="; }; # avoid strict pinning of numpy diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix index 3ea0b24f06842..bd92a27122282 100644 --- a/pkgs/development/python-modules/hacking/default.nix +++ b/pkgs/development/python-modules/hacking/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "hacking"; - version = "5.0.0"; + version = "6.0.1"; src = fetchPypi { inherit pname version; - hash = "sha256-qzWyCK8/FHpvlZUnMxw4gK5BrCHMzra/1oqE9OtW4CY="; + hash = "sha256-YdeEb8G58m7CFnjpkHQmkJX5ZNe72M1kbrbIxML4jcE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix index 8ce6f73c547b3..fe641977812f4 100644 --- a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix +++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hatch-jupyter-builder"; - version = "0.8.2"; + version = "0.8.3"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyterlab"; repo = "hatch-jupyter-builder"; rev = "refs/tags/v${version}"; - hash = "sha256-Ns5jrVfTAA7NuvUok3/13nIpXSSVZ6WRkgHyTuxkSKA="; + hash = "sha256-UywhFJ8d1+lSFOF5ECsknDeQuO7ppckdy5IqAT14ius="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hatch-nodejs-version/default.nix b/pkgs/development/python-modules/hatch-nodejs-version/default.nix index ed849eaa52aa7..806bffe56cc1e 100644 --- a/pkgs/development/python-modules/hatch-nodejs-version/default.nix +++ b/pkgs/development/python-modules/hatch-nodejs-version/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatch-nodejs-version"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "agoose77"; repo = "hatch-nodejs-version"; rev = "refs/tags/v${version}"; - hash = "sha256-txF392XiRqHndTEYw6QVk12Oqw9E6cOwF81hUyp2oh4="; + hash = "sha256-hknlb11DCe+b55CfF3Pr62ccWPxVrjQ197ZagSiH/zU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/pkgs/development/python-modules/hatch-requirements-txt/default.nix index af74b15b02148..a6246b3a4746a 100644 --- a/pkgs/development/python-modules/hatch-requirements-txt/default.nix +++ b/pkgs/development/python-modules/hatch-requirements-txt/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "hatch-requirements-txt"; - version = "0.3.0"; + version = "0.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "repo-helper"; repo = "hatch-requirements-txt"; rev = "refs/tags/v${version}"; - hash = "sha256-Gyt5Fs8uqVe0cOKtxFeg1n1WMyeK5Iokh71ynb2i5cM="; + hash = "sha256-qk+70o/41BLxCuz3SOXkGYSEmUZOG1oLYcFUmlarqmY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 5da7e3018f12a..336f8ed962c31 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/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/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 1971516a00fa2..75d8a4a990cef 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.28"; + version = "0.8.33"; src = fetchPypi { inherit pname version; - hash = "sha256-7tr3Hy87vt/Ew42hrUiXRUzl69R5LhponJecKFPtwFo="; + hash = "sha256-V/q8Xw5F9I0kB7NccxGSq8iWN2QR/n5LuDb/oD04+Q0="; }; patches = [ # should be included in next release diff --git a/pkgs/development/python-modules/hdf5plugin/default.nix b/pkgs/development/python-modules/hdf5plugin/default.nix index 5d231b2b0a605..38782e3240c0d 100644 --- a/pkgs/development/python-modules/hdf5plugin/default.nix +++ b/pkgs/development/python-modules/hdf5plugin/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hdf5plugin"; - version = "4.1.3"; + version = "4.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "silx-kit"; repo = "hdf5plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-0emCZ+r5dCRBT2xaNsgYskcGcLF/9Jf6K7FFi/PA+60="; + hash = "sha256-y0iDPAfm66FdclPREPnvurupWd9ZUgz8PqFd/JoapDc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 0f3f8ae66054b..976766f0a4df0 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , hijri-converter , korean-lunar-calendar +, polib , pytestCheckHook , python-dateutil , pythonOlder @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.29"; + version = "0.32"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "dr-prodigy"; repo = "python-holidays"; rev = "refs/tags/v.${version}"; - hash = "sha256-ijhqu0LzQzpjDSe9ZjNhgdjq/DJuD7oVbRTLX97nGHM="; + hash = "sha256-YAh5gR4KcUgXzeXy3xyGeokDFsyd9FqRQ5j1TC6wCQY="; }; propagatedBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + polib pytestCheckHook ]; diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 570b75eddc467..cc15e00748c0c 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -1,43 +1,40 @@ { lib -, brotlipy +, brotlicffi , buildPythonPackage , decorator -, fetchpatch , fetchPypi , flask , flask-limiter +, flasgger , itsdangerous , markupsafe , raven , six , pytestCheckHook +, setuptools , werkzeug }: buildPythonPackage rec { pname = "httpbin"; - version = "0.7.0"; - format = "setuptools"; + version = "0.10.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-y7N3kMkVdfTxV1f0KtQdn3KesifV7b6J5OwXVIbbjfo="; + hash = "sha256-e4WWvrDnWntlPDnR888mPW1cR20p4d9ve7K3C/nwaj0="; }; - patches = [ - (fetchpatch { - # Replaces BaseResponse class with Response class for Werkezug 2.1.0 compatibility - # https://github.com/postmanlabs/httpbin/pull/674 - url = "https://github.com/postmanlabs/httpbin/commit/5cc81ce87a3c447a127e4a1a707faf9f3b1c9b6b.patch"; - hash = "sha256-SbEWjiqayMFYrbgAPZtSsXqSyCDUz3z127XgcKOcrkE="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ - brotlipy + brotlicffi decorator flask flask-limiter + flasgger itsdangerous markupsafe raven @@ -49,10 +46,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "test_httpbin.py" - ]; - disabledTests = [ # Tests seems to be outdated "test_anything" @@ -70,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP Request and Response Service"; - homepage = "https://github.com/kennethreitz/httpbin"; + homepage = "https://github.com/psf/httpbin"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 9f3905f55182f..91cd904e3afe6 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -3,6 +3,8 @@ , buildPythonPackage , certifi , fetchFromGitHub +, hatchling +, hatch-fancy-pypi-readme , h11 , h2 , pproxy @@ -20,8 +22,8 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.17.2"; - format = "setuptools"; + version = "0.18.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,9 +31,14 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qAoORhzBbjXxgtzTqbAxWBxrohzfwDWm5mxxrgeXt48="; + hash = "sha256-UEpERsB7jZlMqRtyHxLYBisfDbTGaAiTtsgU1WUpvtA="; }; + nativeBuildInputs = [ + hatchling + hatch-fancy-pypi-readme + ]; + propagatedBuildInputs = [ anyio certifi @@ -57,18 +64,19 @@ buildPythonPackage rec { ] ++ passthru.optional-dependencies.http2 ++ passthru.optional-dependencies.socks; - pythonImportsCheck = [ - "httpcore" + disabledTests = [ + # https://github.com/encode/httpcore/discussions/813 + "test_connection_pool_timeout_during_request" + "test_connection_pool_timeout_during_response" + "test_h11_timeout_during_request" + "test_h11_timeout_during_response" + "test_h2_timeout_during_handshake" + "test_h2_timeout_during_request" + "test_h2_timeout_during_response" ]; - preCheck = '' - # remove upstreams pytest flags which cause: - # httpcore.ConnectError: TLS/SSL connection has been closed (EOF) (_ssl.c:997) - rm setup.cfg - ''; - - pytestFlagsArray = [ - "--asyncio-mode=strict" + pythonImportsCheck = [ + "httpcore" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix index 22b6918bccc91..43f69ecd3c9bb 100644 --- a/pkgs/development/python-modules/httpie/default.nix +++ b/pkgs/development/python-modules/httpie/default.nix @@ -106,6 +106,11 @@ buildPythonPackage rec { "test_valid_xml" "test_xml_format_options" "test_xml_xhtm" + # httpbin compatibility issues + "test_compress_form" + "test_binary_suppresses_when_terminal" + "test_binary_suppresses_when_not_terminal_but_pretty" + "test_binary_included_and_correct_when_suitable" ] ++ lib.optionals stdenv.isDarwin [ # flaky "test_daemon_runner" diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 992ddf1c69327..58e6fded6e1a1 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.7.6"; + version = "0.7.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rLcYC8IO2eCWAL4QIiUg/kyigybq6VNTUjNDXx4KPHc="; + hash = "sha256-I00+yB+aRnIMUQIJ7Lvr6LsHpf+gibkHh+2XgpeQn5U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 11204ec8b9b47..7e451532af04a 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.24.1"; + version = "0.25.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qG6fgijNgQKjpSG6sg0+0yqeAU6qV7czR8NgWe63LIg="; + hash = "sha256-zQVavjU66ksO0FB1h32e0YUhOGiQ4jHPvjgLhtxjU6s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index dd7c1eec6725a..aa11d109dbc3a 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.17.3"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-zoZIxp9+4FVPLCiikKussC34rwWBQzWMDlZx9S7NnqQ="; + hash = "sha256-/KbD3TNSbQ9ueXYFLoXnIRIoi/y3l0w72GZ1+JC8ULk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index da287226ff53c..11f37dcac28e7 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.11"; + version = "1.12"; src = fetchPypi { inherit pname version; - hash = "sha256-FcEb13XY+YCVt0W05lihfCXIbjtzJ1yuiWrByNUzyxg="; + hash = "sha256-GLFlPZgyyfjn00AZhsfnryrmeDYWvgvEBr/gsUE0pcY="; }; # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 7f8c9c5bea8af..6fe3968971148 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hvac"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-b1qg1rgTi1hdRlbR/gG12HYWMQyASEuQnMhMLLjwZP0="; + hash = "sha256-x4bj36HzUjmBDlMXzMrb41j0m4yQAaHy9ot5olC5+KE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hypothesis-auto/default.nix b/pkgs/development/python-modules/hypothesis-auto/default.nix index 49638e8258231..ad6ae8dbd96c2 100644 --- a/pkgs/development/python-modules/hypothesis-auto/default.nix +++ b/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -1,41 +1,27 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , hypothesis , poetry-core , pydantic , pytest +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "hypothesis-auto"; - version = "1.1.4"; + version = "1.1.5"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - hash = "sha256-XiwvsJ3AmEJRLYBjC7eSNZodM9LARzrUfuI9oL6eMrE="; + pname = "hypothesis_auto"; + inherit version; + hash = "sha256-U0vcOB9jXmUV5v2IwybVu2arY1FpPnKkP7m2kbD1kRw="; }; - patches = [ - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/timothycrosley/hypothesis-auto/commit/8277b4232617c0433f80e9c2844452b9fae67a65.patch"; - hash = "sha256-/0z0nphtQnUBiLYhhzLZT59kQgktSugaBg+ePNxy0qI="; - }) - ]; - - postPatch = '' - # https://github.com/timothycrosley/hypothesis-auto/pull/20 - substituteInPlace pyproject.toml \ - --replace 'pydantic = ">=0.32.2<2.0.0"' 'pydantic = ">=0.32.2, <2.0.0"' \ - --replace 'hypothesis = ">=4.36<6.0.0"' 'hypothesis = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; @@ -50,6 +36,10 @@ buildPythonPackage rec { "hypothesis_auto" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Enables fully automatic tests for type annotated functions"; homepage = "https://github.com/timothycrosley/hypothesis-auto/"; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index a5692c631508f..4cc5aab3bffe7 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.68.2"; + version = "6.84.3"; outputs = [ "out" ]; format = "setuptools"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-SgX8esTyC3ulFIv9mZJUoBA5hiv7Izr2hyD+NOudkpE="; + hash = "sha256-wymZ/tJBGcP57B3BuDlBT7kbUxNwW4/SSmvwLSa5PvM="; }; # I tried to package sphinx-selective-exclude, but it throws diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 223ef9fe7a434..709c7180f004e 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -14,15 +14,15 @@ buildPythonPackage rec { pname = "hyppo"; - version = "0.3.2"; + version = "0.4.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "neurodata"; repo = pname; - rev = "v${version}"; - hash = "sha256-DQ5DrQrFBJ3dnGAjD1c/7GCJeR3g+aL2poR4hwOvmPA="; + rev = "refs/tags/v${version}"; + hash = "sha256-QRE3oSxTEobTQ/7DzCAUOdjzIZmWUn9bgPmJWj6JuZg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index e2c945c2834ed..eb1c71601c923 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -14,15 +14,15 @@ buildPythonPackage rec { pname = "ifcopenshell"; - version = "210410"; + version = "230915"; format = "other"; src = fetchFromGitHub { owner = "IfcOpenShell"; repo = "IfcOpenShell"; - rev = "blenderbim-${version}"; + rev = "refs/tags/blenderbim-${version}"; fetchSubmodules = true; - sha256 = "1g52asxrqcfj01iqvf03k3bb6rg3v04hh1wc3nmn329a2lwjbxpw"; + sha256 = "sha256-dHw+5AlJbeuUeaxv7eE2XfLjR/K5S00dMSCtoWVcEB8="; }; nativeBuildInputs = [ gcc10 cmake ]; diff --git a/pkgs/development/python-modules/image-go-nord/default.nix b/pkgs/development/python-modules/image-go-nord/default.nix index 519ac772a59e0..ff7c654c9ea3a 100644 --- a/pkgs/development/python-modules/image-go-nord/default.nix +++ b/pkgs/development/python-modules/image-go-nord/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "image-go-nord"; - version = "0.1.5"; + version = "0.1.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Schrodinger-Hat"; repo = "ImageGoNord-pip"; - rev = "v${version}"; - hash = "sha256-O34COlGsXExJShRd2zvhdescNfYXWLNuGpkjcH3koPU="; + rev = "refs/tags/v${version}"; + hash = "sha256-vXABG3aJ6bwT37hfo909oF8qfAY3ZW18xvr1V8vSy5w="; }; propagatedBuildInputs = [ pillow ]; diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index cdffa669edcf3..3f2b7de89dde7 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.8"; + version = "0.4.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-/aoFrRD+Bwt/qOX2FcsNKPO5t5HQCvbSoR5pQVjRCqk="; + hash = "sha256-ObzRZgEY7zYPpAR0VlAQcTZGYaqdkCHT0mxY8e4ggfU="; }; patches = [ diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 6989a12bf8650..083170fd438b7 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.28.1"; + version = "2.31.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XbUIe+XIFOz34sfTChoVyX7Kl9jCbzHdxU12fUpDvOg="; + hash = "sha256-dMaoMtgbetWoqAl23qWO4DPT4rmaVJkMvXibTLCzFGE="; }; patches = lib.optionals (!stdenv.isDarwin) [ diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index c1d896f698e13..3969b1c9ca51a 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -1,27 +1,43 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder + +# build-system , cmake +, scikit-build-core +, pybind11 +, pathspec +, ninja +, pyproject-metadata + +# dependencies , numpy + +# tests , pytestCheckHook -, pythonOlder }: buildPythonPackage rec { pname = "iminuit"; - version = "2.21.3"; - format = "setuptools"; + version = "2.24.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+zE/DMJ+IhubIhvNd5s6Zo+0x3sPkKv9UzaDPsvawBY="; + hash = "sha256-JatjHDyOAksbzHyW9mM4yqxUpKIyTVXx47pWF4FuRP0="; }; nativeBuildInputs = [ cmake - ]; + scikit-build-core + pybind11 + pathspec + ninja + pyproject-metadata + ] ++ scikit-build-core.optional-dependencies.pyproject; propagatedBuildInputs = [ numpy diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index b470eb12a4ea1..8b6afb522b6a7 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "5.12.0"; + version = "6.0.1"; format = "pyproject"; disabled = isPy27; src = fetchPypi { pname = "importlib_resources"; inherit version; - hash = "sha256-S+glib9cHXmZrt8qRRWdEMs8pPGbInH4eSvI5tp7IvY="; + hash = "sha256-Q1lFfkJwhGK5YmoEZXxiCK15nOtB5cWMV/+g5qCYpdQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 9805f72ef8309..10f5a56763ef7 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "inflect"; - version = "6.0.4"; + version = "7.0.0"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-GEJkmhe2ytZoEqXJvfrLYxDh57bdijHwJnZt8bYmEus="; + hash = "sha256-Y9qTJa0p2oHsI+BVtBIleVq3k7TstIO+XcH6Nj/UcX4="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index ce6bccdd409f9..e270df9746d20 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , python-dateutil , fetchPypi -, fetchpatch , mock , msgpack , nose @@ -56,6 +55,7 @@ buildPythonPackage rec { # b'foo[30 chars]_one="1",column_two=1i 0\nfoo,tag_one=red,tag_[46 chars]00\n' "test_write_points_from_dataframe_with_nan_json" "test_write_points_from_dataframe_with_tags_and_nan_json" + "test_write_points_from_dataframe_with_numeric_precision" # Reponse is not empty but `s = '孝'` and the JSON decoder chokes on that "test_query_with_empty_result" # Pandas API changes cause it to no longer infer datetimes in the expected manner diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index 4aec189907324..f5911b627c8da 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -5,6 +5,7 @@ , decorator , ipython , isPyPy +, exceptiongroup , tomli , setuptools , unittestCheckHook @@ -30,6 +31,7 @@ buildPythonPackage rec { ipython decorator ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup tomli ]; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index aeb19ec9f2bd2..74cb52629af53 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.21.2"; + version = "6.25.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bpITSE5M4fsUJn7kNeGPI8w6BjTmNbn7TtRne4Tg/fg="; + hash = "sha256-9Gjd0fF6y0jIzmf8+km6bUbU+awEOMH0Qb58PRNyIws="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index d0fd08146bcf1..a730531bf8737 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch , pythonOlder # Build dependencies @@ -12,6 +11,7 @@ , appnope , backcall , decorator +, exceptiongroup , jedi , matplotlib-inline , pexpect @@ -20,6 +20,7 @@ , pygments , stack-data , traitlets +, typing-extensions # Test dependencies , pytestCheckHook @@ -28,13 +29,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.11.0"; + version = "8.15.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "735cede4099dbc903ee540307b9171fbfef4aa75cfcacc5a273b2cda2f02be04"; + sha256 = "sha256-K661vmlJ7uv1MhUPgXRvgzPizM4C3hx+7d4/I+1enx4="; }; nativeBuildInputs = [ @@ -52,6 +53,10 @@ buildPythonPackage rec { pygments stack-data traitlets + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ] ++ lib.optionals stdenv.isDarwin [ appnope ]; @@ -64,8 +69,8 @@ buildPythonPackage rec { export HOME=$TMPDIR # doctests try to fetch an image from the internet - substituteInPlace pytest.ini \ - --replace "--ipdoctest-modules" "--ipdoctest-modules --ignore=IPython/core/display.py" + substituteInPlace pyproject.toml \ + --replace '"--ipdoctest-modules",' '"--ipdoctest-modules", "--ignore=IPython/core/display.py",' ''; nativeCheckInputs = [ @@ -83,6 +88,7 @@ buildPythonPackage rec { meta = with lib; { description = "IPython: Productive Interactive Computing"; + downloadPage = "https://github.com/ipython/ipython/"; homepage = "https://ipython.org/"; changelog = "https://github.com/ipython/ipython/blob/${version}/docs/source/whatsnew/version${lib.versions.major version}.rst"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 5432d31c54720..0de6db55b9415 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "8.0.6"; + version = "8.1.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-3n13nyBF1g3p9sJfZT/a4tuleJjmoShElLO6ILaJO7g="; + hash = "sha256-QCEe+1Vq3sb6RQzMKnfVnKRKBg9PnxNoM99ZyfU45ug="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix index c3e022cdb38bd..ade0c71ee887d 100644 --- a/pkgs/development/python-modules/iso8601/default.nix +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "iso8601"; - version = "1.1.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MoEee4He7iBj6m0ulPiBmobR84EeSdI2I6QfqDK+8D8="; + hash = "sha256-c5lg03x0x3vZvVRqdlYsy1gf49SCD/XDFB60nIOf2o8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jaraco-classes/default.nix b/pkgs/development/python-modules/jaraco-classes/default.nix index 8c9b32fb11ee8..317fc3e3dc1a5 100644 --- a/pkgs/development/python-modules/jaraco-classes/default.nix +++ b/pkgs/development/python-modules/jaraco-classes/default.nix @@ -6,14 +6,16 @@ buildPythonPackage rec { pname = "jaraco-classes"; - version = "3.1.1"; + version = "3.3.0"; + format = "pyproject"; + disabled = isPy27; src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.classes"; - rev = "v${version}"; - sha256 = "0wzrcsxi9gb65inayg0drm08iaw37jm1lqxhz3860i6pwjh503pr"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-DW8qf6G6997vBOaO1+Bdx4LBvKfpl/MiiFqWJYKE/pg="; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jaraco-functools/default.nix b/pkgs/development/python-modules/jaraco-functools/default.nix index 9cd5e9988f666..0cc2fa124db50 100644 --- a/pkgs/development/python-modules/jaraco-functools/default.nix +++ b/pkgs/development/python-modules/jaraco-functools/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "jaraco-functools"; - version = "3.6.0"; + version = "3.9.0"; format = "pyproject"; src = fetchPypi { pname = "jaraco.functools"; inherit version; - hash = "sha256-Lho74Rq67O5fWrjdWJY4voMEzEy5E2H+Xmg/S22ft6M="; + hash = "sha256-ixN7D+rMF/70us7gTAEcnobyNBCZyHCh0S0743sypjg="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/jaraco-itertools/default.nix b/pkgs/development/python-modules/jaraco-itertools/default.nix index 906733508c25b..23722cc20c4b9 100644 --- a/pkgs/development/python-modules/jaraco-itertools/default.nix +++ b/pkgs/development/python-modules/jaraco-itertools/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "jaraco-itertools"; - version = "6.2.1"; + version = "6.4.1"; format = "pyproject"; src = fetchPypi { pname = "jaraco.itertools"; inherit version; - hash = "sha256-YJjts3xrgCPzeU1CWIoTv3WyygK0D/l5XIRry+DBtGw="; + hash = "sha256-MU/OVi67RepIIqmLvXsi5f6sfVEY28Gk8ess0Ea/+kc="; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index ff4743372a18c..6320619c13839 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "refs/tags/${pname}-v${version}"; + rev = "refs/tags/jaxopt-v${version}"; hash = "sha256-5+GfRFzXyc1Ukp86NeK0qstTq9fkx+eDb4iXvxzRoKs="; }; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index cd6f4060fc968..50c8c520fb082 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/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/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index 35749407a36eb..10969de0673e5 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -9,14 +9,14 @@ , pydantic , pyhamcrest , pytestCheckHook -, python-jsonrpc-server +, python-lsp-jsonrpc , pythonOlder , pythonRelaxDepsHook }: buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.40.0"; + version = "0.41.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pappasam"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+3VgONZzlobgs4wujCaGTTYpIgYrWgWwYgKQqirS7t8="; + hash = "sha256-1ujEhoxWcCM1g640aLE60YGiNQLB+G7t7oLVZXW8AMM="; }; pythonRelaxDeps = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pyhamcrest - python-jsonrpc-server + python-lsp-jsonrpc ]; preCheck = '' diff --git a/pkgs/development/python-modules/jiwer/default.nix b/pkgs/development/python-modules/jiwer/default.nix index b92d1e71755ae..d042726daa6a4 100644 --- a/pkgs/development/python-modules/jiwer/default.nix +++ b/pkgs/development/python-modules/jiwer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "jiwer"; - version = "3.0.2"; + version = "3.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jitsi"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-z+M0/mftitLV2OaaQvTdRehtt16FFeBjqR//S5ad1XE="; + hash = "sha256-32bpSBYl6yxb4lJhHnfnYhtye7DaBZT0VAe9rDcleTc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index d60fd41d70453..4fc2f49119dcd 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "3.0.1"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - hash = "sha256-AyU4gEeV5zuU6tQQgArDh/223pj4iCrJV/zSR+OoUgA="; + hash = "sha256-43q7pL+zykpGR9KLufRwZDb3tGyKgzO0pxirr6jkazc="; }; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix index 646824b064a77..f05b886cfb126 100644 --- a/pkgs/development/python-modules/jsonpointer/default.nix +++ b/pkgs/development/python-modules/jsonpointer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonpointer"; - version = "2.3"; + version = "2.4"; src = fetchPypi { inherit pname version; - hash = "sha256-l8ulFSbIKSgiGP65nasbHmvfjv0cQ9ydV74JPA1pyZo="; + hash = "sha256-WFzugrcCEfqeYEO3u4nbbhqklSQ0Dd6K1rYyBuponYg="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix index 3353e5ec43806..0da22f2cf98f0 100644 --- a/pkgs/development/python-modules/jsonschema-spec/default.nix +++ b/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "jsonschema-spec"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Sa97DwPnGMLmT00hVdkoGO7C0vrvtwxvUvv9lq4nCY4="; + hash = "sha256-1Flb3XQCGhrAYzTvriSVhHDb/Z/uvCyZdbav2u7f3sg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 0f3d69b18d8c9..d8c235efed235 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.18.4"; + version = "4.19.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+zZCc1OZ+pWMDSqtcFeQFVRZbGM0n09rKDxJPPaSol0="; + hash = "sha256-bh51aawTvoE5st0sIaVdNQBm7j+A3wbGCLOYzcbzDo8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 5aa400a1694c2..2d7234051d235 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "8.0.3"; + version = "8.3.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-7WVJi+pth2752No+DbPdM8XRKfWyZF9WrgOZN4KWa9A="; + hash = "sha256-YClLLVuGk1bIk/V7God+plENYNRc9LOAV/FnLYVpmsk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index de73ea621b479..6c2842eb6d0c8 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-3OxduJ93TmbS/fKSKmVXs5vj2IZMX5MqKPTeGklFCbM="; + hash = "sha256-qhcCPAgHlBwt+Lt8NdDa+ZPhNNotCvNtz9WQx6OHvOc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyter-console/default.nix b/pkgs/development/python-modules/jupyter-console/default.nix index e847c341f4d83..715557bad7337 100644 --- a/pkgs/development/python-modules/jupyter-console/default.nix +++ b/pkgs/development/python-modules/jupyter-console/default.nix @@ -2,9 +2,9 @@ , buildPythonPackage , fetchPypi , pythonOlder -, substituteAll , hatchling , ipykernel +, exceptiongroup , ipython , jupyter-client , jupyter-core @@ -51,6 +51,8 @@ buildPythonPackage rec { pygments pyzmq traitlets + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/jupyter-core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix index a25681dda45af..fb5880a4f226f 100644 --- a/pkgs/development/python-modules/jupyter-core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , hatchling , platformdirs , traitlets @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "jupyter-core"; - version = "5.2.0"; + version = "5.3.1"; disabled = pythonOlder "3.7"; format = "pyproject"; @@ -20,16 +19,11 @@ buildPythonPackage rec { owner = "jupyter"; repo = "jupyter_core"; rev = "refs/tags/v${version}"; - hash = "sha256-X3P3bTLhpWIa6EHdxZ/KFiQNAnhszha2cfZ8PynZPRs="; + hash = "sha256-kQ7oNEC5L19PTPaX6C2bP5FYuzlsFsS0TABsw6VvoL8="; }; patches = [ ./tests_respect_pythonpath.patch - (fetchpatch { - # add support for platformdirs>=3 - url = "https://github.com/jupyter/jupyter_core/commit/ff4086cdbdac2ea79c18632e4e35acebc1f7cf57.patch"; - hash = "sha256-UhHO58xZ4hH47NBhOhsfBjgsUtA+1EIHxPBvnKA5w28="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix index a60983e40420d..98e6ea22df6e0 100644 --- a/pkgs/development/python-modules/jupyter-events/default.nix +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "jupyter-events"; - version = "0.6.3"; + version = "0.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_events"; rev = "refs/tags/v${version}"; - hash = "sha256-k+OyCKUN9hC6J1Ff2DDb2ECLvmWkkK1HtNxfKVXyl8g="; + hash = "sha256-hOx2/WiFpDjtmP+qC6Ew2VY4/gdvXuv2k76qtmS+61M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index e894a8c88d8d9..7c0522c754016 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.41.0"; + version = "0.42.0"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - hash = "sha256-UXZ9qgAvCKfPCzchFOtwbv8vNPEtcLU0dwBGTmiHSD4="; + hash = "sha256-GFnox6KnwKWFqsUWY0QYzMShXlH9KFSY3rRJA4RAiCk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 2418b8db4d359..4d668da9bde6b 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "jupyterlab-widgets"; - version = "3.0.7"; + version = "3.0.9"; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - hash = "sha256-w6UO1b9Sigx6hpCWUDr1RwL4bdodtGmu4cktwMAbQ8o="; + hash = "sha256-YAWk6XTHvu6EBg/fujQaMhhJUEbeiuPsZIiOX+Gf20w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 81c7f862f6ad2..a99d4d468c957 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.0.3"; + version = "4.0.6"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-4U0c5GphMCgRHQ1Hah19awlAA7dGK6xmn1tHgxeryzk="; + hash = "sha256-bEOuWmof0v36/LNFQASVi95tp2Mxq7RM/8b55Daxm6E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 2ec4ccf47e7eb..6deb3912730b3 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.24.0"; + version = "2.25.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Tm+Z4KVXm7vDLkScTbsDlWHU8aeCfVczJz7VZzjyHwc="; + hash = "sha256-d8Lx8oLWEPleSW4g1b8dKncGgm37exjzN4rihw0nL7c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/justnimbus/default.nix b/pkgs/development/python-modules/justnimbus/default.nix index cc302cc5865be..ecea9ef4a549a 100644 --- a/pkgs/development/python-modules/justnimbus/default.nix +++ b/pkgs/development/python-modules/justnimbus/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "justnimbus"; - version = "0.6.0"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kvanzuijlen"; repo = pname; - rev = version; - hash = "sha256-uQ5Nc5sxqHeAuavyfX4Q6Umsd54aileJjFwOOU6X7Yg="; + rev = "refs/tags/${version}"; + hash = "sha256-arUdjZiEJx0L1YcCNxqlE4ItoTEzd/TYVgqDPIqomMg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index e2cb5e76f0465..ce68748ac7e29 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -1,4 +1,5 @@ { buildPythonPackage +, bleach , certifi , fetchPypi , lib @@ -8,19 +9,19 @@ , requests , tqdm , urllib3 -, bleach }: buildPythonPackage rec { pname = "kaggle"; - version = "1.5.13"; + version = "1.5.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g2TFbDYSXLgZWHbZEdC8nvvBcxZ+ljuenveTeJupp/4="; + sha256 = "sha256-prNUL1kM80GlrUQdWuAhvpO9ZEQclsdYsVSQNJWjpgA="; }; propagatedBuildInputs = [ + bleach certifi python-dateutil python-slugify diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index 5597980acde10..c86e2a2d6f3a4 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -2,16 +2,18 @@ , buildPythonPackage , fetchPypi , pyyaml -, pytest +, pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "kaptan"; version = "0.6.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EBMwpE/e3oiFhvMBC9FFwOxIpIBrxWQp+lSHpndAIfg="; + hash = "sha256-EBMwpE/e3oiFhvMBC9FFwOxIpIBrxWQp+lSHpndAIfg="; }; postPatch = '' @@ -20,9 +22,17 @@ buildPythonPackage rec { substituteInPlace requirements/base.txt --replace 'PyYAML>=3.13,<6' 'PyYAML>=3.13' ''; - propagatedBuildInputs = [ pyyaml ]; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ pytest ]; + propagatedBuildInputs = [ + pyyaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Configuration manager for python applications"; diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index 199ab908efd78..04d5b17c55e99 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -4,6 +4,8 @@ , pythonOlder # build +, setuptools +, setuptools-git-versioning , setuptools-scm # propagates @@ -17,8 +19,8 @@ }: buildPythonPackage rec { pname = "sapi-python-client"; - version = "0.5.0"; - format = "setuptools"; + version = "0.7.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,12 +28,14 @@ buildPythonPackage rec { owner = "keboola"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-79v9quhzeNRXcm6Z7BhD76lTZtw+Z0T1yK3zhrdreXw="; + hash = "sha256-74sChw6eMkBtfHV6hiaaLNOr/J0Sa73LB93Z8muLaiI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools + setuptools-git-versioning setuptools-scm ]; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index a2a90aa851d32..f5275ea1a2a67 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,12 +6,14 @@ buildPythonPackage rec { pname = "keras"; - version = "2.11.0"; + version = "2.14.0"; format = "wheel"; src = fetchPypi { inherit format pname version; - hash = "sha256-OMb/8OqaiwaicXc2VlySpzyM2bHCOecSXMsYi3hI9l4="; + hash = "sha256-10KdHSExzH6x8uouwzAifH2dONqz398ueN7+5OzEP80="; + python = "py3"; + dist = "py3"; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index 71faf0c4cf18c..134f5af0632f9 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "5.1.2"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - hash = "sha256-2fdIStX8mwu7fsw8vzeVoXBpT72EglEzHlS6SLvuzHI="; + hash = "sha256-AXwrm1mUU8kpQHUO27IPF2hxIbKJARS/nTbfFKBicRc="; }; postPatch = '' @@ -62,8 +62,11 @@ buildPythonPackage rec { testtools ]; + # test_keystoneauth_betamax_fixture is incompatible with urllib3 2.0.0 + # https://bugs.launchpad.net/keystoneauth/+bug/2020112 checkPhase = '' - stestr run + stestr run \ + -E "keystoneauth1.tests.unit.test_betamax_fixture.TestBetamaxFixture.test_keystoneauth_betamax_fixture" ''; pythonImportsCheck = [ "keystoneauth1" ]; diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix index d3276c622b863..dd04b97010dda 100644 --- a/pkgs/development/python-modules/kivy/default.nix +++ b/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/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index 0a985bc3dee09..bc905e77269a7 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "kiwisolver"; - version = "1.4.4"; + version = "1.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU="; + hash = "sha256-5X5WOlf7IqFC2jTziswvwaXIZLwpyhUXqIq8lj5g1uw="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix index 641388fbdd573..c19746970a711 100644 --- a/pkgs/development/python-modules/klein/default.nix +++ b/pkgs/development/python-modules/klein/default.nix @@ -1,35 +1,46 @@ { lib -, stdenv -, attrs , buildPythonPackage , fetchFromGitHub +, pythonOlder + +# build-system +, setuptools +, wheel + +# dependencies +, attrs , hyperlink -, hypothesis , incremental -, python -, pythonOlder -, treq , tubes , twisted -, typing-extensions , werkzeug , zope_interface + +# tests +, idna +, python +, treq }: buildPythonPackage rec { pname = "klein"; - version = "unstable-2022-06-26"; - format = "setuptools"; + version = "unstable-2023-09-05"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "twisted"; repo = pname; - rev = "d8c2b92a3c77aa64c596696fb6f07172ecf94a74"; - hash = "sha256-RDZqavkteUbARV78OctZtLIrE4RoYDVAanjwE5i/ZeM="; + rev = "44b356ede27a667252ae5392014c802f0492c017"; + hash = "sha256-zHdyyx5IseFWr25BGLL0dDM8/5BDehsvbxIci+DEo9s="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ attrs hyperlink @@ -38,17 +49,17 @@ buildPythonPackage rec { tubes werkzeug zope_interface - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; nativeCheckInputs = [ - hypothesis + idna treq ]; checkPhase = '' + runHook preCheck ${python.interpreter} -m twisted.trial klein + runHook postCheck ''; pythonImportsCheck = [ @@ -56,6 +67,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/twisted/klein/releases/tag/${version}"; description = "Klein Web Micro-Framework"; homepage = "https://github.com/twisted/klein"; license = licenses.mit; diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 8e97d083cd9eb..2b28f76d051ae 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "26.1.0"; + version = "27.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "kubernetes-client"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-2QkQGZ4Dho2PykH90ijosWWBzhQoCHoWhRL3ruOiDBg="; + hash = "sha256-KqQ7wUu5Se4WYOdtk9vMU3M5oyz0WgIltSEliCD7s10="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index f5c9bdfed9e29..c0b635abf4606 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.38.0"; + version = "3.52.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Labelbox"; repo = "labelbox-python"; rev = "refs/tags/v.${version}"; - hash = "sha256-AyQPI19As49GML3kVXtHtRNOKthrpkQ7MCmww+F6owc="; + hash = "sha256-t0Q+6tnUPK2oqjdAwwYeSebgn2EQ1fBivw115L8ndOg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index bcae9b88398de..0e96bf2fe9ae2 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -23,13 +23,13 @@ buildPythonPackage rec { pname = "labgrid"; - version = "0.4.1"; + version = "23.0.3"; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; - rev = "v${version}"; - sha256 = "0ih04lh1q3dysps4vfmk2rhqqrsimssadsxvbxdsnim2yihrrw47"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-yhlBqqCLOt6liw4iv8itG6E4QfIa7cW76QJqefUM5dw="; }; patches = [ diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 865ce51b07db0..a2d00f4ba836e 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -6,8 +6,10 @@ , pythonRelaxDepsHook , poetry-core , aiohttp +, anyio , async-timeout , dataclasses-json +, jsonpatch , langsmith , numexpr , numpy @@ -86,7 +88,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.0.285"; + version = "0.0.320"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -95,18 +97,11 @@ buildPythonPackage rec { owner = "hwchase17"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-3vOfwn8qvPd9dPRnsX14bVSLQQKHLPS5r15S8yAQFpw="; + hash = "sha256-Yw3gGt/OvrQ4IYauFUt6pBWOecy+PaWiGXoo5dWev5M="; }; sourceRoot = "${src.name}/libs/langchain"; - postPatch = '' - substituteInPlace langchain/utilities/bash.py \ - --replace '"env", ["-i", "bash", ' '"${lib.getExe bash}", [' - substituteInPlace tests/unit_tests/test_bash.py \ - --replace "/bin/sh" "${bash}/bin/sh" - ''; - nativeBuildInputs = [ poetry-core pythonRelaxDepsHook @@ -128,6 +123,8 @@ buildPythonPackage rec { aiohttp numexpr langsmith + anyio + jsonpatch ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; diff --git a/pkgs/development/python-modules/langchainplus-sdk/default.nix b/pkgs/development/python-modules/langchainplus-sdk/default.nix index 1ea97ccdb11ed..8747c0a8d9e8e 100644 --- a/pkgs/development/python-modules/langchainplus-sdk/default.nix +++ b/pkgs/development/python-modules/langchainplus-sdk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "langchainplus-sdk"; - version = "0.0.20"; + version = "0.0.21"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "langchainplus_sdk"; - hash = "sha256-PTAOLjKQ9ozJ2ELAWflFjeumDndsnnkDCWiMrRv7shk="; + hash = "sha256-frjZnQnOe6IHKrQk+Q/xMc5Akb+eBQ/eBzP545Fq6Xk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index cdb89dc49121e..5d85b5d695016 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.0.35"; + version = "0.0.49"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-TR4vBsRImMLs7CTlBt1NHL+n65jXxBNbOY7wIlfFBfM="; + hash = "sha256-vOa9FNzeJB8QgJ6FW+4vxNfDnBbrKtByIwW3sGP8/ho="; }; sourceRoot = "${src.name}/python"; @@ -46,6 +46,11 @@ buildPythonPackage rec { "integration_tests" ]; + disabledTestPaths = [ + # due to circular import + "tests/integration_tests/test_client.py" + ]; + pythonImportsCheck = [ "langsmith" ]; diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix index b5ba6c7583f17..3158b626c2a63 100644 --- a/pkgs/development/python-modules/lark/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -1,23 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub -, python +, fetchpatch , regex , pytestCheckHook , js2py +, setuptools }: buildPythonPackage rec { pname = "lark"; - version = "1.1.5"; + version = "1.1.7"; + format = "pyproject"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = "refs/tags/${version}"; - hash = "sha256-drvF+0PSOdrha2rfpntrM8xIbeb0S7eNtfioxkdjEKw="; + hash = "sha256-k74tozIgJuwtUqKKmYHlfLpCWyT2hdoygRJiIpw+GDE="; }; + patches = [ + # include .lark files in package data + # https://github.com/lark-parser/lark/pull/1308 + (fetchpatch { + url = "https://github.com/lark-parser/lark/commit/656334cb8793fd4e08a12843eaced5a7bb518be3.patch"; + hash = "sha256-pYeNnFfXJ8xkR0KsU/KMWJ8nF+BhP9PXEANiVhT254s="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + # Optional import, but fixes some re known bugs & allows advanced regex features propagatedBuildInputs = [ regex ]; diff --git a/pkgs/development/python-modules/ledger-bitcoin/default.nix b/pkgs/development/python-modules/ledger-bitcoin/default.nix index edfc9c7f22f2b..afffe79b26bc5 100644 --- a/pkgs/development/python-modules/ledger-bitcoin/default.nix +++ b/pkgs/development/python-modules/ledger-bitcoin/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "ledger-bitcoin"; - version = "0.2.1"; + version = "0.2.2"; format = "pyproject"; src = fetchPypi { inherit version; pname = "ledger_bitcoin"; - hash = "sha256-AWl/q2MzzspNIo6yf30S92PgM/Ygsb+1lJsg7Asztso="; + hash = "sha256-MEZuwIthIOwBkRdR7dEsEznO+GVBeOf7/5xmwNW1SvI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ledgercomm/default.nix b/pkgs/development/python-modules/ledgercomm/default.nix index 092378a142b8f..15bac008f0d5a 100644 --- a/pkgs/development/python-modules/ledgercomm/default.nix +++ b/pkgs/development/python-modules/ledgercomm/default.nix @@ -2,20 +2,22 @@ , buildPythonPackage , fetchPypi , setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "ledgercomm"; - version = "1.1.2"; + version = "1.2.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-izOPbwv+34Xq8mpq9+QRIGhd+z4pVnGJSMnYOktRVbs="; + hash = "sha256-HunJjIRa3IpSL/3pZPf6CroLxEK/l7ihh737VOAILgU="; }; nativeBuildInputs = [ setuptools + setuptools-scm ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 943ed138f991f..43f2e11ef3df3 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "libarchive-c"; - version = "4.0"; + version = "5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Changaco"; repo = "python-${pname}"; - rev = version; - sha256 = "1ar7lj1lpisklq2q07d95yhlbfq25g9g61hcj8whj17mq8vrvml1"; + rev = "refs/tags/${version}"; + sha256 = "sha256-8e3Tnek5q5NJneSVIrbFNTQPjHZ7Ieb14uiKjQwufTE="; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix new file mode 100644 index 0000000000000..1913d07651337 --- /dev/null +++ b/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/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 03cdeea14e51b..a93b6b0d99cb7 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.10.0"; + version = "0.10.1"; format = "pyproject"; src = fetchFromGitHub { @@ -41,22 +41,23 @@ buildPythonPackage rec { repo = "librosa"; rev = "refs/tags/${version}"; fetchSubmodules = true; # for test data - hash = "sha256-MXzPIcbG8b1JwhEyAZG4DRObGaHq+ipVHMrZCzaxLdE="; + hash = "sha256-zbmU87hI9A1CVcBZ/5FU8z0t6SS4jfJk9bj9kLe/EHI="; }; + nativeBuildInputs = [ + setuptools + ]; + patches = [ - # https://github.com/librosa/librosa/pull/1731 (fetchpatch { - name = "support-scipy-1.11.patch"; - url = "https://github.com/librosa/librosa/commit/12dee8eabed7df14c5622b52c05393ddfeb11f4b.patch"; - hash = "sha256-JxTXU0Mc+QYpsafjoGLaIccD7EdCYJvIVianeosYpw4="; + # https://github.com/librosa/librosa/issues/1754 + # https://github.com/librosa/librosa/pull/1755 + name = "matplotlib-3.8-compat.patch"; + url = "https://github.com/librosa/librosa/commit/beef47885ce1255b43b65e48ea2054ddace37c6c.patch"; + hash = "sha256-rrnlUHXHY2me4BWGs3wFq8WJmz75CbXTWKFp3VdJKzE="; }) ]; - nativeBuildInputs = [ - setuptools - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace "--cov-report term-missing --cov librosa --cov-report=xml " "" diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 38ec2aaa5b400..d2fc8cbc13a26 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -2,33 +2,47 @@ , stdenv , buildPythonPackage , fetchPypi + +# build-system , cmake +, ninja +, pathspec +, pyproject-metadata +, scikit-build-core + +# dependencies +, llvmPackages , numpy , scipy , scikit-learn -, llvmPackages ? null , pythonOlder -, python + +# optionals: gpu +, boost +, cudatoolkit , ocl-icd , opencl-headers -, boost , gpuSupport ? stdenv.isLinux }: buildPythonPackage rec { pname = "lightgbm"; - version = "3.3.5"; - format = "setuptools"; + version = "4.1.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ELj73PhR5PaKHwLzjZm9xEx8f7mxpi3PkkoNKf9zOVw="; + hash = "sha256-vuWd0mmpOwk/LGENSmaDp+qHxj0+o1xiISPOLAILKrw="; }; nativeBuildInputs = [ cmake + ninja + pathspec + pyproject-metadata + scikit-build-core ]; dontUseCmakeConfigure = true; @@ -37,6 +51,7 @@ buildPythonPackage rec { llvmPackages.openmp ]) ++ (lib.optionals gpuSupport [ boost + cudatoolkit ocl-icd opencl-headers ]); @@ -47,13 +62,7 @@ buildPythonPackage rec { scikit-learn ]; - buildPhase = '' - runHook preBuild - - ${python.pythonForBuild.interpreter} setup.py bdist_wheel ${lib.optionalString gpuSupport "--gpu"} - - runHook postBuild - ''; + pypaBuildFlags = lib.optionalString gpuSupport "--config-setting=cmake.define.USE_CUDA=ON"; postConfigure = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 8ee1006704180..2146f1b9a0bca 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "limits"; - version = "3.5.0"; + version = "3.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/limits/_version.py" ''; - hash = "sha256-O4yENynvon9xM8F/r0NMSpSh6Hl2EoTcXgldrwzo24M="; + hash = "sha256-VLfFWFcwLgEEvPUKQ00QjEq1HN28OpE6Eu1eyF+TwXU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/linear_operator/default.nix b/pkgs/development/python-modules/linear_operator/default.nix index f42522016c1f1..1bf11865dfc0b 100644 --- a/pkgs/development/python-modules/linear_operator/default.nix +++ b/pkgs/development/python-modules/linear_operator/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "linear_operator"; - version = "0.5.1"; + version = "0.5.2"; format = "pyproject"; src = fetchFromGitHub { owner = "cornellius-gp"; repo = pname; - rev = "v${version}"; - hash = "sha256-7NkcvVDwFaLHBZZhq7aKY3cWxe90qeKmodP6cVsdrPM="; + rev = "refs/tags/v${version}"; + hash = "sha256-OuE6jx9Q4IU+b2a+mrglRdBOReN1tt/thetNXxwk1GI="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/linkify-it-py/default.nix b/pkgs/development/python-modules/linkify-it-py/default.nix index 21c99442f7bd8..660e3cd2d9b96 100644 --- a/pkgs/development/python-modules/linkify-it-py/default.nix +++ b/pkgs/development/python-modules/linkify-it-py/default.nix @@ -4,12 +4,13 @@ , pythonOlder , pytestCheckHook , uc-micro-py +, setuptools }: buildPythonPackage rec { pname = "linkify-it-py"; - version = "2.0.0"; - format = "setuptools"; + version = "2.0.2"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,13 +18,24 @@ buildPythonPackage rec { owner = "tsutsu3"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3bgkhIC6tHl5zieiyllvqFCKwLms55m8MGt1xGhQ4Dk="; + hash = "sha256-e3k2RblqvzWSSIrJL6ib2dxFw7T5vXlN8DrCV1qEr6w="; }; - propagatedBuildInputs = [ uc-micro-py ]; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "linkify_it" ]; + propagatedBuildInputs = [ + uc-micro-py + ]; + + pythonImportsCheck = [ + "linkify_it" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Links recognition library with full unicode support"; diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 906f5eb40a06b..4c1b77bf86a9b 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "linode-api"; - version = "5.0.0"; + version = "5.7.2"; disabled = pythonOlder "3.6"; # Sources from Pypi exclude test fixtures src = fetchFromGitHub { owner = "linode"; repo = "python-linode-api"; - rev = version; - sha256 = "0lqi15vks4fxbki1l7n1bfzygjy3w17d9wchjxvp22ijmas44yai"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-RU/GyNYV05iYVNanMqKMmoksXWrxTQ2H2XvaIwSSslA="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index 75cc1f9b2c614..93e9d8937bd8b 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.7.0"; + version = "0.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Delgan"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JwhJPX58KrPdX237L43o77spycLAVFv3K9njJiRK30Y="; + hash = "sha256-1xcPAOOhjFmWSxmPj6NICRur3ITOuQRNNKPJlfp89Jw="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/lxml-stubs/default.nix b/pkgs/development/python-modules/lxml-stubs/default.nix new file mode 100644 index 0000000000000..8df03f5268967 --- /dev/null +++ b/pkgs/development/python-modules/lxml-stubs/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +, pytest-mypy-plugins +, lxml +}: + +buildPythonPackage rec { + pname = "lxml-stubs"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lxml"; + repo = "lxml-stubs"; + rev = version; + hash = "sha256-RRH/taLtgaXOl0G/ve2Ad7Xy8WRDUG2/k26EFMv1PRM="; + }; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + lxml + ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-mypy-plugins + ]; + + meta = with lib; { + description = "Type stubs for the lxml package"; + homepage = "https://github.com/lxml/lxml-stubs"; + license = licenses.asl20; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 942699156a935..02dd3c540ac4b 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "m2r"; - version = "0.2.1"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "bf90bad66cda1164b17e5ba4a037806d2443f2a4d5ddc9f6a5554a0322aaed99"; + sha256 = "sha256-qvtn/EnPsdieRqNEOsdH4V9LtC3yDtBPBnrZ777iVqs="; }; patches = [ diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 95635b94d5058..d25daaf21bc09 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -2,6 +2,11 @@ , stdenv , buildPythonPackage , fetchPypi + +# build-system +, setuptools + +# dependencies , spake2 , pynacl , six @@ -9,11 +14,15 @@ , twisted , autobahn , automat -, hkdf , tqdm , click , humanize , txtorcon + +# optional-dependencies +, noiseprotocol + +# tests , nettools , mock , magic-wormhole-transit-relay @@ -23,13 +32,18 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.12.0"; + version = "0.13.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0q41j99718y7m95zg1vaybnsp31lp6lhyqkbv4yqz5ys6jixh3qv"; + hash = "sha256-rDvWgoYnDn8UnAYUmo5Anl+jTX/rDoiESibSnu0tFRY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ spake2 pynacl @@ -38,25 +52,29 @@ buildPythonPackage rec { twisted autobahn automat - hkdf tqdm click humanize txtorcon - ] ++ autobahn.optional-dependencies.twisted + ] + ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; + passthru.optional-dependencies = { + dilation = [ + noiseprotocol + ]; + }; + nativeCheckInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server pytestCheckHook - ]; + ] + ++ passthru.optional-dependencies.dilation; - disabledTests = [ - # Expected: (<class 'wormhole.errors.WrongPasswordError'>,) Got: Failure instance: Traceback (failure with no frames): <class 'wormhole.errors.LonelyError'>: - "test_welcome" - ] ++ lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.isDarwin [ # These tests doesn't work within Darwin's sandbox "test_version" "test_text" @@ -92,6 +110,7 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${version}/NEWS.md"; description = "Securely transfer data between computers"; homepage = "https://github.com/magic-wormhole/magic-wormhole"; license = licenses.mit; diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index 3135ded66ebf9..4d23928da1aca 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "manifestoo-core"; - version = "0.11.0"; + version = "1.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-ZZAJDOtGcYWm0yS5bMOUdM1Jf+kfurwiLsJwyTYPz/4="; + hash = "sha256-cnEbws2NDxVkLEgLsYw2VQQWP69nC1SVixl9a6vHPmo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index b1a031bd2a31f..ed3df6f804eb6 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "markdown-it-py"; - version = "2.2.0"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qdRU1BxczFDGoIEtl0ZMkKNn4p5tec8YuPt5ZwX5fYM="; + hash = "sha256-cmjLElJA61EysTUFMVY++Kw0pI4wOIXOyCY3To9fpQc="; }; # fix downstrem usage of markdown-it-py[linkify] diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index 97eeb09d7b8a8..f898acad51446 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mashumaro"; - version = "3.9.1"; + version = "3.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Fatal1ty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VDB6313lvKuLJFOnuzEaiiRLUBOvbdjfowgl3nvG8Y0="; + hash = "sha256-PvMEwIxurDGwYMCmNFThedxDY4vwATHYwMlXkucNuwM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 97b9090cc2501..1646d3ac72460 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/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/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index e5df4ea7d4ea8..4ac081e26a200 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -79,7 +79,7 @@ let in buildPythonPackage rec { - version = "3.7.2"; + version = "3.8.0"; pname = "matplotlib"; format = "pyproject"; @@ -87,7 +87,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-qM25Hd2wRDa9LwmLj99LgTUuaM9NLGdW/MQUeRB2Vps="; + hash = "sha256-34UF4cGdXCwmr/NJeny9PM/C6XBD0eTbPnavo5kWS2k="; }; env.XDG_RUNTIME_DIR = "/tmp"; diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix index 15e619558016d..e96d668265833 100644 --- a/pkgs/development/python-modules/maya/default.nix +++ b/pkgs/development/python-modules/maya/default.nix @@ -1,21 +1,27 @@ { lib , fetchFromGitHub -, fetchpatch , buildPythonPackage + +# build-system +, setuptools + +# dependencies , dateparser , humanize +, tzlocal , pendulum -, pytz , snaptime -, tzlocal -, pytestCheckHook +, pytz + +# tests , freezegun -, pytest-mock +, pytestCheckHook }: buildPythonPackage rec { pname = "maya"; version = "0.6.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "kennethreitz"; @@ -24,16 +30,16 @@ buildPythonPackage rec { hash = "sha256-4fUyUqVQk/AcQL3xMnU1cQlF5yiD/N9NPAsUPuDTTNY="; }; - # fix humanize incompatibility - # https://github.com/timofurrer/maya/commit/d9cd563d1b1ba16bcff4dacb4ef49edd4e32fd1d.patch - # ^ does not apply on 0.6.1 postPatch = '' + # function was made private in humanize substituteInPlace maya/core.py \ - --replace \ - "humanize.time.abs_timedelta" \ - "humanize.time._abs_timedelta" + --replace "humanize.time.abs_timedelta" "humanize.time._abs_timedelta" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ dateparser humanize @@ -44,15 +50,13 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook freezegun - pytest-mock + pytestCheckHook ]; meta = with lib; { description = "Datetimes for Humans"; homepage = "https://github.com/kennethreitz/maya"; license = licenses.mit; - maintainers = with maintainers; [ pbsds ]; }; } diff --git a/pkgs/development/python-modules/md2gemini/default.nix b/pkgs/development/python-modules/md2gemini/default.nix index e50c405334c11..c0b6eec7f8389 100644 --- a/pkgs/development/python-modules/md2gemini/default.nix +++ b/pkgs/development/python-modules/md2gemini/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "md2gemini"; - version = "1.9.0"; + version = "1.9.1"; propagatedBuildInputs = [ mistune cjkwrap wcwidth ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-d1zuK+NqoPS36ihh8qx9gOET94tApY+SGStsc/bITnU="; + hash = "sha256-XreDqqzH3UQ+RIBOrvHpaBb7PXcPPptjQx5cjpI+VzQ="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/mdformat-gfm/default.nix b/pkgs/development/python-modules/mdformat-gfm/default.nix index 2b48bcfa45def..de5a1d2ac68ba 100644 --- a/pkgs/development/python-modules/mdformat-gfm/default.nix +++ b/pkgs/development/python-modules/mdformat-gfm/default.nix @@ -4,7 +4,6 @@ , linkify-it-py , markdown-it-py , mdformat -, mdformat-gfm , mdformat-tables , mdit-py-plugins , poetry-core @@ -45,6 +44,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + "test_default_style__api" + "test_default_style__cli" + ]; + pythonImportsCheck = [ "mdformat_gfm" ]; diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index 772d9547088bc..ad3e8580f11dd 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mdit-py-plugins"; - version = "0.3.5"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-U6Qh/1GklW9ZXBXmjPLuxga0JS/Cyga1iorcMEA+WP8="; + hash = "sha256-YBJu0vIOD747DrJLcqiZMHq34+gHdXeGLCw1OxxzIJ0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index c37aa8f867e5e..2c58382a47794 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "mediapy"; - version = "1.1.8"; + version = "1.1.9"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mVhBM+NQEkLYByp/kCPFJCAY26La5CWjcPl6PgclA9A="; + hash = "sha256-WUOxtE0NfXi0fpdasZTqixPhVV2+Refatvf6dgCb0Z8="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix index df0dd2cb1bb1a..1e0dbb1668395 100644 --- a/pkgs/development/python-modules/meep/default.nix +++ b/pkgs/development/python-modules/meep/default.nix @@ -33,13 +33,13 @@ assert !lapack.isILP64; buildPythonPackage rec { pname = "meep"; - version = "1.25.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "NanoComp"; repo = pname; - rev = "v${version}"; - hash = "sha256-4rIz2RXLSWzZbRuv8d4nidOa0ULYc4QHIdaYrGu1WkI="; + rev = "refs/tags/v${version}"; + hash = "sha256-9ha6YPlvq2HUTuEqngFOAJUqCahBi7L7O8qsIMMfbrY="; }; format = "other"; diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index 2f441ca71106a..fe4e8dd598d5c 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mesa"; - version = "1.2.1"; + version = "2.1.1"; format = "setuptools"; # According to their docs, this library is for Python 3+. @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Mesa"; inherit version; - hash = "sha256-SJiAuQSnatBnsZpwF3KyBTd1oiNjCpJEepq7t0QjoAQ="; + hash = "sha256-1wyXndB7xQy1jnfHsIqMQgsvmGYUhjDuSBB2M0GcXC4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meson-python/add-build-flags.sh b/pkgs/development/python-modules/meson-python/add-build-flags.sh index d2535d1fd59ad..d9327960eb1df 100644 --- a/pkgs/development/python-modules/meson-python/add-build-flags.sh +++ b/pkgs/development/python-modules/meson-python/add-build-flags.sh @@ -1,6 +1,10 @@ -# Add all of mesonFlags to -Csetup-args for pypa builds -for f in $mesonFlags; do - pypaBuildFlags+=" -Csetup-args=$f" - # This requires pip>23.0.1, see: https://meson-python.readthedocs.io/en/latest/how-to-guides/config-settings.html - pipBuildFlags+=" --config-settings=setup-args=$f" -done +mesonPythonBuildFlagsHook() { + # Add all of mesonFlags to -Csetup-args for pypa builds + for f in $mesonFlags; do + pypaBuildFlags+=" -Csetup-args=$f" + # This requires pip>23.0.1, see: https://meson-python.readthedocs.io/en/latest/how-to-guides/config-settings.html + pipBuildFlags+=" --config-settings=setup-args=$f" + done +} + +postConfigureHooks+=(mesonPythonBuildFlagsHook) diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 4b45ee4e77d34..84031db71b808 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "meson-python"; - version = "0.13.1"; + version = "0.14.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "meson_python"; - hash = "sha256-Y7MXAAFCXEL6TP7a25BRy9KJJf+O7XxA02ugCZ48dhg="; + hash = "sha256-uWhmaQMmVE3+RSWDdTrD9DMTIn6f2UFnAajfkK8hIjQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 9b9b25ee37682..65702b23c7ad9 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -6,15 +6,18 @@ , portmidi , python-rtmidi , pytestCheckHook +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "mido"; - version = "1.2.10"; + version = "1.3.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "17b38a8e4594497b850ec6e78b848eac3661706bfc49d484a36d91335a373499"; + sha256 = "sha256-hCguOs40vKP5hCINstvLmCRc/q+4VCYMAuAAdQ3Khqo="; }; patches = [ @@ -24,6 +27,11 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ python-rtmidi ]; diff --git a/pkgs/development/python-modules/mistletoe/default.nix b/pkgs/development/python-modules/mistletoe/default.nix index 98844b1e8e516..c95a26eb6e046 100644 --- a/pkgs/development/python-modules/mistletoe/default.nix +++ b/pkgs/development/python-modules/mistletoe/default.nix @@ -1,20 +1,21 @@ { lib , fetchPypi , buildPythonPackage +, parameterized , pythonOlder , pytestCheckHook }: buildPythonPackage rec { pname = "mistletoe"; - version = "1.0.1"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sfia+weaGxpULp7ywI3UUKB6K9k1wDyrIsMorXyk2Og="; + hash = "sha256-fQwas3RwR9Fp+fxLkl0cuj9cE+rwuQw2W3LkflnQCgI="; }; pythonImportsCheck = [ @@ -22,6 +23,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + parameterized pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 8e9975fb223dd..467da5dd80af9 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.9.2"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "has2k1"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6jdQxRqulE5hIzzmdr9kR5gsLrzt0lfJun5blJjTUY0="; + hash = "sha256-JrE12dU0Es4VwUZLcbB8mabifnpxZ7Qt68WJ22HvPm4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 7f45b1ecc7ae5..59c433145b02f 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.1.13"; + version = "9.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-S+cCNcQR8Y1UGj+4Nfy9Z10N/9PRq13fSeR2YFntxWI="; + hash = "sha256-2Z1U71agXxkYp1OFYd/xInAfN5SVI9FQf39b8DkX10o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix index 54499fdbd07d4..86037b0c18ec8 100644 --- a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mkdocs-mermaid2-plugin"; - version = "1.0.8"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "fralau"; repo = "mkdocs-mermaid2-plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-0h/EMfp6D14ZJcQe3U2r/RQ/VNejOK9bLP6AMNiB0Rc="; + hash = "sha256-9vYLkGUnL+rnmZntcgFzOvXQdf6angb9DRsmrBjnPUY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-minify/default.nix b/pkgs/development/python-modules/mkdocs-minify/default.nix index 5ad4ef4484544..631f881908c33 100644 --- a/pkgs/development/python-modules/mkdocs-minify/default.nix +++ b/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/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index ff9326a8ba7d6..f28fbf5ff7b6c 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.6.4"; + version = "0.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Blueswen"; repo = "mkdocs-swagger-ui-tag"; rev = "refs/tags/v${version}"; - hash = "sha256-/Spvj3lt7p+ZUbA/7xaQMLCSmHOOsoCRliqaAN+YU3g="; + hash = "sha256-08/nwJC7p5pwSXJicoJbZ8Xsc3yOvxWxzaCIS6aQ9uI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index ac3c2c851c63f..61c8bdcd13c15 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -14,8 +14,11 @@ , importlib-metadata , jinja2 , markdown +, markupsafe , mergedeep , packaging +, pathspec +, platformdirs , pyyaml , pyyaml-env-tag , watchdog @@ -28,7 +31,7 @@ buildPythonPackage rec { pname = "mkdocs"; - version = "1.4.2"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -36,29 +39,28 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/NxiKbCd2acYcNe5ww3voM9SGVE2IDqknngqApkDbNs="; + hash = "sha256-9sV1bewsHVJEc2kTyGxDM6SjDTEKEc/HSY6gWBC5tvE="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "Markdown >=3.2.1, <3.4" "Markdown" - ''; - nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ click + ghp-import jinja2 markdown + markupsafe mergedeep + packaging + pathspec + platformdirs pyyaml pyyaml-env-tag - ghp-import - importlib-metadata watchdog - packaging + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index fbbdb91feb2d3..d8fb50f586b28 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -8,13 +8,13 @@ , mkdocs-autorefs , pymdown-extensions , pytestCheckHook -, pdm-pep517 +, pdm-backend , pythonOlder }: buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.21.2"; + version = "0.23.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pi0BEe/zhG/V9wh2CO91Cc7Mze93+2tbVo6/2LGQ6Nw="; + hash = "sha256-t7wxm600XgYl1jsqjOpZdWcmqR9qafdKTaz/xDPdDPY="; }; postPatch = '' @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = [ @@ -61,6 +61,8 @@ buildPythonPackage rec { disabledTests = [ # Not all requirements are available "test_disabling_plugin" + # Circular dependency on mkdocstrings-python + "test_extended_templates" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 14f4b76b48cff..41ebc9545ceff 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.5.0"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+ZKujqnHNQI0S69IxOxEeqnvv6iWW8CQho5hYyNPTrA="; + hash = "sha256-3q8PXydgjpUm1p//zKcMgirJDqKQpvPkuz36GyCbARE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 6f9294e83b13c..0da165ada2b68 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mlxtend"; - version = "0.21.0"; + version = "0.22.0"; disabled = isPy27; src = fetchFromGitHub { owner = "rasbt"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7G4tIoQGS7/YPpAhUn0CRf8fl/DdjdqySPWgJEL0trA="; + hash = "sha256-YLCNLpg2qrdFon0/gdggJd9XovHwRHAdleBFQc18qzE="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 46bc25672e183..940c633d4115f 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "1.3.1"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jvrk6m1Cd5ig2LXq6sAIbHDhmtG1gH/7WNAc7oet+tg="; + hash = "sha256-djVQkj8ktIOxe1xmi+XuIvdS1WdDzozgTJNJhWAhuBo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index ff8d2856cc991..49125a286e90b 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.11.0"; + version = "3.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OIdLP3hHnPZ9MqrHt6G5t2SSO342+jTACgzxM6RjVYM="; + hash = "sha256-sEPLUN9nod4AKYcoCNQZ4FBblUCLCPV1dFOrNC6xDWo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mockfs/default.nix b/pkgs/development/python-modules/mockfs/default.nix new file mode 100644 index 0000000000000..234a3d14d696f --- /dev/null +++ b/pkgs/development/python-modules/mockfs/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, setuptools-scm +, wheel +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mockfs"; + version = "1.1.4"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "mockfs"; + repo = "mockfs"; + rev = "v${version}"; + hash = "sha256-JwSkOI0dz9ZetfE0ZL3CthvcCSXGFYX+yQZy/oC6VBk="; + }; + + postPatch = '' + sed -i '/addopts/d' pytest.ini + ''; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + pythonImportsCheck = [ "mockfs" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "A simple mock filesystem for use in unit tests"; + homepage = "https://github.com/mockfs/mockfs"; + changelog = "https://github.com/mockfs/mockfs/blob/${src.rev}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/moddb/default.nix b/pkgs/development/python-modules/moddb/default.nix index 102410dc6bbbd..a0205d5c4676a 100644 --- a/pkgs/development/python-modules/moddb/default.nix +++ b/pkgs/development/python-modules/moddb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "moddb"; - version = "0.8.1"; + version = "0.9.0"; format = "setuptools"; src = fetchFromGitHub { owner = "ClementJ18"; repo = "moddb"; rev = "v${version}"; - hash = "sha256-Pl/Wc0CL31+ZLFfy6yUfrZzsECifnEpWVGRHZVaFWG4="; + hash = "sha256-2t5QQAmSLOrdNCl0XdsFPdP2UF10/qq69DovqeQ1Vt8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl_window/default.nix index 31d76131c2ba7..f4e1d6a04de59 100644 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ b/pkgs/development/python-modules/moderngl_window/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, setuptools , glfw , moderngl , numpy @@ -19,18 +20,22 @@ buildPythonPackage rec { pname = "moderngl-window"; - version = "2.4.4"; - format = "setuptools"; + version = "2.4.5"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "moderngl"; repo = "moderngl_window"; rev = "refs/tags/${version}"; - hash = "sha256-mg3j5ZoMwdk39L5xjcoEJo9buqssM1VLJtndSFsuCB0="; + hash = "sha256-OfvIxezeZyuv5LLbe+4o1X2UCGnXT2DNvAF7t2Isw6Y="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy moderngl @@ -75,6 +80,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ c0deaddict ]; platforms = platforms.mesaPlatforms; - broken = versionAtLeast pillow.version "2" || stdenv.isDarwin; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index cb0be3e5ea9f1..c4b7b7135e2b6 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.26.0"; + version = "0.27.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mPz9Nyoyke++e9vBWSKunc9VGHCP8pbmldgKty5HIMA="; + hash = "sha256-UCd7RpsSNDKh3vgVRYrFYWYVLQuK7WI0n/Moukhq5dM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 37107a1b1b528..cebb9c382c7c2 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -9,12 +9,13 @@ , pytestCheckHook , pythonOlder , ruamel-yaml +, torch , tqdm }: buildPythonPackage rec { pname = "monty"; - version = "2023.4.10"; + version = "2023.9.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9of56ErJ03hU+KqxUjR4IiyU4XLJoothSwODlzSWv9Y="; + hash = "sha256-VzOu0gLQcobWQs8uMFzI4CyN+1OVx94VqhJYB+rMpMI="; }; postPatch = '' @@ -43,6 +44,7 @@ buildPythonPackage rec { pydantic pymongo pytestCheckHook + torch ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index 86a1b5d3d32d9..df3804095665c 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "9.1.0"; + version = "10.1.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-yrqjQa0DieqDwXqUVmpTrkydBzSYYeyxTcbQNFz5rF0="; + hash = "sha256-Ymw2n6DrN7rAKRvOglmzMv1ZrHkvpUl7WYNzCc1bEUo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index c30fc5311d040..73e95a6e1eadd 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -33,6 +33,7 @@ # tests , freezegun +, py-partiql-parser , pytestCheckHook , pytest-xdist , sure @@ -40,14 +41,14 @@ buildPythonPackage rec { pname = "moto"; - version = "4.1.3"; + version = "4.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yCAMyqlEDC6dqgvV4L12inGdtaLILqjXgvDj+gmjxeI="; + hash = "sha256-7jTEw/U5ANlTGAlGkgyduhJ6SD4u1A5tv5PUri52Dnw="; }; nativeBuildInputs = [ @@ -83,6 +84,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun + py-partiql-parser pytestCheckHook sure ]; @@ -105,12 +107,21 @@ buildPythonPackage rec { "--deselect=tests/test_iotdata/test_iotdata.py::test_basic" "--deselect=tests/test_iotdata/test_iotdata.py::test_delete_field_from_device_shadow" "--deselect=tests/test_iotdata/test_iotdata.py::test_publish" - "--deselect=tests/test_s3/test_server.py::test_s3_server_bucket_versioning" + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_data" + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_file_using_requests" "--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header" + "--deselect=tests/test_s3/test_s3.py::test_presigned_put_url_with_approved_headers" + "--deselect=tests/test_s3/test_s3.py::test_presigned_put_url_with_custom_headers" + "--deselect=tests/test_s3/test_s3.py::test_put_chunked_with_v4_signature_in_body" + "--deselect=tests/test_s3/test_s3.py::test_upload_from_file_to_presigned_url" + "--deselect=tests/test_s3/test_server.py::test_s3_server_bucket_versioning" + "--deselect=tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins" # Disable tests that require docker daemon + "--deselect=tests/test_core/test_docker.py::test_docker_is_running_and_available" "--deselect=tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda" "--deselect=tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda" + "--deselect=tests/test_sqs/test_sqs_integration.py" # json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0) "--deselect=tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function" diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index 704c8697ce8d6..3e4cf4d574add 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "motor"; - version = "3.1.1"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mongodb"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PD41ZyUFY4fYaO4Fo7kiTWcn1a6LOd81K3PWAAagmr4="; + hash = "sha256-iJz3JiW9cVT3G1rLQwWQXcPfPBRGsIwVLs4gauM+pYo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 123008106b8e7..31febd203db89 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.23.0"; + version = "1.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JcmjOs+EMB+T0f2+nxqcYM04rw1f/9v6N4E4/HvB6Gs="; + hash = "sha256-fS7NrUGl9zuyuBPzBhpM9HySRiEQWo7RN1hvy52Pgn4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix index ed55b0421cd89..0953e46a5545f 100644 --- a/pkgs/development/python-modules/multipledispatch/default.nix +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "multipledispatch"; - version = "0.6.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "a7ab1451fd0bf9b92cab3edbd7b205622fb767aeefb4fb536c2e3de9e0a38bea"; + sha256 = "sha256-XIOZFUZcaCBsPpxHM1eQghbCg4O0JTYeXRRFlL+Fp+A="; }; # No tests in archive diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index 962a70726adb9..647281b8b4ee2 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.14"; + version = "0.70.15"; format = "setuptools"; src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; rev = "refs/tags/multiprocess-${version}"; - hash = "sha256-pjYOEOI5No9gT0XchmH6FSJ9uDqEnaLj/PyHT2a90jo="; + hash = "sha256-fpyFBrQXy5TwbHmce3qg1RiM8JnH3J5skl3es1IQPiw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix index f6ca7c1d69055..0ff62dcbee2bb 100644 --- a/pkgs/development/python-modules/munch/default.nix +++ b/pkgs/development/python-modules/munch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "munch"; - version = "2.5.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2"; + sha256 = "sha256-VCyxUUYSYyFqTjfD/Zr8Ql/urziqowJc0qmB+ttCIjU="; }; propagatedBuildInputs = [ six pbr ]; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 90fafe527bd7f..0ee96a6d690db 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -2,14 +2,12 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder # build-system , setuptools , types-psutil , types-setuptools -, types-typed-ast # propagates , mypy-extensions @@ -32,7 +30,7 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.4.1"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,23 +39,14 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; rev = "refs/tags/v${version}"; - hash = "sha256-2PeE/L9J6J0IuUpHZasemM8xxefNJrdzYnutgJjevWQ="; + hash = "sha256-qs+axm2+UWNuWzLW8CI4qBV7k7Ra8gBajid8mYKDsso="; }; - patches = [ - (fetchpatch { - # pytest 7.4 compat - url = "https://github.com/python/mypy/commit/0a020fa73cf5339a80d81c5b44e17116a5c5307e.patch"; - hash = "sha256-3HQPo+V7T8Gr92clXAt5QJUJPmhjnGjQgFq0qR0whfw="; - }) - ]; - nativeBuildInputs = [ mypy-extensions setuptools types-psutil types-setuptools - types-typed-ast typing-extensions ] ++ lib.optionals (pythonOlder "3.11") [ tomli diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 7b85fcf54b547..d821adc3bb257 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -1,11 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, libmysqlclient }: +{ lib +, buildPythonPackage +, fetchPypi +, libmysqlclient +, pkg-config +}: buildPythonPackage rec { pname = "mysqlclient"; - version = "2.1.1"; + version = "2.2.0"; nativeBuildInputs = [ - libmysqlclient + pkg-config ]; buildInputs = [ @@ -17,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-godX5Bn7Ed1sXtJXbsksPvqpOg98OeJjWG0e53nD14I="; + hash = "sha256-BDaERfnEh9irt6h449I+kj5gcsBKbDIPng3IqC77oU4="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix index 3a51d240c5aed..66c07489dfaa0 100644 --- a/pkgs/development/python-modules/myst-docutils/default.nix +++ b/pkgs/development/python-modules/myst-docutils/default.nix @@ -13,12 +13,13 @@ buildPythonPackage rec { pname = "myst-docutils"; - version = "1.0.0"; + version = "2.0.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-fbh97Z/5TnnMHj2bGZ4UvJkPpYtrTTcFOgpLWgHUYk0="; + pname = "myst_docutils"; + inherit version; + hash = "sha256-WmmPEg+bINmeId+pjR6bbp8qzjfSXfEel+sQEdPIu8Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index f2beeb85036ff..0e6b2204ddbb5 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "myst-parser"; - version = "1.0.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Kewd6/4yawpRuyCe8Na0BGUMo59tr2fc97VlGbVJ8mI="; + hash = "sha256-1BW7Z+0rs5Up+VZ3vDygnhLzE9Y2BqEMnTnflboweu0="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix index eabbadc1d6145..9b835d52737a2 100644 --- a/pkgs/development/python-modules/napalm/default.nix +++ b/pkgs/development/python-modules/napalm/default.nix @@ -1,58 +1,76 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, setuptools, cffi -, paramiko, requests, future, textfsm, jinja2, netaddr, pyyaml, pyeapi, netmiko -, junos-eznc, ciscoconfparse, scp, lxml, ncclient, pytestCheckHook, ddt, mock -, pythonOlder, invoke }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build-system +, setuptools +, cffi + +# dependencies +, future +, jinja2 +, junos-eznc +, lxml +, ncclient +, netaddr +, netmiko +, netutils +, paramiko +, pyeapi +, pyyaml +, requests +, scp +, textfsm +, ttp +, ttp-templates +, typing-extensions + +# tests +, pytestCheckHook +, ddt +, mock + }: buildPythonPackage rec { pname = "napalm"; - version = "3.4.1"; - format = "setuptools"; + version = "4.1.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "napalm-automation"; repo = "napalm"; - rev = version; - hash = "sha256-TNWRJtc6+VS6wgJGGvCPDoFQmOKQAyXdjFQo9bPJ2F8="; + rev = "refs/tags/${version}"; + hash = "sha256-JqjuYMJcP58UMn1pPYg7x8KpqCKQUs19Ng9HbI2iX38="; }; - patches = [ - # netmiko 4.0.0 support - (fetchpatch{ - url = "https://github.com/napalm-automation/napalm/commit/4b8cc85db3236099a04f742cf71773e74d9dd70e.patch"; - excludes = [ "requirements.txt" ]; - hash = "sha256-DBKp+wiKd+/j2xAqaQL3UCcGQd6wnWcNTsNXBBt9c98="; - }) - (fetchpatch{ - url = "https://github.com/napalm-automation/napalm/commit/4a8b5b1823335dd79aa5269c038a1f08ecd35cdd.patch"; - hash = "sha256-uiou/rzmnFf4wAvXwmUsGJx99GeHWKJB2JrMM1kLakM="; - }) + nativeBuildInputs = [ + setuptools ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "netmiko>=3.3.0,<4.0.0" "netmiko" - ''; - propagatedBuildInputs = [ cffi - paramiko - requests future - textfsm - invoke jinja2 + junos-eznc + lxml + ncclient netaddr - pyyaml - pyeapi netmiko - junos-eznc - ciscoconfparse + # breaks infinite recursion + (netutils.override { napalm = null; }) + paramiko + pyeapi + pyyaml + requests scp setuptools - lxml - ncclient + textfsm + ttp + ttp-templates + typing-extensions ]; nativeCheckInputs = [ pytestCheckHook mock ddt ]; diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix index fc81042527b8e..53fffeaadcbad 100644 --- a/pkgs/development/python-modules/napari-npe2/default.nix +++ b/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.0"; - - format = "pyproject"; + version = "0.7.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -27,15 +26,14 @@ buildPythonPackage rec { owner = "napari"; repo = "npe2"; rev = "refs/tags/v${version}"; - hash = "sha256-6kHyz7jMZO3385XaNJ4zFBoQiU1SIRyYZsUeMH5EBXo="; + 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/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 6c386ee01854b..745de65f4b2e4 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -19,7 +19,7 @@ let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.7.2"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ let nbclient = buildPythonPackage rec { owner = "jupyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2H6Oi1tK/GrtfMTR1j12tZdRzQkFUxXzMSpfCtGPyWE="; + hash = "sha256-uBCYmrl/Zfw58hd12z20jLVwGSPv+M3fMo1mfV2GO/M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index e7fb3dfba4721..68d3de53cb3a3 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -33,7 +33,7 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.7.3"; + version = "7.8.0"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-SlmWv1880WqgQxiXuhqkxkhCwgefQ0s9xrjEslLvM1U="; + hash = "sha256-9bwVoSR+FN1Bzu8MCjvHACDgFldusFeNpi8cW0+VBHk="; }; # Add $out/share/jupyter to the list of paths that are used to search for diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 354a937a61055..290663e78a810 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.9.1"; + version = "5.9.2"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-On9S0EBjnL2KOJAhjIsP+5MhFYjFdEbJAJXjK6WIG10="; + hash = "sha256-X5i1uhmX3/F1534MF9XBCpbq7Sy9HeNTPR/DXV4REZI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix index 7258acb2aad12..513c3ade941fb 100644 --- a/pkgs/development/python-modules/netmiko/default.nix +++ b/pkgs/development/python-modules/netmiko/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "netmiko"; - version = "4.1.2"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-9e3iooZw09/TRwBhRoZl+A+bSQbtIOaw+02eHJvmevw="; + hash = "sha256-et3m/j6mMzYij0moY2UMLYP7DmgODw0Vi1sPsExBAOE="; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index c1f43e64f8f02..517c90b3f4494 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , jinja2 +, jsonschema , napalm , poetry-core , pytestCheckHook @@ -30,6 +31,12 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + jsonschema + napalm + ]; + + passthru.optional-dependencies.optionals = [ + jsonschema napalm ]; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 5342b12dc8b26..b793bc57bf0e8 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "3.0"; + version = "3.1"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-mpmSNFNTYYrpgznCtj2CAcOBwpRPOKKrSctFpMZn5BI="; + hash = "sha256-3jRjNUCPhN4Orab/n6+v/5vNoR8KDfqpMRM967FGq2E="; }; propagatedBuildInputs = [ decorator setuptools ]; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 5a79242daa060..921af46b15d56 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.10.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - hash = "sha256-zH8QaOA4B2Un6tG9NjQ2+I9ejSHou1ezI7MLkm/HVTo="; + hash = "sha256-koo2Tn7XfRXQK38icZfqfHj0Ty/ngP61VdbXz5Iy+EY="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index 648d954be7d04..81fcdce60d1e2 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nose2"; - version = "0.12.0"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-lW55ub1VjuCLYgDAWtLHZGW344YMDAU3aGCJKFwyARM="; + hash = "sha256-V8aK1nbvS4i1BpSTfrUvSUOqHKJhB0tJCbbhYwRrRvA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix index 985cc63158e66..3bdb11416863b 100644 --- a/pkgs/development/python-modules/notebook-shim/default.nix +++ b/pkgs/development/python-modules/notebook-shim/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "notebook-shim"; - version = "0.2.2"; + version = "0.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyter"; repo = "notebook_shim"; rev = "refs/tags/v${version}"; - hash = "sha256-/z4vXSBqeL2wSqJ0kFNgU0TSGUGByhxHNya8EO55+7s="; + hash = "sha256-eAYZuNYqOMKC6joDbbKk4Q4nrfdbO7b+yZeSvMdWWrI="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 95f387653d972..0532d2472a7f4 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.0.2"; + version = "7.0.3"; disabled = pythonOlder "3.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-1w1qB0GMgpvV9UM3zpk7cQUmHZAm+dP+aOm4qhog2po="; + hash = "sha256-B/PFBi/Q5uaYZEN6A0erxIXZkaroepLEfWWWmfVxtyk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix index 82ba5a8cec109..c43cb81eb2fc7 100644 --- a/pkgs/development/python-modules/num2words/default.nix +++ b/pkgs/development/python-modules/num2words/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.5.12"; + version = "0.5.13"; pname = "num2words"; src = fetchPypi { inherit pname version; - hash = "sha256-fnwLDwgEBao6HdnTKxypCzvwO6sXuOVNsF4beDAaCYg="; + hash = "sha256-owZHFvu/kNdcRJRQzr+8c6ahPmOyUx0JvezDqxoiCc8="; }; propagatedBuildInputs = [ docopt ]; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index a12524d46d1e7..51a043b8d7f31 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -12,7 +12,6 @@ , importlib-metadata , substituteAll , runCommand -, fetchpatch , config @@ -29,15 +28,16 @@ let in buildPythonPackage rec { # Using an untagged version, with numpy 1.25 support, when it's released # also drop the versioneer patch in postPatch - version = "unstable-2023-08-11"; + version = "0.58.0rc2"; pname = "numba"; format = "setuptools"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "numba"; repo = "numba"; - rev = "6f0c5060a69656319ab0bae1d8bb89484cd5631f"; + rev = "refs/tags/${version}"; # Upstream uses .gitattributes to inject information about the revision # hash and the refname into `numba/_version.py`, see: # @@ -50,7 +50,7 @@ in buildPythonPackage rec { # use `forceFetchGit = true;`.` If in the future we'll observe the hash # changes too often, we can always use forceFetchGit, and inject the # relevant strings ourselves, using `sed` commands, in extraPostFetch. - hash = "sha256-34qEn/i2X6Xu1cjuiRrmrm/HryNoN+Am4A4pJ90srAE="; + hash = "sha256-ktFBjzd2vEahdr86lhVLVFEadCIhPP3hRF/EuZhHCC4="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; @@ -78,13 +78,6 @@ in buildPythonPackage rec { cuda_toolkit_lib_path = cudatoolkit.lib; }) ]; - # with untagged version we need to specify the correct version ourselves - - postPatch = '' - substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='0.57.1'" - substituteInPlace numba/_version.py \ - --replace 'git_refnames = " (HEAD -> main)"' 'git_refnames = "tag: 0.57.1"' - ''; postFixup = lib.optionalString cudaSupport '' find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 63d95622c0617..6acc3e53f4e4a 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.8.4"; + version = "2.8.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1UMlN0GNGGkbkRXWFdbaoX7oJ1uu8+3xr7v4vGmAYUc="; + hash = "sha256-Yzb426P0VuQaT/w8l+tj2JxzWJ/24XBxQSJLkwJjJg0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 344a458c9a878..d2d85bddf3b6c 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,12 +1,11 @@ { lib , stdenv , fetchPypi -, fetchpatch , python , buildPythonPackage , gfortran , hypothesis -, pytest +, pytestCheckHook , typing-extensions , blas , lapack @@ -42,24 +41,17 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.25.1"; + version = "1.25.2"; format = "setuptools"; disabled = pythonOlder "3.9" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-mjqfOmFIDMCGEXtCaovYaGnCE/xAcuYG8BxOS2brkr8="; + hash = "sha256-/WCOGcjXxVAh3/1Dv+VJL6uMwQXMiYb4E/jDwEizh2A="; }; patches = [ - # f2py.f90mod_rules generates code with invalid function pointer conversions, which are - # clang 16 makes an error by default. - (fetchpatch { - url = "https://github.com/numpy/numpy/commit/609fee4324f3521d81a3454f5fcc33abb0d3761e.patch"; - hash = "sha256-6Dbmf/RWvQJPTIjvchVaywHGcKCsgap/0wAp5WswuCo="; - }) - # Disable `numpy/core/tests/test_umath.py::TestComplexFunctions::test_loss_of_precision[complex256]` # on x86_64-darwin because it fails under Rosetta 2 due to issues with trig functions and # 80-bit long double complex numbers. @@ -102,19 +94,41 @@ in buildPythonPackage rec { enableParallelBuilding = true; nativeCheckInputs = [ - pytest + pytestCheckHook hypothesis typing-extensions ]; - checkPhase = '' - runHook preCheck - pushd "$out" - ${python.interpreter} -c 'import numpy, sys; sys.exit(numpy.test("fast", verbose=10) is False)' - popd - runHook postCheck + preCheck = '' + cd "$out" ''; + # https://github.com/numpy/numpy/blob/a277f6210739c11028f281b8495faf7da298dbef/numpy/_pytesttester.py#L180 + pytestFlagsArray = [ + "-m" "not\\ slow" # fast test suite + ]; + + # https://github.com/numpy/numpy/issues/24548 + disabledTests = lib.optionals stdenv.isi686 [ + "test_new_policy" # AssertionError: assert False + "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded + "test_float_remainder_overflow" # AssertionError: FloatingPointError not raised by divmod + "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1 + ] ++ lib.optionals stdenv.isAarch32 [ + "test_impossible_feature_enable" # AssertionError: Failed to generate error + "test_features" # AssertionError: Failure Detection + "test_new_policy" # AssertionError: assert False + "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded + "test_unary_spurious_fpexception"# AssertionError: Got warnings: [<warnings.WarningMessage object at 0xd1197430>] + "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1 + "test_real" # AssertionError: selectedrealkind(16): expected 10 but got -1 + "test_quad_precision" # AssertionError: selectedrealkind(32): expected 16 but got -1 + "test_big_arrays" # ValueError: array is too big; `arr.size * arr.dtype.itemsize` is larger tha... + "test_multinomial_pvals_float32" # Failed: DID NOT RAISE <class 'ValueError'> + ] ++ lib.optionals stdenv.isAarch64 [ + "test_big_arrays" # OOM on a 16G machine + ]; + passthru = { # just for backwards compatibility blas = blas.provider; diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix index da52ca153e488..421131e7f8e23 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nutils"; - version = "7.3"; + version = "8.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "evalf"; repo = "nutils"; rev = "refs/tags/v${version}"; - hash = "sha256-3VtQFnR8vihxoIyRkbE1a1Rs8Np3/79PWNKReTBZDg8="; + hash = "sha256-6VvzUKKUB5SkmvC7PFPqGayc51t3PTMPwrxgZI5+jHA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index dce4276d57cd6..b2a8329538eba 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/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/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index fddfd74834e91..64abf9f96f107 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -3,22 +3,27 @@ , fetchPypi , buildPythonPackage , regex +, pip }: buildPythonPackage rec { pname = "oelint-parser"; - version = "2.11.3"; + version = "2.11.4"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-iR/MDHt3SEG29hSLqA36EXe8EBRZVntt+u6bwoujy0s="; + hash = "sha256-r8qpD7UDh8ZfsdwVuv0ipihPEX3263t929mMYf143iA="; }; + buildInputs = [ pip ]; propagatedBuildInputs = [ regex ]; pythonImportsCheck = [ "oelint_parser" ]; + # Fail to run inside the code the build. + doCheck = false; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index f2e19e4a63403..d6068b59e0438 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "okta"; - version = "2.9.2"; + version = "2.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kbzqriybzN/86vov3Q+kH2lj9plK1GzWPlc/Nc/nWF0="; + hash = "sha256-mOKVCRp8cLY7p0AVbvphWdB3II6eB6HlN8i1HrVUH+o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/onnxconverter-common/default.nix b/pkgs/development/python-modules/onnxconverter-common/default.nix index d45d82da0e3a1..dfe5a03e7cc79 100644 --- a/pkgs/development/python-modules/onnxconverter-common/default.nix +++ b/pkgs/development/python-modules/onnxconverter-common/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "onnxconverter-common"; - version = "1.13.0"; + version = "1.14.0"; format = "setuptools"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "onnxconverter-common"; rev = "refs/tags/v${version}"; - hash = "sha256-VT9ly0d0Yhw1J6C521oUyaCx4WtFSdpyk8EdIKlre3c="; + hash = "sha256-NbHyjLcr/Gq1zRiJW3ZBpEVQGVQGhp7SmfVd5hBIi2o="; }; propagatedBuildInputs = [ @@ -29,6 +29,10 @@ buildPythonPackage rec { onnx ]; + pythonImportsCheck = [ + "onnxconverter_common" + ]; + nativeCheckInputs = [ onnxruntime unittestCheckHook diff --git a/pkgs/development/python-modules/openaiauth/default.nix b/pkgs/development/python-modules/openaiauth/default.nix index 68eead616b47c..da10f6ffbe557 100644 --- a/pkgs/development/python-modules/openaiauth/default.nix +++ b/pkgs/development/python-modules/openaiauth/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "openaiauth"; - version = "2.0.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "OpenAIAuth"; - hash = "sha256-wmVR+cN/uJ75l62uzmHqpvEcnjzi6CU0kQ2e/5LxkBw="; + hash = "sha256-9SrptiheiM5s9YI6Ht68ahDGMFADWfBQgAWUBY3EEJ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index b9593b0e13c16..282c659291a4e 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.18.0"; + version = "0.18.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-2OcGaZQwzgxcwrXinmJjFc91620Ri0O79c8WZWfDdlQ="; + hash = "sha256-8zD4SDGH7Pcu54CcBTJ9Q2sbYfWP4OyNh5STatZ7pAk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/openllm-client/default.nix b/pkgs/development/python-modules/openllm-client/default.nix index 5fd2e6316bb08..2dd395bab677f 100644 --- a/pkgs/development/python-modules/openllm-client/default.nix +++ b/pkgs/development/python-modules/openllm-client/default.nix @@ -5,8 +5,11 @@ , hatch-fancy-pypi-readme , hatch-vcs , hatchling +, attrs +, cattrs , httpx , openllm-core +, orjson , soundfile , transformers }: @@ -14,7 +17,7 @@ buildPythonPackage rec { inherit (openllm-core) src version; pname = "openllm-client"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -27,8 +30,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + attrs + cattrs httpx - openllm-core + orjson ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/openllm-core/default.nix b/pkgs/development/python-modules/openllm-core/default.nix index 3f2c80cf0a57d..75b755740d041 100644 --- a/pkgs/development/python-modules/openllm-core/default.nix +++ b/pkgs/development/python-modules/openllm-core/default.nix @@ -22,8 +22,8 @@ buildPythonPackage rec { pname = "openllm-core"; - version = "0.2.27"; - format = "pyproject"; + version = "0.3.9"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "bentoml"; repo = "OpenLLM"; rev = "refs/tags/v${version}"; - hash = "sha256-R69Qsx9360pJx+7oyhHdeAXUjTAdevPmaBl9gj+AA8U="; + hash = "sha256-M/ckvaHTdKFg7xfUgFxu7pRBrS6TGw0m2U3L88b2DKU="; }; sourceRoot = "source/openllm-core"; @@ -67,6 +67,7 @@ buildPythonPackage rec { ] ++ transformers.optional-dependencies.torch ++ transformers.optional-dependencies.tokenizers ++ transformers.optional-dependencies.accelerate; + full = with passthru.optional-dependencies; ( vllm ++ fine-tune ); }; # there is no tests diff --git a/pkgs/development/python-modules/openllm/default.nix b/pkgs/development/python-modules/openllm/default.nix index 63974fa8be7bd..b9f3d2b6fa3b5 100644 --- a/pkgs/development/python-modules/openllm/default.nix +++ b/pkgs/development/python-modules/openllm/default.nix @@ -15,6 +15,7 @@ , einops , fairscale , flax +, ghapi , hypothesis , ipython , jax @@ -35,6 +36,7 @@ , pytest-xdist , ray , safetensors +, scipy , sentencepiece , soundfile , syrupy @@ -49,7 +51,7 @@ buildPythonPackage rec { inherit (openllm-core) src version; pname = "openllm"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -68,17 +70,19 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + accelerate bentoml bitsandbytes click + ghapi openllm-client + openllm-core optimum safetensors tabulate transformers ] ++ bentoml.optional-dependencies.io ++ tabulate.optional-dependencies.widechars - # ++ transformers.optional-dependencies.accelerate ++ transformers.optional-dependencies.tokenizers ++ transformers.optional-dependencies.torch; @@ -119,13 +123,15 @@ buildPythonPackage rec { ]; gptq = [ # auto-gptq + optimum ]; # ++ autogptq.optional-dependencies.triton; grpc = [ - openllm-client + openllm-client ] ++ openllm-client.optional-dependencies.grpc; llama = [ fairscale sentencepiece + scipy ]; mpt = [ einops @@ -134,7 +140,7 @@ buildPythonPackage rec { openai = [ openai tiktoken - ]; + ] ++ openai.optional-dependencies.embeddings; opt = [ flax jax @@ -156,9 +162,10 @@ buildPythonPackage rec { ray # vllm ]; - all = with passthru.optional-dependencies; ( + full = with passthru.optional-dependencies; ( agents ++ baichuan ++ chatglm ++ falcon ++ fine-tune ++ flan-t5 ++ ggml ++ gptq ++ llama ++ mpt ++ openai ++ opt ++ playground ++ starcoder ++ vllm ); + all = passthru.optional-dependencies.full; }; nativeCheckInputs = [ @@ -176,6 +183,8 @@ buildPythonPackage rec { export HOME=$TMPDIR # skip GPUs test on CI export GITHUB_ACTIONS=1 + # disable hypothesis' deadline + export CI=1 ''; disabledTests = [ diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix index 2d2fbc0dbdd85..00b2128db2aaa 100644 --- a/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "openstackdocstheme"; - version = "3.0.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-yB1CdOqWV7hEfUYdtqQ/fd4sNfy7Sp7YJbRQhK5egLk="; + hash = "sha256-PwSWLJr5Hjwz8cRXXutnE4Jc+vLcL3TJTZl6biK/4E4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 1ccb00617ac0f..289784d4ac414 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -14,15 +14,15 @@ let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.18.0"; + version = "1.20.0"; disabled = pythonOlder "3.7"; # to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python"; - rev = "refs/tags/v${self.version}"; - hash = "sha256-8xf4TqEkBeueejQBckFGwBNN4Gyo+/7/my6Z1Mnei5Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-tOg3G6BjHInY5TFYyS7/JA4mQajeP0b1QjrZBGqiqnM="; }; sourceRoot = "${src.name}/opentelemetry-api"; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix index 71c742c0ba2a4..8a43e9b4cda42 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , hatchling +, backoff , opentelemetry-api , opentelemetry-proto , opentelemetry-sdk @@ -23,6 +24,7 @@ buildPythonPackage { ]; propagatedBuildInputs = [ + backoff opentelemetry-sdk opentelemetry-proto ]; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 331a5e864374b..4ee758ea564da 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "0.39b0"; + version = "1.16.0"; disabled = pythonOlder "3.7"; # to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-MPBOdurEQhA9BPRgVftejjtkvN/zRQEJDjQcS2QW3xc="; + hash = "sha256-6tGQjPBej2zv5yJN0S46le3kyD7q3TELYyDmyxlp5Wo="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation"; diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 0c8a9a738aa16..2742f9aab8bf3 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.12.0"; + version = "1.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-/Z7Gh8pAa5z96X7rdcuq6kxtpF53EFGIYOu1ft8w+XM="; + hash = "sha256-heTyGgHC9tfS0hFv83sdxVApcXa63GQLG9Nwgi30GFo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index 2673151654a3d..814c90a698dc2 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -8,22 +8,21 @@ , docutils , filelock , lockfile +, numpy , pytest-qt , pytestCheckHook -, python , qasync , qt5 -, writeShellScript -, xvfb-run +, requests-cache }: buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.1.31"; + version = "0.1.33"; src = fetchPypi { inherit pname version; - hash = "sha256-kqh/c0pEWFLqf1BMD79li1MqLpH/4xrdTH9+/7YO/tg="; + hash = "sha256-w3krij7+CtJl1XoJz3RRAAp2aKqMCQg/PBh5erf/Phs="; }; propagatedBuildInputs = [ @@ -34,7 +33,9 @@ buildPythonPackage rec { docutils filelock lockfile + numpy qasync + requests-cache ]; pythonImportsCheck = [ "orangecanvas" ]; diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index cff4a603c8469..c8939f01e9394 100644 --- a/pkgs/development/python-modules/orange3/default.nix +++ b/pkgs/development/python-modules/orange3/default.nix @@ -44,8 +44,7 @@ let self = buildPythonPackage rec { pname = "orange3"; - version = "3.35.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-dj/Z4uOjA4nidd45dnHZDyHZP6Fy/MGC8asqOPV7U7A="; + hash = "sha256-O5ZN5O1vMkqiv83Q5UoaDefGnqVnDLPmYLLG20cdajk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 934b65298f4e5..5297cb920d33f 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.9.4"; + version = "3.9.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "ijl"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WS4qynQmJIVdDf0sYK/HFVQ+F5nfoJwx/zzmaL6YTRc="; + hash = "sha256-VkCwvksUtgvFLSMy2fHLxrpZjcWYhincSM4fX/Gwl0I="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-hGUXPTiKvKygxQzxXAO/+bD34eLnpkhQ7r/g27E+d4I="; + hash = "sha256-IwWbd7LE/t1UEo/bdC0bXl2K8hYyvDPbyHLBIurfb/8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index 90b56b3cd4d75..e50d9b2788fa3 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ormar"; - version = "0.12.1"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "collerek"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7d0vmYDN1EjzNWmylb/As4ywo8YYzQ88UwigIsVnwMM="; + hash = "sha256-Yd5ex0bcy61zq5Sn2dKeb98s/CMxUWnyGx6jFWQ3RUs="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index b70de2a16e4fe..50a544c1d7fb6 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "oslo-config"; - version = "9.1.1"; + version = "9.2.0"; src = fetchPypi { pname = "oslo.config"; inherit version; - hash = "sha256-sHZUtT2HeSro5zmWKtcpxSnJk4oRjYkezp7jHVlxa8k="; + hash = "sha256-/+sBymWmA9VSWQXxqIozGb4Jzixqw3bEMSquwoMJWHg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 659d8b816bb95..a8052d4211c08 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "12.3.1"; + version = "14.0.0"; src = fetchPypi { pname = "oslo.db"; inherit version; - hash = "sha256-Gd7FAkDwj7q1rnZzVOtZF1oUdz8CcdeDpX/KxJ5KbaE="; + hash = "sha256-nAipzYOOv/rSHrMBL64AKg93v5Vpb6RNBbG2OiJ+n8E="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/oslo-i18n/default.nix b/pkgs/development/python-modules/oslo-i18n/default.nix index bfa608448146a..e4d0f9f75d932 100644 --- a/pkgs/development/python-modules/oslo-i18n/default.nix +++ b/pkgs/development/python-modules/oslo-i18n/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "oslo-i18n"; - version = "6.0.0"; + version = "6.1.0"; src = fetchPypi { pname = "oslo.i18n"; inherit version; - hash = "sha256-7RBoa3X3xgeCUXemaRVfTiWc459hQ6N19jWbvKpKNc0="; + hash = "sha256-4rgp8gW/HrYgR1bMNAJ9EZSUti0nH+7oYL+BbKegfq0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index f076574bfd606..0d55f870e5fa4 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "6.1.0"; + version = "6.2.1"; src = fetchPypi { pname = "oslo.utils"; inherit version; - hash = "sha256-drwBCNUKypcraP7IKY55G1+8vrmlGifGmGtBsKamLus="; + hash = "sha256-EyK6BfoP88Gor8cn/PlF31qoLWWEcn0uBK8Di1roQkQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index fec12037e20b5..fec12037e20b5 100755..100644 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix diff --git a/pkgs/development/python-modules/paddle2onnx/default.nix b/pkgs/development/python-modules/paddle2onnx/default.nix index 1719401044440..a3853022f0a6a 100644 --- a/pkgs/development/python-modules/paddle2onnx/default.nix +++ b/pkgs/development/python-modules/paddle2onnx/default.nix @@ -9,7 +9,7 @@ }: let pname = "paddle2onnx"; - version = "1.0.6"; + version = "1.0.9"; format = "wheel"; pyShortVersion = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; src = fetchPypi { @@ -18,7 +18,7 @@ let python = pyShortVersion; abi = pyShortVersion; platform = "manylinux_2_12_x86_64.manylinux2010_x86_64"; - hash = "sha256-qHy6+RKh/gjy1mBmIj+1ENcHuIERkOeM6rrd5GNfX+Q="; + hash = "sha256-QnXfcbfzRt1sSagnDLP3ZRLH3KNqK76L+KvifTU6MJQ="; }; in buildPythonPackage { diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix index bd13c288894af..2f7cb7138c4cb 100644 --- a/pkgs/development/python-modules/palettable/default.nix +++ b/pkgs/development/python-modules/palettable/default.nix @@ -2,19 +2,23 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "palettable"; - version = "3.3.2"; - - format = "setuptools"; + version = "3.3.3"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aoZ8Qlov8ojqtDVr7ewA3gBt7jbJmmFHwuGwXeeJrJ8="; + sha256 = "sha256-CU3X2aX8HMpIVHc+XB/GoxWzO9WzqPRwZJKPrK8EkKg="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index e64f61e0ddeca..147366a2c514a 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -1,13 +1,15 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder # build-system , cython +, meson-python +, meson , oldest-supported-numpy -, setuptools +, pkg-config , versioneer , wheel @@ -63,24 +65,42 @@ buildPythonPackage rec { pname = "pandas"; - version = "2.0.3"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-wC83Kojg0X820wk6ZExzz8F4jodqfEvLQCCndRLiBDw="; + src = fetchFromGitHub { + owner = "pandas-dev"; + repo = "pandas"; + rev = "refs/tags/v${version}"; + hash = "sha256-QwMW/qc1n51DaVhUnIaG0bdOvDitvvPh6ftoDawiYlc="; }; + patches = [ + # https://github.com/pandas-dev/pandas/issues/54888#issuecomment-1701186809 + ./installer-fix.patch + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "meson-python==0.13.1" "meson-python>=0.13.1" \ + --replace "meson==1.0.1" "meson>=1.0.1" + ''; + nativeBuildInputs = [ - setuptools cython + meson-python + meson numpy - oldest-supported-numpy + pkg-config versioneer wheel - ] ++ versioneer.optional-dependencies.toml; + ] + ++ versioneer.optional-dependencies.toml + ++ lib.optionals (pythonOlder "3.12") [ + oldest-supported-numpy + ]; enableParallelBuilding = true; @@ -193,10 +213,9 @@ buildPythonPackage rec { pytestFlagsArray = [ # https://github.com/pandas-dev/pandas/blob/main/test_fast.sh - "--skip-db" - "--skip-slow" - "--skip-network" - "-m" "'not single_cpu and not slow_arm'" + "-m" "'not single_cpu and not slow and not network and not db and not slow_arm'" + # https://github.com/pandas-dev/pandas/issues/54907 + "--no-strict-data-files" "--numprocesses" "4" ]; diff --git a/pkgs/development/python-modules/pandas/installer-fix.patch b/pkgs/development/python-modules/pandas/installer-fix.patch new file mode 100644 index 0000000000000..b1659c9dbb3d4 --- /dev/null +++ b/pkgs/development/python-modules/pandas/installer-fix.patch @@ -0,0 +1,25 @@ +diff --git a/pandas/_libs/meson.build b/pandas/_libs/meson.build +index f302c649bc..ddce9ea2d6 100644 +--- a/pandas/_libs/meson.build ++++ b/pandas/_libs/meson.build +@@ -113,8 +113,4 @@ foreach ext_name, ext_dict : libs_sources + ) + endforeach + +-py.install_sources('__init__.py', +- pure: false, +- subdir: 'pandas/_libs') +- + subdir('window') +diff --git a/pandas/_libs/tslibs/meson.build b/pandas/_libs/tslibs/meson.build +index 14d2eef46d..a862345c3a 100644 +--- a/pandas/_libs/tslibs/meson.build ++++ b/pandas/_libs/tslibs/meson.build +@@ -30,7 +30,3 @@ foreach ext_name, ext_dict : tslibs_sources + install: true + ) + endforeach +- +-py.install_sources('__init__.py', +- pure: false, +- subdir: 'pandas/_libs/tslibs') diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index 4306579bc5179..79a073af9955c 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -1,10 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , flit-core , pytestCheckHook -, coveralls , numpy , decopatch , more-itertools @@ -16,23 +14,15 @@ buildPythonPackage rec { pname = "parametrize-from-file"; - version = "0.17.0"; + version = "0.18.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "parametrize_from_file"; - hash = "sha256-suxQht9YS+8G0RXCTuEahaI60daBda7gpncLmwySIbE="; + hash = "sha256-mYE8J7XWlvCS2H3kt0bB8dyPHFDqmW8NiH9UCrNccAU="; }; - patches = [ - (fetchpatch { - name = "replace contextlib2-with-contextlib.patch"; - url = "https://github.com/kalekundert/parametrize_from_file/commit/edee706770a713130da7c4b38b0a07de1bd79c1b.patch"; - hash = "sha256-VkPKGkYYTB5XCavtEEnFJ+EdNUUhITz/euwlYAPC/tQ="; - }) - ]; - # patch out coveralls since it doesn't provide us value preBuild = '' sed -i '/coveralls/d' ./pyproject.toml diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 278556fe48855..278bb0583e350 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -5,23 +5,23 @@ , fetchpatch , fetchPypi , gssapi +, icecream , invoke , mock , pyasn1 , pynacl -, pytest-relaxed , pytestCheckHook , six }: buildPythonPackage rec { pname = "paramiko"; - version = "2.11.0"; + version = "3.3.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-AD5r7nwDTCH7sFG/g9wKnuQQYgTdPFMFTHFFLMTsOTg="; + hash = "sha256-ajd3qWGshtvvN1xfW41QAUoaltD9fwVKQ7yIATSw/3c="; }; patches = [ @@ -31,11 +31,6 @@ buildPythonPackage rec { url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; hash = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; }) - (fetchpatch { - name = "fix-sftp-tests.patch"; - url = "https://github.com/paramiko/paramiko/commit/47cfed55575c21ac558e6d00a4ab1814406be651.patch"; - hash = "sha256-H3nKT8+4CTEDoiqnlhFfuKnc/65GGfwwAm9H2lwrlK8="; - }) ]; propagatedBuildInputs = [ @@ -52,6 +47,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + icecream mock pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); @@ -70,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/paramiko/paramiko/"; + changelog = "https://github.com/paramiko/paramiko/blob/${version}/sites/www/changelog.rst"; description = "Native Python SSHv2 protocol library"; license = licenses.lgpl21Plus; longDescription = '' diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index e795ab3d49d32..e7ebfb5c63e40 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "parse-type"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "jenisys"; repo = "parse_type"; - rev = "v${version}"; - hash = "sha256-v79zzAAwXYoK2N8ZPl1L90qOwMRexAV2wCTMvo4vrSc="; + rev = "refs/tags/v${version}"; + hash = "sha256-dunvcSi+nN5VruvRUPIEpkyUsmeS+kIYDfS8ibDR96s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 1ce34bfaab68a..7956a2971b514 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -1,18 +1,27 @@ -{ lib, fetchPypi -, buildPythonPackage, python +{ lib, fetchFromGitHub +, buildPythonPackage +, setuptools +, pytestCheckHook }: buildPythonPackage rec { pname = "parse"; - version = "1.19.0"; + version = "1.19.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"; + src = fetchFromGitHub { + owner = "r1chardj0n3s"; + repo = "parse"; + rev = "refs/tags/${version}"; + hash = "sha256-f08SlkGnwhSh0ajTKFqBAGGFvLj8nWBZVb6uClbRaP4="; }; - checkPhase = '' - ${python.interpreter} test_parse.py - ''; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/r1chardj0n3s/parse"; diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 5002f564094c1..912768621d107 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -41,7 +41,7 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "8.4.2"; + version = "8.6.1"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-6dP9zQI0jYiE+lUhmFBNp8Sv9povm9Pa4R4TuzAmEQk="; + hash = "sha256-lnIhXkBodvLWVeqiwFcnU4M53zwWDmtFz+9TThQY63I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index d633b8dfceb1c..52e76646875e3 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "partd"; - version = "1.3.0"; + version = "1.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-zpGrzcYXjWaLyqQxeRpakX2QI0HLGT9UP+RF1JRmBIU="; + hash = "sha256-qg/zXbvMgHrjdNtWMy9MGzm0b2e/KXX1FR4LQYau0NU="; }; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pasimple/default.nix b/pkgs/development/python-modules/pasimple/default.nix new file mode 100644 index 0000000000000..6dc52b2101580 --- /dev/null +++ b/pkgs/development/python-modules/pasimple/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pulseaudio +}: + +buildPythonPackage rec { + pname = "pasimple"; + version = "0.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "henrikschnor"; + repo = "pasimple"; + rev = "v${version}"; + hash = "sha256-Z271FdBCqPFcQzVqGidL74nO85rO9clNvP4czAHmdEw="; + }; + + postPatch = '' + substituteInPlace pasimple/pa_simple.py --replace \ + "_libpulse_simple = ctypes.CDLL('libpulse-simple.so.0')" \ + "_libpulse_simple = ctypes.CDLL('${lib.getLib pulseaudio}/lib/libpulse-simple.so.0')" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "pasimple" + "pasimple.pa_simple" + ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "A python wrapper for the \"PulseAudio simple API\". Supports playing and recording audio via PulseAudio and PipeWire"; + homepage = "https://github.com/henrikschnor/pasimple"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix index 93f1fbcabe558..ee0329c4050de 100644 --- a/pkgs/development/python-modules/path/default.nix +++ b/pkgs/development/python-modules/path/default.nix @@ -1,27 +1,23 @@ { lib +, appdirs , buildPythonPackage -, pythonOlder , fetchPypi - -# build time -, setuptools-scm - -# tests -, pytestCheckHook -, appdirs , packaging +, pytestCheckHook +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "path"; - version = "16.6.0"; + version = "16.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vqOBbh1U9OM6rHjSAxoLDtL5XmnbhbRdUfF9+XBx2mk="; + hash = "sha256-K0d/WIcDPzy+oc/YVT7mpqSY6yVAoZ9KoIKCKq3Oowo="; }; nativeBuildInputs = [ @@ -45,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Object-oriented file system path manipulation"; homepage = "https://github.com/jaraco/path"; + changelog = "https://github.com/jaraco/path/blob/v${version}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 6f60593054b1b..cf9d9eaa48ca3 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -1,16 +1,16 @@ { lib , buildPythonPackage -, fetchFromGitHub , dill +, fetchFromGitHub +, multiprocess , pox , ppft -, multiprocess , pythonOlder }: buildPythonPackage rec { pname = "pathos"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "uqfoundation"; repo = pname; rev = "refs/tags/pathos-${version}"; - hash = "sha256-Jc7pMVjOUSaZydRh87FsHivEAXpX9v6EbZNkHwPeq/Q="; + hash = "sha256-uQv1t3TRbvoQv86wNOdc5k0cgKt9kvnw5/DGbbbE46w="; }; propagatedBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parallel graph management and execution in heterogeneous computing"; homepage = "https://pathos.readthedocs.io/"; + changelog = "https://github.com/uqfoundation/pathos/releases/tag/pathos-${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index b43bcdb2382b1..5b97cea17b793 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.11.0"; + version = "0.11.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ZNM41OCRTpHBeSMh5pB7Wlk/GrGFHef8JpVXohsw67w="; + hash = "sha256-4NjQrC8S2mGVbrIwa2n5RptC9N6w88tu1HuczpmWztM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pathy/default.nix b/pkgs/development/python-modules/pathy/default.nix index 5ec592d53a44f..c5fc0852b8686 100644 --- a/pkgs/development/python-modules/pathy/default.nix +++ b/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/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix index 704e979c2caac..0985d32afb55a 100644 --- a/pkgs/development/python-modules/pcpp/default.nix +++ b/pkgs/development/python-modules/pcpp/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pcpp"; - version = "1.21"; + version = "1.30"; src = fetchFromGitHub { owner = "ned14"; repo = "pcpp"; - rev = "v${version}"; - sha256 = "0k52qyxzdngdhyn4sya2qn1w1a4ll0mcla4h4gb1v91fk4lw25dm"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Fs+CMV4eRKcB+KdV93ncgcqaMnO5etnMY/ivmSJh3Wc="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pdfplumber/default.nix b/pkgs/development/python-modules/pdfplumber/default.nix index a43eaae34a808..37809324e275b 100644 --- a/pkgs/development/python-modules/pdfplumber/default.nix +++ b/pkgs/development/python-modules/pdfplumber/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pdfplumber"; - version = "0.9.0"; + version = "0.10.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jsvine"; repo = "pdfplumber"; rev = "refs/tags/v${version}"; - hash = "sha256-cGTn1JTSp1YvksemjlvvToZcVauZ7GKINiNmG5f4zKg="; + hash = "sha256-nuHHEVOYm2/PkXIs9Ze5y5xyJMLkxqp3q3u4gV8Ks80="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index 96f626b24b61a..0572a1e633b83 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.1.4"; + version = "2.1.6"; format = "pyproject"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-46HTamiy+8fiGVeviYqXsjwu+PEBE38y19cBVRc+zm0="; + hash = "sha256-ZEci8VeKYuORs9iAzaEqrtVBh9fMWHlLsFH1e5PRLwA="; }; env.PDM_BUILD_SCM_VERSION = version; diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 38397535c01f7..33e65661f92e1 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.5.4"; + version = "19.5.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AkVUYUZobQsnSfMfciiSbPwo0HCnlO3NLoUA1+wqBt4="; + hash = "sha256-AgJT/VfNHcSuJhypBwqJkgXuvYDBlZ7eQp4nGva4z6U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/peewee-migrate/default.nix b/pkgs/development/python-modules/peewee-migrate/default.nix index da6f60403c338..dc7cefd00c0d3 100644 --- a/pkgs/development/python-modules/peewee-migrate/default.nix +++ b/pkgs/development/python-modules/peewee-migrate/default.nix @@ -17,24 +17,26 @@ buildPythonPackage rec { pname = "peewee-migrate"; - version = "1.10.1"; + version = "1.12.2"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "klen"; repo = "peewee_migrate"; rev = "refs/tags/${version}"; - hash = "sha256-SBHeXHfhYjyXr+tODryKQfxZKy7l4ez5C6eU6FjS2qI="; + hash = "sha256-jxM2cvlDsoiUlVoxdS3wpUKlwMveMraiR431A8kIdgI="; }; - nativeBuildInputs = [ - poetry-core - ]; - postPatch = '' sed -i '/addopts/d' pyproject.toml ''; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ peewee click @@ -49,6 +51,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # sqlite3.OperationalError: error in table order after drop column... + "test_migrator" + ]; + meta = with lib; { description = "Simple migration engine for Peewee"; homepage = "https://github.com/klen/peewee_migrate"; diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 7f494813a19a1..ca5d4f45677c6 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.16.2"; + version = "3.16.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-eHTbVhgVqxMR3ZuaC6FPyYbxRpRBi53EfDqERpPBjVQ="; + hash = "sha256-QeJaGTKZHmzN+J8uUGXQJXCTINX7iP30u+s+GDP/kpQ="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 09feb66549a46..869fb6146f2e9 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "persim"; - version = "0.3.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7w8KJHrc9hBOysFBF9sLJFgXEOqKjZZIFoBTlXALSXU="; + hash = "sha256-p6Vumfr+vRDr0D9PnEZItp9vNlCLIb59HpBg1KdyHGE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 9e0815ddfc71f..ee580829bbe00 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.29.4"; + version = "1.30.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dtKqF1ejC8ceAwfa4Yw3TjNqaRI+awRuIGqWYR+iozA="; + hash = "sha256-wEKA5mocz7UWbbXBZBZMLhuPYq+u3/0hFFGlMproSik="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index ff3b9207182e9..ead9239f5cde7 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -1,11 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# dependencies , gevent -, nose2 -, mock , twisted , tornado + +# tests +, nose2 +, mock + }: buildPythonPackage rec { @@ -20,9 +28,20 @@ buildPythonPackage rec { hash = "sha256-60Z+y3YXazUghfnOy4e7HzM18iju5m5OEt4I3Wg6ty4="; }; - propagatedBuildInputs = [ gevent tornado twisted ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + gevent + tornado + twisted + ]; - nativeCheckInputs = [ nose2 mock ]; + nativeCheckInputs = [ + nose2 + mock + ]; postPatch = '' # don't stop at first test failure @@ -45,7 +64,9 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://github.com/pika/pika/releases/tag/${version}"; description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; + downloadPage = "https://github.com/pika/pika"; homepage = "https://pika.readthedocs.org"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index fe243c6a03243..6edc041ed481b 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -1,18 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system , cmake -, pillow -, pytest , nasm + +# native dependencies , libheif , libaom , libde265 , x265 + +# dependencies +, pillow + +# tests +, opencv4 +, numpy +, pympler +, pytestCheckHook }: buildPythonPackage rec { - pname = "pillow_heif"; + pname = "pillow-heif"; version = "0.13.0"; format = "setuptools"; @@ -23,16 +34,37 @@ buildPythonPackage rec { hash = "sha256-GbOW29rGpLMS7AfShuO6UCzcspdHtFS7hyNKori0otI="; }; - nativeBuildInputs = [ cmake nasm ]; - buildInputs = [ libheif libaom libde265 x265 ]; - propagatedBuildInputs = [ pillow ]; - nativeCheckInputs = [ pytest ]; + nativeBuildInputs = [ + cmake + nasm + ]; dontUseCmakeConfigure = true; - pythonImportsCheck = [ "pillow_heif" ]; + buildInputs = [ + libaom + libde265 + libheif + x265 + ]; + + propagatedBuildInputs = [ + pillow + ]; + + pythonImportsCheck = [ + "pillow_heif" + ]; + + nativeCheckInputs = [ + opencv4 + numpy + pympler + pytestCheckHook + ]; meta = { + changelog = "https://github.com/bigcat88/pillow_heif/releases/tag/v${version}"; description = "Python library for working with HEIF images and plugin for Pillow"; homepage = "https://github.com/bigcat88/pillow_heif"; license = with lib.licenses; [ bsd3 lgpl3 ]; diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index bf3b1991c39a1..ebfcdd8d55748 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch , isPyPy , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11 , libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook, setuptools @@ -13,7 +12,7 @@ import ./generic.nix (rec { pname = "pillow"; - version = "10.0.0"; + version = "10.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,19 +20,9 @@ import ./generic.nix (rec { src = fetchPypi { pname = "Pillow"; inherit version; - hash = "sha256-nIK1s+BDx68NlXktDSDM9o9hof7Gs1MOcYtohCJyc5Y="; + hash = "sha256-1ylnsGvpMA/tXPvItbr87sSL983H2rZrHSVJA1KHGR0="; }; - patches = [ - # Pull in zlib-1.3 fix pending upstream inclusion - # https://github.com/python-pillow/Pillow/pull/7344 - (fetchpatch { - name = "zlib-1.3.patch"; - url = "https://github.com/python-pillow/Pillow/commit/9ef7cb39def45b0fe1cdf4828ca20838a1fc39d1.patch"; - hash = "sha256-N7V6Xz+SBHSm3YIgmbty7zbqkv8MzpLMhU4Xxerhx8w="; - }) - ]; - passthru.tests = { inherit imageio matplotlib pilkit pydicom reportlab; }; diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index 5ee12b7a223d0..ef4e789249ceb 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/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/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index ad1fa2d68fd1d..9e6263351daaa 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , plaster , pastedeploy , pytestCheckHook @@ -9,22 +8,14 @@ buildPythonPackage rec { pname = "plaster-pastedeploy"; - version = "0.6"; + version = "1.0.1"; src = fetchPypi { - inherit pname version; - sha256 = "c231130cb86ae414084008fe1d1797db7e61dc5eaafb5e755de21387c27c6fae"; + pname = "plaster_pastedeploy"; + inherit version; + hash = "sha256-viYubS5BpyZIddqi/ihQy7BhVyi83JKCj9xyc244FBI="; }; - patches = [ - # Fix tests compatibility with pastedeploy 2+ - # https://github.com/Pylons/plaster_pastedeploy/pull/17 - (fetchpatch { - url = "https://github.com/Pylons/plaster_pastedeploy/commit/d77d81a57e917c67a20332beca8f418651172905.patch"; - sha256 = "0n5vnqn8kad41kn9grcwiic6c6rhvy1ji3w81s2v9xyk0bd9yryf"; - }) - ]; - propagatedBuildInputs = [ plaster pastedeploy ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index f64a76d3e6259..777ba72bcc2c8 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "3.9.1"; + version = "3.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gBiXdnBWp0SlpE6TQPONTXEsQ2XFGCANGdNM/gv7V5s="; + hash = "sha256-Ytilbs29oxuwLfoKTXNQxlh8qBF39F2ZRK8imd57A1w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 201f2fcfc4bd6..4698a84cefb15 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.13.1"; + version = "5.16.1"; src = fetchPypi { inherit pname version; - hash = "sha256-kO6aH+4N2jDigw4SmFUIHqF70bBqVTpiti3hXK/xohk="; + hash = "sha256-KVrCXt6xjIk6u3Hcrc6gdbeP1v3wfO5CF6ThAJZnkls="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index 717f530ef16d3..241dced9f7e5f 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "plotnine"; - version = "0.10.1"; + version = "0.12.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-2RKgS2ONz4IsUaZ4i4VmQjI0jVFfFR2zpkwAAZZvaEE="; + hash = "sha256-o43LNgf8ADweWa4MnVNdrngXZQ0cvC5W5W5bPeiN/pk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 8876eea828afd..22e0a62827620 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.33.1"; + version = "0.33.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-uJBUim5FlS+Jw3rGEKuorksVIgI5tVRAI7tESeYnGUc="; + hash = "sha256-WTgv0bEkhLMoRCw6Xh5SlYLxnlQCv603lKTajjCETT4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plyer/default.nix b/pkgs/development/python-modules/plyer/default.nix index f190dcb6b24e1..5b8bc870b838d 100644 --- a/pkgs/development/python-modules/plyer/default.nix +++ b/pkgs/development/python-modules/plyer/default.nix @@ -2,35 +2,22 @@ buildPythonPackage rec { pname = "plyer"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "kivy"; repo = pname; - rev = version; - sha256 = "15z1wpq6s69s76r6akzgg340bpc21l2r1j8270gp7i1rpnffcjwm"; + rev = "refs/tags/${version}"; + sha256 = "sha256-7Icb2MVj5Uit86lRHxal6b7y9gIJ3UT2HNqpA9DYWVE="; }; - patches = [ - # fix naming of the DOCUMENTS dir - (fetchpatch { - url = "https://github.com/rski/plyer/commit/99dabb2d62248fc3ea5705c2720abf71c9fc378b.patch"; - hash = "sha256-bbnw0TxH4FGTso5dopzquDCjrjZAy+6CJauqi/nfstA="; - }) - # fix handling of the ~/.config/user-dirs.dir file - (fetchpatch { - url = "https://github.com/rski/plyer/commit/f803697a1fe4fb5e9c729ee6ef1997b8d64f3ccd.patch"; - hash = "sha256-akuh//P5puz2PwcBRXZQ4KoGk+fxi4jn2H3pTIT5M78="; - }) - ]; - postPatch = '' rm -r examples # remove all the wifi stuff. Depends on a python wifi module that has not been updated since 2016 find -iname "wifi*" -exec rm {} \; substituteInPlace plyer/__init__.py \ --replace "wifi = Proxy('wifi', facades.Wifi)" "" \ - --replace "'wifi'" "" + --replace "'wifi', " "" substituteInPlace plyer/facades/__init__.py \ --replace "from plyer.facades.wifi import Wifi" "" ''; diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 130fba959ea3f..20495ba0dd012 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "plyfile"; - version = "0.7.4"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "9e9a18d22a3158fcd74df38761d43a7facc6df75126f2ab9f4e9a5d4d2188652"; + sha256 = "sha256-TOrt8e2Ss6Jrdm/IxWzaG5sjkOwpmxbe3i5f1FCXJho="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 1205b860b8da2..fc8da7447ffba 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.6.1"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,47 +24,9 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - hash = "sha256-Gc22Y2T4uO39jiOqEUFeOfnVCbknuDjmzFPZgk2eY74="; + hash = "sha256-OfY2zc+5CgOrgbiPVnvMdT4h1S7Aek8S7iThl6azmsk="; }; - # revert update of vendored dependencies to unbreak e.g. zeroconf on x86_64-darwin - patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/0bdf29e9631fda9436066a07ca8e69a4aa97a31e.patch"; - revert = true; - hash = "sha256-Uqlv17GUcmVkB6ZFePtrbUonsbkiIXay7LLuT/WcPh8="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/48447a18a60c43240bf075fc0c2501f6d68f0211.patch"; - revert = true; - hash = "sha256-23GazppqYmuAmkE/xMtuzng2PbxhYNwgtmsvb6lfvig="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/bc97ac6030049a01e5337fcb53493112a9c75a81.patch"; - revert = true; - hash = "sha256-8NAG+Xm/BNL16NONZJRNB3JiRRKvjMsZJH2FWlw+dHk="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/835bc91393fbb983de6227d67b076aea1360ea68.patch"; - revert = true; - hash = "sha256-Z5viypprDY9GGeX6luBsIoSI9D0lN9g14U9uMh4DTfA="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/80d7dcdc722dee0e09e5f3303b663003d794832c.patch"; - revert = true; - hash = "sha256-CPjkNCmuAiowp/kyKqnEfUQNmXK95RMJOIa24nG6xi8="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/43fd7fe62676421b3661c96844b5d7cf49b87c07.patch"; - excludes = [ - "vendors/poetry.lock" - "vendors/pyproject.toml" - ]; - revert = true; - hash = "sha256-mbu16qFH9ymDZ0KIMiYMy7js5OmxY7z5qg6ZfgfgeLs="; - }) - ]; - nativeCheckInputs = [ build git diff --git a/pkgs/development/python-modules/polling/default.nix b/pkgs/development/python-modules/polling/default.nix new file mode 100644 index 0000000000000..22e7e0c3916d1 --- /dev/null +++ b/pkgs/development/python-modules/polling/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "polling"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "justiniso"; + repo = "polling"; + rev = "v${version}"; + hash = "sha256-Qy2QxCWzAjZMJ6yxZiDT/80I2+rLimoG8/SYxq960Tk="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ + "polling" + ]; + + nativeCheckInputs = [ + mock + pytestCheckHook + ]; + + meta = with lib; { + description = "Powerful polling utility in Python"; + homepage = "http://github.com/justiniso/polling"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 8c94f8bd1a67d..57d6dd0b9ab60 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -2,7 +2,6 @@ , lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , numpy , scipy , cython @@ -16,14 +15,15 @@ buildPythonPackage rec { pname = "pomegranate"; - version = "0.14.8"; + version = "1.0.0"; + format = "pyproject"; src = fetchFromGitHub { repo = pname; owner = "jmschrei"; # no tags for recent versions: https://github.com/jmschrei/pomegranate/issues/974 - rev = "0652e955c400bc56df5661db3298a06854c7cce8"; - sha256 = "16g49nl2bgnh6nh7bd21s393zbksdvgp9l13ww2diwhplj6hlly3"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-EnxKlRRfsOIDLAhYOq7bUSbI/NvPoSyYCZ9D5VCXFGQ="; }; propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 06c4617c0ce9c..b8ba613ba350e 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -2,10 +2,12 @@ , buildPythonPackage , isPy27 , fetchPypi +, setuptools , setuptools-scm +, wheel , pytestCheckHook , packaging -, appdirs +, platformdirs , requests , tqdm , paramiko @@ -14,46 +16,62 @@ buildPythonPackage rec { pname = "pooch"; - version = "1.6.0"; + version = "1.7.0"; format = "pyproject"; + disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-V9IOxLEN1pTSsFu2S8axCcboWmwUBXlM6H7Ys0GrP0Q="; + hash = "sha256-8XShBBtkR/Du+IYPdtF/YO0vhX3A76OHp/CCKK8F2Zg="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; - propagatedBuildInputs = [ packaging appdirs requests ]; + propagatedBuildInputs = [ + packaging + platformdirs + requests + ]; + + passthru = { + optional-dependencies = { + progress = [ tqdm ]; + sftp = [ paramiko ]; + xxhash = [ xxhash ]; + }; + }; + preCheck = '' + export HOME=$TMPDIR + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; - preCheck = "HOME=$TMPDIR"; - nativeCheckInputs = [ pytestCheckHook ]; # tries to touch network disabledTests = [ + "check_availability" + "decompress" + "downloader" + "extractprocessor_fails" + "integration" + "pooch_corrupted" "pooch_custom_url" "pooch_download" "pooch_logging_level" "pooch_update" - "pooch_corrupted" - "check_availability" - "downloader" + "processor" + "test_fetch" + "test_load_registry_from_doi" "test_retrieve" "test_stream_download" - "test_fetch" - "decompress" - "extractprocessor_fails" - "processor" - "integration" - ]; - passthru = { - optional-dependencies = { - progress = [ tqdm ]; - sftp = [ paramiko ]; - xxhash = [ xxhash ]; - }; - }; + ]; meta = with lib; { description = "A friend to fetch your data files."; diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 4dfd663ac8711..73356631615f8 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,13 +1,17 @@ { lib, buildPythonPackage, fetchPypi +, pythonOlder , pytestCheckHook, setuptools-scm, tempora }: buildPythonPackage rec { pname = "portend"; - version = "3.1.0"; + version = "3.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4"; + sha256 = "sha256-UlCjUsGclZ12fKyHi4Kdk+XcdiWlFDOZoqANxmKP+3I="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -16,6 +20,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "portend" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index f9b8f7993ffd0..2595e20622d95 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.5.2"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xVaDrXJfXACkG8fbAiUiPovgJLH6Vk0DntM5Dk/Uj7M="; + hash = "sha256-vVB/1vlvZe4CeB8uZ06dxsmbv6bjw5mS45FiBMnUMfo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix index 455ee183a26ff..a6251b3ea4796 100644 --- a/pkgs/development/python-modules/pot/default.nix +++ b/pkgs/development/python-modules/pot/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pot"; - version = "0.8.2"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "POT"; inherit version; - hash = "sha256-PKmuPI83DPy7RkOgHHPdPJJz5NT/fpr123AVTzTLwgQ="; + hash = "sha256-gcJTJ6ABl/8Rwf5SIc8YGtHf/mFWRBUuLhFd3d9eWRs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 3a868d78d86dc..cd801f497a8cc 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { # darwin seems to hang doCheck = !stdenv.isDarwin; + checkPhase = '' runHook preCheck ${python.interpreter} -m ppft.tests @@ -38,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed and parallel Python"; homepage = "https://ppft.readthedocs.io/"; + changelog = "https://github.com/uqfoundation/ppft/releases/tag/ppft-${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index b253525aacd12..e0d37c51a2b12 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "preshed"; - version = "3.0.8"; + version = "3.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bHTHAHiAm/3doXvpZIPEHQbXF5NLB8q3khAR2BdYs1c="; + hash = "sha256-chhjxSRP/NJlGtCSiVGix8d7EC9OEaJRrYXTfudiFmA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index bd676fc23c17a..2869c042d2d08 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.38"; + version = "3.0.39"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - hash = "sha256-I6xdUFOKmjjIveBf7LR9C0A+zQZihXqG+Ib3mFY9W5s="; + hash = "sha256-BFBa3mh9wm3EKEsa0ZqDvi8q/oPnqCis4McvOh33Kqw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index d6ef622698a94..d75842e507a2c 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.22.2"; + version = "1.22.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-DozaPVpjTZiVt1xXPJNSwWSGy3XesOB4tf2jTbQkMWU="; + hash = "sha256-/c0JcTy9QkgHQNL+KcmQ9/vYhaZ+/DKKqL5u4+n3ams="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index e2d775f0b3b33..38554ad8e97a2 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -35,13 +35,13 @@ let pname = "psycopg"; - version = "3.1.10"; + version = "3.1.11"; src = fetchFromGitHub { owner = "psycopg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GdgzHmzPCK3wq/8sCc1NaPEVwl4Q5OBZMp86RXkhE0M="; + hash = "sha256-cQTGaiVgdgaq1fmDdtqvc+uCp66S+s0GsTcFTARR+SI="; }; patches = [ diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index b697c66613b30..bfe33e1ec3ad9 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "psycopg2"; - version = "2.9.5"; + version = "2.9.7"; format = "setuptools"; # Extension modules don't work well with PyPy. Use psycopg2cffi instead. @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-pSRtLmg6ly4hh6hxS1ws+BVsBkYp+amxqHPBcw2eJFo="; + hash = "sha256-8AzDW9cRnx/tF7hb0QB4VRlN3iy9jeAauOuxdIdECtg="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index c4a1565ccc2d7..c9a1f710b671b 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -8,13 +8,14 @@ , pydantic , pytestCheckHook , pythonOlder +, toolz , typing-extensions , wrapt }: buildPythonPackage rec { pname = "psygnal"; - version = "0.9.0"; + version = "0.9.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9rYG0XqwFJQojnvM5ygm1RVu9NbeFASns0llOGKaP+4="; + hash = "sha256-Ki2s057aqaZa+kOpAlhBYFpZeuDX42+txQXFuBtXd04="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -42,6 +43,7 @@ buildPythonPackage rec { numpy pydantic pytestCheckHook + toolz wrapt ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 1b0745990ec54..1aadffd70324e 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20231020"; + version = "0.10.0.20231022"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5Woh5xWIVvVvgmp4xtpU51rXSCZDH0ljPpLpkvFmO+8="; + hash = "sha256-sXmntukr4m876x4Hu45tHlT01rI28l7YT59u2TW8TV4="; }; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pvo/default.nix b/pkgs/development/python-modules/pvo/default.nix index 6f3f698fe2c74..6963d37000138 100644 --- a/pkgs/development/python-modules/pvo/default.nix +++ b/pkgs/development/python-modules/pvo/default.nix @@ -13,18 +13,25 @@ buildPythonPackage rec { pname = "pvo"; - version = "1.0.0"; + version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-pvoutput"; rev = "refs/tags/v${version}"; - hash = "sha256-6oVACUnK8WVlEx047CUXmSXQ0+M3xnSvyMHw5Wttk7M="; + hash = "sha256-SvsrvGwIAlj/8hdk90+rxigVrx6n3YInvF/4eux2H04="; }; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -41,13 +48,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" - ''; - pythonImportsCheck = [ "pvo" ]; diff --git a/pkgs/development/python-modules/py-libzfs/default.nix b/pkgs/development/python-modules/py-libzfs/default.nix index 1eacc39b8ab07..d148e539d3fff 100644 --- a/pkgs/development/python-modules/py-libzfs/default.nix +++ b/pkgs/development/python-modules/py-libzfs/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "py-libzfs"; - version = "22.02.4"; + version = "22.12.4.2"; src = fetchFromGitHub { owner = "truenas"; repo = pname; rev = "TS-${version}"; - hash = "sha256-BJG+cw07Qu4aL99pVKNd7JAgr+w/6Uv2eI46EB615/I="; + hash = "sha256-vBLbjP1gQEQNsTLc2W6uRzCFHQXZp+jGiwE0Pe8VTuw="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 9d44aff943940..f0f5484aeb56f 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.51"; + version = "3.53"; src = fetchPypi { inherit pname version; - hash = "sha256-x4MftAC1TyR4FEvl+ytwCYg2cm5qAG/X/MJUhJRGlkU="; + hash = "sha256-vZrzHERjAg9J004A2dAbq8hKmAUslCTaRdwEAe9JRqU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyarr/default.nix b/pkgs/development/python-modules/pyarr/default.nix index 41fa4afc215bb..2da0b65e5bedb 100644 --- a/pkgs/development/python-modules/pyarr/default.nix +++ b/pkgs/development/python-modules/pyarr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyarr"; - version = "4.1.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-3DX02V3Srpx6hqimWbesxfkDqslVH4+8uXY7XYDmjX0="; + hash = "sha256-jlcc9Kj1MYSsnvJkKZXXWWJVDx3KIuojjbGtl8kDUpw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyatag/default.nix b/pkgs/development/python-modules/pyatag/default.nix index ff2b4c2dcffc7..405c39398d5e9 100644 --- a/pkgs/development/python-modules/pyatag/default.nix +++ b/pkgs/development/python-modules/pyatag/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyatag"; - version = "0.3.6.2"; + version = "3.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MatsNl"; repo = "pyatag"; rev = "refs/tags/${version}"; - hash = "sha256-yJEPDNjEv2lGrBQ78sl7nseVRemsG7hTdBGH5trciYU="; + hash = "sha256-hyGos0LFVKv63jf1ODPFfk+R47oyHea+8MGvxeKpop8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 33660d9165e8d..f801b878ae75f 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -18,24 +18,14 @@ }: buildPythonPackage rec { - version = "0.15.6"; + version = "0.16.3"; pname = "pybids"; src = fetchPypi { inherit pname version; - hash = "sha256-OjWW08tyVDHkF0X3Pa+10HYD/7Gysp5DkEt9LaVxsdM="; + hash = "sha256-EOJ5NQyNFMpgLA1EaaXkv3/zk+hkPIMaVGrnNba4LMM="; }; - patches = [ - # remove after next release - (fetchpatch { - name = "fix-pybids-sqlalchemy-dep"; - url = "https://github.com/bids-standard/pybids/commit/5f008dfc282394ef94a68d47dba37ceead9eac9a.patch"; - hash = "sha256-gx6w35XqDBZ8cTGHeY/mz2xNQqza9E5z8bRJR7mbPcg="; - excludes = [ "pyproject.toml" ]; # not in PyPI dist - }) - ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "sqlalchemy" ]; diff --git a/pkgs/development/python-modules/pybigwig/default.nix b/pkgs/development/python-modules/pybigwig/default.nix index 3101066ff2518..efbc350530e57 100644 --- a/pkgs/development/python-modules/pybigwig/default.nix +++ b/pkgs/development/python-modules/pybigwig/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pybigwig"; - version = "0.3.20"; + version = "0.3.22"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "deeptools"; repo = "pyBigWig"; rev = "refs/tags/${version}"; - hash = "sha256-uYKxM0HOG4fus5geBFjbfbv6G1kDvMaAwhk0w/e1YII="; + hash = "sha256-wJC5eXIC9PNlbCtmq671WuoIJVkh3aX7K6WArJWjyFg="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index 004572279abb0..a104e1e1aeb7b 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -19,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-SXIs9AUXWm1H49MVDT4z6msNPaW5sAU20rcsWZ7ERdU="; }; + patches = [ + ./urllib3-2.0-compat.patch + ]; + propagatedBuildInputs = [ requests requests-oauthlib diff --git a/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch b/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch new file mode 100644 index 0000000000000..8b6ef4e91cc31 --- /dev/null +++ b/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch @@ -0,0 +1,21 @@ +diff --git a/pybotvac/robot.py b/pybotvac/robot.py +index f87546f..e9a61de 100644 +--- a/pybotvac/robot.py ++++ b/pybotvac/robot.py +@@ -6,7 +6,6 @@ from datetime import datetime, timezone + from email.utils import format_datetime + + import requests +-import urllib3 + from voluptuous import ( + ALLOW_EXTRA, + All, +@@ -21,8 +20,6 @@ from voluptuous import ( + from .exceptions import NeatoRobotException, NeatoUnsupportedDevice + from .neato import Neato # For default Vendor argument + +-# Disable warning due to SubjectAltNameWarning in certificate +-urllib3.disable_warnings(urllib3.exceptions.SubjectAltNameWarning) + + _LOGGER = logging.getLogger(__name__) + diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 84c64b79df062..ff2f2e5819067 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.23.0"; + version = "1.24.0"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "refs/tags/v${version}"; - hash = "sha256-tkyVTJUdL2pBpBUpWsiDPKnd5OV88w3TdEOMxMc+hPM="; + hash = "sha256-eAE0YPZAV90MP6g1V1T80suaRV15ts38kYt6Djb78Xk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycddl/default.nix b/pkgs/development/python-modules/pycddl/default.nix index 389717400670f..9cd2d1fab2024 100644 --- a/pkgs/development/python-modules/pycddl/default.nix +++ b/pkgs/development/python-modules/pycddl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pycddl"; - version = "0.4.0"; + version = "0.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w0CGbPeiXyS74HqZXyiXhvaAMUaIj5onwjl9gWKAjqY="; + hash = "sha256-LdecJPSov2Y/QI4MWb20DcF0EtMuDO0VwiQDUeD55GI="; }; nativeBuildInputs = with rustPlatform; [ maturinBuildHook cargoSetupHook ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-g96eeaqN9taPED4u+UKUcoitf5aTGFrW2/TOHoHEVHs="; + hash = "sha256-FJET2Xb1cq4aePFhPXpp2oEPIOtpugYWNFAa2Dj0F6Y="; }; nativeCheckInputs = [ pytestCheckHook psutil cbor2 ]; diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix index 1b9eba36b96dc..45e5ff27ee558 100644 --- a/pkgs/development/python-modules/pyclipper/default.nix +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyclipper"; - version = "1.3.0.post4"; + version = "1.3.0.post5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fonttools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FMqOZ0WOorTtbdweeu9UdoUNWOPrcwc+0SK+55XxyQQ="; + hash = "sha256-FKpP+tgJFzhij3wDQsAgwrTNnny7lgmN+tlSQ9JgG+Q="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index cdbec27700806..250537774c2a4 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -3,11 +3,12 @@ , fetchPypi , lib , python +, pytestCheckHook }: buildPythonPackage rec { pname = "pycodestyle"; - version = "2.10.0"; + version = "2.11.0"; disabled = pythonOlder "3.6"; @@ -15,26 +16,22 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-NHGHvbR2Mp2Y9pXCE9cpWoRtEVL/T+m6y4qVkLjucFM="; + hash = "sha256-JZvMF4V9ios7SiMnMkt55fAgoTwWB0Zw+cjI+HLqdtA="; }; - patches = [ - # https://github.com/PyCQA/pycodestyle/issues/1151 - # Applies a modified version of an upstream patch that only applied - # to Python 3.12. - ./python-3.11.4-compat.patch + pythonImportsCheck = [ + "pycodestyle" ]; - # https://github.com/PyCQA/pycodestyle/blob/2.10.0/tox.ini#L13 - checkPhase = '' + nativCheckInputs = [ + pytestCheckHook + ]; + + # https://github.com/PyCQA/pycodestyle/blob/2.11.0/tox.ini#L16 + postCheck = '' ${python.interpreter} -m pycodestyle --statistics pycodestyle.py - ${python.interpreter} -m pycodestyle --max-doc-length=72 --testsuite testsuite - ${python.interpreter} -m pycodestyle --max-doc-length=72 --doctest - ${python.interpreter} -m unittest discover testsuite -vv ''; - pythonImportsCheck = [ "pycodestyle" ]; - meta = with lib; { changelog = "https://github.com/PyCQA/pycodestyle/blob/${version}/CHANGES.txt"; description = "Python style guide checker"; diff --git a/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch b/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch deleted file mode 100644 index d8a0d7953776d..0000000000000 --- a/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/testsuite/test_api.py b/testsuite/test_api.py -index 8dde32ff..38e34acf 100644 ---- a/testsuite/test_api.py -+++ b/testsuite/test_api.py -@@ -329,7 +329,10 @@ def test_check_nullbytes(self): - count_errors = pep8style.input_file('stdin', lines=['\x00\n']) - - stdout = sys.stdout.getvalue() -- expected = "stdin:1:1: E901 ValueError" -+ if sys.version_info < (3, 11, 4): -+ expected = "stdin:1:1: E901 ValueError" -+ else: -+ expected = "stdin:1:1: E901 SyntaxError: source code string cannot contain null bytes" # noqa: E501 - self.assertTrue(stdout.startswith(expected), - msg='Output %r does not start with %r' % - (stdout, expected)) diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index 22947f9e13699..a66c0ef49117b 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pycognito"; - version = "2022.12.0"; + version = "2023.5.0"; disabled = isPy27; src = fetchFromGitHub { owner = "pvizeli"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WepDna9f3Z3dBxWdE6G7nbl3yPK5vMG+7X1rxbZwdjE="; + hash = "sha256-2Aqid2bd5BAnWQ+Wtji0zXjLAmSpyJNGqJ0VroGi6lY="; }; propagatedBuildInputs = [ @@ -47,6 +47,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests.py" ]; + disabledTests = [ + # requires network access + "test_srp_requests_http_auth" + ]; + pythonImportsCheck = [ "pycognito" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index cacb67496c8ca..fb4aacf3b83db 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , isPyPy , fetchPypi -, fetchpatch , pythonOlder , curl , openssl @@ -14,24 +13,14 @@ buildPythonPackage rec { pname = "pycurl"; - version = "7.45.1"; + version = "7.45.2"; disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - hash = "sha256-qGOtGP9Hj1VFkkBXiHza5CLhsnRuQWdGFfaHSY6luIo="; + hash = "sha256-VzBZC+AnE2Slvd2eJFycwPtxDEy6y92VJkoxItIyJMo="; }; - patches = [ - # Pull upstream patch for curl-3.83: - # https://github.com/pycurl/pycurl/pull/753 - (fetchpatch { - name = "curl-3.83.patch"; - url = "https://github.com/pycurl/pycurl/commit/d47c68b1364f8a1a45ab8c584c291d44b762f7b1.patch"; - hash = "sha256-/lGq7O7ZyytzBAxWJPigcWdvypM7OHLBcp9ItmX7z1g="; - }) - ]; - preConfigure = '' substituteInPlace setup.py --replace '--static-libs' '--libs' export PYCURL_SSL_LIBRARY=openssl @@ -75,6 +64,14 @@ buildPythonPackage rec { "test_libcurl_ssl_gnutls" # AssertionError: assert 'crypto' in ['curl'] "test_ssl_in_static_libs" + # tests that require curl with http3Support + "test_http_version_3" + # https://github.com/pycurl/pycurl/issues/819 + "test_multi_socket_select" + # https://github.com/pycurl/pycurl/issues/729 + "test_multi_socket_action" + # https://github.com/pycurl/pycurl/issues/822 + "test_request_with_verifypeer" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Fatal Python error: Segmentation fault "cadata_test" diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index b5de4635b47e7..18fd4dc70b4ad 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -1,38 +1,46 @@ { lib , buildPythonPackage , fetchPypi -, python +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pydal"; - version = "20221110.1"; - format = "setuptools"; + version = "20230521.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fD6JHHD42JGONidvIQoZWbt7rfOydvRxkZhv/PW2o5A="; + hash = "sha256-EEeKYeYnxbjLdpH39+v3IQhFSFMWST0310DCl/ttGEU="; }; - postPatch = '' - # this test has issues with an import statement - # rm tests/tags.py - sed -i '/from .tags import/d' tests/__init__.py - - # this assertion errors without obvious reason - sed -i '/self.assertEqual(csv0, str(r4))/d' tests/caching.py - - # some sql tests fail against sqlite engine - sed -i '/from .sql import/d' tests/__init__.py - ''; - - pythonImportsCheck = [ "pydal" ]; - - checkPhase = '' - runHook preCheck - ${python.interpreter} -m unittest tests - runHook postCheck - ''; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/*.py" + # these tests already seem to be broken on the upstream + "--deselect=tests/nosql.py::TestFields::testRun" + "--deselect=tests/nosql.py::TestSelect::testGroupByAndDistinct" + "--deselect=tests/nosql.py::TestExpressions::testOps" + "--deselect=tests/nosql.py::TestExpressions::testRun" + "--deselect=tests/nosql.py::TestImportExportUuidFields::testRun" + "--deselect=tests/nosql.py::TestConnection::testRun" + "--deselect=tests/validation.py::TestValidateAndInsert::testRun" + "--deselect=tests/validation.py::TestValidateUpdateInsert::testRun" + "--deselect=tests/validators.py::TestValidators::test_IS_IN_DB" + ]; + + pythonImportsCheck = ["pydal"]; meta = with lib; { description = "Python Database Abstraction Layer"; diff --git a/pkgs/development/python-modules/pydantic-core/Cargo.lock b/pkgs/development/python-modules/pydantic-core/Cargo.lock deleted file mode 100644 index 05a29d770d838..0000000000000 --- a/pkgs/development/python-modules/pydantic-core/Cargo.lock +++ /dev/null @@ -1,662 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -dependencies = [ - "memchr", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "enum_dispatch" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.25", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[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 = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "indoc" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - -[[package]] -name = "itoa" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libmimalloc-sys" -version = "0.1.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mimalloc" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" -dependencies = [ - "libmimalloc-sys", -] - -[[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-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "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 = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "proc-macro2" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "pydantic-core" -version = "2.3.0" -dependencies = [ - "ahash", - "base64", - "enum_dispatch", - "idna 0.3.0", - "mimalloc", - "num-bigint", - "pyo3", - "pyo3-build-config", - "python3-dll-a", - "regex", - "serde", - "serde_json", - "speedate", - "strum", - "strum_macros 0.24.3", - "url", - "version_check", -] - -[[package]] -name = "pyo3" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59" -dependencies = [ - "cfg-if", - "indoc", - "libc", - "memoffset", - "num-bigint", - "parking_lot", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" -dependencies = [ - "once_cell", - "python3-dll-a", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-macros" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2" -dependencies = [ - "proc-macro2", - "pyo3-macros-backend", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "python3-dll-a" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f07cd4412be8fa09a721d40007c483981bbe072cd6a21f2e83e04ec8f8343f" -dependencies = [ - "cc", -] - -[[package]] -name = "quote" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "rustversion" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" - -[[package]] -name = "ryu" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "serde" -version = "1.0.171" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.171" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.25", -] - -[[package]] -name = "serde_json" -version = "1.0.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "smallvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" - -[[package]] -name = "speedate" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54e4ea42510cf6cb46223f6974670faf58ef49e82040e924a295aa3f0c8eaa2" -dependencies = [ - "strum", - "strum_macros 0.25.1", -] - -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros 0.25.1", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "strum_macros" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.25", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "target-lexicon" -version = "0.12.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unindent" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" - -[[package]] -name = "url" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" -dependencies = [ - "form_urlencoded", - "idna 0.4.0", - "percent-encoding", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[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.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[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.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[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.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix index 7826712acb6ec..6e273aaef4c90 100644 --- a/pkgs/development/python-modules/pydantic-core/default.nix +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -14,64 +14,74 @@ , dirty-equals }: -buildPythonPackage rec { - pname = "pydantic-core"; - version = "2.3.0"; - format = "pyproject"; +let + pydantic-core = buildPythonPackage rec { + pname = "pydantic-core"; + version = "2.6.3"; + format = "pyproject"; - src = fetchFromGitHub { - owner = "pydantic"; - repo = "pydantic-core"; - rev = "v${version}"; - hash = "sha256-Wi+b+xiJtVi3KIy6bzT29kyHFSI7mbMNrLa/Iu3cTEY="; - }; + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic-core"; + rev = "refs/tags/v${version}"; + hash = "sha256-bEVACTlzELXPoCtEHMR1s87KJn/qnE0lO1O4RmdjmPM="; + }; - patches = [ - ./01-remove-benchmark-flags.patch - ]; + patches = [ + ./01-remove-benchmark-flags.patch + ]; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-h9SmMLg/W11h/SQz8Te5OoCKdyG6Fctc5ftqbVQFSwU="; + }; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + typing-extensions + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; - nativeBuildInputs = [ - cargo - rustPlatform.cargoSetupHook - rustPlatform.maturinBuildHook - rustc - typing-extensions - ]; + pythonImportsCheck = [ "pydantic_core" ]; - buildInputs = lib.optionals stdenv.isDarwin [ - libiconv - ]; + # escape infinite recursion with pydantic via dirty-equals + doCheck = false; + passthru.tests.pytest = pydantic-core.overrideAttrs { doCheck = true; }; - propagatedBuildInputs = [ - typing-extensions - ]; + nativeCheckInputs = [ + pytestCheckHook + hypothesis + pytest-timeout + dirty-equals + pytest-mock + ]; - pythonImportsCheck = [ "pydantic_core" ]; + disabledTests = [ + # RecursionError: maximum recursion depth exceeded while calling a Python object + "test_recursive" + ]; - nativeCheckInputs = [ - pytestCheckHook - hypothesis - pytest-timeout - dirty-equals - pytest-mock - ]; - disabledTests = [ - # RecursionError: maximum recursion depth exceeded while calling a Python object - "test_recursive" - ]; - disabledTestPaths = [ - # no point in benchmarking in nixpkgs build farm - "tests/benchmarks" - ]; + disabledTestPaths = [ + # no point in benchmarking in nixpkgs build farm + "tests/benchmarks" + ]; - meta = with lib; { - description = "Core validation logic for pydantic written in rust"; - homepage = "https://github.com/pydantic/pydantic-core"; - license = licenses.mit; - maintainers = with maintainers; [ blaggacao ]; + meta = with lib; { + description = "Core validation logic for pydantic written in rust"; + homepage = "https://github.com/pydantic/pydantic-core"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; }; -} +in pydantic-core diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix new file mode 100644 index 0000000000000..539873a1a4be2 --- /dev/null +++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, pydantic +, phonenumbers +, pycountry +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pydantic-extra-types"; + version = "2.1.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic-extra-types"; + rev = "v${version}"; + hash = "sha256-QPBOHIssTsWQlEg2WRpLRKrB6zmae43EExnPn5P4oAY="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + pydantic + ]; + + passthru.optional-dependencies = { + all = [ + phonenumbers + pycountry + ]; + }; + + pythonImportsCheck = [ "pydantic_extra_types" ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ passthru.optional-dependencies.all; + + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + + meta = with lib; { + description = "Extra Pydantic types"; + homepage = "https://github.com/pydantic/pydantic-extra-types"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix new file mode 100644 index 0000000000000..a375ded35f042 --- /dev/null +++ b/pkgs/development/python-modules/pydantic-settings/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, pydantic +, python-dotenv +, pytestCheckHook +, pytest-examples +, pytest-mock +}: + +buildPythonPackage rec { + pname = "pydantic-settings"; + version = "2.0.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic-settings"; + rev = "v${version}"; + hash = "sha256-3V6daCibvVr8RKo2o+vHC++QgIYKAOyRg11ATrCzM5Y="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + pydantic + python-dotenv + ]; + + pythonImportsCheck = [ "pydantic_settings" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-examples + pytest-mock + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + description = "Settings management using pydantic"; + homepage = "https://github.com/pydantic/pydantic-settings"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index ea4943a06506b..4384e51db22b5 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.10.9"; + version = "1.10.12"; format = "setuptools"; outputs = [ @@ -48,18 +48,9 @@ buildPythonPackage rec { owner = "pydantic"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-POqMxBJUFFS1TnO9h5W7jYwFlukBOng0zbtq4kzmMB4="; + hash = "sha256-3XnbPGU90wLCPEryFAOky6Iy73Dvgzzh+GbOKW8hZ4U="; }; - patches = [ - # Fixes racy doctests build failures on really fast machines - # FIXME: remove after next release - (fetchpatch { - url = "https://github.com/pydantic/pydantic/pull/6103/commits/f05014a30340e608155683aaca17d275f93a0380.diff"; - hash = "sha256-sr47hpl37SSFFbK+/h3hGlF6Pl6L8XPKDU0lZZV7Vzs="; - }) - ]; - postPatch = '' sed -i '/flake8/ d' Makefile ''; diff --git a/pkgs/development/python-modules/pydexcom/default.nix b/pkgs/development/python-modules/pydexcom/default.nix index 412373f09a294..57031c90f97cb 100644 --- a/pkgs/development/python-modules/pydexcom/default.nix +++ b/pkgs/development/python-modules/pydexcom/default.nix @@ -1,20 +1,30 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools +, setuptools-scm , requests }: buildPythonPackage rec { pname = "pydexcom"; - version = "0.2.3"; + version = "0.3.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "gagebenne"; repo = pname; - rev = version; - hash = "sha256-ItDGnUUUTwCz4ZJtFVlMYjjoBPn2h8QZgLzgnV2T/Qk="; + rev = "refs/tags/${version}"; + hash = "sha256-VZ8Y8W3oEQ3W8eubMbHLfQAXK8cL6+OTyBFwtEe0cBE="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ requests ]; # tests are interacting with the Dexcom API diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index a2100c83c8df0..11114257714d2 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -11,13 +11,13 @@ let pname = "pydicom"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "pydicom"; repo = "pydicom"; rev = "refs/tags/v${version}"; - hash = "sha256-FNZVu2/7kBGeP4iTH53bsApfHzHFxr5bxqbqkI4T95E="; + hash = "sha256-PF4iA/FPxPYD8OfgWqKRndwi2vURuzh6tlEwduxs/3E="; }; # Pydicom needs pydicom-data to run some tests. If these files aren't downloaded diff --git a/pkgs/development/python-modules/pyduotecno/default.nix b/pkgs/development/python-modules/pyduotecno/default.nix index e61e725a80a1b..17fd2d78885c4 100644 --- a/pkgs/development/python-modules/pyduotecno/default.nix +++ b/pkgs/development/python-modules/pyduotecno/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyduotecno"; - version = "2023.10.0"; + version = "2023.10.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "pyDuotecno"; rev = "refs/tags/${version}"; - hash = "sha256-GxCqWgw4OdhJUMsGzCZnl6KYH7HQpGyV7zXMxbShHlg="; + hash = "sha256-fDooQb1i9rgzDZBzZ+lYb0WUYC8JNPEYk5DJ9wtS2Dg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index f7923144bae2a..2ca3ff02edd9b 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , setuptools , mock , netaddr @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "pyeapi"; - version = "0.8.4"; + version = "1.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arista-eosplus"; repo = pname; - rev = "v${version}"; - sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GZBoCoAqij54rZezRDF/ihJDQ5T6FFyDSRXGV3//avQ="; }; nativeBuildInputs = [ @@ -36,28 +35,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Fix usage of collection, https://github.com/arista-eosplus/pyeapi/pull/223 - (fetchpatch { - name = "fix-collection-usage.patch"; - url = "https://github.com/arista-eosplus/pyeapi/commit/81754f57eb095703cc474f527a0915360af76f68.patch"; - hash = "sha256-ZNBTPRNmXCFVJeRAJxzIHmCOXZiGwU6t4ekSupU3BX8="; - }) - (fetchpatch { - name = "fix-collection-usage-2.patch"; - url = "https://github.com/arista-eosplus/pyeapi/commit/cc9c584e4a3167e3c1624cccb6bc0d9c9bcdbc1c.patch"; - hash = "sha256-EY0i1Skm1llEQAAzvrb2yelhhLBkqKAFJB5ObAIxAYo="; - excludes = [ - ".github/workflows/ci.yml" - ]; - }) - (fetchpatch { - name = "fix-collection-usage-3.patch"; - url = "https://github.com/arista-eosplus/pyeapi/commit/dc35ab076687ea71665ae9524480b05a4e893909.patch"; - hash = "sha256-xPaYULCPTxiQGB9Im/qLet+XebW9wq+TAfrxcgQxcoE="; - }) - ]; - pytestFlagsArray = [ "test/unit" ]; diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index a009186dd0192..0efcb94259fec 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -6,25 +6,29 @@ , pytest-trio , pytestCheckHook , pythonOlder +, setuptools +, setuptools-scm , twisted , typing-extensions -, vcversioner +, wheel }: buildPythonPackage rec { pname = "pyee"; - version = "9.0.4"; - format = "setuptools"; + version = "11.0.0"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-J3DEkoq8ch9GtwXmpysMWUgMSmnJqDygsAu5lPHqSzI="; + hash = "sha256-J8aCvOYL2txdPiPqzUEB3zKMAoCISj2cB/Ok4+WV3ic="; }; - buildInputs = [ - vcversioner + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 360db91241756..d18160d897d38 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.12.0"; + version = "1.13.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-gqbRz0JAp8hjZpFUzlFzqq86UKgD0TLWSp1Z9rdrk3s="; + hash = "sha256-8wGGx7ERYm+lKvLW/NUcJeBTqEXPM0jJNOOlkj/UzYk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index b976989f6b5b2..fd0f1409ca750 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -3,22 +3,27 @@ , buildPythonPackage , importlib-metadata , importlib-resources +, setuptools , traits , pythonOlder }: buildPythonPackage rec { pname = "pyface"; - version = "7.4.4"; - format = "setuptools"; + version = "8.0.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-0F+qxFOUvVWYWQahIM8AEv58rCxmNJYsBTC2pjUO2yI="; + hash = "sha256-fhNhg0e3pkjtIM29T9GlFkj1AQKR815OD/G/cKcgy/g="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ importlib-metadata importlib-resources diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 416ec7c39bca2..912754373f3eb 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "5.1.0"; + version = "5.2.4"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-MWxgJmQNFKa0+95x/ZZ0V20bVxDe2o+r3oqtUdeF28M="; + hash = "sha256-PgQPN5IIYIag3CGRsF/nCUOOFoqv4ulPzb7444WSCNg="; }; postPatch = '' @@ -32,6 +32,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # https://github.com/jmcgeheeiv/pyfakefs/issues/581 (OSError: [Errno 9] Bad file descriptor) disabledTests = [ "test_open_existing_pipe" ]; + + disabledTestPaths = [ + # try to import opentimelineio but nixpkgs doesn't have it as of 2023-09-16 + "pyfakefs/pytest_tests/segfault_test.py" + ]; + pythonImportsCheck = [ "pyfakefs" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix index b1a38f11f6acc..2f059d19a1b9f 100644 --- a/pkgs/development/python-modules/pyfibaro/default.nix +++ b/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/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index d83c02783729c..2dea4630c5750 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,13 +2,12 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch, isPy311 , pytestCheckHook }: buildPythonPackage rec { pname = "pyflakes"; - version = "3.0.1"; + version = "3.1.0"; disabled = pythonOlder "3.6"; @@ -16,17 +15,9 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-7IsnamtgvYDe/tJa3X5DmIHBnmSFCv2bNGKD1BZf0P0="; + hash = "sha256-oKrgNMRE2wBxqgd5crpHaNQMgw2VOf1Fv0zT+PaZLvw="; }; - patches = lib.optional isPy311 # could be made unconditional on rebuild - (fetchpatch { - name = "tests-py311.patch"; - url = "https://github.com/PyCQA/pyflakes/commit/836631f2f73d45baa4021453d89fc9fd6f52be58.diff"; - hash = "sha256-xlgql+bN0HsGnTMkwax3ZG/5wrbkUl/kQkjlr3lsgRw="; - }) - ; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index e7539a814505b..3c530d199f81f 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pygame-gui"; - version = "068"; + version = "069"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "MyreMylar"; repo = "pygame_gui"; rev = "refs/tags/v_${version}"; - hash = "sha256-BCgSCOnuIqjpROpEtkzkvIXK7dIO0dNYsPmQSwXfmTQ="; + hash = "sha256-IXU00Us1odbfS7jLPMYuCPv2l/5TUZdYKES7xHs+EWg="; }; propagatedBuildInputs = [ pygame python-i18n ]; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 140b233e34289..f4ceeb9b978cd 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pygame"; - version = "2.2.0"; + version = "2.5.1"; disabled = pythonOlder "3.6"; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; + rev = "refs/tags/${version}"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The documentation # has such files and will be removed. - hash = "sha256-SMkY3uN3kAlb/pbm047W0G8MJ7G8mCsfGVSPhzd5aEo="; + hash = "sha256-0mVbjfNYTfuo8uyd7NFKlneUZMt78mcitQ5nCgPxmFs="; postFetch = "rm -rf $out/docs/reST"; }; diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index f4f842852b0cb..10336a27549f3 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -4,12 +4,13 @@ , buildPythonPackage , llvmPackages , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pygccxml"; - version = "2.3.0"; - format = "setuptools"; + version = "2.4.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,13 @@ buildPythonPackage rec { owner = "gccxml"; repo = "pygccxml"; rev = "refs/tags/v${version}"; - hash = "sha256-+cmp41iWbkUSLNFLvEPHocpTQAX2CpD8HMXLIYcy+8k="; + hash = "sha256-rw99afv68c92LWmKUErB1y0Cts69UEpI0GCxSMvD+B8="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ castxml llvmPackages.libcxxStdenv diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index c7e4979d13724..5505b1c3a83fd 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -6,7 +6,7 @@ , cffi , fetchPypi , isPyPy -, libgit2_1_6 +, libgit2 , pycparser , pytestCheckHook , pythonOlder @@ -14,22 +14,22 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.12.2"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VuhdDmbelX1ZnR77JAnTmv7v2PAQCb/aB5a0Kktng1g="; + hash = "sha256-bd43Q2+rFCZK09bLxarj/VVeualoCnv91uVkzXe14rg="; }; preConfigure = lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH="${libgit2_1_6}/lib" + export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; buildInputs = [ - libgit2_1_6 + libgit2 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index 7ca6b344c9a24..caf3e014eed64 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pygls"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "openlawlibrary"; repo = "pygls"; rev = "refs/tags/v${version}"; - hash = "sha256-ovm897Vu6HRziGee3NioM1BA65mLe3F5Z2k0E+A35Gs="; + hash = "sha256-z673NRlnudFyDjKoM+xCbMRTFwh+tjUf4BaNtjwvKx8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index 8f32d26ebc249..f2b89cbcefd50 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -13,13 +13,13 @@ let pygments = buildPythonPackage rec { pname = "pygments"; - version = "2.15.1"; + version = "2.16.1"; format = "pyproject"; src = fetchPypi { pname = "Pygments"; inherit version; - hash = "sha256-is5NPB3UgYlLIAX1YOrQ+fGe5k/pgzZr4aIeFx0Sd1w="; + hash = "sha256-Ha/wSUggxpvIlB5AeqIPV3N07og2TuEKmP2+Cuzpbik="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index 147198087fa5d..0ce6a2fd3f990 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -18,13 +18,13 @@ toPythonModule (stdenv.mkDerivation rec { pname = "pygmo"; - version = "2.19.0"; + version = "2.19.5"; src = fetchFromGitHub { owner = "esa"; repo = "pygmo2"; rev = "refs/tags/v${version}"; - hash = "sha256-gjmZf66AcNaAMqyLerBgRu5RUzV6qrT7DigTNE39AwI="; + hash = "sha256-szQyw5kYfrQEeXRQzjQ0hzULuzTfmGod6ZxG9PDRj5M="; }; cmakeFlags = [ diff --git a/pkgs/development/python-modules/pygtkspellcheck/default.nix b/pkgs/development/python-modules/pygtkspellcheck/default.nix index 767eb706bb7f3..a467ff0746434 100644 --- a/pkgs/development/python-modules/pygtkspellcheck/default.nix +++ b/pkgs/development/python-modules/pygtkspellcheck/default.nix @@ -1,19 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, gobject-introspection, gtk3, pyenchant, pygobject3 }: +{ lib +, buildPythonPackage +, fetchPypi +, gobject-introspection +, gtk3 +, poetry-core +, pyenchant +, pygobject3 +}: buildPythonPackage rec { pname = "pygtkspellcheck"; - version = "5.0.1"; + version = "5.0.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-hIHf1LBmFhPWN138jaAAOpmx+frbe6XM22+jG+OWcvw="; + hash = "sha256-rWV/ghoMWHOAmT8ablwOjJSEhtvPqT/UdoZBXL5Nj0s="; }; - nativeBuildInputs = [ gobject-introspection ]; - propagatedBuildInputs = [ pyenchant pygobject3 gtk3 ]; + nativeBuildInputs = [ + gobject-introspection + poetry-core + ]; + + propagatedBuildInputs = [ + pyenchant + pygobject3 + gtk3 + ]; doCheck = false; # there are no tests - pythonImportsCheck = [ "gtkspellcheck" ]; + + pythonImportsCheck = [ + "gtkspellcheck" + ]; meta = with lib; { homepage = "https://github.com/koehlma/pygtkspellcheck"; diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index 7e59dbf9b1122..76197c47c2fdb 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyhepmc"; - version = "2.12.0"; + version = "2.13.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-po1ad02dpY69RRhaRApskH6tdOaSIsCl5PgpjsAzyKo="; + hash = "sha256-M18Bq6WrAINpgPx5+uh8dufPBxIklRHpbBWUYMC8v10="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index f8100ad3ddbba..901bec161445b 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyicu"; - version = "2.10.2"; + version = "2.11"; format = "setuptools"; src = fetchPypi { pname = "PyICU"; inherit version; - hash = "sha256-DDMJ7qf6toV1B6zmJANRW2D+CWy/tPkNFPVf91xUQcE="; + hash = "sha256-OrUxJkz+kTKz0qxdcI2ppGSdJfbmgTcwrIjPBAoIqEQ="; }; nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index 52f59cc3fc8d0..e56b1dfa36839 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -10,19 +10,26 @@ buildPythonPackage rec { pname = "pyliblo"; version = "0.10.0"; - disabled = isPyPy || pythonAtLeast "3.11"; + disabled = isPyPy; src = fetchurl { url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; sha256 = "13vry6xhxm7adnbyj28w1kpwrh0kf7nw83cz1yq74wl21faz2rzw"; }; + patches = [ + (fetchurl { + url = "https://git.alpinelinux.org/aports/plain/community/py3-pyliblo/py3.11.patch?id=a7e1eca5533657ddd7e37c43e67e8126e3447258"; + hash = "sha256-4yCWNQaE/9FHGTVuvNEimBNuViWZ9aSJMcpTOP0fnM0="; + }) + ]; + buildInputs = [ liblo cython ]; meta = with lib; { homepage = "https://das.nasophon.de/pyliblo/"; description = "Python wrapper for the liblo OSC library"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; }; } diff --git a/pkgs/development/python-modules/pymanopt/default.nix b/pkgs/development/python-modules/pymanopt/default.nix index 0ade36294d966..d6fbdacf4650d 100644 --- a/pkgs/development/python-modules/pymanopt/default.nix +++ b/pkgs/development/python-modules/pymanopt/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pymanopt"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nbSxqMmYWi71s74bbB9LAlPKEslTqG/j266cLfNHrwg="; + hash = "sha256-pDFRYhswcuAHG9pcqvzXIy3Ivhxe5R5Ric7AFRh7MK4="; }; propagatedBuildInputs = [ numpy scipy torch ]; diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index 1f4bcb1cce293..f6fea35270e5a 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -44,14 +44,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "10.1.0"; + version = "10.3"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = "refs/tags/${version}"; - hash = "sha256-KqDEmWAWXdDpQPsP9Vrced+Ozz9IZiD8rCG57hPR7Xs="; + hash = "sha256-R35R2dHfjcVQbEa2319FEMjPGl1Y5/u2KEHeR0wTYEo="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 292e7fceead6c..bb6196f775a23 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pymongo"; - version = "4.3.3"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NOlf+wpov/vDtDfy0fJfyRb+899c3u0JktpfQvrpuAc="; + hash = "sha256-aB8lLkOz7wVMqRYWNfgbcw9NjK3Siz8rIAT1py+FOYI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymorphy3/default.nix b/pkgs/development/python-modules/pymorphy3/default.nix index c4642b9065445..2ef0e9629bd50 100644 --- a/pkgs/development/python-modules/pymorphy3/default.nix +++ b/pkgs/development/python-modules/pymorphy3/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pymorphy3"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "no-plagiarism"; repo = pname; - rev = version; - hash = "sha256-5MXAYcjZPUrGf5G5e7Yml1SLukrZURA0TCv0GiP56rM="; + rev = "refs/tags/${version}"; + hash = "sha256-JTRG+UtNXnS9GFUrgHNVCktb3HdH98wDFgzDPp6oVcQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 0bea5f8c51b57..d7e69706e51f8 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.22.5"; + version = "1.23.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyMuPDF"; inherit version; - hash = "sha256-XsjVEGdSKXUp0NaNRs/EzpmRSqvZm+hD8VmaGELWP+k="; + hash = "sha256-AhR4rmx26IWSQdu5cGEskIColX2L1pe7oLRTHcHPT4c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index b7075b9619d76..0d0171b1b066d 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.8"; + version = "0.5.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-p8VSVpv2BKEB/VS7odJ8EjieBllF3uOmd3pRjGOkbys="; + hash = "sha256-XV3Gg8A+9V/j3faThZcgyhj4XG5uW7C08UhwJ41SiK0="; }; patches = [ diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index 394c6f87b65c4..88c46532d997c 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -1,22 +1,61 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib, evdev }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools +, setuptools-lint +, sphinx + +# dependencies +, xlib +, evdev +, darwin +, six + + # tests +, unittestCheckHook + }: buildPythonPackage rec { pname = "pynput"; version = "1.7.6"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "3a5726546da54116b687785d38b1db56997ce1d28e53e8d22fc656d8b92e533c"; + src = fetchFromGitHub { + owner = "moses-palmer"; + repo = "pynput"; + rev = "refs/tags/v${version}"; + hash = "sha256-gRq4LS9NvPL98N0Jk09Z0GfoHS09o3zM284BEWS+NW4="; }; - nativeBuildInputs = [ sphinx ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'sphinx >=1.3.1'" "" + ''; - propagatedBuildInputs = [ setuptools-lint xlib ] - ++ lib.optionals stdenv.isLinux [ - evdev + nativeBuildInputs = [ + setuptools + setuptools-lint + sphinx ]; - doCheck = false; + propagatedBuildInputs = [ + six + ] ++ lib.optionals stdenv.isLinux [ + evdev + xlib + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices + Quartz + ]); + + doCheck = false; # requires running X server + + nativeCheckInputs = [ + unittestCheckHook + ]; meta = with lib; { broken = stdenv.isDarwin; diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix index edc9eb26440ec..d2dd95f42451b 100644 --- a/pkgs/development/python-modules/pynws/default.nix +++ b/pkgs/development/python-modules/pynws/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MatthewFlamm"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-x56kfnmdVV0Fc7XSI60rrtEl4k3uzpIdZxTofUbkUHU="; }; diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix index 699b6c3cf553e..ecc92bc3bd388 100644 --- a/pkgs/development/python-modules/pyocd/default.nix +++ b/pkgs/development/python-modules/pyocd/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pyocd"; - version = "0.34.3"; + version = "0.35.1"; src = fetchPypi { inherit pname version; - sha256 = "2zDr6fnA2MCTT/hNVvk7u3gugMo+nUF2E2VsOPhJXH4="; + sha256 = "sha256-AugIT007JtTXx0cLtHD9TtxsK/K6eB492U2k+EVxyXU="; }; patches = [ diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index d3e7faf03cd39..d8cf1f260da2e 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.35"; + version = "4.0.39"; format = "setuptools"; disabled = pythonOlder "3.7" || isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - hash = "sha256-krmvSOi5KEVbyLlL89oFdR+uwJMqEe7iN8GJxtQ55cg="; + hash = "sha256-5Si7cN1tYpnuQphokl3whm4+kZx3K57/ecjheSDY8RY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index b8c0812cfbaa8..4d473ae094d8c 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyparted"; - version = "3.12.0"; + version = "3.13.0"; disabled = isPyPy; src = fetchFromGitHub { repo = pname; owner = "dcantrell"; - rev = "v${version}"; - hash = "sha256-LfBLR0A/wnfBtXISAAY6Nl4vnk1rtY03F+PT8UIMrEs="; + rev = "refs/tags/v${version}"; + hash = "sha256-AiUCCrEbDD0OxrvXs1YN3/1IE7SuVasC2YCirIG58iU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index 585d12e8fb048..df58a17aee206 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "3.15.1"; + version = "3.16.0"; format = "pyproject"; src = fetchFromGitHub { @@ -34,7 +34,7 @@ buildPythonPackage rec { rev = "refs/tags/${version}"; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-0KMZnMIeTkra2Il4HGDBtm8HLP8zpMXgUD4V5U5fYy0="; + hash = "sha256-vE5ujknMpufBuwWqtjkLegTRe4eDAvBVPCVM6It2pHQ="; }; outputs = [ diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index e6ae36f0cf8a5..fc87620c6b9c9 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyperf"; - version = "2.5.0"; + version = "2.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-n9m+W1ciTmi1pbiPcSbxW2yGZ1c/YqCjn68U1v3ROQk="; + hash = "sha256-Fxrqabjv3mEhDlEhZth2Tndlqcdni3aAUhdLAfNJ8kc="; }; patches = [ diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix index 6cbef5b8a77f1..4ba62fc1e3101 100644 --- a/pkgs/development/python-modules/pyproject-api/default.nix +++ b/pkgs/development/python-modules/pyproject-api/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pyproject-api"; - version = "1.5.4"; + version = "1.6.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pyproject-api"; rev = "refs/tags/${version}"; - hash = "sha256-HX+5BypfEOfQ3vg3vha0QCVrEarjMu/Q8id+xgmWGfA="; + hash = "sha256-XQD+36NP2zKUp/QRlgKhwzfMYBh6GVlCYXURXs2qeO8="; }; outputs = [ diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index 2b7b4a1377a73..9e8a876213e85 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -10,7 +10,7 @@ , pytestCheckHook , freefont_ttf , makeFontsConf -, fetchpatch +, setuptools }: let @@ -20,21 +20,18 @@ let in buildPythonPackage rec { pname = "pyqtgraph"; - version = "0.12.2"; + version = "0.13.3"; + format = "pyproject"; src = fetchFromGitHub { owner = "pyqtgraph"; repo = "pyqtgraph"; - rev = "pyqtgraph-${version}"; - sha256 = "093kkxwj75nb508vz7px4x7lxrwpaff10pl15m4h74hjwyvbsg3d"; + rev = "refs/tags/pyqtgraph-${version}"; + hash = "sha256-kFTNhv8pgIRSJX0ePmp1I0+MGfCaW8b86baIYZ2bZQM="; }; - # TODO: remove when updating to 0.12.3 - patches = [ - (fetchpatch { - url = "https://github.com/pyqtgraph/pyqtgraph/commit/2de5cd78da92b48e48255be2f41ae332cf8bb675.patch"; - sha256 = "1hy86psqyl6ipvbg23zvackkd6f7ajs6qll0mbs0x2zmrj92hk00"; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ @@ -53,6 +50,11 @@ buildPythonPackage rec { export FONTCONFIG_FILE=${fontsConf} ''; + pytestFlagsArray = [ + # we only want to run unittests + "tests" + ]; + disabledTests = lib.optionals (!stdenv.hostPlatform.isx86) [ # small precision-related differences on other architectures, # upstream doesn't consider it serious. diff --git a/pkgs/development/python-modules/pyramid-multiauth/default.nix b/pkgs/development/python-modules/pyramid-multiauth/default.nix index f0feafaa59610..c70e7f0b0b649 100644 --- a/pkgs/development/python-modules/pyramid-multiauth/default.nix +++ b/pkgs/development/python-modules/pyramid-multiauth/default.nix @@ -1,22 +1,37 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pyramid +, unittestCheckHook +, setuptools }: buildPythonPackage rec { pname = "pyramid-multiauth"; version = "1.0.1"; + pyproject = true; - src = fetchPypi { - pname = "pyramid-multiauth"; - inherit version; - sha256 = "6d8785558e1d0bbe0d0da43e296efc0fbe0de5071d1f9b1091e891f0e4ec9682"; + src = fetchFromGitHub { + owner = "mozilla-services"; + repo = "pyramid_multiauth"; + rev = "refs/tags/${version}"; + hash = "sha256-+Aa+Vc4qCqDe/W5m/RBpYAyOMJkBv+ZGSqElJlkHqs4="; }; - propagatedBuildInputs = [ pyramid ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pyramid + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/mozilla-services/pyramid_multiauth/releases/tag/${version}"; description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies"; homepage = "https://github.com/mozilla-services/pyramid_multiauth"; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index 808b0e5428e93..1f616e00acbee 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, cython +, cython_3 , fetchFromGitHub , libiconv , pandas @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyreadstat"; - version = "1.2.2"; + version = "1.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,11 +22,11 @@ buildPythonPackage rec { owner = "Roche"; repo = "pyreadstat"; rev = "refs/tags/v${version}"; - hash = "sha256-CvovylOTTyXm0ucTwNSFZzkcA0H8H76BSg4vjB2Pe4M="; + hash = "sha256-Rd2nHsEYfr1I5gu2+iXIdHKvF/QgMD+vK6SIK/ytrmo="; }; nativeBuildInputs = [ - cython + cython_3 ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pyrevolve/default.nix b/pkgs/development/python-modules/pyrevolve/default.nix index 754baf91ad38c..d60b2164051c0 100644 --- a/pkgs/development/python-modules/pyrevolve/default.nix +++ b/pkgs/development/python-modules/pyrevolve/default.nix @@ -2,17 +2,18 @@ , buildPythonPackage , fetchFromGitHub , contexttimer +, setuptools , versioneer , cython , numpy -, pytest +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "pyrevolve"; - version = "2.2.2"; - format = "setuptools"; + version = "2.2.3"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,12 +21,18 @@ buildPythonPackage rec { owner = "devitocodes"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JLDn3WEBcdO8YYzt/MWOHB/1kcmbmZUsiH00/4Uwlxo="; + hash = "sha256-z1G8DXG06Capd87x02zqrtYyBrX4xmJP94t4bgaR2PE="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace ', "flake8"' "" + ''; + nativeBuildInputs = [ - versioneer cython + setuptools + versioneer ]; propagatedBuildInputs = [ @@ -33,12 +40,12 @@ buildPythonPackage rec { numpy ]; - nativeCheckInputs = [ pytest ]; - # Using approach bellow bcs the tests fail with the pytestCheckHook, throwing the following error - # ImportError: cannot import name 'crevolve' from partially initialized module 'pyrevolve' - # (most likely due to a circular import) - checkPhase = '' - pytest + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + rm -rf pyrevolve ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 106fa03a082bc..cfa2f64c38b3d 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchpatch, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: +{ lib +, stdenv +, fetchPypi +, buildPythonPackage +, swig +, pcsclite +, PCSC +}: let # Package does not support configuring the pcsc library. @@ -6,23 +13,14 @@ let in buildPythonPackage rec { - version = "2.0.2"; + version = "2.0.7"; pname = "pyscard"; src = fetchPypi { inherit pname version; - sha256 = "05de0579c42b4eb433903aa2fb327d4821ebac262434b6584da18ed72053fd9e"; + hash = "sha256-J4BUUl+nX76LEEYNh+3NA6cK2U1oixE0Xkc5mH+Fwb8="; }; - patches = [ - # present in master - remove after 2.0.2 - (fetchpatch { - name = "darwin-typo-test-fix.patch"; - url = "https://github.com/LudovicRousseau/pyscard/commit/ce842fcc76fd61b8b6948d0b07306d82ad1ec12a.patch"; - sha256 = "0wsaj87wp9d2vnfzwncfxp2w95m0zhr7zpkmg5jccn06z52ihis3"; - }) - ]; - postPatch = if withApplePCSC then '' substituteInPlace smartcard/scard/winscarddll.c \ --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index 29f795560d41b..5089e19c22647 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "pyscf"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "pyscf"; repo = pname; rev = "v${version}"; - hash = "sha256-x693NB0oc9X7SuDZlV3VKOmgnIgKA39O9yswDM0outk="; + hash = "sha256-+dZsXiLqqyRWr1eOEVSHZ1KMM760hrDaT07ylZUcGmo="; }; # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake. diff --git a/pkgs/development/python-modules/pysnooz/default.nix b/pkgs/development/python-modules/pysnooz/default.nix index dd8d6ea4fcdef..4ff2513685f6a 100644 --- a/pkgs/development/python-modules/pysnooz/default.nix +++ b/pkgs/development/python-modules/pysnooz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pysnooz"; - version = "0.8.6"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AustinBrunkhorst"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hJwIObiuFEAVhgZXYB9VCeAlewBBnk0oMkP83MUCpyU="; + hash = "sha256-jOXmaJprU35sdNRrBBx/YUyiDyyaE1qodWksXkTSEe0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index c553b6242b2a7..9107961653401 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyspnego"; - version = "0.8.0"; + version = "0.9.2"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3nFxUu2P8dGt80HRGYOliGHXLrtc83C96kJW27CgXV0="; + hash = "sha256-A0vVpEI8TKelZ96dIqSc01SX1gU3pDUVSOV6jap2WtU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysptk/default.nix b/pkgs/development/python-modules/pysptk/default.nix index 4051dc789d3c5..e1d3a631549dc 100644 --- a/pkgs/development/python-modules/pysptk/default.nix +++ b/pkgs/development/python-modules/pysptk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pysptk"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nZchBqagUn26vGmUc3+5S57mnQQ2/4vqOz00DUUF1+U="; + hash = "sha256-dFqNWJRDDTlvveZVv3WWUi+KJ8sey4N0qRuBcqmkWIM="; }; PYSPTK_BUILD_VERSION = 0; diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index ed282f06b2a19..dcaeb3355bfa8 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -10,10 +10,10 @@ buildPythonPackage rec { pname = "pystemd"; - version = "0.10.0"; + version = "0.13.2"; src = fetchPypi { inherit pname version; - hash = "sha256-10qBS/2gEIXbGorZC+PLJ9ryOlGrawPn4p7IEfoq6Fk="; + hash = "sha256-Tc+ksTpVaFxJ09F8EGMeyhjDN3D2Yxb47yM3uJUcwUQ="; }; disabled = python.pythonOlder "3.4"; diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix index cf6a79853cbc0..a6d073dbd669d 100644 --- a/pkgs/development/python-modules/pystray/default.nix +++ b/pkgs/development/python-modules/pystray/default.nix @@ -5,15 +5,17 @@ , xlib , six , xvfb-run -, sphinx +, setuptools , gobject-introspection , pygobject3 , gtk3 -, libayatana-appindicator }: +, libayatana-appindicator +}: buildPythonPackage rec { pname = "pystray"; version = "0.19.2"; + format = "pyproject"; src = fetchFromGitHub { owner = "moses-palmer"; @@ -22,9 +24,28 @@ buildPythonPackage rec { hash = "sha256-8B178MSe4ujlnGBmQhIu+BoAh1doP9V5cL0ermLQTvs="; }; - nativeBuildInputs = [ gobject-introspection sphinx ]; - propagatedBuildInputs = [ pillow xlib six pygobject3 gtk3 libayatana-appindicator ]; - nativeCheckInputs = [ xvfb-run ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'sphinx >=1.3.1'" "" + ''; + + nativeBuildInputs = [ + gobject-introspection + setuptools + ]; + + propagatedBuildInputs = [ + pillow + xlib + six + pygobject3 + gtk3 + libayatana-appindicator + ]; + + nativeCheckInputs = [ + xvfb-run + ]; checkPhase = '' rm tests/icon_tests.py # test needs user input diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix index cea21215f2163..8b37c75e9c24b 100644 --- a/pkgs/development/python-modules/pytablewriter/default.nix +++ b/pkgs/development/python-modules/pytablewriter/default.nix @@ -117,6 +117,7 @@ buildPythonPackage rec { disabledTestPaths = [ "test/writer/binary/test_excel_writer.py" "test/writer/binary/test_sqlite_writer.py" + "test/writer/test_elasticsearch_writer.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 4a70b0d980574..9cd6ec0491a92 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , setuptools-scm +, wheel , aiohttp , pytest , pytest-asyncio @@ -10,22 +12,26 @@ buildPythonPackage rec { pname = "pytest-aiohttp"; - version = "1.0.4"; + version = "1.0.5"; - format = "setuptools"; + format = "pyproject"; __darwinAllowLocalNetworking = true; - src = fetchPypi { - inherit pname version; - sha256 = "39ff3a0d15484c01d1436cbedad575c6eafbf0f57cdf76fb94994c97b5b8c5a4"; + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "pytest-aiohttp"; + rev = "refs/tags/v${version}"; + hash = "sha256-UACf0frMTOAgSsXQ0oqROHKR1zn4OfLPhd9MwBK002Y="; }; nativeBuildInputs = [ + setuptools setuptools-scm + wheel ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; buildInputs = [ pytest @@ -40,15 +46,9 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # pytest 7.2.0 incompatibilities - # https://github.com/aio-libs/pytest-aiohttp/issues/50 - "tests/test_fixtures.py" - ]; - meta = with lib; { homepage = "https://github.com/aio-libs/pytest-aiohttp/"; - changelog = "https://github.com/aio-libs/pytest-aiohttp/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/aio-libs/pytest-aiohttp/blob/${src.rev}/CHANGES.rst"; description = "Pytest plugin for aiohttp support"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 0b941d9be6076..4fbfb942eddaa 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "3.2.1"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ansible"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fSerRbd7QeEdTfyy2lVLq7FKHWWT0MlutonunHhM5M4="; + hash = "sha256-TV/dR4eTiwjrgamwRCig10acaf3MpAzLu0fHF0V2pzw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-base-url/default.nix b/pkgs/development/python-modules/pytest-base-url/default.nix index 4110a0191f3c2..a6aa15890b855 100644 --- a/pkgs/development/python-modules/pytest-base-url/default.nix +++ b/pkgs/development/python-modules/pytest-base-url/default.nix @@ -46,6 +46,11 @@ buildPythonPackage rec { "tests" ]; + disabledTests = [ + # should be xfail? or mocking doesn't work + "test_url_fails" + ]; + pythonImportsCheck = [ "pytest_base_url" ]; diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index 135b0c2295e37..f9011b6d721bb 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -2,6 +2,7 @@ , aspectlib , buildPythonPackage , elasticsearch +, elastic-transport , fetchFromGitHub , fetchpatch , freezegun @@ -11,6 +12,7 @@ , pygal , pytest , pytestCheckHook +, pytest-xdist , pythonOlder , isPy311 }: @@ -45,19 +47,24 @@ buildPythonPackage rec { py-cpuinfo ]; + passthru.optional-dependencies = { + aspect = [ aspectlib ]; + histogram = [ pygal ]; + elasticsearch = [ elasticsearch ]; + }; + pythonImportsCheck = [ "pytest_benchmark" ]; nativeCheckInputs = [ - aspectlib - elasticsearch + elastic-transport freezegun git mercurial - pygal pytestCheckHook - ]; + pytest-xdist + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); preCheck = '' export PATH="$out/bin:$PATH" diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index 1f11f31e21398..d8a188af25de5 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -8,12 +8,13 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "2.1.4"; + version = "2.2.1"; format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-AbN/1wPaD6ZntwF68fBGDHRKhfHuh2de4+D5Ssw98XI="; + pname = "pytest_check"; + inherit version; + hash = "sha256-3rN/iB36DV4kbymWI4rvdFp5ANezUjp0FgV3K4osSVI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix index 1cf1db5fe1a83..5170a7a902acd 100644 --- a/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-console-scripts"; - version = "1.3.1"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XGw9qunPn77Q5lUHISiThgAZPcACpc8bGHJIZEugKFc="; + hash = "sha256-WoJu2EzAr6IC655EOB19di973ajgwj+feafx9Ez0qJU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index b3f445cad4313..d4f5a3c5c5aba 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, numpy , packaging , pytest , pytestCheckHook @@ -11,14 +12,14 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.12.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-epeeS+mdkRbgesBmxfANRfOHZ319d5877zDG/6jHkYE="; + hash = "sha256-9lBEDcrt4T7W19pzv7SsWF1AqAREujVC0+buzbJ11J8="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + numpy pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix index 1d03413290a78..92ed531c6fbf6 100644 --- a/pkgs/development/python-modules/pytest-env/default.nix +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-env"; - version = "0.8.2"; + version = "1.0.1"; format = "pyproject"; src = fetchPypi { pname = "pytest_env"; inherit version; - hash = "sha256-uu2bO2uud711uSOODtHuaQOkKAaunWrv+4dUzVWE1P8="; + hash = "sha256-YD/iFujgOl0TSYnLQTF8Waq+8BPSJQxxuGSrB5j75vY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index f5b20cb1b508f..3375a7a0a0bd4 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -1,19 +1,65 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder -, pytest, pytest-metadata, setuptools-scm }: - -buildPythonPackage rec { +{ lib +, buildNpmPackage +, buildPythonPackage +, fetchPypi +, pythonOlder +, hatch-vcs +, hatchling +, jinja2 +, pytest +, pytest-metadata +}: +let pname = "pytest-html"; - version = "3.2.0"; - disabled = pythonOlder "3.6"; + version = "4.0.2"; src = fetchPypi { - inherit pname version; - hash = "sha256-xOL0uwv/xDf1GtIXSoo+cd+Bu8L2iUYE5gSvGPvmh8M="; + pname = "pytest_html"; + inherit version; + hash = "sha256-iGgrno5ROSRyVGpwohObJ9a8GDSkr9PkHaM8nZ+R5KQ="; + }; + + web-assets = buildNpmPackage { + pname = "${pname}-web-assets"; + inherit version src; + + npmDepsHash = "sha256-aRod+SzVSb4bqEJzthfl/mH+DpbIe+j2+dNtrrhO2xU="; + + installPhase = '' + runHook preInstall + + install -Dm644 src/pytest_html/resources/{app.js,style.css} -t $out/lib + + runHook postInstall + ''; }; +in + +buildPythonPackage { + inherit pname version src; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + buildInputs = [ pytest web-assets ]; + propagatedBuildInputs = [ jinja2 pytest-metadata ]; + + env.HATCH_BUILD_NO_HOOKS = true; + + preBuild = '' + install -Dm644 ${web-assets}/lib/{app.js,style.css} -t src/pytest_html/resources + ''; + + # tests require network access + doCheck = false; - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ pytest-metadata ]; + pythonImportsCheck = [ + "pytest_html" + ]; meta = with lib; { description = "Plugin for generating HTML reports"; diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index edfc988cc6c32..db94f2b6e1635 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-httpbin"; - version = "1.0.2"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kevin1024"; repo = "pytest-httpbin"; - rev = "v${version}"; - hash = "sha256-S4ThQx4H3UlKhunJo35esPClZiEn7gX/Qwo4kE1QMTI="; + rev = "refs/tags/v${version}"; + hash = "sha256-tq9nz2na94HkLACt7xB1MUanh9/JOoe2vyEm5sAq0/4="; }; buildInputs = [ @@ -32,17 +32,16 @@ buildPythonPackage rec { six ]; - preCheck = '' - # Remove assertion that doesn't hold for Flask 2.1.0 - substituteInPlace tests/test_server.py \ - --replace "assert response.headers['Location'].startswith('https://')" "" - ''; - nativeCheckInputs = [ pytestCheckHook requests ]; + disabledTests = [ + # incompatible with flask 2.3 + "test_redirect_location_is_https_for_secure_server" + ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index da22eea8d7f14..dbcfafc0a5fed 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.22.0"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "pytest_httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-J5Y5G3/8d9hAtDFqweqA73amnXUpPbmb0uTrCslpl9k="; + hash = "sha256-8cuXsHyS9OaYXzKXgwan+mBFocyr39B9G8wr8I1pmg4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix index f9e49cf091449..6f5f6484a5702 100644 --- a/pkgs/development/python-modules/pytest-jupyter/default.nix +++ b/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -22,14 +22,14 @@ let self = buildPythonPackage rec { pname = "pytest-jupyter"; - version = "0.6.2"; + version = "0.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pytest-jupyter"; rev = "refs/tags/v${version}"; - hash = "sha256-kY4QHrlj0opEBywe4SpwE4Ck6l6JIzEosx6uuXh+yCQ="; + hash = "sha256-ZocpIBHnXTvQdjWU8yVhGK49I+FFct+teDhghiMnvW0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 23ac11d84ad0a..4ab9c74be35e7 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.7.1"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-53tGVVy0OJMdIZxUvPn1lTwEB9ZFQ2pgK1cwur/T/js="; + hash = "sha256-XZDOfQhddB51n6hU29LnxbVXMh1pUXmJTrQOIQ6i/zA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix index 4c041ce40c89d..f4c809218fb01 100644 --- a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix +++ b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix @@ -1,19 +1,22 @@ { lib , buildPythonPackage -, chevron , decorator , fetchFromGitHub +, jinja2 +, jsonschema , mypy +, packaging , pytest , pytestCheckHook , pythonOlder , pyyaml , regex +, tomlkit }: buildPythonPackage rec { pname = "pytest-mypy-plugins"; - version = "1.11.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +25,7 @@ buildPythonPackage rec { owner = "typeddjango"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UlNjqloAl0Qmy3EQ73e+KmsHeJN3eBkkBJxCehpOs48="; + hash = "sha256-kIA2tVOsKsav4tRqZiWCMcRgbRnxAEo7SpmxC2pt9B0="; }; buildInputs = [ @@ -30,11 +33,18 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - chevron - pyyaml - mypy decorator + jinja2 + jsonschema + mypy + packaging + pyyaml regex + tomlkit + ]; + + pythonImportsCheck = [ + "pytest_mypy_plugins" ]; nativeCheckInputs = [ @@ -46,16 +56,8 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; - pythonImportsCheck = [ - "pytest_mypy_plugins" - ]; - - disabledTests = [ - # ...TypecheckAssertionError: Invalid output: - "with_out" - "add_mypypath_env_var_to_package_searc" - "error_case" - "skip_if_false" + disabledTestPaths = [ + "pytest_mypy_plugins/tests/test_explicit_configs.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-param-files/default.nix b/pkgs/development/python-modules/pytest-param-files/default.nix index 80dea1dbeaad2..55923b5ed266b 100644 --- a/pkgs/development/python-modules/pytest-param-files/default.nix +++ b/pkgs/development/python-modules/pytest-param-files/default.nix @@ -2,30 +2,38 @@ , buildPythonPackage , fetchFromGitHub , flit-core +, ruamel-yaml , pytest , pytestCheckHook }: buildPythonPackage rec { pname = "pytest-param-files"; - version = "0.3.4"; + version = "0.6.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "chrisjsewell"; repo = pname; - rev = "v${version}"; - hash = "sha256-Q7wWoggJN2w2a2umQHx5TsVcugqpovBEtOKruNMZQ8A="; + rev = "refs/tags/v${version}"; + hash = "sha256-hgEEfKf9Kmah5WDNHoFWQJKLOs9Z5BDHiebXCdDc1zE="; }; - format = "pyproject"; - - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + ]; buildInputs = [ pytest ]; - pythonImportsCheck = [ "pytest_param_files" ]; + propagatedBuildInputs = [ + ruamel-yaml + ]; + + pythonImportsCheck = [ + "pytest_param_files" + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index a9e56d3c43e28..e804a0482dc1e 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.4.2"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-6riee6SqM5vf4HsxBH6OanCx54RudKi7/DGliNAecwM="; + hash = "sha256-gYx4hMHP87q/ie67AsvCezB4VrGYVCfCTVLLgSoQb9k="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix index 36f31a0288c88..872e9dc8fc0dd 100644 --- a/pkgs/development/python-modules/pytest-trio/default.nix +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "pytest-trio"; - version = "0.7.0"; + version = "0.8.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-trio"; repo = pname; rev = "v${version}"; - sha256 = "0bhh2nknhp14jzsx4zzpqm4qnfaihyi65cjf6kf6qgdhc0ax6nf4"; + sha256 = "sha256-gUH35Yk/pBD2EdCEt8D0XQKWU8BwmX5xtAW10qRhoYk="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 5fde855e58e3e..d557bcf15e937 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.4.0"; + version = "7.4.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-tL+MRb1Zk07YQAGtUeEbTuQNQKEinSx5+cWSsKP2vYo="; + hash = "sha256-p2YlnPq1ZKKtUssarhuIGnXD6340yjd5aXwj7UfEcGk="; }; outputs = [ diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index e9224b543b579..20a4819948ad1 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -1,15 +1,24 @@ { lib -, arangodb , buildPythonPackage , fetchFromGitHub , pythonOlder , pytestCheckHook -, pyjwt -, pytest -, mock + +# build-system +, setuptools +, setuptools-scm + +# dependencies +, urllib3 , requests , requests-toolbelt -, setuptools +, pyjwt +, importlib-metadata +, packaging + +# tests +, arangodb +, mock }: let @@ -23,8 +32,8 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "7.5.7"; - format = "setuptools"; + version = "7.6.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,14 +41,24 @@ buildPythonPackage rec { owner = "ArangoDB-Community"; repo = "python-arango"; rev = "refs/tags/${version}"; - hash = "sha256-cd2xE5rYLl3NOv/DZjmHRPCe224k4XyPjo9aXV1ZhvU="; + hash = "sha256-1n+3Rl945NQ3Ugd6UKhN429vTz1ky2Qr43fI0TrgrBU="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ + importlib-metadata requests requests-toolbelt + packaging pyjwt setuptools + urllib3 ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index f350f6df619b3..acb47fceb8b12 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -20,13 +20,13 @@ let ''; in buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.28.7"; + version = "0.29.1"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AxRgoXPiFFFHQSj5/jU55hwWzHtutfjmD2IKGxYwd0A="; + hash = "sha256-sfvVLPTSTXjwyB0a2NyDIONv01FXZ40nHZwwo3oqI90="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 9a0269c983f0d..990cbd1be317e 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -10,13 +10,14 @@ , pytestCheckHook , pythonOlder , requests +, simple-websocket , tornado , websocket-client }: buildPythonPackage rec { pname = "python-engineio"; - version = "4.6.1"; + version = "4.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +26,21 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "refs/tags/v${version}"; - hash = "sha256-za2JY5Gu9MEqi3W1zxcuwYiJ5XLc43ig6Hdx/4JwDbY="; + hash = "sha256-jHXpPnrQlIpmQ2sY4y6AUx/6W8Pf+683s4NmmlwZO58="; + }; + + propagatedBuildInputs = [ + simple-websocket + ]; + + passthru.optional-dependencies = { + client = [ + requests + websocket-client + ]; + asyncio_client = [ + aiohttp + ]; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index c73160c55e6e5..fe81dda8939ca 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/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/pkgs/development/python-modules/python-lzo/default.nix b/pkgs/development/python-modules/python-lzo/default.nix index 38a31fbb6cb6b..e3f1b0922a6a4 100644 --- a/pkgs/development/python-modules/python-lzo/default.nix +++ b/pkgs/development/python-modules/python-lzo/default.nix @@ -1,22 +1,32 @@ -{ lib, fetchPypi, buildPythonPackage, lzo, nose }: +{ lib, fetchPypi, buildPythonPackage, lzo, pytestCheckHook, setuptools, wheel }: buildPythonPackage rec { pname = "python-lzo"; - version = "1.14"; + version = "1.15"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "83cbd8ecaae284735250e31d6c0ecc18ac08763fab2a8c910dc5a6910db6250c"; + hash = "sha256-pXqqAMXDoFFd2fdCa6LPYBdn3BncAj2LmdShOwoye0k="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + buildInputs = [ lzo ]; - propagatedBuildInputs = [ ]; - nativeCheckInputs = [ nose ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ + "lzo" + ]; meta = with lib; { homepage = "https://github.com/jd-boyd/python-lzo"; description = "Python bindings for the LZO data compression library"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.jbedo ]; }; } diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index 9078f41aeacaf..3c04398e56d48 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, hatchling , pytestCheckHook , mock , pyyaml @@ -9,14 +10,19 @@ buildPythonPackage rec { pname = "python-multipart"; - version = "0.0.5"; - format = "setuptools"; + version = "0.0.6"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "f7bb5f611fc600d15fa47b3974c8aa16e93724513b49b5f95c81e6624c83fa43"; + pname = "python_multipart"; + inherit version; + hash = "sha256-6ZJagLtmhSnxtnx/2wpdrN18v8b7C/8+pEP+Ir3WITI="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/python-myq/default.nix index 91c691f843a39..88248abde3a3e 100644 --- a/pkgs/development/python-modules/pymyq/default.nix +++ b/pkgs/development/python-modules/python-myq/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - pname = "pymyq"; + pname = "python-myq"; version = "3.1.13"; pyproject = true; @@ -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/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix index a96501dbbf3c8..6c47e8189a920 100644 --- a/pkgs/development/python-modules/python-ndn/default.nix +++ b/pkgs/development/python-modules/python-ndn/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "named-data"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-ArTP4LQu7VNjI/N13gMTc1SDiNmW5l4GdLYOk8JEfKg="; }; diff --git a/pkgs/development/python-modules/python-osc/default.nix b/pkgs/development/python-modules/python-osc/default.nix index 27a5a084fa459..500e6beb0b0ef 100644 --- a/pkgs/development/python-modules/python-osc/default.nix +++ b/pkgs/development/python-modules/python-osc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "python-osc"; - version = "1.8.1"; + version = "1.8.3"; src = fetchPypi { inherit pname version; - hash = "sha256-69a3z4rjhzgPSOnW1zabrRwXahr2YI79eIi1C08OdK0="; + hash = "sha256-pc4bpWyNgt9Ryz8pRrXdM6cFInkazEuFZOYtKyCtnKo="; }; pythonImportsCheck = [ "pythonosc" ]; diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index 4cb8273b78bc8..c6b59b0ac985d 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-socks"; - version = "2.1.1"; + version = "2.4.2"; format = "setuptools"; disabled = pythonOlder "3.6.2"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "python-socks"; rev = "refs/tags/v${version}"; - hash = "sha256-QvUuCS8B/6+dgzWrflizLfNlAUeOPpUPtmFaE6LGYGc="; + hash = "sha256-HnZrnsxPmRJzrvJbKS5r+di+msykDwWS7TB5CitIve8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix index 97e6215f1d9d9..017be9041dc1a 100644 --- a/pkgs/development/python-modules/python-tado/default.nix +++ b/pkgs/development/python-modules/python-tado/default.nix @@ -6,9 +6,9 @@ , requests }: -buildPythonPackage { +buildPythonPackage rec { pname = "python-tado"; - version = "0.16.0"; + version = "0.17.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,8 +17,8 @@ buildPythonPackage { owner = "wmalgadey"; repo = "PyTado"; # https://github.com/wmalgadey/PyTado/issues/62 - rev = "674dbc450170a380e76460c22d6ba943dfedb8e9"; - hash = "sha256-gduqQVw/a64aDzTHFmgZu7OVB53jZb7L5vofzL3Ho6s="; + rev = "refs/tags/${version}"; + hash = "sha256-w1qtSEpnZCs7+M/0Gywz9AeMxUzz2csHKm9SxBKzmz4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 93969551842bc..262f1d22e8ca5 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "20.5"; + version = "20.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/AdGpOl87EeVDCAZLjtan7ttE2vUL0gi1qeM18ilYEQ="; + hash = "sha256-t6yHl2uNdGaTLdbQTXp3+zds2pab4T6Pe69mu31HahA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-telegram/default.nix b/pkgs/development/python-modules/python-telegram/default.nix index a79362a934224..405f74bebda8d 100644 --- a/pkgs/development/python-modules/python-telegram/default.nix +++ b/pkgs/development/python-modules/python-telegram/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "python-telegram"; - version = "0.15.0"; + version = "0.18.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Na2NIiVgYexKbEqjN58hfkgxwFdCTL7Z7D3WEhL4wXA="; + hash = "sha256-UbJW/op01qe/HchfJUlBPBY9/W8NbZkEmFM8gZ5+EmI="; }; patches = [ diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index efb1288943af2..8a187257ca76d 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -1,5 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi -, udev }: +{ lib +, buildPythonPackage +, fetchPypi +, udev +}: buildPythonPackage rec { pname = "python-uinput"; @@ -14,6 +17,8 @@ buildPythonPackage rec { NIX_CFLAGS_LINK = "-ludev"; + doCheck = false; # no tests + meta = with lib; { description = "Pythonic API to Linux uinput kernel module"; homepage = "https://tjjr.fi/sw/python-uinput/"; diff --git a/pkgs/development/python-modules/python-ulid/default.nix b/pkgs/development/python-modules/python-ulid/default.nix new file mode 100644 index 0000000000000..db1456dc3186c --- /dev/null +++ b/pkgs/development/python-modules/python-ulid/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling +, freezegun +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-ulid"; + version = "2.2.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "mdomke"; + repo = "python-ulid"; + rev = "refs/tags/${version}"; + hash = "sha256-d5jCPxWUOfw/OCtbA9Db9+s1D5DAdL+vbPR8zavgbbo="; + }; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + + nativeCheckInputs = [ + freezegun + pytestCheckHook + ]; + + pythonImportsCheck = [ "ulid" ]; + + meta = with lib; { + description = "ULID implementation for Python"; + homepage = "https://github.com/mdomke/python-ulid"; + changelog = "https://github.com/mdomke/python-ulid/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix index 981f963db389d..7a5d8bccaa316 100644 --- a/pkgs/development/python-modules/python3-saml/default.nix +++ b/pkgs/development/python-modules/python3-saml/default.nix @@ -24,14 +24,23 @@ buildPythonPackage rec { }; patches = [ + # skip tests with expired test data + # upstream issue: https://github.com/SAML-Toolkits/python3-saml/issues/373 (fetchpatch { name = "test-expired.patch"; url = "https://github.com/SAML-Toolkits/python3-saml/commit/bd65578e5a21494c89320094c61c1c77250bea33.diff"; hash = "sha256-9Trew6R5JDjtc0NRGoklqMVDEI4IEqFOdK3ezyBU6gI="; }) - # skip tests with expired test data - # upstream issue: https://github.com/SAML-Toolkits/python3-saml/issues/373 - ./skip-broken-tests.patch + (fetchpatch { + name = "test-expired.patch"; + url = "https://github.com/SAML-Toolkits/python3-saml/commit/ea3a6d4ee6ea0c5cfb0f698d8c0ed25638150f47.patch"; + hash = "sha256-Q9+GM+mCEZK0QVp7ulH2hORVig2411OvkC4+o36DeXg="; + }) + (fetchpatch { + name = "test-expired.patch"; + url = "https://github.com/SAML-Toolkits/python3-saml/commit/feb0d1d954ee4d0ad1ad1d7d536bf9e83fa9431b.patch"; + hash = "sha256-NURGI4FUnFlWRZfkioU9IYmZ+Zk9FKfZchjdn7N9abU="; + }) ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python3-saml/skip-broken-tests.patch b/pkgs/development/python-modules/python3-saml/skip-broken-tests.patch deleted file mode 100644 index ea845e7da3de8..0000000000000 --- a/pkgs/development/python-modules/python3-saml/skip-broken-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/tests/src/OneLogin/saml2_tests/response_test.py b/tests/src/OneLogin/saml2_tests/response_test.py -index fbe714f..bbed3c2 100644 ---- a/tests/src/OneLogin/saml2_tests/response_test.py -+++ b/tests/src/OneLogin/saml2_tests/response_test.py -@@ -562,6 +562,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase): - response_2 = OneLogin_Saml2_Response(settings, xml_2) - self.assertTrue(response_2.check_one_condition()) - -+ @unittest.skip("test data expired") - def testCheckOneAuthnStatement(self): - """ - Tests the check_one_authnstatement method of SamlResponse -@@ -970,6 +971,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase): - with self.assertRaisesRegex(Exception, 'Could not validate timestamp: expired. Check system clock.'): - response_2.is_valid(self.get_request_data(), raise_exceptions=True) - -+ @unittest.skip("test data expired") - def testIsInValidNoStatement(self): - """ - Tests the is_valid method of the OneLogin_Saml2_Response -@@ -1080,6 +1082,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase): - with self.assertRaisesRegex(Exception, 'Found an Attribute element with duplicated Name'): - response.get_attributes() - -+ @unittest.skip("test data expired") - def testIsInValidDestination(self): - """ - Tests the is_valid method of the OneLogin_Saml2_Response class diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 3bd169bc1af84..138dc5f502fa4 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pytorch-pfn-extras"; - version = "0.6.4"; + version = "0.7.2"; src = fetchFromGitHub { owner = "pfnet"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x1aE/55+2QwYG3Hhy35j26jLAj9O5orrU/c4KlTTOcc="; + hash = "sha256-juoLw/qfq4YF7opyR7cTYCVzUa9pXVvQnvGntcQhBr4="; }; propagatedBuildInputs = [ numpy packaging torch typing-extensions ]; diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index ad4f76baf667a..8d4bcfbb3c6f7 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pytz"; - version = "2023.3"; + version = "2023.3.post1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-HYzinbGJGR+1UzjubQOH2Cq1nz0A6sEDQS1k4OvQxYg="; + hash = "sha256-e0/dvrlKHrpLVX2iTxn9+dtXUZJUQnCpEB2FCfn0PXs="; }; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/pyvis/default.nix b/pkgs/development/python-modules/pyvis/default.nix index c4698744531b9..a9fea2dc68303 100644 --- a/pkgs/development/python-modules/pyvis/default.nix +++ b/pkgs/development/python-modules/pyvis/default.nix @@ -6,31 +6,38 @@ , jinja2 , ipython , jsonpickle +, pytestCheckHook , numpy }: buildPythonPackage rec { pname = "pyvis"; - version = "0.2.1"; + version = "0.3.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "WestHealth"; repo = pname; - rev = "v${version}"; - hash = "sha256-cER5XYxnURzRLtrisWBu2kxtOiRqgaRTJYyaCMh2qqE="; + rev = "refs/tags/v${version}"; + hash = "sha256-eo9Mk2c0hrBarCrzwmkXha3Qt4Bl1qR7Lhl9EkUx96E="; }; - patches = [ - # Fix test: https://github.com/WestHealth/pyvis/issues/138 - (fetchpatch { - url = "https://github.com/WestHealth/pyvis/commit/eaa24b882401e2e74353efa78bf4e71a880cfc47.patch"; - hash = "sha256-hyDypavoCM36SiuQda1U4FLUPdAjTIMtaeZ0KqfHKzI="; - }) + propagatedBuildInputs = [ + jinja2 + networkx + ipython + jsonpickle ]; - propagatedBuildInputs = [ networkx jinja2 ipython jsonpickle ]; + nativeCheckInputs = [ + pytestCheckHook + numpy + ]; - nativeCheckInputs = [ numpy ]; + disabledTestPaths = [ + # jupyter integration test with selenium and webdriver_manager + "pyvis/tests/test_html.py" + ]; pythonImportsCheck = [ "pyvis" ]; @@ -38,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/WestHealth/pyvis"; description = "Python package for creating and visualizing interactive network graphs"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ pbsds ]; }; } diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index 72801ee30690f..4498b4f150908 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -14,23 +14,15 @@ buildPythonPackage rec { pname = "pyvo"; - version = "1.4"; + version = "1.4.2"; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-R2ttLoFd6Ic0KZl49dzN5NtWAqPpXRaeki6X8CRGsCw="; + hash = "sha256-Zv4piGWs/XJbxfGHUHctfxuImbjluxd1chUgvtV9lcs="; }; - patches = [ - # Backport Python 3.11 support. - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/astropy/pyvo/pull/385.patch"; - sha256 = "IHf3W9fIT8XFvyM41PUiJkt1j+B3RkX3TS4FOnRUMDk="; - }) - ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index 84e2a3f644423..04df94d137efe 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pywebview"; - version = "4.1"; + version = "4.3.3"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "r0x0r"; repo = "pywebview"; rev = "refs/tags/${version}"; - hash = "sha256-oqyWT0GaZ201OMVRcRpm1dma6NonTMmTx5SKnjzQl3M="; + hash = "sha256-8BkbO7C8cYDIQWWCKaXFjfD45L5KVG1tDZJl+uW5g9g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix index 277de7a83170d..69b8114a95e57 100644 --- a/pkgs/development/python-modules/pywemo/default.nix +++ b/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/pkgs/development/python-modules/pyyaml-include/default.nix b/pkgs/development/python-modules/pyyaml-include/default.nix index 92ec25186f504..176d402e99c19 100644 --- a/pkgs/development/python-modules/pyyaml-include/default.nix +++ b/pkgs/development/python-modules/pyyaml-include/default.nix @@ -1,25 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchFromGitHub , pytestCheckHook , pyyaml +, setuptools , setuptools-scm -, setuptools-scm-git-archive -, toml +, wheel }: buildPythonPackage rec { pname = "pyyaml-include"; - version = "1.3"; + version = "1.3.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-9/vrjnG1C+Dm4HRy98edv7GhW63pyToHg2n/SeV+Z3E="; + src = fetchFromGitHub { + owner = "tanbro"; + repo = "pyyaml-include"; + rev = "refs/tags/v${version}"; + hash = "sha256-xsNMIEBYqMVQp+H8R7XpFCwROXA8I6bFvAuHrRvC+DI="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ - pyyaml + setuptools setuptools-scm - setuptools-scm-git-archive - toml + wheel + ]; + + propagatedBuildInputs = [ + pyyaml ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 74f5b3afc1d6c..88fbf7d63c05d 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -7,18 +7,19 @@ , pythonOlder , tornado , zeromq +, pytest-asyncio }: buildPythonPackage rec { pname = "pyzmq"; - version = "24.0.1"; + version = "25.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IW9dfbtnFmdZ5ZsEebyoK4rPm+1gFbUmuOsQFD+wjnc="; + hash = "sha256-JZwiSFtxq6zfqL95cgzXvPS50SizDqVU8BrnH9v9qiM="; }; buildInputs = [ @@ -32,6 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook tornado + pytest-asyncio ]; pythonImportsCheck = [ @@ -40,6 +42,9 @@ buildPythonPackage rec { pytestFlagsArray = [ "$out/${python.sitePackages}/zmq/tests/" # Folder with tests + # pytest.ini is missing in pypi's sdist + # https://github.com/zeromq/pyzmq/issues/1853#issuecomment-1592731986 + "--asyncio-mode auto" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/qasync/default.nix b/pkgs/development/python-modules/qasync/default.nix index bdbede92c5d4d..c3761210a1c1f 100644 --- a/pkgs/development/python-modules/qasync/default.nix +++ b/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/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix index a31438335ef82..16ad74dd24695 100644 --- a/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/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/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 9ac348304e5e1..78fdcc99d267c 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -2,11 +2,11 @@ , buildPythonPackage , lib , fetchPypi +, poetry-core , networkx , numpy , pint , pydantic -, poetry-core , pytestCheckHook , pythonOlder }: @@ -24,7 +24,9 @@ buildPythonPackage rec { hash = "sha256-oU6FEM2/2mRe8UYcGv0C77WZMRcz27pfg/zR1haKbd0="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ networkx diff --git a/pkgs/development/python-modules/qcodes-loop/default.nix b/pkgs/development/python-modules/qcodes-loop/default.nix index ee9cb180a35a5..80355c1b53412 100644 --- a/pkgs/development/python-modules/qcodes-loop/default.nix +++ b/pkgs/development/python-modules/qcodes-loop/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "qcodes-loop"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "qcodes_loop"; - hash = "sha256-pDR0Ws8cYQifftdE9dKcSzMxmouFo4tJmQvNanm6zyM="; + hash = "sha256-TizNSC49n4Xc2BmJNziARlVXYQxp/LtwmKpgqQkQ3a8="; }; patches = [ diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index fb70d6d1f7882..2083000992bc2 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -18,6 +18,7 @@ , numpy , opencensus , opencensus-ext-azure +, opentelemetry-api , packaging , pandas , pyvisa @@ -53,14 +54,14 @@ buildPythonPackage rec { pname = "qcodes"; - version = "0.39.1"; + version = "0.40.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2gJ/WeynabiGB1Z66+qaUbf6/1wogf/XjIE2mCAXUZY="; + sha256 = "sha256-C8/ltX3tSxCbbheuel3BjIkRBl/E92lK709QYx+2FL0="; }; postPatch = '' @@ -86,6 +87,7 @@ buildPythonPackage rec { numpy opencensus opencensus-ext-azure + opentelemetry-api packaging pandas pillow @@ -159,9 +161,10 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}"; description = "Python-based data acquisition framework"; + downloadPage = "https://github.com/QCoDeS/Qcodes"; homepage = "https://qcodes.github.io/Qcodes/"; - changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ evilmav ]; }; diff --git a/pkgs/development/python-modules/qdldl/default.nix b/pkgs/development/python-modules/qdldl/default.nix index 25d28dc4d069d..8369bbf2a33d3 100644 --- a/pkgs/development/python-modules/qdldl/default.nix +++ b/pkgs/development/python-modules/qdldl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "qdldl"; - version = "0.1.5.post3"; + version = "0.1.7.post0"; src = fetchPypi { inherit pname version; - hash = "sha256-acCS9uH8I/t3moCmLm/N/i66BcklhgJIxNZ1T0c2k48="; + hash = "sha256-80ahFMg0LubU29ZHHu8xQZn7Jo0797lYhco1H94rAj8="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/qds_sdk/default.nix b/pkgs/development/python-modules/qds-sdk/default.nix index b172f0e71816a..d4fb7a5031449 100644 --- a/pkgs/development/python-modules/qds_sdk/default.nix +++ b/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/pkgs/development/python-modules/qgrid/default.nix b/pkgs/development/python-modules/qgrid/default.nix index 645328f1a712f..f5758c3182d91 100644 --- a/pkgs/development/python-modules/qgrid/default.nix +++ b/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/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 60d5efc9e329b..e774990fb9998 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.11.2"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = "refs/tags/${version}"; - hash = "sha256-ew9ucqOWDztjB+hJTh9WkJiutVBJyVQobtEcWeUwEcw="; + hash = "sha256-K8Avh1j9j5CGdEYIeJJRF+PjUFXvVILkZLqX1QClInE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 8e2de37788d3e..4bf996a26507e 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.20.1"; + version = "0.20.2"; disabled = pythonOlder "3.6"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BFiGMPiO9Xcl8EiTZYiwHCpo7z+tRaBkIb8GTo01rBA="; + hash = "sha256-7dIspeJpukLDfICoBPPZZWdzkVumtvh+NRxvtmnvWH0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index 28d572afc378a..1c23fb3b0398d 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.5.0"; + version = "0.6.1"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wK0ZRNnU7WJlTWRJ2ce6LN6WGKlkh5jBrbXMDYcPQJI="; + hash = "sha256-oSLQvZGEq/nBj7ktDEq3BMk7xyYiLGpBDmKxuXtMTfs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index 629dc04bd3f44..8fc30687f69e4 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "qiskit-nature"; - version = "0.5.2"; + version = "0.6.2"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rUY5fnsWg2UisF0tGORvHot8laCs8eVAvuVKUOG5ibw="; + hash = "sha256-X/4jA/e2nmmaVEiCgd/4KJc/sAdcYDkyKzvyVztovXM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index f6c5010fbfb72..2c290493b063d 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -58,15 +58,15 @@ in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.21.0"; + version = "0.25.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "qiskit"; repo = pname; - rev = version; - hash = "sha256-imktzBpgP+lq6FsVWIUK82+t76gKTgt53kPfKOnsseQ="; + rev = "refs/tags/${version}"; + hash = "sha256-4/LVKDNxKsRztCtU/mMfKMVHHJqfadZXmxeOlnlz9Tc="; }; nativeBuildInputs = [ setuptools-rust rustc cargo rustPlatform.cargoSetupHook ]; diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index 367416c296020..1ab12f28412ca 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { pname = "qpsolvers"; - version = "3.4.0"; + version = "4.0.0"; format = "pyproject"; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; - rev = "v${version}"; - hash = "sha256-GrYAhTWABBvU6rGoHi00jBa7ryjCNgzO/hQBTdSW9cg="; + rev = "refs/tags/v${version}"; + hash = "sha256-KkV61pBkIh+4Qav9TVobEBUCyMa6Xqg+eygnOoQRpcQ="; }; pythonImportsCheck = [ "qpsolvers" ]; diff --git a/pkgs/development/python-modules/quart-cors/default.nix b/pkgs/development/python-modules/quart-cors/default.nix index 8ffe47b4eda41..78f3f0311f880 100644 --- a/pkgs/development/python-modules/quart-cors/default.nix +++ b/pkgs/development/python-modules/quart-cors/default.nix @@ -12,18 +12,19 @@ # tests , pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { pname = "quart-cors"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pgjones"; repo = "quart-cors"; rev = "refs/tags/${version}"; - hash = "sha256-SbnYrpeyEn47JgP9p3Us0zfkjC1sJ7jPPUIHYHAiSgc="; + hash = "sha256-qUzs0CTZHf3fGADBXPkd3CjZ6dnz1t3cTxflMErvz/k="; }; nativeBuildInputs = [ @@ -47,6 +48,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-asyncio ]; meta = with lib; { diff --git a/pkgs/development/python-modules/quart/default.nix b/pkgs/development/python-modules/quart/default.nix index 932d972eef762..6cf51d6920ffa 100644 --- a/pkgs/development/python-modules/quart/default.nix +++ b/pkgs/development/python-modules/quart/default.nix @@ -75,6 +75,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # remove after 0.18.4 + "tests/test_signals.py" + ]; + meta = with lib; { description = "An async Python micro framework for building web applications"; homepage = "https://github.com/pallets/quart/"; diff --git a/pkgs/development/python-modules/ratelimiter/default.nix b/pkgs/development/python-modules/ratelimiter/default.nix deleted file mode 100644 index 6c01a9e548c94..0000000000000 --- a/pkgs/development/python-modules/ratelimiter/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest-asyncio -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "ratelimiter"; - version = "1.2.0.post0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-XDldyr273i5ReO8/ibVoowZkVKbdwiO3ZHPawi+JtPc="; - }; - - nativeCheckInputs = [ - pytest-asyncio - pytestCheckHook - ]; - - pythonImportsCheck = [ - "ratelimiter" - ]; - - preCheck = '' - # Uses out-dated options - rm tests/conftest.py - ''; - - disabledTests = [ - # TypeError: object Lock can't be used in 'await' expression - "test_alock" - ]; - - meta = with lib; { - description = "Simple python rate limiting object"; - homepage = "https://github.com/RazerM/ratelimiter"; - license = licenses.asl20; - maintainers = with maintainers; [ helkafen ]; - }; -} diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index dc5ddf9cdfdb7..471439b28e5ce 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -4,6 +4,9 @@ , fetchFromGitHub , pythonOlder +# builds +, poetry-core + # propagates , isodate , pyparsing @@ -25,18 +28,22 @@ buildPythonPackage rec { pname = "rdflib"; - version = "6.2.0"; - format = "setuptools"; + version = "7.0.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "RDFLib"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GkqfSyApOFKPIiIYXhgaRZuMawk7PRYmxGDhnRI+Rz0="; + hash = "sha256-VCjvgXMun1Hs+gPeqjzLXbIX1NBQ5aMLz0aWlwsm0iY="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ isodate html5lib @@ -76,6 +83,7 @@ buildPythonPackage rec { "testGuessFormatForParse" "test_infix_owl_example1" "test_context" + "test_example" "test_guess_format_for_parse" "rdflib.extras.infixowl" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/readmdict/default.nix b/pkgs/development/python-modules/readmdict/default.nix new file mode 100644 index 0000000000000..b7d61f8c8f57d --- /dev/null +++ b/pkgs/development/python-modules/readmdict/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub + +, poetry-core +, python-lzo +, tkinter + +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "readmdict"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ffreemt"; + repo = "readmdict"; + rev = "v${version}"; + hash = "sha256-1/f+o2bVscT3EA8XQyS2hWjhimLRzfIBM6u2O7UqwcA="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + python-lzo + tkinter + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "readmdict" + ]; + + meta = with lib; { + description = "Read mdx/mdd files (repacking of readmdict from mdict-analysis)"; + homepage = "https://github.com/ffreemt/readmdict"; + license = licenses.mit; + maintainers = with maintainers; [ paveloom ]; + }; +} diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 0451d63cc3d1d..fc2fd653083d5 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "2.2.0"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - hash = "sha256-5e/82CWBYRGjd6t6iXuBkhUTj45eisyG+ZIYMo+VckA="; + hash = "sha256-kiF77xTZE3e88nvffaNj5XSzseQYC2Xu9ufPpV8P0Lg="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index f2a9f17ab670b..c5b7fcb88b762 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.43.0"; + version = "14.46.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-ik/ADmu6yGY7xWXCAn0kcWJphANIIwM8QKWjm9xoVYQ="; + hash = "sha256-XCcunwqmcvPC5AVxR9mit06BRDTYfu/CeTXg3IH7Dy0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/recordlinkage/default.nix b/pkgs/development/python-modules/recordlinkage/default.nix index 4d8ab8e8a8c99..7b92cfacebf9d 100644 --- a/pkgs/development/python-modules/recordlinkage/default.nix +++ b/pkgs/development/python-modules/recordlinkage/default.nix @@ -15,6 +15,7 @@ , scipy , setuptools , setuptools-scm +, wheel }: buildPythonPackage rec { @@ -32,6 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix new file mode 100644 index 0000000000000..af0170cbf322a --- /dev/null +++ b/pkgs/development/python-modules/redis-om/default.nix @@ -0,0 +1,85 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, unasync +, poetry-core +, python +, click +, hiredis +, more-itertools +, pydantic +, python-ulid +, redis +, types-redis +, typing-extensions +, pkgs +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "redis-om"; + version = "0.2.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "redis"; + repo = "redis-om-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-jQS0VTYZeAj3+OVFy+JP4mUFBPo+a5D/kdJKagFraaA="; + }; + + nativeBuildInputs = [ + unasync + poetry-core + ]; + + propagatedBuildInputs = [ + click + hiredis + more-itertools + pydantic + python-ulid + redis + types-redis + typing-extensions + ]; + + preBuild = '' + ${python.pythonForBuild.interpreter} make_sync.py + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + preCheck = '' + ${pkgs.redis}/bin/redis-server & + REDIS_PID=$! + ''; + + postCheck = '' + kill $REDIS_PID + ''; + + # probably require redisearch + # https://github.com/redis/redis-om-python/issues/532 + doCheck = false; + + pythonImportsCheck = [ + "aredis_om" + "redis_om" + ]; + + meta = with lib; { + description = "Object mapping, and more, for Redis and Python"; + homepage = "https://github.com/redis/redis-om-python"; + changelog = "https://github.com/redis/redis-om-python/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index d99b25374a135..2616e1da9f4d2 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "redis"; - version = "4.5.4"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-c+w12k2iZ9aEfkf2hzD91fYuLKaePvWIXGp4qTdMOJM="; + hash = "sha256-XOpsDTNcmnMypGDthynOq7TQxInHKFsKhtu/igF70SA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix index 1c739ebb07809..7bf21823e7bb8 100644 --- a/pkgs/development/python-modules/redshift-connector/default.nix +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "redshift-connector"; - version = "2.0.911"; + version = "2.0.914"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "aws"; repo = "amazon-redshift-python-driver"; rev = "refs/tags/v${version}"; - hash = "sha256-D1LpFGYEpGmkYCAJbYJaQStDnol90mH8X4S6iXg6Nfs="; + hash = "sha256-fGOo9FgVMI6ayyB3EMN6RGThwWciShcBZzWTZWtOt8E="; }; # disable test coverage diff --git a/pkgs/development/python-modules/reedsolo/default.nix b/pkgs/development/python-modules/reedsolo/default.nix index 65006ea823ab9..a2fb336f70b4d 100644 --- a/pkgs/development/python-modules/reedsolo/default.nix +++ b/pkgs/development/python-modules/reedsolo/default.nix @@ -1,35 +1,40 @@ { lib , buildPythonPackage -, fetchpatch , fetchFromGitHub + +# build-system , cython -, nose +, setuptools + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "reedsolo"; - version = "1.5.4"; + version = "1.7.0"; + format = "pyproject"; # Pypi does not have the tests src = fetchFromGitHub { owner = "tomerfiliba"; repo = "reedsolomon"; - rev = "v${version}"; - hash = "sha256-GUMdL5HclXxqMYasq9kUE7fCqOkjr1D20wjd/E+xPBk="; + rev = "refs/tags/v${version}"; + hash = "sha256-nzdD1oGXHSeGDD/3PpQQEZYGAwn9ahD2KNYGqpgADh0="; }; - patches = [ - (fetchpatch { - # python3.10 compat; https://github.com/tomerfiliba/reedsolomon/pull/38 - url = "https://github.com/tomerfiliba/reedsolomon/commit/63e5bd9fc3ca503990c212eb2c77c10589e6d6c3.patch"; - hash = "sha256-47g+jUsJEAyqGnlzRA1oSyc2XFPUOfH0EW+vcOJzsxI="; - }) + nativeBuildInputs = [ + cython + setuptools ]; - nativeBuildInputs = [ cython ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ nose ]; - checkPhase = "nosetests"; + disabledTestPaths = [ + "tests/test_creedsolo.py" # TODO: package creedsolo + ]; meta = with lib; { description = "Pure-python universal errors-and-erasures Reed-Solomon Codec"; diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix index 37e418f3ea441..dc09aa3594a4b 100644 --- a/pkgs/development/python-modules/referencing/default.nix +++ b/pkgs/development/python-modules/referencing/default.nix @@ -15,7 +15,7 @@ let self = buildPythonPackage rec { pname = "referencing"; - version = "0.30.0"; + version = "0.30.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ let repo = "referencing"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-nJSnZM3gg2+yfFAnOJzzXsmIEQdNf5ypt5R0O60NphA="; + hash = "sha256-C2gKjoaMcUWz/QOsqpv4TkozQyI+zEIQf3GMf5w40aw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/releases/default.nix b/pkgs/development/python-modules/releases/default.nix index 9c1fc34cae468..05c6d5ae75d00 100644 --- a/pkgs/development/python-modules/releases/default.nix +++ b/pkgs/development/python-modules/releases/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "releases"; - version = "1.6.3"; + version = "2.1.1"; format = "setuptools"; src = fetchFromGitHub { owner = "bitprophet"; repo = pname; rev = version; - hash = "sha256-XX2e6bjBNMun31h0sNJ9ieZE01U+PhA5JYYNOuMgD20="; + hash = "sha256-IgEKAUk97R3ZvqvexD/ptT8i0uf48K+DKkk4q3pn3G8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index 5d2e002538c2b..32916774ee36f 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "remarshal"; - version = "0.17.0"; + version = "0.17.1"; format = "pyproject"; src = fetchFromGitHub { owner = "dbohdan"; repo = pname; - rev = "v${version}"; - hash = "sha256-FytVq9p7Yo0lS5rHj0crPIpHFjxolW8esSPkj2wLfaI="; + rev = "refs/tags/v${version}"; + hash = "sha256-2WxMh5P/8NvElymnMU3JzQU0P4DMXFF6j15OxLaS+VA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix index 45105965cb6c4..06143c2922f44 100644 --- a/pkgs/development/python-modules/reolink/default.nix +++ b/pkgs/development/python-modules/reolink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink"; - version = "0.64"; + version = "0053"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3r5BwVlNolji2HIGjqv8gkizx4wWxrKYkiNmSJedKmI="; + hash = "sha256-DZcTfmzO9rBhhRN2RkgoPwUPE+LPPeZgc8kmhYU9V2I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 608debea5693b..664d87040c452 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -3,6 +3,7 @@ , fetchPypi , freetype , pillow +, setuptools , glibcLocales , python , isPyPy @@ -12,26 +13,18 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.6.13"; + version = "4.0.4"; + format = "pyproject"; + + # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit + disabled = isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-b3XTP3o3IM9HNxq2PO0PDr0a622xk4aukviXegm+lhE="; + hash = "sha256-f3CztWr/XxHLQTbFGg9aVv5uTI+7rHuQMHbbmajvMcE="; }; - patches = [ - ./darwin-m1-compat.patch - ]; - - nativeCheckInputs = [ glibcLocales ]; - - buildInputs = [ ft ]; - propagatedBuildInputs = [ pillow ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "mif = findFile(d,'ft2build.h')" "mif = findFile('${lib.getDev ft}','ft2build.h')" - # Remove all the test files that require access to the internet to pass. rm tests/test_lib_utils.py rm tests/test_platypus_general.py @@ -42,16 +35,34 @@ in buildPythonPackage rec { rm tests/test_graphics_charts.py ''; + nativeBuildInputs = [ + setuptools + ]; + + buildInputs = [ + ft + ]; + + propagatedBuildInputs = [ + pillow + ]; + + nativeCheckInputs = [ + glibcLocales + ]; + checkPhase = '' - cd tests + runHook preCheck + pushd tests LC_ALL="en_US.UTF-8" ${python.interpreter} runAll.py + popd + runHook postCheck ''; - # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit - disabled = isPyPy; - - meta = { + meta = with lib; { description = "An Open Source Python library for generating PDFs and graphics"; homepage = "http://www.reportlab.com/"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 00060c08bc2ed..81ab320c77f97 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -3,8 +3,11 @@ , astropy-extension-helpers , astropy-healpix , buildPythonPackage +, cloudpickle , cython +, dask , fetchPypi +, fsspec , numpy , oldest-supported-numpy , pytest-astropy @@ -12,18 +15,19 @@ , pythonOlder , scipy , setuptools-scm +, zarr }: buildPythonPackage rec { pname = "reproject"; - version = "0.10.0"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-OKxPPKcVVrEVUGR8Zaphn7ur9HOuqQKa9gnMo2RQQME="; + hash = "sha256-jb4efKT5jMY0ECV+ab5rpUHEk+tT4T2MioCRxs92TbI="; }; postPatch = '' @@ -42,9 +46,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ astropy astropy-healpix + cloudpickle + dask + fsspec numpy scipy - ]; + zarr + ] ++ dask.optional-dependencies.array; nativeCheckInputs = [ pytest-astropy @@ -65,6 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "Reproject astronomical images"; + downloadPage = "https://github.com/astropy/reproject"; homepage = "https://reproject.readthedocs.io"; license = licenses.bsd3; maintainers = with maintainers; [ smaret ]; diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index f85d2b2debe85..d04f25ae0e013 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -1,23 +1,28 @@ { lib -, appdirs , attrs , buildPythonPackage , bson , boto3 , botocore , cattrs -, exceptiongroup , fetchFromGitHub , itsdangerous +, platformdirs , poetry-core +, psutil , pymongo , pytestCheckHook +, pytest-rerunfailures +, pytest-xdist , pythonOlder , pyyaml , redis , requests , requests-mock +, responses , rich +, tenacity +, time-machine , timeout-decorator , ujson , urllib3 @@ -26,7 +31,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.9.8"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -35,7 +40,7 @@ buildPythonPackage rec { owner = "requests-cache"; repo = "requests-cache"; rev = "refs/tags/v${version}"; - hash = "sha256-Xbzbwz80xY8IDPDhZEUhmmiCFJZvSQMQ6EmE4EL7QGo="; + hash = "sha256-kJqy7aK67JFtmsrwMtze/wTM9qch9YYj2eUzGJRJreQ="; }; nativeBuildInputs = [ @@ -43,10 +48,9 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - appdirs attrs cattrs - exceptiongroup + platformdirs requests urllib3 url-normalize @@ -78,9 +82,15 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + psutil pytestCheckHook + pytest-rerunfailures + pytest-xdist requests-mock + responses rich + tenacity + time-machine timeout-decorator ] ++ passthru.optional-dependencies.json @@ -98,6 +108,9 @@ buildPythonPackage rec { disabledTests = [ # Tests are flaky in the sandbox "test_remove_expired_responses" + # Tests that broke with urllib 2.0.5 + "test_request_only_if_cached__stale_if_error__expired" + "test_stale_if_error__error_code" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index d7b6f01d16c25..0d4bf487d7bff 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -29,6 +29,16 @@ buildPythonPackage rec { trustme ]; + disabledTests = [ + # incompatible with urllib3 2.0 + "test_dump_response" + "test_dump_all" + "test_prepared_request_override_base" + "test_prepared_request_with_base" + "test_request_override_base" + "test_request_with_base" + ]; + pythonImportsCheck = [ "requests_toolbelt" ]; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 24a25e2756a54..86c3ac1ffeeb7 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rich"; - version = "13.3.5"; + version = "13.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PnyO5u0gxfYKT6xr0k3H0lbLl9wKPl6oxR1mM9A0Hys="; + hash = "sha256-ycDmFJa68OOrNqIy/hGKxbjoaIbiniiO4UAPNSyZvDk="; }; nativeBuildInputs = [ @@ -46,6 +46,20 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # pygments 2.16 compat + # https://github.com/Textualize/rich/issues/3088 + "test_card_render" + "test_markdown_render" + "test_markdown_render" + "test_python_render" + "test_python_render_simple" + "test_python_render_simple_passing_lexer_instance" + "test_python_render_indent_guides" + "test_option_no_wrap" + "test_syntax_highlight_ranges" + ]; + pythonImportsCheck = [ "rich" ]; diff --git a/pkgs/development/python-modules/rkm-codes/default.nix b/pkgs/development/python-modules/rkm-codes/default.nix index ca003ed906975..0a8869052d604 100644 --- a/pkgs/development/python-modules/rkm-codes/default.nix +++ b/pkgs/development/python-modules/rkm-codes/default.nix @@ -7,27 +7,27 @@ buildPythonPackage rec { pname = "rkm-codes"; - version = "0.5"; + version = "0.6"; + format = "pyproject"; src = fetchFromGitHub { owner = "KenKundert"; repo = "rkm_codes"; - rev = "v${version}"; - hash = "sha256-r4F72iHxH7BoPtgYm1RD6BeSZszKRrpeBQccmT4wzuw="; + rev = "refs/tags/v${version}"; + hash = "sha256-CkLLZuWcNL8sqAupc7lHXu0DXUXrX3qwd1g/ekyHdw4="; }; - format = "pyproject"; nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ setuptools ]; # this has a circular dependency on quantiphy preBuild = '' - sed -i '/quantiphy/d' ./setup.py - sed -i '/pytest-runner/d' ./setup.py + sed -i '/quantiphy/d' pyproject.toml ''; # this import check will fail as quantiphy is imported by this package diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix index bb7044a89d44d..6793cf747b5f1 100644 --- a/pkgs/development/python-modules/rlax/default.nix +++ b/pkgs/development/python-modules/rlax/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "rlax"; - version = "0.1.5"; + version = "0.1.6"; src = fetchPypi { inherit pname version; - hash = "sha256-GRqiGacyHZpVKUqfAteMjRV4EtdHkSgfFRj/H76bBVo="; + hash = "sha256-C3nFOv/zxvAoz6WZ0RAZffzEbxIx/XrGabO4QPxrik8="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index 8dfbb32fe08d9..eea465ee8fb94 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.2.4"; + version = "1.3.1"; pname = "robotframework-databaselibrary"; src = fetchPypi { inherit pname version; - sha256 = "627d872b3dda6a308a650ac9e676dadedf9c294e4ef70ad207cbb86b78eb8847"; + sha256 = "sha256-C+shwpGbiA+YS8t9ApJEv6mYQVd3fVvY3qWzDF6vYqU="; }; # unit tests are impure diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index fe33d2e3f6f49..114c24aa1c98b 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -13,7 +13,7 @@ }: buildPythonPackage rec { - version = "6.1.0"; + version = "6.1.2"; pname = "robotframework-seleniumlibrary"; # no tests included in PyPI tarball @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "refs/tags/v${version}"; - sha256 = "sha256-iCZU+9xFUPoyucdQ/26dgxAm8jRf92P3JyA2KqV8bYI="; + sha256 = "sha256-QbAwPm1Y76KPIcHkopiyISULQSwUet021erFa/zi8Zw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index 4fd25ec8067e6..544beaf120726 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "robotsuite"; - version = "2.3.1"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - hash = "sha256-iugVKUPl6HTTO8K1EbSqAk1fl/fsEPoOcsOnnAgcEas="; + hash = "sha256-sPmOoR5K+gMfyPk2QMbiDNmWPRcqKrsz6ZPBAKR/3XY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index 1c93184a36e6f..450fa9c8bee21 100644 --- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/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/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index 8b6eb61e72f69..6cd3f5dea28ef 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.9.2"; + version = "0.10.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,13 +20,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-jXDo8UkA8mV8JJ6k3vljvthqKbgfgfW3a1qSFWgN6UU="; + hash = "sha256-/MHrt1YaPiSmWI98be0V2ArsIsZqBwx1dVm1exf/0cs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-2LiQ+beFj9+kykObPNtqcg+F+8wBDzvWcauwDLHa7Yo="; + hash = "sha256-iWy6BHVsKsZB0SVrh3CVhryaavk4gAQVvRdu9xBiDRg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 58e38eb56294d..837d77b4dce29 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.5.12"; + version = "3.5.14"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - hash = "sha256-7q33lP0qpUj4hWjGodJufDgQzUp2Soeyw7MdMZQtbUU="; + hash = "sha256-X0auMdNuEXvjZq1K4CSTwBWsa6WevjtM1yAAdTMvxIE="; }; patches = [ @@ -81,6 +81,10 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; + # newlines in environment variables are a problem due to + # https://github.com/rpy2/rpy2/issues/1066 + preCheck = "unset postPatch"; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix index 1d9b8114df7b3..361ba5e7fb56e 100644 --- a/pkgs/development/python-modules/rtmixer/default.nix +++ b/pkgs/development/python-modules/rtmixer/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "rtmixer"; - version = "0.1.1"; + version = "0.1.4"; disabled = isPy27; src = fetchFromGitHub { owner = "spatialaudio"; repo = "python-rtmixer"; - rev = version; - sha256 = "1bvgzzxiypvvb3qacbcry6761x9sk3dnx7jga7pli63f69vakg4y"; + rev = "refs/tags/${version}"; + sha256 = "sha256-S8aVfxoG0o5GarDX5ZIDQ3GKOT32NtttQJ449FI9Fy0="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix index 7975629b4e125..a7a362bcf4ab6 100644 --- a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchhg +, cython }: buildPythonPackage rec { @@ -19,6 +20,11 @@ buildPythonPackage rec { # circular dependency with ruamel-yaml # pythonImportsCheck = [ "_ruamel_yaml" ]; + nativeBuildInputs = [ cython ]; + + # Fix incompatible function pointer conversion errors with clang 16. + patches = [ ./fix-incompatible-function-pointers.patch ]; + preBuild = "cython _ruamel_yaml.pyx -3 --module-name _ruamel_yaml -I."; meta = with lib; { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; diff --git a/pkgs/development/python-modules/ruamel-yaml-clib/fix-incompatible-function-pointers.patch b/pkgs/development/python-modules/ruamel-yaml-clib/fix-incompatible-function-pointers.patch new file mode 100644 index 0000000000000..99debf22e5ae8 --- /dev/null +++ b/pkgs/development/python-modules/ruamel-yaml-clib/fix-incompatible-function-pointers.patch @@ -0,0 +1,79 @@ +Based on https://sourceforge.net/p/ruamel-yaml-clib/code/merge-requests/4/ with additions +for `input_handler` and `output_handler`. + +--- a/_ruamel_yaml.pxd ++++ b/_ruamel_yaml.pxd +@@ -2,15 +2,15 @@ + cdef extern from "_ruamel_yaml.h": + + void malloc(int l) +- void memcpy(char *d, char *s, int l) ++ void memcpy(unsigned char *d, char *s, int l) + int strlen(char *s) + int PyString_CheckExact(object o) + int PyUnicode_CheckExact(object o) + char *PyString_AS_STRING(object o) + int PyString_GET_SIZE(object o) +- object PyString_FromStringAndSize(char *v, int l) ++ object PyString_FromStringAndSize(unsigned char *v, size_t l) + object PyUnicode_FromString(char *u) +- object PyUnicode_DecodeUTF8(char *u, int s, char *e) ++ object PyUnicode_DecodeUTF8(unsigned char *u, size_t s, char *e) + object PyUnicode_AsUTF8String(object o) + int PY_MAJOR_VERSION + +@@ -85,11 +85,11 @@ + YAML_MAPPING_START_EVENT + YAML_MAPPING_END_EVENT + +- ctypedef int yaml_read_handler_t(void *data, char *buffer, +- int size, int *size_read) except 0 +- +- ctypedef int yaml_write_handler_t(void *data, char *buffer, +- int size) except 0 ++ ctypedef int yaml_read_handler_t(void *data, unsigned char *buffer, ++ size_t size, size_t *size_read) except 0 ++ ++ ctypedef int yaml_write_handler_t(void *data, unsigned char *buffer, ++ size_t size) except 0 + + ctypedef struct yaml_mark_t: + int index +@@ -112,7 +112,7 @@ + char *handle + char *suffix + ctypedef struct _yaml_token_scalar_data_t: +- char *value ++ unsigned char *value + int length + yaml_scalar_style_t style + ctypedef struct _yaml_token_version_directive_data_t: +@@ -151,7 +151,7 @@ + ctypedef struct _yaml_event_scalar_data_t: + char *anchor + char *tag +- char *value ++ unsigned char *value + int length + int plain_implicit + int quoted_implicit +--- a/_ruamel_yaml.pyx ++++ b/_ruamel_yaml.pyx +@@ -904,7 +904,7 @@ + raise error + return 1 + +-cdef int input_handler(void *data, char *buffer, int size, int *read) except 0: ++cdef int input_handler(void *data, unsigned char *buffer, size_t size, size_t *read) except 0: + cdef CParser parser + parser = <CParser>data + if parser.stream_cache is None: +@@ -1514,7 +1514,7 @@ + self.ascend_resolver() + return 1 + +-cdef int output_handler(void *data, char *buffer, int size) except 0: ++cdef int output_handler(void *data, unsigned char *buffer, size_t size) except 0: + cdef CEmitter emitter + emitter = <CEmitter>data + if emitter.dump_unicode == 0: diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index a609bbe99b691..3617648186057 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "boto"; repo = pname; rev = version; - hash = "sha256-cL4IOfWLRUJC5zCzmN/qRf0N/IV/MDHF/j2JDX5hlUE="; + hash = "sha256-hoHNblnCSZteHmI5sJN72WrX7tveNFZqmL1jFKQmdag="; }; propagatedBuildInputs = [ botocore ]; diff --git a/pkgs/development/python-modules/safetensors/default.nix b/pkgs/development/python-modules/safetensors/default.nix index 06a2c3966a2d4..976d6b9b3fa81 100644 --- a/pkgs/development/python-modules/safetensors/default.nix +++ b/pkgs/development/python-modules/safetensors/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "safetensors"; - version = "0.3.1"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RoIBD+zBKVzXE8OpI8GR371YPxceR4P8B9T1/AHc9vA="; + hash = "sha256-U+indMoLFN6vMZkJTWFG08lsdXuK5gOfgaHmUVl6DPk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/bindings/python"; - hash = "sha256-tC0XawmKWNGCaByHQfJEfmHM3m/qgTuIpcRaEFJC6dM"; + hash = "sha256-MhRs9tFCmVZI5O0EVRUbo4ZnUVRQ0EfQTU+E1K+qKZI="; }; sourceRoot = "${src.name}/bindings/python"; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index b27b75e91b22a..752802df209cd 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -141,6 +141,10 @@ buildPythonPackage rec { "test_default_reload_shutdown_order" # App not found. "test_input_is_dir" + # HTTP 500 with Websocket subprotocols + "test_websocket_route_with_subprotocols" + # Socket closes early + "test_no_exceptions_when_cancel_pending_request" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 9c82820f84164..2affddbb6a4c0 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -61,13 +61,13 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "31.2.6"; + version = "32.0.6"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-VvhgXZpV58DHeY5+7nPbrbTTVuHkawFw5akbm4hPnBY="; + hash = "sha256-suqk7LOnZgSJGlaHq81LDOSCHZWdsJOUbma6MEpHxSM="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 2c4920cf4c15d..a1b355f1b8324 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -20,13 +20,13 @@ }: buildPythonPackage rec { - version = "0.5.8"; + version = "0.5.9"; pname = "scikit-bio"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-1VqDw+XyyhEydE4UCSM/th2a8MWpXet7KR5uNAcSuGs="; + hash = "sha256-euBE3IvuIxkAJIrcOoZZB352FA1WrJ9CvQH7eYEBSRA="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix index 2cb24d76b2b9a..2a988049f4479 100644 --- a/pkgs/development/python-modules/scikit-misc/default.nix +++ b/pkgs/development/python-modules/scikit-misc/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "scikit-misc"; - version = "0.2.0"; + version = "0.3.0"; format = "pyproject"; src = fetchPypi { pname = "scikit_misc"; inherit version; - hash = "sha256-rBTdTpNeRC/DSrHFg7ZhHUYD0G9IgoqFx+A+LCxYK7w="; + hash = "sha256-mom0Ch+b3bViErh9ueVYiGfVz5SQUSqCCcGsBJ7+Nrg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index 6940859b9f6a4..130e56896e31c 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "scikit-rf"; - version = "0.28.0"; + version = "0.29.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "scikit-rf"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cTvWNfIs2bAOYpXDg6ghZA4tRXlaNbUZwcaZMjCi/YY="; + hash = "sha256-rBOw1rIEF8Ia6xXlXxVzRRiUxrOjOAlipFuKiL+gRl0="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index 7e2b8bf8bfd9c..b2c4218e5f33a 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "scikit-survival"; - version = "0.20.0"; + version = "0.21.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-24+8Sociq6u3KnoGSdV5Od5t/OT1uPkv19i3p5ezLjw="; + hash = "sha256-rcdEtlmD3O2BQuwxRlOJ/HOEBdWJBRJR5UR6rZoeArw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 7312e53ed4137..2c5ecd42585c5 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -32,8 +32,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.11.2"; - srcHash = "sha256-7FE740/yKUXtujVX60fQB/xvCZFfV69FRihvSi6+UWo="; + version = "1.11.3"; + srcHash = "sha256-swxRfFjTcKjKQv6GFdWNR6IKhdJQYhZSR7UWLtcnrXw="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -79,8 +79,9 @@ in buildPythonPackage { # Relax deps a bit postPatch = '' substituteInPlace pyproject.toml \ + --replace 'meson-python>=0.12.1,<0.14.0' 'meson-python' \ --replace 'numpy==' 'numpy>=' \ - --replace "pybind11>=2.10.4,<2.11.0" "pybind11>=2.10.4,<2.12.0" \ + --replace "pybind11>=2.10.4,<2.11.1" "pybind11>=2.10.4,<2.12.0" \ --replace 'wheel<0.41.0' 'wheel' ''; @@ -214,6 +215,7 @@ in buildPythonPackage { meta = with lib; { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering"; + downloadPage = "https://github.com/scipy/scipy"; homepage = "https://www.scipy.org/"; license = licenses.bsd3; maintainers = with maintainers; [ fridh doronbehar ]; diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 267b6065ed735..de5bbed119988 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -1,8 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchpatch -, fetchPypi +, fetchFromGitHub , flit-core , matplotlib , pytest-xdist @@ -11,38 +10,23 @@ , pandas , pythonOlder , scipy +, statsmodels }: buildPythonPackage rec { pname = "seaborn"; - version = "0.12.2"; + version = "0.13.0rc0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-N0ZF82UJ0NyriVy6W0fa8Fhvd7/js2yXxgfbfaW+ATk="; + src = fetchFromGitHub { + owner = "mwaskom"; + repo = "seaborn"; + rev = "refs/tags/v${version}"; + hash = "sha256-bNuTDXUjdOwqJN1U20eaeSa4/Q3Fe2XMqulqVmDLFEU="; }; - patches = [ - (fetchpatch { - name = "fix-test-using-matplotlib-3.7.patch"; - url = "https://github.com/mwaskom/seaborn/commit/db7ae11750fc2dfb695457239708448d54e9b8cd.patch"; - hash = "sha256-LbieI0GeC/0NpFVxV/NRQweFjP/lj/TR2D/SLMPYqJg="; - }) - (fetchpatch { - name = "fix-pandas-deprecation.patch"; - url = "https://github.com/mwaskom/seaborn/commit/a48601d6bbf8381f9435be48624f1a77d6fbfced.patch"; - hash = "sha256-LuN8jn6Jo9Fvdl5iGZ2LgINYujSDvvs+hSclnadV1F4="; - }) - (fetchpatch { - name = "fix-tests-using-numpy-1.25.patch"; - url = "https://github.com/mwaskom/seaborn/commit/b6737d5aec9a91bb8840cdda896a7970e1830d56.patch"; - hash = "sha256-Xj82yyB5Vy2xKRl0ideDmJ5Zr4Xc+8cEHU/liVwMSvE="; - }) - ]; - nativeBuildInputs = [ flit-core ]; @@ -51,9 +35,15 @@ buildPythonPackage rec { matplotlib numpy pandas - scipy ]; + passthru.optional-dependencies = { + stats = [ + scipy + statsmodels + ]; + }; + nativeCheckInputs = [ pytest-xdist pytestCheckHook @@ -62,10 +52,6 @@ buildPythonPackage rec { disabledTests = [ # requires internet connection "test_load_dataset_string_error" - - # per https://github.com/mwaskom/seaborn/issues/3431, we can enable this - # once matplotlib releases version > 3.7.2 - "test_share_xy" ] ++ lib.optionals (!stdenv.hostPlatform.isx86) [ # overly strict float tolerances "TestDendrogram" @@ -82,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Statistical data visualization"; homepage = "https://seaborn.pydata.org/"; + changelog = "https://github.com/mwaskom/seaborn/blob/master/doc/whatsnew/${src.rev}.rst"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 053b42d90e9a5..fdb052a474991 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.8.0"; + version = "4.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-YTi6SNtTWuEPlQ3PTeis9osvtnWmZ7SRQbne9fefdco="; + hash = "sha256-A2lI40bPSIri/0yp6C3aJZBX5p6ON1fWGfJTcul9/2o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index 7316256cd8aac..7802340cedef2 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.17.1"; + version = "2.18.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zfgkTBdE8UWwk+G3bLBThVjgU+m2QoPf1fzORyznEgs="; + hash = "sha256-wYYSS4lABCbIhmUU3z3Wh0+4zwpEzXl8Kk9gi6LBrbQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index e71d8bc78dc04..e1c04780b8e82 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -6,25 +6,40 @@ , semantic-version , setuptools , setuptools-scm +, tomli , typing-extensions }: buildPythonPackage rec { pname = "setuptools-rust"; - version = "1.6.0"; + version = "1.7.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yG5zTerDMFl5mL+8CNpFGH5rJ4N+I72R6tsyBzI5ImI="; + hash = "sha256-xxAJmZSCNaOK5+VV/hmapmwlPcOEsSX12FRzv4Hq46M="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + semantic-version + setuptools + typing-extensions + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; - propagatedBuildInputs = [ semantic-version setuptools typing-extensions ]; + pythonImportsCheck = [ + "setuptools_rust" + ]; doCheck = false; - pythonImportsCheck = [ "setuptools_rust" ]; passthru.tests.pyo3 = callPackage ./pyo3-test { }; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index ad7638f3cb38b..93912d4b4ad31 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "setuptools"; - version = "68.0.0"; + version = "68.2.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; rev = "refs/tags/v${version}"; - hash = "sha256-Ew/DpI5XsYMB4kBfkFeeB5wv5cjx4oYTddZCWLgBHBs="; + hash = "sha256-PpZbITlYp/cA+8jmObw8g69TK+oE9YEXD3NNJixExB4="; }; patches = [ diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index 20e4d95928ea7..46332d0d528a2 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sh"; - version = "2.0.2"; + version = "2.0.6"; format = "pyproject"; src = fetchFromGitHub { owner = "amoffat"; repo = "sh"; rev = "refs/tags/${version}"; - hash = "sha256-qMYaGNEvv2z47IHFGqb64TRpN3JHycpEmhYhDjrUi6s="; + hash = "sha256-c4Ms4ydcW7LgmAI1WuYD74nzILuY/Xg+JePJe0q5AQQ="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "tests/test.py" + "tests" ]; # A test needs the HOME directory to be different from $TMPDIR. diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index 8598f04918c35..5da242e7b4c37 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.12.4"; + version = "1.12.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nYL2kSDS6DSrBzAKbg7Wj6boSZ52+T/yX+NYnYQ9rQo="; + hash = "sha256-mj7lbBGEybsEzWo4TYmPrN3mBXItdo/JomVIYmzIDAY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/simple-websocket/default.nix b/pkgs/development/python-modules/simple-websocket/default.nix index 475478826ea37..5af426fb5ba2c 100644 --- a/pkgs/development/python-modules/simple-websocket/default.nix +++ b/pkgs/development/python-modules/simple-websocket/default.nix @@ -24,9 +24,12 @@ buildPythonPackage rec { wheel ]; + propagatedBuildInputs = [ + wsproto + ]; + nativeCheckInputs = [ pytestCheckHook - wsproto ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/simpleitk/default.nix b/pkgs/development/python-modules/simpleitk/default.nix index aa8a970364d89..e07e6e994d432 100644 --- a/pkgs/development/python-modules/simpleitk/default.nix +++ b/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/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index 2be43f157a160..e1544a0b89a64 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "simpy"; - version = "4.0.1"; + version = "4.0.2"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b36542e2faab612f861c5ef4da17220ac1553f5892b3583c67281dbe4faad404"; + sha256 = "sha256-bYrcAinfawL7fibc0TOHA7T09j8WelrCpyE8uAq6RIQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/single-version/default.nix b/pkgs/development/python-modules/single-version/default.nix index 53989afe94f86..558126bbbd71e 100644 --- a/pkgs/development/python-modules/single-version/default.nix +++ b/pkgs/development/python-modules/single-version/default.nix @@ -8,25 +8,16 @@ buildPythonPackage rec { pname = "single-version"; - version = "1.5.1"; + version = "1.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hongquan"; repo = pname; - rev = "v${version}"; - hash = "sha256-I8ATQzPRH9FVjqPoqrNjYMBU5azpmkLjRmHcz943C10="; + rev = "refs/tags/v${version}"; + hash = "sha256-dUmJhNCPuq/7WGzFQXLjb8JrQgQn7qyBqzPWaKzD9hc="; }; - patches = [ - # https://github.com/hongquan/single-version/pull/4 - (fetchpatch { - name = "use-poetry-core.patch"; - url = "https://github.com/hongquan/single-version/commit/0cdf9795cb0522e90a8dc00306f1ff7bb85621ad.patch"; - hash = "sha256-eT9G1XvkNF0+NKgx+yN7ei53xIEMvnc7V/KtPLqlWik="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 5d6fde555d6fc..f4870f2fa6f15 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,22 +2,24 @@ , stdenv , buildPythonPackage , fetchPypi +, pythonOlder , setuptools , wheel , packaging , ply , toml +, tomli }: buildPythonPackage rec { pname = "sip"; - version = "6.7.7"; + version = "6.7.11"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-3unAb6iubUQaQB+SKGf8YZbt2idO69n7/sVPB2nCqeI="; + hash = "sha256-8Nwyh6CxcuVmSTHIeEd1DUfk/c2k/jYrUUr47dZVtGk="; }; nativeBuildInputs = [ @@ -25,7 +27,9 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ packaging ply toml ]; + propagatedBuildInputs = [ packaging ply toml ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; # There aren't tests doCheck = false; diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix index 0fefc6d41f7c8..d12726ec391c9 100644 --- a/pkgs/development/python-modules/skia-pathops/default.nix +++ b/pkgs/development/python-modules/skia-pathops/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "skia-pathops"; - version = "0.7.4"; + version = "0.8.0.post1"; src = fetchPypi { pname = "skia-pathops"; inherit version; extension = "zip"; - hash = "sha256-Ci/e6Ht62wGMv6bpXvnkKZ7WOwCAvidnejD/77ypE1A="; + hash = "sha256-oFYkneL2H6VRFrnuVVE8aja4eK7gDJFFDkBNFgZIXLs="; }; postPatch = '' @@ -36,6 +36,14 @@ buildPythonPackage rec { --replace "-mthumb" "" substituteInPlace src/cpp/skia-builder/skia/src/core/SkOpts.cpp \ --replace "defined(SK_CPU_ARM64)" "0" + '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) /* old compiler? */ '' + patch -p1 <<EOF + --- a/src/cpp/skia-builder/skia/include/private/base/SkTArray.h + +++ b/src/cpp/skia-builder/skia/include/private/base/SkTArray.h + @@ -492 +492 @@: + - static constexpr int kMaxCapacity = SkToInt(std::min(SIZE_MAX / sizeof(T), (size_t)INT_MAX)); + + static constexpr int kMaxCapacity = SkToInt(std::min<size_t>(SIZE_MAX / sizeof(T), (size_t)INT_MAX)); + EOF ''; nativeBuildInputs = [ cython ninja setuptools-scm ] diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix index 266fb65bf2138..20f43924b9d08 100644 --- a/pkgs/development/python-modules/skrl/default.nix +++ b/pkgs/development/python-modules/skrl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "skrl"; - version = "0.10.2"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Toni-SM"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OY5+bUPg+G1eKFMvHlXSHwc2WWHTpyoyCKjY3MvlLyM="; + hash = "sha256-89OoJanmaB74SLF1qMI8WFBdN1czS7Yr7BmojaRdo4M="; }; patches = [ diff --git a/pkgs/development/python-modules/slpp/default.nix b/pkgs/development/python-modules/slpp/default.nix new file mode 100644 index 0000000000000..d52ac84dad7a4 --- /dev/null +++ b/pkgs/development/python-modules/slpp/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi + +, setuptools +, six +}: + +buildPythonPackage rec { + pname = "slpp"; + version = "1.2.3"; + pyproject = true; + + src = fetchPypi { + pname = "SLPP"; + inherit version; + hash = "sha256-If3ZMoNICQxxpdMnc+juaKq4rX7MMi9eDMAQEUy1Scg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + six + ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ + "slpp" + ]; + + meta = with lib; { + description = "Simple lua-python parser"; + homepage = "https://github.com/SirAnthony/slpp"; + license = licenses.mit; + maintainers = with maintainers; [ paveloom ]; + }; +} diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 078101b1d6a2e..df0cbdc8a01c6 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -11,6 +11,7 @@ , moto , paramiko , pytestCheckHook +, responses }: buildPythonPackage rec { @@ -27,27 +28,49 @@ buildPythonPackage rec { hash = "sha256-fciNaVw603FAcgrSrND+LEycJffmnFQij2ZpatYZ/e4="; }; - propagatedBuildInputs = [ - azure-common - azure-core - azure-storage-blob - boto3 - google-cloud-storage - requests + passthru.optional-dependencies = { + s3 = [ + boto3 + ]; + gcs = [ + google-cloud-storage + ]; + azure = [ + azure-storage-blob + azure-common + azure-core + ]; + http = [ + requests + ]; + webhdfs = [ + requests + ]; + ssh = [ + paramiko + ]; + }; + + pythonImportsCheck = [ + "smart_open" ]; nativeCheckInputs = [ moto - paramiko pytestCheckHook - ]; + responses + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pytestFlagsArray = [ "smart_open" ]; - pythonImportsCheck = [ - "smart_open" + disabledTests = [ + # https://github.com/RaRe-Technologies/smart_open/issues/784 + "test_https_seek_forward" + "test_seek_from_current" + "test_seek_from_end" + "test_seek_from_start" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 35d7a877fed10..9701824a4df2b 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.36.1"; + version = "0.36.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "NabuCasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ViFAPAA6uU5MQNHCTIw0OTR8eZPgF34GqRP+py6L6RU="; + hash = "sha256-ViNsmTq1iLxNujA71b9JZB5AZ79ZbiqdTyDeBGd4gUA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 8f1f2cb954239..41f7c2e10c3d7 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.4.6"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xkx8QlabOCodqj4tRYxpln0z+HHVwYdqlXkaitzmKx8="; + hash = "sha256-PtD3fQnIqd79NcYFdDMlpNwhCY6PHGL/wDR/QnKdsFo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 98f98741a9868..14530ec68abae 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "somajo"; - version = "2.2.4"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - hash = "sha256-vO3wEM3WkPQqq+ureJY+cpRHQ4cOLPV6DukA5LOscEM="; + hash = "sha256-CNGSol77Q3uAZPLeV43NhIffO31tnZoMYOsevkZh3pc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index e26a04192f480..1ae1cb7b8d2be 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "2.4"; + version = "2.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-4o26nKbHwAFz405LpXRI8GiLtoG3xei/SXHar8CT1po="; + hash = "sha256-VmPVp7O/ru4LxDcuf8SPnP9JQLPuxUpkUcxSmfEJdpA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix index 20532f4c00fae..941b6e596a2f0 100644 --- a/pkgs/development/python-modules/soxr/default.nix +++ b/pkgs/development/python-modules/soxr/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "soxr"; - version = "0.3.5"; + version = "0.3.6"; format = "pyproject"; src = fetchFromGitHub { @@ -27,7 +27,7 @@ buildPythonPackage rec { repo = "python-soxr"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-q/K7XlqvDHAna+fqN6iiJ9wD8efsuwHiEfKjXS46jz8="; + hash = "sha256-H2sueQq32o/9EHENANKVoiWlFoSF88P0LZ7DfEh/Esg="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/spacy-alignments/default.nix b/pkgs/development/python-modules/spacy-alignments/default.nix index ff6e0eff1f043..9bcb74a242fff 100644 --- a/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/pkgs/development/python-modules/spacy-alignments/default.nix @@ -2,7 +2,6 @@ , stdenv , cargo , fetchPypi -, fetchpatch , buildPythonPackage , isPy3k , rustPlatform @@ -13,19 +12,19 @@ buildPythonPackage rec { pname = "spacy-alignments"; - version = "0.8.4"; + version = "0.9.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-1HApl/RZ0w5Tf2OPu1QBUa36uIqilp+dDbPjujn0e9s="; + hash = "sha256-jcNYghWR9Xbu97/hAYe8ewa5oMQ4ofNGFwY4cY7/EmM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-oFSruBnoodv6/0/OrmJ/2SVoWm3u3FGtzVJ9xgp0+Cg="; + hash = "sha256-I5uI+qFyb4/ArpUZi4yS/E/bmwoW7+CalMq02Gnm9S8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index db50edc66affd..6a34745848d15 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.2.5"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+VIQXcffodzR6QEr2ZfvEIBGIxqKwsNZotI+Eh0EOIw="; + hash = "sha256-vxzDGLa+LoKnLpaqG7kGLfSLxqQdW+9AXw2YzBAz0UY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index a3cf5a63cf507..944fef7909c1c 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.5.4"; + version = "3.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mpwWfp3Ov++sx12sNKjnK+y+NI60W78GpsBSOuBaxCU="; + hash = "sha256-YyOphwauLVVhaUsDqLC1dRiHoAKQOkiU5orrKcxnIWY="; }; pythonRelaxDeps = [ @@ -81,7 +81,7 @@ buildPythonPackage rec { typing-extensions ]; postPatch = '' substituteInPlace setup.cfg \ - --replace "typer>=0.3.0,<0.5.0" "typer>=0.3.0" + --replace "thinc>=8.1.8,<8.2.0" "thinc>=8.1.8" ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 6bbff9e28f3a8..95d73246aab91 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -1,25 +1,54 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, pytest, pyyaml }: +{ lib +, buildPythonPackage +, fetchPypi + +# build-system +, scikit-build-core +, cmake +, pathspec +, ninja +, pyproject-metadata + +# dependencies +, numpy + +# tests +, pytestCheckHook +, pyyaml +}: buildPythonPackage rec { pname = "spglib"; - version = "2.0.2"; + version = "2.1.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-HQgewi2kq0/DGY6URd2tbewiYcQ5J4MRUdk+OUImEKo="; + hash = "sha256-gUNUX9/8EfvNpNcFpra81Iid6bw1JLeN+GajbdDeCks="; }; - propagatedBuildInputs = [ numpy ]; + nativeBuildInputs = [ + scikit-build-core + cmake + pathspec + ninja + pyproject-metadata + ]; + + dontUseCmakeConfigure = true; - nativeCheckInputs = [ pytest pyyaml ]; + propagatedBuildInputs = [ + numpy + ]; - # pytestCheckHook doesn't work - # ImportError: cannot import name '_spglib' from partially initialized module 'spglib' - checkPhase = '' - pytest - ''; + nativeCheckInputs = [ + pytestCheckHook + pyyaml + ]; - pythonImportsCheck = [ "spglib" ]; + pythonImportsCheck = [ + "spglib" + ]; meta = with lib; { description = "Python bindings for C library for finding and handling crystal symmetries"; diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix index d8d98a803b8ce..3d47f22c87261 100644 --- a/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -1,41 +1,50 @@ { lib -, astroid , buildPythonPackage , fetchPypi -, jinja2 -, mock -, pytestCheckHook , pythonOlder + +# build-system +, setuptools + +# dependencies +, astroid +, anyascii +, jinja2 , pyyaml , sphinx -, stdenv -, typing-extensions -, unidecode + +# tests +, beautifulsoup4 +, mock +, pytestCheckHook }: buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "2.0.1"; - format = "setuptools"; + version = "2.1.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zfR5aMIIUvT+sMzv0J5BS7ggr4r4+C+rFaJLCaPRuro="; + hash = "sha256-+625bnkCDWsOxF2IhRe/gW1rWHotNA++HsMRNeMApsg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + anyascii astroid jinja2 pyyaml sphinx - unidecode - ] ++ lib.optionals (pythonOlder "3.11") [ - typing-extensions ]; nativeCheckInputs = [ + beautifulsoup4 mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index aca87f3c893c5..d99577fd234eb 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -10,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "1.23.0"; + version = "1.24.0"; in buildPythonPackage { @@ -22,7 +22,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-XUTimWYzza2kmbbSeklt3528ld0fDwn3s3lAJJ5h9uk="; + hash = "sha256-lORABmlBuyN3BLuIB4Xi0F6K5UBsiGdP7vu5OK0Nxq8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-automodapi/default.nix b/pkgs/development/python-modules/sphinx-automodapi/default.nix index 7560b37036d34..bc74fae5491e3 100644 --- a/pkgs/development/python-modules/sphinx-automodapi/default.nix +++ b/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.14.1"; - format = "setuptools"; - + version = "0.16.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "astropy"; repo = pname; rev = "v${version}"; - hash = "sha256-olD9LIyFCNEu287wQIRqoabfrdcdyZpNc69jq/e1304="; + 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/pkgs/development/python-modules/sphinx-comments/default.nix b/pkgs/development/python-modules/sphinx-comments/default.nix index fc2e9517ce23c..2ffed0c091fb3 100644 --- a/pkgs/development/python-modules/sphinx-comments/default.nix +++ b/pkgs/development/python-modules/sphinx-comments/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "sphinx-comments"; version = "0.0.3"; + format = "pyproject"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix b/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix index 612717120f83f..33e346638e9cd 100644 --- a/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix +++ b/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "sphinx-multitoc-numbering"; version = "0.1.3"; + format = "pyproject"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinx-prompt/default.nix b/pkgs/development/python-modules/sphinx-prompt/default.nix index cc5d5f0b2eca6..776752d74c459 100644 --- a/pkgs/development/python-modules/sphinx-prompt/default.nix +++ b/pkgs/development/python-modules/sphinx-prompt/default.nix @@ -1,21 +1,33 @@ { lib , buildPythonPackage , fetchFromGitHub -, sphinxHook +, poetry-core +, poetry-dynamic-versioning , sphinx }: buildPythonPackage rec { pname = "sphinx-prompt"; - version = "1.5.0"; + version = "1.7.0"; # read before updating past 1.7.0 https://github.com/sbrunner/sphinx-prompt/issues/398 + format = "pyproject"; src = fetchFromGitHub { owner = "sbrunner"; repo = "sphinx-prompt"; - rev = version; - hash = "sha256-ClUPAIyPrROJw4GXeakA8U443Vlhy3P/2vFnAtyrPHU="; + rev = "refs/tags/${version}"; + hash = "sha256-/XxUSsW8Bowks7P+d6iTlklyMIfTb2otXva/VtRVAkM="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"poetry-plugin-tweak-dependencies-version", ' "" + ''; + + nativeBuildInputs = [ + poetry-core + poetry-dynamic-versioning + ]; + propagatedBuildInputs = [ sphinx ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix index ecb2cbf55e777..a034b2b3f01d7 100644 --- a/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "sphinx-pytest"; - version = "0.0.3"; + version = "0.1.1"; src = fetchFromGitHub { owner = "chrisjsewell"; repo = pname; - rev = "v${version}"; - hash = "sha256-vRHPq6BAuhn5QvHG2BGen9v6ezA3RgFVtustsNxU+n8="; + rev = "refs/tags/v${version}"; + hash = "sha256-26cV6mfNos/1YLhz5aVQVb54qsiyHWdcHtvmmSzMurk="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix index 613f199812160..fe056b3e70bca 100644 --- a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sphinx-rtd-theme"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; src = fetchPypi { pname = "sphinx_rtd_theme"; inherit version; - hash = "sha256-oNi9Gi7VLgszjL4ZxLLu88XnoEh2l1PaxqnwWce2Qbg="; + hash = "sha256-WQsDDHq7nPA47AU7leU4C1xw1hWR6wtVIGP758QfCTE="; }; preBuild = '' diff --git a/pkgs/development/python-modules/sphinx-tabs/default.nix b/pkgs/development/python-modules/sphinx-tabs/default.nix index a2714c2d12603..1c43bcd6a6615 100644 --- a/pkgs/development/python-modules/sphinx-tabs/default.nix +++ b/pkgs/development/python-modules/sphinx-tabs/default.nix @@ -1,7 +1,10 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonImportsCheckHook + +# build-system +, setuptools + # documentation build dependencies , sphinxHook # runtime dependencies @@ -16,6 +19,8 @@ buildPythonPackage rec { pname = "sphinx-tabs"; version = "3.4.1"; + format = "pyproject"; + outputs = [ "out" "doc" ]; src = fetchFromGitHub { @@ -30,7 +35,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pythonImportsCheckHook + setuptools sphinxHook ]; diff --git a/pkgs/development/python-modules/sphinx-thebe/default.nix b/pkgs/development/python-modules/sphinx-thebe/default.nix index 1bf8685282ee3..d2e05c755a252 100644 --- a/pkgs/development/python-modules/sphinx-thebe/default.nix +++ b/pkgs/development/python-modules/sphinx-thebe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinx-thebe"; version = "0.2.1"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/sphinx-togglebutton/default.nix b/pkgs/development/python-modules/sphinx-togglebutton/default.nix index 391fb9205c95e..3b3e146b98e81 100644 --- a/pkgs/development/python-modules/sphinx-togglebutton/default.nix +++ b/pkgs/development/python-modules/sphinx-togglebutton/default.nix @@ -1,23 +1,35 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , wheel -, sphinx , docutils +, sphinx }: buildPythonPackage rec { pname = "sphinx-togglebutton"; version = "0.3.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-qwyLNmQnsB5MiYAtXQeEcsQn+m6dEtUhw0+gRCVZ3Ho="; }; - propagatedBuildInputs = [ wheel sphinx docutils ]; + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + docutils + sphinx + ]; - pythonImportsCheck = [ "sphinx_togglebutton" ]; + pythonImportsCheck = [ + "sphinx_togglebutton" + ]; meta = with lib; { description = "Toggle page content and collapse admonitions in Sphinx"; diff --git a/pkgs/development/python-modules/sphinx-version-warning/default.nix b/pkgs/development/python-modules/sphinx-version-warning/default.nix index 52a6a26124cd5..1fb89f3a28490 100644 --- a/pkgs/development/python-modules/sphinx-version-warning/default.nix +++ b/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -15,9 +15,11 @@ # Latest tagged release release "1.1.2" (Nov 2018) does not contain # documenation, it was added in commits Aug 10, 2019. Repository does not have # any activity since then. -buildPythonPackage rec { +buildPythonPackage { pname = "sphinx-version-warning"; version = "unstable-2019-08-10"; + format = "pyproject"; + outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix index 5308034786141..ad89521a5b59b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-apidoc"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - hash = "sha256-cpv1ks97fdV8TAV5T3MtwCYScnXXhcKlSUUh/d53P7k="; + hash = "sha256-/lnRWIJHKqk8Jzevvepr7bNM41y9NKpJR5CfXfFQCq0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 4a0dcda238872..8c7cd9b966a90 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sphinxcontrib-bibtex"; - version = "2.5.0"; + version = "2.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-cbQuXbDi4oTyQ4dTJr+ZNqqadjKCJ311BIgm/vWwDqo="; + hash = "sha256-BGtJ8HCuUnavNMG43bm8lWLvbeL3pS03qRy45T9UuGM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 5830ff0caf572..111db7922b49c 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , docutils , sphinx , requests @@ -9,13 +10,19 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.0.0"; + version = "2.3.0"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-RyShQt/t8tnE5ZHM0WDQ+jrvXem3y24tCpj3s6Thq+g="; + pname = "sphinxcontrib_confluencebuilder"; + inherit version; + hash = "sha256-Zpe2n131afnq4IhQEEZtquvSEkkjv/uznXt2tQhGfZA="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ docutils sphinx diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index 45027ba15c43c..ad800984ee46e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -1,20 +1,30 @@ { lib , buildPythonPackage , fetchPypi +, flit-core +, jinja2 , sphinxcontrib-serializinghtml -, six }: buildPythonPackage rec { pname = "sphinxcontrib-websupport"; - version = "1.2.4"; + version = "1.2.6"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "4edf0223a0685a7c485ae5a156b6f529ba1ee481a1417817935b20bde1956232"; + pname = "sphinxcontrib_websupport"; + inherit version; + hash = "sha256-1ZK+jhEmG7vGRmjyWO/E/ULJOrYXQRFDtSRf4wxjPYw="; }; - propagatedBuildInputs = [ six sphinxcontrib-serializinghtml ]; + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + jinja2 + sphinxcontrib-serializinghtml + ]; doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix index 795556797b931..67249bd882835 100644 --- a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-youtube"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; nativeBuildInputs = [ flit-core ]; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-contrib"; repo = "youtube"; - rev = "v${version}"; - hash = "sha256-SUnnrzYJ6cOktE0IdnRWTvPGcL/eVS9obtHBMpS2s4A="; + rev = "refs/tags/v${version}"; + hash = "sha256-/mu/OGMc+iP7DV36fmE8pb5y6MMOQ0fmzT8R7RP/tjM="; }; propagatedBuildInputs = [ sphinx requests ]; diff --git a/pkgs/development/python-modules/sphinxemoji/default.nix b/pkgs/development/python-modules/sphinxemoji/default.nix index 726ba8132b013..02abae52c4d19 100644 --- a/pkgs/development/python-modules/sphinxemoji/default.nix +++ b/pkgs/development/python-modules/sphinxemoji/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , sphinx , sphinxHook }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "sphinxemoji"; version = "0.2.0"; + format = "pyproject"; outputs = [ "out" "doc" ]; @@ -18,14 +20,15 @@ buildPythonPackage rec { hash = "sha256-TLhjpJpUIoDAe3RZ/7sjTgdW+5s7OpMEd1/w0NyCQ3A="; }; - propagatedBuildInputs = [ - sphinx - ]; - nativeBuildInputs = [ + setuptools sphinxHook ]; + propagatedBuildInputs = [ + sphinx + ]; + pythonImportsCheck = [ "sphinxemoji" ]; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index d3ad0bf97038e..84b42ad27f2f2 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -37,13 +37,13 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.40.0"; + version = "0.41.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - hash = "sha256-r4AwiaeSmAP662FzuQ8p0aZ60C8dHnMvQLBUqOs8c3A="; + hash = "sha256-ohgb/wHuuER544Vx0sBxjrUgQvmv2MGU0NAod+hLfXQ="; }; patches = [ @@ -92,6 +92,7 @@ buildPythonPackage rec { "--deselect tests/functions/test_database.py::TestDatabasePostgresCreateDatabaseCloseConnection::test_create_database_twice" "--deselect tests/functions/test_database.py::TestDatabasePostgresPg8000::test_create_and_drop" "--deselect tests/functions/test_database.py::TestDatabasePostgresPsycoPG2CFFI::test_create_and_drop" + "--deselect tests/functions/test_database.py::TestDatabasePostgresPsycoPG3::test_create_and_drop" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 2f5f5d1a8e2c2..95e357cabda94 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "2.0.19"; + version = "2.0.21"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-97q04wQVtlV2b6VJHxvnQ9ep76T5umn1KI3hXh6a8kU="; + hash = "sha256-ldBn+pdZfqnBKdYkOcG47ScH/hBgeJBeIvn1hCIBw/A="; }; nativeBuildInputs =[ diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix index e1649db165bc9..cba83f5df09b2 100644 --- a/pkgs/development/python-modules/stack-data/default.nix +++ b/pkgs/development/python-modules/stack-data/default.nix @@ -47,6 +47,10 @@ buildPythonPackage rec { typeguard ]; + # https://github.com/alexmojaki/stack_data/issues/50 + # incompatible with typeguard>=3 + doCheck = false; + disabledTests = [ # AssertionError "test_example" diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 1c08e61f66604..acac9c99f13ab 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.27.0"; + version = "0.31.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,18 +31,13 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qT3ZJQY5l1K88llJdKoSkwHvfcWwjH6JysMnHYGknqw="; + hash = "sha256-Tq414cEpXX8MQDR0KYyB+J7lFqorbiwP/sGnUFvs7wA="; }; nativeBuildInputs = [ hatchling ]; - postPatch = '' - # remove coverage arguments to pytest - sed -i '/--cov/d' setup.cfg - ''; - propagatedBuildInputs = [ anyio itsdangerous @@ -79,6 +74,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/encode/starlette/releases/tag/${version}"; + downloadPage = "https://github.com/encode/starlette"; homepage = "https://www.starlette.io/"; description = "The little ASGI framework that shines"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/steamship/default.nix b/pkgs/development/python-modules/steamship/default.nix index e79b9993b883d..5309312bba351 100644 --- a/pkgs/development/python-modules/steamship/default.nix +++ b/pkgs/development/python-modules/steamship/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "steamship"; - version = "2.17.27"; + version = "2.17.28"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Wgz0jkMaMUTM7ubb/TsGaQm8UbdPtEvzapl0h4xrqq0="; + hash = "sha256-NdWQiHu5YDIEtL4zJj5Vydjmwq1b5aqVcmqIe7zYv3g="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix index dc90700948c0a..8cd6ff3f3d6e8 100644 --- a/pkgs/development/python-modules/stem/default.nix +++ b/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/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index b05e147dcaa98..df64dbebab509 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "stravalib"; - version = "1.2.0"; + version = "1.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-P00oxUz0oVQB969c/N2wpKLe09wtvQWPH4DH4EZUaxc="; + hash = "sha256-OEdMRg3KjUrXt/CgJgsUqa/sVFAE0JONNZg5MBKtxmY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 761a14fbfd03f..93704c953ee80 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.205.0"; + version = "0.208.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -51,7 +51,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-58pBsTQM3t5rj4AywhMqmCUzUQB4BH9FAF7J3p6Qkok="; + hash = "sha256-Gp58q1oZblbEQftEiq3il12eVIVF68jbGiqLdlolHvU="; }; patches = [ diff --git a/pkgs/development/python-modules/streaming-form-data/default.nix b/pkgs/development/python-modules/streaming-form-data/default.nix index 959c47d8121bd..f3aa0aa281163 100644 --- a/pkgs/development/python-modules/streaming-form-data/default.nix +++ b/pkgs/development/python-modules/streaming-form-data/default.nix @@ -1,30 +1,33 @@ { lib, fetchFromGitHub, buildPythonPackage, pythonOlder, -cython, numpy, pytest, requests-toolbelt }: +cython, smart-open, pytestCheckHook, moto, requests-toolbelt }: buildPythonPackage rec { pname = "streaming-form-data"; - version = "1.8.1"; + version = "1.13.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "siddhantgoel"; repo = "streaming-form-data"; rev = "v${version}"; - sha256 = "1wnak8gwkc42ihgf0g9r7r858hxbqav2xdgqa8azid8v2ff6iq4d"; + hash = "sha256-Ntiad5GZtfRd+2uDPgbDzLBzErGFroffK6ZAmMcsfXA="; }; nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ requests-toolbelt ]; + propagatedBuildInputs = [ smart-open ]; - nativeCheckInputs = [ numpy pytest ]; + nativeCheckInputs = [ pytestCheckHook moto requests-toolbelt ]; - checkPhase = '' - make test - ''; + pytestFlagsArray = [ "tests" ]; pythonImportsCheck = [ "streaming_form_data" ]; + preCheck = '' + # remove in-tree copy to make pytest find the installed one, with the native parts already built + rm -rf streaming_form_data + ''; + meta = with lib; { description = "Streaming parser for multipart/form-data"; homepage = "https://github.com/siddhantgoel/streaming-form-data"; diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index b764d95734513..b764d95734513 100755..100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 9f1f11e1c18c6..c70241afeb373 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,22 +3,24 @@ , fetchPypi , requests , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "stripe"; - version = "5.5.0"; + version = "6.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BKlzKzekYijs8OSWFjo+3ZNZaw5iAAKfvEiRFjhifhk="; + hash = "sha256-9fTHare5AfJjHvd3QdBpMg8zKMHjGRjax+20qgSssP0="; }; propagatedBuildInputs = [ requests + typing-extensions ]; # Tests require network connectivity and there's no easy way to disable them diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index e81365767432c..a676f28d2758b 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "4.1.3"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YNShjuLC7gBRn11oAd5Kp5CfCn92vAo/K4QNIXm/Mtc="; + hash = "sha256-7tmyywyfQw1T9qr5UbPH/KR+AmmhSaHunkeUGRKDl+Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sv-ttk/default.nix b/pkgs/development/python-modules/sv-ttk/default.nix index 3032761032e2a..660d32a6735c6 100644 --- a/pkgs/development/python-modules/sv-ttk/default.nix +++ b/pkgs/development/python-modules/sv-ttk/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "sv-ttk"; - version = "2.4.5"; + version = "2.5.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sv_ttk"; - hash = "sha256-ysRhRxrml+wmluH8F5AE7vZYXrTNUg5ZzI+26jwpOpc="; + hash = "sha256-m7/iq6bMb5/fcNeTMQRlQ8lmb8zMeLrV/2SKmYfjzts="; }; # No tests available diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index 60ae595848057..38ceda0982097 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.9.2"; + version = "0.10.0"; format = "setuptools"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; - rev = "v${version}"; - hash = "sha256-ZHplYEG97foy/unOdSokFFkDl4LK5TI4kypHSLpcCM4="; + rev = "refs/tags/v${version}"; + hash = "sha256-03lHip0iExfptrUe5ObA6xXrsfS4QJPrh1Z0v7q2lDI="; }; patches = [ diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix index 601fdee70310c..c473a3755fe06 100644 --- a/pkgs/development/python-modules/tableauserverclient/default.nix +++ b/pkgs/development/python-modules/tableauserverclient/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "tableauserverclient"; - version = "0.25"; + version = "0.26"; src = fetchPypi { inherit pname version; - sha256 = "sha256-01TRYkXEWagFrSB7zvP6Bj4YvIFoaVkgrIm/gSWkILY="; + sha256 = "sha256-vn7A7n0Z4kTtrm8MEoUJiv94K3qA/4Kx8lElhDM/LlI="; }; propagatedBuildInputs = [ defusedxml requests packaging ]; diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 8705f64817e8e..c1726ee97a853 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -36,6 +36,12 @@ buildPythonPackage rec { url = "https://github.com/PyTables/PyTables/commit/337792561e5924124efd20d6fea6bbbd2428b2aa.patch"; hash = "sha256-pz3A/jTPWXXlzr+Yl5PRUvdSAinebFsoExfek4RUHkc="; }) + (fetchpatch { + name = "numexpr-2.8.5-compatibility.patch"; + url = "https://github.com/PyTables/PyTables/commit/1a235490ebe1a138da1139cfa19829b5f0a2af37.patch"; + includes = [ "tables/tests/test_queries.py" ]; + hash = "sha256-uMS+Z2Zcz68ILMQaBdIDMnCyasozCaCGOiGIyw0+Evc="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix index 585cf7205e1f1..b985ebf8d8934 100644 --- a/pkgs/development/python-modules/tabula-py/default.nix +++ b/pkgs/development/python-modules/tabula-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tabula-py"; - version = "2.7.0"; + version = "2.8.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "chezou"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SV4QLvk7dXtU0/husS5A5mBYvbTejLyO9PpiO2oBtjs="; + hash = "sha256-QqTfbSwGaNRXBiAzB1fsEawxCvlIunB1j2jSFD9imPI="; }; patches = [ diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 2f06b665d33f8..0441fb2894fd2 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tblib"; - version = "1.7.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "059bd77306ea7b419d4f76016aef6d7027cc8a0785579b5aad198803435f882c"; + sha256 = "sha256-pt8w8nLAi/i+ZuB3X62GIAXZUKa4RJuU98eIcx1w7Nc="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 91017b8403598..5fe70090feeac 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tenacity"; - version = "8.2.2"; + version = "8.2.3"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Q68DeCK9ACkCWHfzstl8xNe7DCmRAAo9WdcVF8XJaeA="; + hash = "sha256-U5jvDXjmP0AAfB+0wL/5bhkROU0vqNGU93YZwF/2zIo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorboard-data-server/default.nix b/pkgs/development/python-modules/tensorboard-data-server/default.nix index d6df4fc0b2415..5ff48c7cc3d12 100644 --- a/pkgs/development/python-modules/tensorboard-data-server/default.nix +++ b/pkgs/development/python-modules/tensorboard-data-server/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "tensorboard-data-server"; - version = "0.6.1"; + version = "0.7.1"; format = "wheel"; disabled = pythonOlder "3.6"; @@ -11,7 +11,7 @@ buildPythonPackage rec { inherit version format; dist = "py3"; python = "py3"; - hash = "sha256-gJ/piHaC01wffR9U8PQPmLsfdxsUJltFPKBR4s5Y/Kc="; + hash = "sha256-mTi9OfUEF5ezOSEGb7oOqwOg3RDRiHoF5irliEGtTD8="; }; pythonImportsCheck = [ "tensorboard_data_server" ]; diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index c49fcad075312..73c76d74771c4 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.11.0"; + version = "2.14.0"; format = "wheel"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-oOWS7oeWLhevPw3Of6rj+70jkDAVnp5iXM6BC341xT0="; + hash = "sha256-Nmf5dF2ZKAg2rWcwIjYshA9g7Y/v1aPjC/Bx9aj9ABc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index ba5244f66af38..0d40a1b44f96c 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "termcolor"; - version = "2.2.0"; + version = "2.3.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-38isPzUHiPI7KUez5s+lpTtjC2EubNiWWgFad2AguZo="; + hash = "sha256-tbCPaJN/E4/pL2wIm5nx4toK5WxSt4v3B1/ZVCD9mlo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 4ccc1251a8fba..64b49efbd1de9 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "7.1.0"; + version = "7.2.0"; format = "setuptools"; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-RWzk85MWDyfNaEClNw7PSnDxchc39eZ6KveebIF4BKQ="; + hash = "sha256-jIwg3TDqETVIUHWEodqud5JI26pXEmcseruXCfD7+LI="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index e0780dd768cb9..c4f74d377d5fb 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "testtools"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "57c13433d94f9ffde3be6534177d10fb0c1507cc499319128958ca91a65cb23f"; + sha256 = "sha256-KLZeFMDy0+y7+19VydzeXk+qgKwWo3qCOQmh/jy8swo="; }; propagatedBuildInputs = [ pbr python-mimeparse extras ]; diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 2986f3428eb1b..80c40f7d55144 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "textacy"; - version = "0.12.0"; + version = "0.13.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "2c92bdd6b47305447b64e4cb6cc43c11675f021f910a8074bc8149dbf5325e5b"; + sha256 = "sha256-a+AkSMCPx9fE7fhSiQBuOaSlPvdHIB/yS2dcZS9AxoY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/textparser/default.nix b/pkgs/development/python-modules/textparser/default.nix new file mode 100644 index 0000000000000..86c436ac21f99 --- /dev/null +++ b/pkgs/development/python-modules/textparser/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "textparser"; + version = "0.24.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VvcI51qp0AKtt22CO6bvFm1+zsHj5MpMHKED+BdWgzU="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "textparser" + ]; + + meta = with lib; { + homepage = "https://github.com/eerimoq/textparser"; + description = "A text parser"; + license = licenses.mit; + maintainers = with maintainers; [ gray-heron ]; + }; +} diff --git a/pkgs/development/python-modules/tf2onnx/default.nix b/pkgs/development/python-modules/tf2onnx/default.nix index b1fe7abfae253..f1359e6fdaac9 100644 --- a/pkgs/development/python-modules/tf2onnx/default.nix +++ b/pkgs/development/python-modules/tf2onnx/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tf2onnx"; - version = "1.14.0"; + version = "1.15.1"; format = "setuptools"; src = fetchFromGitHub { owner = "onnx"; repo = "tensorflow-onnx"; - rev = "v${version}"; - hash = "sha256-JpXwf+GLjn0krsb5KnEhVuemWa0V2+wF10neDsdtOfI="; + rev = "refs/tags/v${version}"; + hash = "sha256-HqzcoPPX9+NOj0uFfOSVI2MNCkxq1NmLqXflwdi5RF0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/thefuzz/default.nix b/pkgs/development/python-modules/thefuzz/default.nix index 2748381f7dc20..8d240fe19e3e7 100644 --- a/pkgs/development/python-modules/thefuzz/default.nix +++ b/pkgs/development/python-modules/thefuzz/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "thefuzz"; - version = "0.19.0"; + version = "0.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-b3Em2y8silQhKwXjp0DkX0KRxJfXXSB1Fyj2Nbt0qj0="; + hash = "sha256-ol5JeGscRgPH/G4taea8ZgmCopGWmLU2/4NU4GMcxA0="; }; propagatedBuildInputs = [ levenshtein ]; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index a712f0078b9a4..18f8623f45394 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -21,6 +21,7 @@ , pytestCheckHook , python , pythonOlder +, setuptools , srsly , tqdm , typing-extensions @@ -29,16 +30,25 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.1.10"; + version = "8.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bEpI19oH4EToSmjLubIvMvhJCZWiurC/xg5BLRSvuZE="; + hash = "sha256-gsoeeDHjVNdMZ3bth9vXP0qtWe0ljIdGy+hoaIGG/Ek="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "preshed>=3.0.2,<3.1.0" "preshed" + ''; + + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index b1102c44e95d7..1b9582a71c8b9 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2023.7.18"; + version = "2023.8.30"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-WlpiSy96t/N+nsQXSuLfGAW5ZY+JAT+bS1VQZy9l8qE="; + hash = "sha256-aoxTsBKihrddCaFJirMvIC8kzGJwoQW11ZEdxEJvFio="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tiktoken/Cargo.lock b/pkgs/development/python-modules/tiktoken/Cargo.lock index 1d992854518e1..e65fd819d3d4c 100644 --- a/pkgs/development/python-modules/tiktoken/Cargo.lock +++ b/pkgs/development/python-modules/tiktoken/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -40,12 +40,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bstr" -version = "1.4.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] @@ -58,9 +57,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "fancy-regex" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0678ab2d46fa5195aaf59ad034c083d351377d4af57f3e073c074d0da3e3c766" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" dependencies = [ "bit-set", "regex", @@ -74,15 +73,15 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -90,24 +89,24 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "parking_lot" @@ -121,31 +120,31 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-targets", ] [[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" +checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" dependencies = [ "cfg-if", "indoc", @@ -160,9 +159,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" +checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" dependencies = [ "once_cell", "target-lexicon", @@ -170,9 +169,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" +checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" dependencies = [ "libc", "pyo3-build-config", @@ -180,67 +179,73 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" +checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "pyo3-macros-backend" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" +checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[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 = "regex" -version = "1.7.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", + "regex-automata", "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rustc-hash" @@ -250,21 +255,35 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.36", +] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "syn" @@ -278,14 +297,25 @@ dependencies = [ ] [[package]] +name = "syn" +version = "2.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e02e55d62894af2a08aca894c6577281f76769ba47c94d5756bec8ac6e7373" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] name = "target-lexicon" -version = "0.12.6" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tiktoken" -version = "0.3.3" +version = "0.5.1" dependencies = [ "bstr", "fancy-regex", @@ -296,9 +326,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unindent" @@ -307,19 +337,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets", -] - -[[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -332,42 +353,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/pkgs/development/python-modules/tiktoken/default.nix b/pkgs/development/python-modules/tiktoken/default.nix index 13eaecc0fb4de..3cf68063f1199 100644 --- a/pkgs/development/python-modules/tiktoken/default.nix +++ b/pkgs/development/python-modules/tiktoken/default.nix @@ -6,7 +6,9 @@ , rustPlatform , cargo , rustc +, setuptools , setuptools-rust +, wheel , libiconv , requests , regex @@ -14,10 +16,10 @@ }: let pname = "tiktoken"; - version = "0.3.3"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - hash = "sha256-l7WLe/2pRXkeyFXlPRZujsIMY3iUK5OFGmyRnd+dBJY="; + hash = "sha256-J+dzVkIyAE9PgQ/R+FI2Zz7DpW7X8SBvye2GcOvtuXo="; }; postPatch = '' cp ${./Cargo.lock} Cargo.lock @@ -25,18 +27,20 @@ let in buildPythonPackage { inherit pname version src postPatch; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.8"; nativeBuildInput = [ + setuptools setuptools-rust + wheel ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit src postPatch; name = "${pname}-${version}"; - hash = "sha256-27xR7xVH/u40Xl4VbJW/yEbURf0UcGPG5QK/04igseA="; + hash = "sha256-Q7XO+auj4tKDAGbqNn9pmJg8EJvooN2ie0lWwZVrld4="; }; nativeBuildInputs = [ @@ -54,6 +58,13 @@ buildPythonPackage { blobfile ]; + # almost all tests require network access + doCheck = false; + + pythonImportsCheck = [ + "tiktoken" + ]; + meta = with lib; { description = "tiktoken is a fast BPE tokeniser for use with OpenAI's models."; homepage = "https://github.com/openai/tiktoken"; diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index 34597923f3be2..516a22f44ccef 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.20.0"; + version = "0.23.0"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = "refs/tags/${version}"; - hash = "sha256-Be83b9JVxGxPYoOfqTfVm7qAjZD7cfH5BG6tbSHXhIQ="; + hash = "sha256-QxqUYu8y+k5SLRFtxpcs57gnAHgXIre0smURlqUzC1s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index a8749adfb616c..799570ada1b85 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.11.0"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = pname; rev = version; - hash = "sha256-4HwHNowif0/YflznQrn8YRITjuiaBCB2mFIO0iCf6tA="; + hash = "sha256-vBww78/3vC3IA4Nh9Ne+rBo/CO9FggjP+TUUV2/ih9c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index e67ed91c135fd..615d2a76d0582 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "timm"; - version = "0.9.2"; + version = "0.9.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "pytorch-image-models"; rev = "refs/tags/v${version}"; - hash = "sha256-gYrc8ds6urZvwDsTnzPjxjSTiAGzUD3RlCf0wogCrDI="; + hash = "sha256-NB4uj9gB6QGxhnQMoYXN16T8v/o8IZuRMnN7pDXmaj4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 35c8578cab440..5e6f441d3d3bd 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tinycss2"; - version = "1.1.1"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,10 +17,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kozea"; repo = "tinycss2"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; # for tests fetchSubmodules = true; - hash = "sha256-RUF/3cjNgDFofoxl9iKY3u5ZAVVQmXu2Qbb5U4brdcQ="; + hash = "sha256-rJtxMmW30NK+E+Dhh/fu6FPrEojWWdoEWNt0raYEubs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix index 1b001cd536597..33dd694a7f5fb 100644 --- a/pkgs/development/python-modules/tlds/default.nix +++ b/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/pkgs/development/python-modules/toonapi/default.nix b/pkgs/development/python-modules/toonapi/default.nix index 8df8fa89a2ca3..ac51cae1c805d 100644 --- a/pkgs/development/python-modules/toonapi/default.nix +++ b/pkgs/development/python-modules/toonapi/default.nix @@ -3,18 +3,22 @@ , backoff , buildPythonPackage , fetchFromGitHub +, pythonOlder , yarl }: buildPythonPackage rec { pname = "toonapi"; - version = "0.2.1"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "frenck"; repo = "python-toonapi"; - rev = "v${version}"; - sha256 = "10jh6p0ww51cb9f8amd9jq3lmvby6n2k08qwcr2n8ijbbgyp0ibf"; + rev = "refs/tags/v${version}"; + hash = "sha256-RaN9ppqJbTik1/vNX0/YLoBawrqjyQWU6+FLTspIxug="; }; propagatedBuildInputs = [ @@ -25,11 +29,15 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "toonapi" ]; + + pythonImportsCheck = [ + "toonapi" + ]; meta = with lib; { description = "Python client for the Quby ToonAPI"; homepage = "https://github.com/frenck/python-toonapi"; + changelog = "https://github.com/frenck/python-toonapi/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 9efb0facaff34..765a8d9468bc9 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -95,8 +95,7 @@ let paths = with rocmPackages; [ rocm-core clr rccl miopen miopengemm rocrand rocblas - rocsparse hipsparse rocthrust rocprim hipcub - roctracer # Unfree at the moment due to hsa-amd-aqlprofile hard dependency in rocprofiler + rocsparse hipsparse rocthrust rocprim hipcub roctracer rocfft rocsolver hipfft hipsolver hipblas rocminfo rocm-thunk rocm-comgr rocm-device-libs rocm-runtime clr.icd hipify diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix index 420a5fd8dfc52..e22993e8d23f4 100644 --- a/pkgs/development/python-modules/torchinfo/default.nix +++ b/pkgs/development/python-modules/torchinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "torchinfo"; - version = "1.7.2"; + version = "1.64"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "TylerYep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-O+I7BNQ5moV/ZcbbuP/IFoi0LO0WsGHBbSfgPmFu1Ec="; + hash = "sha256-gcl8RxCD017FP4LtB60WVtOh7jg2Otv/vNd9hKneEAU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/torchlibrosa/default.nix b/pkgs/development/python-modules/torchlibrosa/default.nix index bab73b0dae93a..ca8f890c0e620 100644 --- a/pkgs/development/python-modules/torchlibrosa/default.nix +++ b/pkgs/development/python-modules/torchlibrosa/default.nix @@ -2,7 +2,6 @@ , lib , buildPythonPackage , fetchPypi -, fetchpatch , librosa , numpy , torch @@ -10,12 +9,12 @@ buildPythonPackage rec { pname = "torchlibrosa"; - version = "0.0.9"; + version = "0.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-+LzejKvLlJIIwWm9rYPCWQDSueIwnG5gbkwNE+wbv0A="; + hash = "sha256-Yqi+7fnJtBQaBiNN8/ECKfe6huZ2eMzuAkiexO8EQCg="; }; propagatedBuildInputs = [ @@ -24,14 +23,6 @@ buildPythonPackage rec { torch ]; - patches = [ - # Fix run against librosa 0.9.0, https://github.com/qiuqiangkong/torchlibrosa/pull/8 - (fetchpatch { - url = "https://github.com/qiuqiangkong/torchlibrosa/commit/eec7e7559a47d0ef0017322aee29a31dad0572d5.patch"; - hash = "sha256-c1x3MA14Plm7+lVuqiuLWgSY6FW615qnKbcWAfbrcas="; - }) - ]; - # Project has no tests. # In order to make pythonImportsCheck work, NUMBA_CACHE_DIR env var need to # be set to a writable dir (https://github.com/numba/numba/issues/4032#issuecomment-488102702). diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index e3d51f7b551f2..f458db0ced03a 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -15,7 +15,7 @@ let pname = "torchmetrics"; - version = "0.11.4"; + version = "1.1.2"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PyTorchLightning"; repo = "metrics"; rev = "refs/tags/v${version}"; - hash = "sha256-K8QLdDpnS4N8s3zXsifFloRXW/QXEm36mJXXKEBEJBs="; + hash = "sha256-qbO2POXJp2O0VL16zY5mb6TDpogs1L34anFVeSf502g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index 06ec0f00a5b25..03b916883438f 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "towncrier"; - version = "22.12.0"; + version = "23.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nEnX519kaprqAq6QTAvBY5yP0UoBKS0rEjuNMHVkA00="; + hash = "sha256-/Cm9WrRyfI2s++Y29/tdxTuZgFti2hyWshSDYVn/cME="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index de9707116600f..1b0bf1755ab73 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tox"; - version = "4.4.6"; + version = "4.11.3"; format = "pyproject"; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; rev = "refs/tags/${version}"; - hash = "sha256-kWvYN2PA4al2X813Mu4R/n2ZLsZ+MaYCCWNfmYD3nBo="; + hash = "sha256-VLoWRAiQ1TP9S0f8TKwQ0H2Lgemd+dTzSM+TjhioDMk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 891771ebc6981..640e62212081f 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -2,7 +2,9 @@ , stdenv , buildPythonPackage , fetchPypi +, setuptools , setuptools-scm +, wheel , pytestCheckHook , pytest-asyncio , pytest-timeout @@ -14,15 +16,18 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.64.1"; + version = "4.66.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-X09oKgBJUcG0ULx1PHEOkoDFdGzm/+3uJT3by/VM8eQ="; + hash = "sha256-2I5lH5242FUaYlVtPP+eMDQnTKXWbpMZfPJJDi3Lacc="; }; nativeBuildInputs = [ + setuptools setuptools-scm + wheel ]; nativeCheckInputs = [ @@ -38,8 +43,7 @@ buildPythonPackage rec { lib.optional (!stdenv.isi686 && !stdenv.hostPlatform.isRiscV) pandas; pytestFlagsArray = [ - # pytest-asyncio 0.17.0 compat; https://github.com/tqdm/tqdm/issues/1289 - "--asyncio-mode=strict" + "-W" "ignore::FutureWarning" ]; # Remove performance testing. diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index 43f147a6a9ca3..466d6db8da5aa 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -16,7 +16,7 @@ let pname = "trainer"; - version = "0.0.29"; + version = "0.0.31"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-ISEIIJReYKT3tEAF9/pckPg2+aYkBJyRWo6fvWZ/asI="; + hash = "sha256-avZuujeWG/UGkj7fcGB99Fw7KYktJPIDf8oB4wjoiD4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index aa37946026f95..6df71a041b253 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.9.0"; + version = "5.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9s3iGpxoz3Vq8CA19y1acjv2B+hi574z7OUFq/Sjutk="; + hash = "sha256-9YTqIJJARm5m6R88gap9AEukz3lJkLDHdZOKFUQhfNE="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index de0928508844f..0c7245225d10d 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -1,6 +1,7 @@ { lib , fetchPypi , buildPythonPackage +, setuptools , traits , pyface , pythonOlder @@ -8,16 +9,20 @@ buildPythonPackage rec { pname = "traitsui"; - version = "7.4.3"; - format = "setuptools"; + version = "8.0.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2zJRfpYioFgMIyCeE/gDLOoA5hxndJNnCf9F52M11bk="; + hash = "sha256-kBudHLxFUT4Apzl2d7CYRBsod0tojzChWbrUgBv0A2Q="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ traits pyface diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix index 1560e1810ba6b..789eb346e8c64 100644 --- a/pkgs/development/python-modules/treeo/default.nix +++ b/pkgs/development/python-modules/treeo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { # Note that there is a version 0.4.0, but it was released in error. At the # time of writing (2022-03-29), v0.0.11 is the latest as reported on GitHub # and PyPI. - version = "0.0.11"; + version = "0.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "cgarciae"; repo = pname; - rev = version; - hash = "sha256-zs3F8i+G5OX/A9wOO60xVuvnm2QqrL+dHIrC0qwH37o="; + rev = "refs/tags/${version}"; + hash = "sha256-0py7sKjq6WqdsZwTq61jqaIbULTfwtpz29TTpt8M2Zw="; }; # See https://github.com/cgarciae/treex/issues/68. diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 109f48d1f71b0..23af30faefbab 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.13.7"; + version = "0.13.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-dodeWIYBfclPUbu0Efkn8QO9nj7L8HVNXkSjU4mBSeA="; + hash = "sha256-Y01O3fNWAyV8MhYY2FSMajWyc4Rle2XjsL261jWlfP8="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index fb985e890a77f..c01db3259a7d9 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -6,6 +6,7 @@ , idna , outcome , pytestCheckHook +, pytest-trio , pyopenssl , trustme , sniffio @@ -16,15 +17,24 @@ , coreutils }: +let + # escape infinite recursion with pytest-trio + pytest-trio' = (pytest-trio.override { + trio = null; + }).overrideAttrs { + doCheck = false; + pythonImportsCheck = []; + }; +in buildPythonPackage rec { pname = "trio"; - version = "0.22.0"; + version = "0.22.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zmjxxUAKR7E3xaTecsfJAb1OeiT73r/ptB3oxsBOqs8="; + hash = "sha256-OIfPGMi8yJRDNCAwVGg4jax2ky6WaK+hxJqjgGtqzLM="; }; propagatedBuildInputs = [ @@ -46,13 +56,16 @@ buildPythonPackage rec { jedi pyopenssl pytestCheckHook + pytest-trio' trustme yapf ]; preCheck = '' - substituteInPlace trio/tests/test_subprocess.py \ + substituteInPlace trio/_tests/test_subprocess.py \ --replace "/bin/sleep" "${coreutils}/bin/sleep" + + export HOME=$TMPDIR ''; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. @@ -64,6 +77,8 @@ buildPythonPackage rec { "static_tool_sees_all_symbols" # tests pytest more than python "fallback_when_no_hook_claims_it" + # requires mypy + "test_static_tool_sees_class_members" ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index 7cd0dd7ca8a53..e9691044a9261 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -9,14 +9,14 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2023.7.6"; + version = "2023.8.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-io4Wi1HSD+1gcEODHTdjK7UJGdHICmTg8Tk3RGkaiyI="; + hash = "sha256-yfKgqF1UXlNi6Wfk8Gn1b939kSFeIv+kjGb7KDUhMZo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb-api/default.nix index 0e05aa041dba7..bec0964acc0d6 100644 --- a/pkgs/development/python-modules/tvdb_api/default.nix +++ b/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/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index aa91f01686c71..e52f70753f327 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "twentemilieu"; - version = "1.0.0"; + version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-twentemilieu"; - rev = "v${version}"; - hash = "sha256-MTAVa5gP5e8TIE/i1DjfmwKm1zDVC/WEcYKxZSV/+Ug="; + rev = "refs/tags/v${version}"; + hash = "sha256-r0LZS8TXux1mzzXBTSu+x5sxUZOCzW7poKG3dQ2A6No="; }; postPatch = '' @@ -45,7 +45,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "twentemilieu" ]; + pythonImportsCheck = [ + "twentemilieu" + ]; meta = with lib; { description = "Python client for Twente Milieu"; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 6c9014d5bd335..801adb77da376 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -1,34 +1,42 @@ { lib , stdenv , buildPythonPackage -, pythonAtLeast , pythonOlder , fetchPypi , fetchpatch , python -, appdirs + +# build-system +, hatchling +, hatch-fancy-pypi-readme + +# dependencies , attrs , automat -, bcrypt , constantly +, hyperlink +, incremental +, typing-extensions +, zope_interface + +# optional-dependencies +, appdirs +, bcrypt , cryptography -, git -, glibcLocales , h2 -, hyperlink -, hypothesis , idna -, incremental , priority , pyasn1 -, pyhamcrest -, pynacl , pyopenssl , pyserial , service-identity -, setuptools -, typing-extensions -, zope_interface + +# tests +, cython-test-exception-raiser +, git +, glibcLocales +, pyhamcrest +, hypothesis # for passthru.tests , cassandra-driver @@ -46,16 +54,15 @@ buildPythonPackage rec { pname = "twisted"; - version = "22.10.0"; - format = "setuptools"; + version = "23.8.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - pname = "Twisted"; - inherit version; + inherit pname version; extension = "tar.gz"; - hash = "sha256-Mqy9QKlPX0bntCwQm/riswIlCUVWF4Oot6BZBI8tTTE="; + hash = "sha256-PHM2Ct0XM2piLA2BHCos4phmtuWbESX9ZQmxclIJiiQ="; }; patches = [ @@ -70,42 +77,27 @@ buildPythonPackage rec { url = "https://github.com/mweinelt/twisted/commit/e69e652de671aac0abf5c7e6c662fc5172758c5a.patch"; hash = "sha256-LmvKUTViZoY/TPBmSlx4S9FbJNZfB5cxzn/YcciDmoI="; }) - # remove half broken pyasn1 integration that blow up with pyasn 0.5.0 - # https://github.com/twisted/twisted/pull/11843 - (fetchpatch { - url = "https://github.com/twisted/twisted/commit/bdee0eb835a76b2982beaf10c85269ff25ea09fa.patch"; - excludes = [ "pyproject.toml" "tox.ini" ]; - hash = "sha256-oGAHmZMpMWfK+2zEDjHD115sW7exCYqfORVOLw+Wa6M="; - }) - ] ++ lib.optionals (pythonAtLeast "3.11") [ - (fetchpatch { - url = "https://github.com/twisted/twisted/pull/11734.diff"; - excludes = [ ".github/workflows/*" ]; - hash = "sha256-Td08pDxHwl7fPLCA6rUySuXpy8YmZfvXPHGsBpdcmSo="; - }) - (fetchpatch { - url = "https://github.com/twisted/twisted/commit/00bf5be704bee022ba4d9b24eb6c2c768b4a1921.patch"; - hash = "sha256-fnBzczm3OlhbjRcePIQ7dSX6uldlCZ9DJTS+UFO2nAQ="; - }) ]; __darwinAllowLocalNetworking = true; + nativeBuildInputs = [ + hatchling + hatch-fancy-pypi-readme + incremental + ]; + propagatedBuildInputs = [ attrs automat constantly hyperlink incremental - setuptools typing-extensions zope_interface ]; postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"pyasn1 >= 0.4",' "" - echo 'ListingTests.test_localeIndependent.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py echo 'ListingTests.test_newFile.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py echo 'ListingTests.test_newSingleDigitDayOfMonth.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py @@ -128,6 +120,13 @@ buildPythonPackage rec { # fails since migrating to libxcrypt echo 'HelperTests.test_refuteCryptedPassword.skip = "OSError: Invalid argument"' >> src/twisted/conch/test/test_checkers.py + # expectation mismatch with `python -m twisted --help` and `python -m twisted.trial --help` usage output + echo 'MainTests.test_twisted.skip = "Expectation Mismatch"' >> src/twisted/test/test_main.py + echo 'MainTests.test_trial.skip = "Expectation Mismatch"' >> src/twisted/test/test_main.py + + # tests for missing https support in usage + echo 'ServiceTests.test_HTTPSFailureOnMissingSSL.skip = "Expectation Mismatch"' >> src/twisted/web/test/test_tap.py + # not packaged substituteInPlace src/twisted/test/test_failure.py \ --replace "from cython_test_exception_raiser import raiser # type: ignore[import]" "raiser = None" @@ -154,12 +153,15 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ + cython-test-exception-raiser git glibcLocales hypothesis pyhamcrest ] ++ passthru.optional-dependencies.conch + ++ passthru.optional-dependencies.http2 + ++ passthru.optional-dependencies.serial # not supported on aarch64-darwin: https://github.com/pyca/pyopenssl/issues/873 ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) passthru.optional-dependencies.tls; @@ -171,9 +173,8 @@ buildPythonPackage rec { ''; passthru = { - optional-dependencies = rec { + optional-dependencies = { conch = [ appdirs bcrypt cryptography pyasn1 ]; - conch_nacl = conch ++ [ pynacl ]; http2 = [ h2 priority ]; serial = [ pyserial ]; tls = [ idna pyopenssl service-identity ]; diff --git a/pkgs/development/python-modules/txredisapi/default.nix b/pkgs/development/python-modules/txredisapi/default.nix index 9d8b268b30b28..315e7f8e27138 100644 --- a/pkgs/development/python-modules/txredisapi/default.nix +++ b/pkgs/development/python-modules/txredisapi/default.nix @@ -1,20 +1,39 @@ -{ lib, buildPythonPackage, fetchFromGitHub, nixosTests, six, twisted }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, six +, twisted +, nixosTests +}: buildPythonPackage rec { pname = "txredisapi"; - version = "1.4.7"; + version = "1.4.9"; + format = "pyproject"; src = fetchFromGitHub { owner = "IlyaSkriblovsky"; repo = "txredisapi"; - rev = "1.4.7"; - sha256 = "1f7j3c5l7jcfphvsk7nqmgyb4jaydbzq081m555kw0f9xxak0pgq"; + rev = "refs/tags/${version}"; + hash = "sha256-6Z2vurTAw9YHxvEiixtdxBH0YHj+Y9aTdsSkafPMZus="; }; - propagatedBuildInputs = [ six twisted ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + six + twisted + ] + ++ twisted.optional-dependencies.tls; + + pythonImportsCheck = [ + "txredisapi" + ]; doCheck = false; - pythonImportsCheck = [ "txredisapi" ]; passthru.tests.unit-tests = nixosTests.txredisapi; diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index af8b9c5ef364b..3511a87127ba4 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "2.0.2"; + version = "23.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typed_settings"; inherit version; - hash = "sha256-AYHA1xFS0g99cloGIjvi8loKS/Q/AteyLiLH8rf+2No="; + hash = "sha256-gnwiSCVWU0mpUDiHt9GE2DtfFd2xpOsDL5r/fFctkg4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index c2a6171e1b810..7fd258e9123fa 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -2,6 +2,7 @@ , fetchPypi , pythonOlder , lib +, setuptools , setuptools-scm , pytestCheckHook , typing-extensions @@ -13,30 +14,39 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.13.3"; + version = "4.1.5"; + format = "pyproject"; + disabled = pythonOlder "3.5"; - outputs = [ "out" "doc" ]; src = fetchPypi { inherit pname version; - sha256 = "00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"; + hash = "sha256-6goRO7wRG8/8kHieuyFWJcljQR9wlqfpBi1ORjDBVf0="; }; + outputs = [ + "out" + "doc" + ]; + nativeBuildInputs = [ glibcLocales + setuptools setuptools-scm sphinxHook sphinx-autodoc-typehints sphinx-rtd-theme ]; - LC_ALL = "en_US.utf-8"; + propagatedBuildInputs = [ + typing-extensions + ]; - postPatch = '' - substituteInPlace setup.cfg --replace " --cov" "" - ''; + env.LC_ALL = "en_US.utf-8"; - nativeCheckInputs = [ pytestCheckHook typing-extensions ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTestPaths = [ # mypy tests aren't passing with latest mypy diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index d42e2c0a2c84b..c67234d5f25d8 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.19.1.6"; + version = "0.20.0.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ozSnA6hoiRDQhpRk8fb4vTMNdYQ72rT4k1R7+ylBegE="; + hash = "sha256-SSjnkPQrmdWDOZD5nI3Z+p8Wgl9u0wOAypgYRtNocM0="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix index c3c63592624f2..74b85c6e4a4d4 100644 --- a/pkgs/development/python-modules/types-pillow/default.nix +++ b/pkgs/development/python-modules/types-pillow/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "10.0.0.2"; + version = "10.0.0.3"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - hash = "sha256-/gk4CrItQSztmJoGfp7kr3Gfo6R7obU7IytGUUqHEEI="; + hash = "sha256-rgyHfTY9o0m7uCxUY8nngDcpDMB9NxTLDOr10vf1yCU="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index efa9b6cf24b7a..bac128984bfb0 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "67.4.0.3"; + version = "68.2.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-GelY39vxxaYo5UwqfuhJNQUa+3J40MHNsIrBlHV+47E="; + hash = "sha256-pCFvHi7ynQiYd7OvOrKs9InrhpzK+QUSXGnS3Dky/YU="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix index 3e475b17cfd1e..140664989f3b2 100644 --- a/pkgs/development/python-modules/types-toml/default.nix +++ b/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.8.5"; + version = "0.10.8.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-v4D859LXS+kRSPR7iNmuWt6xAkq+8iqi/bq8A21rizw="; + hash = "sha256-WLB4HGgeZx/wtcAxkwmRBon0q0DookMeIF1wyUu277E="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix index ad4207769a1d4..32671d5846416 100644 --- a/pkgs/development/python-modules/types-typed-ast/default.nix +++ b/pkgs/development/python-modules/types-typed-ast/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-typed-ast"; - version = "1.5.8.6"; + version = "1.5.8.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-lUO1hj25e0EqKx1fQHyQgzY2WgutME1k6DKKdp9IwjA="; + hash = "sha256-93lfb51ZezUhIxQEC5k/ZhO1HYFzjtzjweOj6e9lUSQ="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index 8790249579378..91bbc854a26df 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "tzdata"; - version = "2022.7"; + version = "2023.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-/l+Gbt3YuW6fy6l4+OUDyQmxnqfv2hHlLjlJS606e/o="; + hash = "sha256-Ee8eCOVKyw1Plb2xvgXaZZZz3krL0hv5xp6UzF6Qejo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 5b32b4343a055..e9ab0bc6abe35 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "4.3"; # version needs to be compatible with APScheduler + version = "5.0.1"; # version needs to be compatible with APScheduler disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-PyHQnhsqqfLazKEtokDKN947pSN6k63f1tWTr+kHM1U="; + hash = "sha256-RuuZrUvbcfP3K30k9CZ3U+JAlE7PwW8l0nGbqJgnqAM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 2ae0d32a5679c..207ad3d43727f 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-uamqp-python"; - rev = "refs/tags/v.${version}"; - hash = "sha256-OjZTroaBuUB/dakl5gAYigJkim9EFiCwUEBo7z35vhQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-q8FxM4PBXLD5q68nrUJ+TGkui1yQJ3HHNF7jn+e+HkA="; }; patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ diff --git a/pkgs/development/python-modules/uc-micro-py/default.nix b/pkgs/development/python-modules/uc-micro-py/default.nix index d83a4cbd54d29..f6aa059d709c9 100644 --- a/pkgs/development/python-modules/uc-micro-py/default.nix +++ b/pkgs/development/python-modules/uc-micro-py/default.nix @@ -3,24 +3,34 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "uc-micro-py"; - version = "1.0.1"; - format = "setuptools"; + version = "1.0.2"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tsutsu3"; repo = "uc.micro-py"; - rev = "v${version}"; - hash = "sha256-23mKwoRGjtxpCOC26V8bAN5QEHLDOoSqPeTlUuIrxZ0="; + rev = "refs/tags/v${version}"; + hash = "sha256-PUeWYG/VyxCfhB7onAcDFow1yYqArjmfMT99+058P7U="; }; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "uc_micro" ]; + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "uc_micro" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Micro subset of unicode data files for linkify-it-py"; diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix index f9d1cf6c1d79a..90f5b783cc8d5 100644 --- a/pkgs/development/python-modules/ucsmsdk/default.nix +++ b/pkgs/development/python-modules/ucsmsdk/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ucsmsdk"; - version = "0.9.14"; + version = "0.9.15"; format = "setuptools"; src = fetchFromGitHub { owner = "CiscoUcs"; repo = "ucsmsdk"; - rev = "v${version}"; - hash = "sha256-lSkURvKRgW+qV1A8OT4WYsMGlxxIqaFnxQ3Rnlixdw0="; + rev = "refs/tags/v${version}"; + hash = "sha256-xNRfsIfhoVI5ORWn6NmLCuMMJregIZWQ20QBiBsA1Pc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 9ed1ec78e1bd6..98087eaae75d1 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "2.30.0"; + version = "2.33.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ZpO55rNXkVbqMdGxsZn77gJnGBbM8c8GIAaQnTzVnf8="; + hash = "sha256-e6p/H1Vub0Ln0VhQvwsVLuD/p8uNG5oCPhfQPCTl1nY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ufoLib2/default.nix b/pkgs/development/python-modules/ufoLib2/default.nix index eba49e474aaf6..c2fef2e4656a3 100644 --- a/pkgs/development/python-modules/ufoLib2/default.nix +++ b/pkgs/development/python-modules/ufoLib2/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "ufoLib2"; - version = "0.14.0"; + version = "0.16.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-OdUJfNe3nOQyCf3nT9/5y/C8vZXnSAWiLHvZ8GXMViw="; + hash = "sha256-SfDcf3LMrP5/rv4NU9N5cdRWZNiwVj7zaVb6e/pVor0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index b93552c4e07f1..34bb5fef6df46 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "uharfbuzz"; - version = "0.37.0"; + version = "0.37.3"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,9 +19,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "harfbuzz"; repo = "uharfbuzz"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-CZp+/5fG5IBawnIZLeO9lXke8rodqRcSf+ofyF584mc="; + hash = "sha256-876gFYyMqeGYoXMdBguV6bi7DJKHJs9HNLw9xRu+Mxk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 02376023260d9..9816c88f3e6b2 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "5.7.0"; + version = "5.8.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-54jl1dyuj2EYrJtF0LiRoNVfesSA7dy38HJj8rzzeyM="; + hash = "sha256-eOMY3vSt6JikYbPZKnn5RB5+Dk0q1UGavtQzbXAsdCU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/univers/default.nix b/pkgs/development/python-modules/univers/default.nix index ea450651da7e8..3308be6a9b29c 100644 --- a/pkgs/development/python-modules/univers/default.nix +++ b/pkgs/development/python-modules/univers/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "univers"; - version = "30.10.0"; + version = "30.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IJeM9Nzfqs1B0xP43i6u65XSEVPdiGhXWuORglbNARI="; + hash = "sha256-xyrg8B+C5xUN8zHLrMbAe/MWjZb8fCL0MIAz2w4B7/U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index a906ce2d76f94..837d162044734 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/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/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 13ef39be76db9..a5a3e6b8b644b 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -5,6 +5,7 @@ , certifi , cryptography , fetchPypi +, hatchling , idna , isPyPy , mock @@ -20,14 +21,18 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.16"; - format = "setuptools"; + version = "2.0.5"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-jxNfZQJ1a95rKpsomJ31++h8mXDOyqaQQe3M5/BYmxQ="; + hash = "sha256-E6vzc4LqLOb7dE1NrWeDjuyFfJ9PVwCYkYBeC14SNZQ="; }; + nativeBuildInputs = [ + hatchling + ]; + # FIXME: remove backwards compatbility hack propagatedBuildInputs = passthru.optional-dependencies.brotli ++ passthru.optional-dependencies.socks; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 014382b21501b..7f9512be2cb18 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,43 +1,57 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch -, isPy3k + +# build-system +, setuptools +, setuptools-scm +, wheel + +# tests , glibcLocales +, pytestCheckHook }: buildPythonPackage rec { pname = "urwid"; - version = "2.1.2"; - format = "setuptools"; + version = "2.2.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae"; + hash = "sha256-4zkRqxjyxz/dvpvyFtAh504gstWqm+MEA8WPVRMbuKE="; }; - patches = [ - # https://github.com/urwid/urwid/pull/517 - (fetchpatch { - name = "python311-compat.patch"; - url = "https://github.com/urwid/urwid/commit/42c1ed1eeb663179b265bae9b384d7ec11c8a9b5.patch"; - hash = "sha256-Oz8O/M6AdqbB6C/BB5rtxp8FgdGhZUxkSxKIyq5Dmho="; - }) + postPatch = '' + sed -i '/addopts =/d' pyproject.toml + ''; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel ]; - # tests need to be able to set locale - LC_ALL = "en_US.UTF-8"; - nativeCheckInputs = [ glibcLocales ]; + nativeCheckInputs = [ + glibcLocales + pytestCheckHook + ]; + + env.LC_ALL = "en_US.UTF8"; - # tests which assert on strings don't decode results correctly - doCheck = isPy3k; + disabledTestPaths = [ + # expect call hangs + "urwid/tests/test_vterm.py" + ]; pythonImportsCheck = [ "urwid" ]; meta = with lib; { + changelog = "https://github.com/urwid/urwid/releases/tag/${version}"; description = "A full-featured console (xterm et al.) user interface library"; + downloadPage = "https://github.com/urwid/urwid"; homepage = "https://urwid.org/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 9baa150afb712..bbec8df096fa2 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.23.1"; + version = "0.23.2"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; repo = pname; - rev = version; - hash = "sha256-X/G6K0X4G1EsMIBpvqy62zZ++8paTHNqgYLi+B7YK+0="; + rev = "refs/tags/${version}"; + hash = "sha256-98Ahb6syD/J9StwaOqVj/MCdzbHOgey0sixp7SJnROE="; }; outputs = [ diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index 1c0131c0549d5..8e29effda9a24 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -1,14 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry-core , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "validators"; - version = "0.21.1"; + version = "0.22.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,11 +17,11 @@ buildPythonPackage rec { owner = "python-validators"; repo = "validators"; rev = "refs/tags/${version}"; - hash = "sha256-b5K1WP+cEAjPBXu9sAZQf1J5H7PLnn94400Zd/0Y9ew="; + hash = "sha256-Qu6Tu9uIluT1KBJYkFjDFt9AWN2Kez3uCYDQknXqYrU="; }; nativeBuildInputs = [ - poetry-core + setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/validobj/default.nix b/pkgs/development/python-modules/validobj/default.nix index 6e96ff579da21..73eaf56f9e9dc 100644 --- a/pkgs/development/python-modules/validobj/default.nix +++ b/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/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 043d08a022bb8..fc4283766b522 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, mock , pytest-httpbin , pytestCheckHook , pythonOlder @@ -13,14 +12,14 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "4.2.1"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fNPoGixJLgHCgfGAvMKoa1ILFz0rZWy12J2ZR1Qj4BM="; + hash = "sha256-u/FTLyYYoE8RvOKpmvOpZHoyyICVcpP/keCl8Ye2s9I="; }; propagatedBuildInputs = [ @@ -41,6 +40,9 @@ buildPythonPackage rec { disabledTests = [ "TestVCRConnection" + # https://github.com/kevin1024/vcrpy/issues/645 + "test_get_vcr_with_matcher" + "test_testcase_playback" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index 03f38e12a6f1d..cbfe657219e87 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "vector"; - version = "1.0.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-T62k/dqlwb1ppbopb/2UjMy1da16vlPRSWD1b+Mt1ME="; + hash = "sha256-aVdFHlnOUI9hgzVRnFPzDOuItwU9ZfPRZkWf1wjtOLU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix index e1d4531719b4d..a233b51773ac1 100644 --- a/pkgs/development/python-modules/vehicle/default.nix +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "vehicle"; - version = "1.0.1"; + version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-vehicle"; rev = "refs/tags/v${version}"; - hash = "sha256-nN7efkN59FCCjCk3svYCTGGdvr2RSM5VektuUkHy3Vo="; + hash = "sha256-EbjrAfbqVY336RHBWq81KM+oHixen+38aUTnWZQ+nCs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index dda198ff95ccc..0b06bf91548d9 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2023.10.0"; + version = "2023.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Cereal2nd"; repo = pname; - rev = version; - hash = "sha256-xVELkmucrw1QazSR2XN6ldmzdTya/rWsQd1mRsLTcbU="; + rev = "refs/tags/${version}"; + hash = "sha256-v2B+tDqvQTm+K+cvTRM8LnfaFp5CTsI8/B5clBDNE08="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 10602bfd4f3af..18db218039d3f 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.24.0"; + version = "20.24.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4qfO+dqIDWk7kz23ZUNndU8U4gZQ3GDo7nOFVx+Fk6M="; + hash = "sha256-6DYZZ/bab73xQmSDv+n8qCh8JCrAvDBCmQVyHO+/91I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vncdo/default.nix b/pkgs/development/python-modules/vncdo/default.nix index b6d12a67185ce..5f27bba823c47 100644 --- a/pkgs/development/python-modules/vncdo/default.nix +++ b/pkgs/development/python-modules/vncdo/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "vncdo"; - version = "0.12.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "sibson"; repo = "vncdotool"; - rev = "v${version}"; - sha256 = "0h3ccr8zi7xpgn6hz43x1045x5l4bhha7py8x00g8bv6gaqlbwxn"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-m8msWa8uUuDEjEUlXHCgYi0HFPKXLVXpXLyuQ3quNbA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix index b568350324909..e3fcad870a95e 100644 --- a/pkgs/development/python-modules/vulture/default.nix +++ b/pkgs/development/python-modules/vulture/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "vulture"; - version = "2.7"; + version = "2.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Z/uAoBTtn9tZndRLuWy1QxEDKhBBBvwucG73ptrYgDI="; + hash = "sha256-tqKqYytv1RSIqO6sZQq0pQm7GgMugZQ4F6ii5qY6MLM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index 08ce68fdd616a..66e48a2b7f292 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "w3lib"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DhGY8bdFGVtrPdGkzWYBH7+C8wpNnauu4fnlyG8CAnQ="; + hash = "sha256-7Vt06ZfuoqvjwTIfkW40QUTujpBypvM0Y+6OV/hYpLE="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index 085eca293d112..29439bb2a2d1d 100644 --- a/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/pkgs/development/python-modules/wagtail-localize/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.5.1"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { repo = pname; owner = "wagtail"; rev = "refs/tags/v${version}"; - hash = "sha256-RjJyx3sr69voJxa3lH8Nq/liZ3eMoTfZ4phykj7neZA="; + hash = "sha256-7r2FFfWGqjE3Z7wsdf6KwwbUZ+wXqOscsL/2CepSMLY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index 54c30dabc7811..cc5fa6c5a9a03 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "wagtail"; - version = "5.0.2"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3r0h34el2zRF1l/94S7xTjBqJPWtSQFQvtVW8Mjq0rs="; + hash = "sha256-IR/wzXBZ+Win/EOFUDsg2AHB5otW9YMeCmpPxgCllD8="; }; postPatch = '' @@ -58,7 +58,7 @@ buildPythonPackage rec { requests telepath willow - ]; + ] ++ willow.optional-dependencies.heif; # Tests are in separate derivation because they require a package that depends # on wagtail (wagtail-factories) diff --git a/pkgs/development/python-modules/wallbox/default.nix b/pkgs/development/python-modules/wallbox/default.nix index 4fe26418ef830..a53344a76fd17 100644 --- a/pkgs/development/python-modules/wallbox/default.nix +++ b/pkgs/development/python-modules/wallbox/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "wallbox"; - version = "0.4.14"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HKlq5DPG3HD9i9LLTJdlzEFim+2hBdSfKl43BojhEf8="; + hash = "sha256-EDEB7/CkrfYSNcSh55Itrj6rThsNKeuj8lHLAY+Qml4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index 1c61ab19c7082..cb113420006be 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -6,13 +6,11 @@ , fetchFromGitHub , rustPlatform , rustc -, setuptools-rust , pythonOlder , dirty-equals , pytest-mock , pytest-timeout , pytestCheckHook -, python , CoreServices , libiconv }: @@ -73,6 +71,11 @@ buildPythonPackage rec { rm -rf watchfiles ''; + disabledTests = [ + # BaseExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception) + "test_awatch_interrupt_raise" + ]; + pythonImportsCheck = [ "watchfiles" ]; diff --git a/pkgs/development/python-modules/watermark/default.nix b/pkgs/development/python-modules/watermark/default.nix index 6cb717679d1ae..29b600624e874 100644 --- a/pkgs/development/python-modules/watermark/default.nix +++ b/pkgs/development/python-modules/watermark/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "watermark"; - version = "2.3.1"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rasbt"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-E3UxdGlxTcvkiKa3RoG9as6LybyW+QrCUZvA9VHwxlk="; + rev = "refs/tags/v${version}"; + hash = "sha256-4/1Y7cdh1tF33jgPrqdxCGPcRnnxx+Wf8lyztF54Ck0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 3e56109bcbe31..3ba0e22f83a17 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "3.22.1"; + version = "3.24.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-r/Yb0/XXTfIKYjKEQ+OqnIYNUzD9+xnE2N3ETLYEAy8="; + hash = "sha256-4HM1DCG9TcpcDqxd1dlftHQnjHFaryBB44LYa7dRisg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix index 5ec245676a6ad..7ee91e7ea2b4d 100644 --- a/pkgs/development/python-modules/webcolors/default.nix +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -3,20 +3,25 @@ , fetchPypi , pythonOlder , unittestCheckHook +, setuptools }: buildPythonPackage rec { pname = "webcolors"; - version = "1.12"; - format = "setuptools"; + version = "1.13"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FtBD06CP1qGxt+Pp5iZA0JeQ3OgNK91HkqF1s1/nlKk="; + hash = "sha256-wiW2dMg/qSO+k9I1MwzgMANz0CiFzvIyOIE7DVZoMEo="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index a2873a26f07d8..26c27825f7bd9 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.5.1"; + version = "1.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Pwnm2CMIklRxMhd/V1pOPnPP3wZSbiDMAqocO0cYTUA="; + hash = "sha256-Oq0l0xKEJmvPz9H9inQ/YygjBaNkuNCUikO9YGrMZS8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 98bc6cc863ca6..ec6e429f5945e 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "websockets"; - version = "10.4"; + version = "11.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aaugustin"; repo = pname; - rev = version; - hash = "sha256-IylvnaS8cHatA+WMc5uY9E+l+52INqOMITU1VJPO2xY="; + rev = "refs/tags/${version}"; + hash = "sha256-RdkbIiZI/UYsWdnnl5gJPsnJ/6adfFtkiXC7MO/HwcI="; }; patchPhase = '' diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index e5b6a93eae6d6..db045e77c52fe 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, flit-core , watchdog , ephemeral-port-reserve , pytest-timeout @@ -15,30 +16,37 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "2.2.3"; - format = "setuptools"; + version = "2.3.7"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "Werkzeug"; - inherit version; - hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; + inherit pname version; + hash = "sha256-K4wORHtLnbzIXdl7butNy69si2w74L1lTiVVPgohV9g="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ markupsafe - ] ++ lib.optionals (!stdenv.isDarwin) [ - # watchdog requires macos-sdk 10.13+ - watchdog ]; + passthru.optional-dependencies = { + watchdog = lib.optionals (!stdenv.isDarwin) [ + # watchdog requires macos-sdk 10.13[ + watchdog + ]; + }; + nativeCheckInputs = [ ephemeral-port-reserve pytest-timeout pytest-xprocess pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTests = lib.optionals stdenv.isDarwin [ "test_get_machine_id" diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index a27ebf2ec5895..679e19722f459 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "4.0.7"; + version = "4.0.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-6mfBenzUrjWPj0bDswTEBpi8BCNzLj8nMyHuFBIyyL4="; + hash = "sha256-PB9eRtwRZt/UCkLWhealE5b9NP+Hh0Kj5HxvDMSio4U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index f7030f7c874eb..1787faa38905a 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -1,34 +1,62 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder +# build-system +, flit-core + # dependencies , filetype -, defusedxml, +, defusedxml + +# optional-dependencies +, pillow-heif + +# tests +, numpy +, opencv4 +, pillow +, pytestCheckHook +, wand }: buildPythonPackage rec { pname = "willow"; - version = "1.5.1"; - format = "setuptools"; + version = "1.6.2"; + format = "pyproject"; disabled = pythonOlder "2.7"; - src = fetchPypi { - pname = "Willow"; - inherit version; - hash = "sha256-t6SQkRATP9seIodZLgZzzCVeAobhzVNCfuaN8ckiDEw="; + src = fetchFromGitHub { + owner = "wagtail"; + repo = "Willow"; + rev = "refs/tags/v${version}"; + hash = "sha256-dW2FVN3/mBAhVQ094uBsnXzdyTRKgHUDx0SWLm3g374="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ filetype defusedxml ]; - # Test data is not included - # https://github.com/torchbox/Willow/issues/34 - doCheck = false; + passthru.optional-dependencies = { + heif = [ + pillow-heif + ]; + }; + + nativeCheckInputs = [ + numpy + opencv4 + pytestCheckHook + pillow + wand + ] ++ passthru.optional-dependencies.heif; meta = with lib; { description = "A Python image library that sits on top of Pillow, Wand and OpenCV"; diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 3e9e35edeea85..c1a5f51956d13 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -15,18 +15,25 @@ buildPythonPackage rec { pname = "wled"; - version = "0.16.0"; + version = "0.17.0"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-wled"; rev = "refs/tags/v${version}"; - hash = "sha256-esINtvctvgl8AqNwCDVnGU+3j/UzEHqY8H1Rws1kQfs="; + hash = "sha256-y32zynkVsn5vWw+BZ6ZRf9zemGOWJMN4yfNQZ0bRpos="; }; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -45,13 +52,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" - ''; - pythonImportsCheck = [ "wled" ]; diff --git a/pkgs/development/python-modules/wtf-peewee/default.nix b/pkgs/development/python-modules/wtf-peewee/default.nix index 326a56461a45b..d4e37b5976812 100644 --- a/pkgs/development/python-modules/wtf-peewee/default.nix +++ b/pkgs/development/python-modules/wtf-peewee/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch +, setuptools , peewee , wtforms , python @@ -9,19 +9,16 @@ buildPythonPackage rec { pname = "wtf-peewee"; - version = "3.0.3"; + version = "3.0.4"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "faa953fe3f705d4f2b48f3c1a81c5c5a6a38f9ed1378c9a830e6efc1b0fccb15"; + hash = "sha256-cTbYRdvAUTY86MPR33BH+nA6H/epR8sgHDgOBQ/TUkQ="; }; - patches = [ - (fetchpatch { - name = "fix-wtforms3.patch"; - url = "https://github.com/coleifer/wtf-peewee/commit/b1764f4474c73a9a2b34ae6b7db61274f5252a7f.patch"; - sha256 = "0maz3fm9bi8p80nk9sdb34xq55xq8ihm51y7k0m8ck9aaypvwbig"; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ @@ -30,7 +27,9 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck ${python.interpreter} runtests.py + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 58de4e7124ad2..8b8b795edda92 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "xapp"; - version = "2.4.1"; + version = "21"; format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; - rev = version; + rev = "refs/tags/master.mint${version}"; hash = "sha256-Kvhp+biZ+KK9FYma/8cUEaQCHPKMLjOO909kbyMLQ3o="; }; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 45e79fdd89d09..12cefa0332aa0 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "2023.7.0"; + version = "2023.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2s4v2/G3/xhdnBImokv4PCrlLzJT2/6A4X0RYmANBVw="; + hash = "sha256-glxtZCAqcxpOSTIe3R6d+r9L4GgC8bjIo8AKPr/Izt8="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix index d5583200becb0..f44d2e4435664 100644 --- a/pkgs/development/python-modules/xdg/default.nix +++ b/pkgs/development/python-modules/xdg/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - version = "5.1.1"; + version = "6.0.0"; pname = "xdg"; disabled = isPy27; format = "pyproject"; @@ -13,8 +13,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "srstevenson"; repo = pname; - rev = version; - hash = "sha256-z/Zvo2WGw9qA+M3Pt9r35DuxtuhL7/I75LlFEdDOJcc="; + rev = "refs/tags/${version}"; + hash = "sha256-yVuruSKv99IZGNCpY9cKwAe6gJNAWjL+Lol2D1/0hiI="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index fd2e2e3567c43..0fa17ac6858aa 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -27,7 +27,7 @@ #, flash-attn }: let - version = "0.0.21"; + version = "0.03"; in buildPythonPackage { pname = "xformers"; @@ -39,8 +39,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "facebookresearch"; repo = "xformers"; - rev = "v${version}"; - hash = "sha256-zYziynjLtqjPPHjDbruuuG9209y0Sh+wYUFHUj+QG2Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-G8f7tny5B8SAQ6+2uOjhY7nD0uOT4sskIwtTdwivQXo="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index 9062026f742b5..10afcbe837895 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "3.2.0"; + version = "3.3.0"; pname = "xxhash"; src = fetchPypi { inherit pname version; - hash = "sha256-Gv1Hr4lVxdtzD2MK1TrnmM9/rgrLZM67PPlNNcR90Ig="; + hash = "sha256-w/njIrHr7r1E49nS2bEk4MVQwe9BvVUq/c3XGVFu5Bo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix index 5a03ed14fcbfc..797242993f925 100644 --- a/pkgs/development/python-modules/xyzservices/default.nix +++ b/pkgs/development/python-modules/xyzservices/default.nix @@ -1,22 +1,28 @@ { lib , buildPythonPackage -, fetchFromGitHub , fetchPypi , mercantile , pytestCheckHook , requests +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "xyzservices"; - version = "2023.2.0"; - format = "setuptools"; + version = "2023.7.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-M0K7pBDXlBKQ7tDlii5arbD3uXhj7EKDsoPEBu5yOig="; + hash = "sha256-DskodCIn1vXUNn6ntFf8/tlDQp9N4pSbWwKoLN9VadY="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + disabledTests = [ # requires network connections "test_free_providers" diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index 05d26bcd48591..00cdf026c46f4 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.4.18"; + version = "1.4.19"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-VMgx2MTiOoAw8tW8SckheN950JVbdWWSS3PWDNs0dT0="; + hash = "sha256-rYUxv3TEdyr2D3UEmmHcJJtlG6gXJnp1c2pez4H13SU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix index 8c171d9d74ae2..9012efc8a81d2 100644 --- a/pkgs/development/python-modules/yark/default.nix +++ b/pkgs/development/python-modules/yark/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "yark"; - version = "1.2.7"; + version = "1.2.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-8O4EpHb1fP/O/t6hS1K1ylSXNKBuiipo7wvEnUJODSw="; + hash = "sha256-FXgJ/y8qN7FkR7nhpNgPvUH/EQgw8cgRFqUA9KiJKKM="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 0f27248c688c8..78610073af012 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.16.0"; + version = "2.16.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hONraVvaDs6lKvmGEnGYTLIqXIZGeZB7e5uj95toT34="; + hash = "sha256-QnbPS0plNDEELNU/8igrxNKSpoQkEeiFKZZFBPsHMoY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index d1e7891eee520..4bd3e7692283e 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -1,19 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, heapdict, pythonOlder }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pytest-asyncio +, pytest-repeat +, pytest-timeout +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "zict"; - version = "2.2.0"; + version = "3.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1zZsLiKTMUES3PJDIQhCime5J7AABWGf7vwxDRLYM/M="; + hash = "sha256-4yHiY7apeq/AeQw8+zwEZWtwZuZzjDf//MqV2APJ+6U="; }; - disabled = pythonOlder "3.6"; + nativeBuildInputs = [ + setuptools + ]; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ heapdict ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + pytest-repeat + pytest-timeout + ]; meta = with lib; { description = "Mutable mapping tools."; diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index a2143171dc547..0c0209740332f 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "zope-deferredimport"; - version = "4.4"; + version = "5.0"; src = fetchPypi { pname = "zope.deferredimport"; inherit version; - sha256 = "2ae3257256802787e52ad840032f39c1496d3ce0b7e11117f663420e4a4c9add"; + sha256 = "sha256-Orvw4YwfF2WRTs0dQbVJ5NBFshso5AZfsMHeCtc2ssM="; }; propagatedBuildInputs = [ zope-proxy ]; diff --git a/pkgs/development/python-modules/zope-testbrowser/default.nix b/pkgs/development/python-modules/zope-testbrowser/default.nix index 59c6e676938ef..15b3f74a43945 100644 --- a/pkgs/development/python-modules/zope-testbrowser/default.nix +++ b/pkgs/development/python-modules/zope-testbrowser/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "zope-testbrowser"; - version = "5.6.1"; + version = "6.0"; format = "setuptools"; src = fetchPypi { pname = "zope.testbrowser"; inherit version; - sha256 = "035bf63d9f7244e885786c3327448a7d9fff521dba596429698b8474961b05e7"; + sha256 = "sha256-RLd6XpA3q+3DZHai6j3H6XTWE85Sk913zAL4iO4x+ho="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index 97625a3e3c1c8..c8ecd77730d8a 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "zopfli"; - version = "0.2.2"; + version = "0.2.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1z1akqx3fjnwa75insch9p08hafikqdvqkj6mxv1k6fr81sxnj9d"; + sha256 = "sha256-28mEG+3XNgQeteaYLNktqTvuFFdF9UIvN5X28ljNxu8="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index 2da5ae524bb39..2bc20be4d4ed2 100755..100644 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "zstandard"; - version = "0.20.0"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-YT2q3XLHGxSIdCyvssOzgcOdDJu4xswVeqLV6kXMLvw="; + hash = "sha256-8I46ENAaJHh35MthqCoxnqdGw1ajeGVYvtJIHmxAVUY="; }; propagatedNativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/5/clang-ocl/default.nix b/pkgs/development/rocm-modules/5/clang-ocl/default.nix index 96fc4945747f5..7af83bd2e1327 100644 --- a/pkgs/development/rocm-modules/5/clang-ocl/default.nix +++ b/pkgs/development/rocm-modules/5/clang-ocl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "clang-ocl"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/rocm-modules/5/clr/default.nix b/pkgs/development/rocm-modules/5/clr/default.nix index 8a5d695e2b4cf..f12ef2bfc8b5a 100644 --- a/pkgs/development/rocm-modules/5/clr/default.nix +++ b/pkgs/development/rocm-modules/5/clr/default.nix @@ -35,7 +35,7 @@ let ]; in stdenv.mkDerivation (finalAttrs: { pname = "clr"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" @@ -46,7 +46,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "ROCm-Developer-Tools"; repo = "clr"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-C+rFW/7kf35rz0sQTI2+iY5RhZZQY07fc5a+e6cB5OQ="; + hash = "sha256-1gZJhvBbUFdKH9p/7SRfzEV/fM+gIN2Qvlxf2VbmAIw="; }; nativeBuildInputs = [ @@ -144,6 +144,8 @@ in stdenv.mkDerivation (finalAttrs: { name = finalAttrs.pname; owner = finalAttrs.src.owner; repo = finalAttrs.src.repo; + page = "tags?per_page=1"; + filter = ".[0].name | split(\"-\") | .[1]"; }; impureTests = { diff --git a/pkgs/development/rocm-modules/5/composable_kernel/default.nix b/pkgs/development/rocm-modules/5/composable_kernel/default.nix index 2372b27ebe52b..75039fc7d417a 100644 --- a/pkgs/development/rocm-modules/5/composable_kernel/default.nix +++ b/pkgs/development/rocm-modules/5/composable_kernel/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "composable_kernel"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/5/default.nix b/pkgs/development/rocm-modules/5/default.nix index 6e263998dbe6c..3229d7b077a07 100644 --- a/pkgs/development/rocm-modules/5/default.nix +++ b/pkgs/development/rocm-modules/5/default.nix @@ -111,8 +111,7 @@ in rec { # Needs GCC roctracer = callPackage ./roctracer { - inherit rocmUpdateScript rocm-device-libs rocm-runtime rocprofiler clr; - inherit (llvm) clang; + inherit rocmUpdateScript rocm-device-libs rocm-runtime clr; }; # Needs GCC diff --git a/pkgs/development/rocm-modules/5/half/default.nix b/pkgs/development/rocm-modules/5/half/default.nix index 08c645848fa25..1ddd06b014491 100644 --- a/pkgs/development/rocm-modules/5/half/default.nix +++ b/pkgs/development/rocm-modules/5/half/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "half"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; diff --git a/pkgs/development/rocm-modules/5/hip-common/default.nix b/pkgs/development/rocm-modules/5/hip-common/default.nix index 9f5f37511ef01..6e2f950c0193f 100644 --- a/pkgs/development/rocm-modules/5/hip-common/default.nix +++ b/pkgs/development/rocm-modules/5/hip-common/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hip-common"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; diff --git a/pkgs/development/rocm-modules/5/hipblas/default.nix b/pkgs/development/rocm-modules/5/hipblas/default.nix index b2206c737b00a..c604dda465934 100644 --- a/pkgs/development/rocm-modules/5/hipblas/default.nix +++ b/pkgs/development/rocm-modules/5/hipblas/default.nix @@ -18,7 +18,7 @@ # Can also use cuBLAS stdenv.mkDerivation (finalAttrs: { pname = "hipblas"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/5/hipcc/default.nix b/pkgs/development/rocm-modules/5/hipcc/default.nix index e6610e8909f75..20c428bbf8096 100644 --- a/pkgs/development/rocm-modules/5/hipcc/default.nix +++ b/pkgs/development/rocm-modules/5/hipcc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipcc"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; diff --git a/pkgs/development/rocm-modules/5/hipcub/default.nix b/pkgs/development/rocm-modules/5/hipcub/default.nix index 447c2c4174afe..943a14c379a1c 100644 --- a/pkgs/development/rocm-modules/5/hipcub/default.nix +++ b/pkgs/development/rocm-modules/5/hipcub/default.nix @@ -16,7 +16,7 @@ # CUB can also be used as a backend instead of rocPRIM. stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/5/hipfft/default.nix b/pkgs/development/rocm-modules/5/hipfft/default.nix index 153a7c8c18cc5..b0c5928a192d9 100644 --- a/pkgs/development/rocm-modules/5/hipfft/default.nix +++ b/pkgs/development/rocm-modules/5/hipfft/default.nix @@ -21,7 +21,7 @@ # Can also use cuFFT stdenv.mkDerivation (finalAttrs: { pname = "hipfft"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/5/hipfort/default.nix b/pkgs/development/rocm-modules/5/hipfort/default.nix index 4bb2a270271b6..4b6c7c56af41a 100644 --- a/pkgs/development/rocm-modules/5/hipfort/default.nix +++ b/pkgs/development/rocm-modules/5/hipfort/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipfort"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; diff --git a/pkgs/development/rocm-modules/5/hipify/default.nix b/pkgs/development/rocm-modules/5/hipify/default.nix index 893056496c9c0..e553c0e385a5d 100644 --- a/pkgs/development/rocm-modules/5/hipify/default.nix +++ b/pkgs/development/rocm-modules/5/hipify/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipify"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; diff --git a/pkgs/development/rocm-modules/5/hipsolver/default.nix b/pkgs/development/rocm-modules/5/hipsolver/default.nix index 34592a5bbd961..9c5c1cad2207a 100644 --- a/pkgs/development/rocm-modules/5/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/5/hipsolver/default.nix @@ -18,7 +18,7 @@ # Can also use cuSOLVER stdenv.mkDerivation (finalAttrs: { pname = "hipsolver"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "hipSOLVER"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-I9Xjkilo+baeM1CRXjLAbj/vrg8r5/E2yEImhHGSyf8="; + hash = "sha256-5b6kPj9yvXvP7f7AyHDTYRoM/EhQZvwkVCfDflFJugc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/5/hipsparse/default.nix b/pkgs/development/rocm-modules/5/hipsparse/default.nix index 79b78f3661d85..0e77079348b39 100644 --- a/pkgs/development/rocm-modules/5/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/5/hipsparse/default.nix @@ -18,7 +18,7 @@ # This can also use cuSPARSE as a backend instead of rocSPARSE stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/5/llvm/base.nix b/pkgs/development/rocm-modules/5/llvm/base.nix index 655192d892bb1..82de9e6f3665c 100644 --- a/pkgs/development/rocm-modules/5/llvm/base.nix +++ b/pkgs/development/rocm-modules/5/llvm/base.nix @@ -53,7 +53,7 @@ let llvmTargetsToBuild' = [ "AMDGPU" ] ++ builtins.map inferNativeTarget llvmTargetsToBuild; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-llvm-${targetName}"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" @@ -70,7 +70,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-oJIXALwxo130jl8b6yCFw+a2kMBlny5/0ubiqF6MOWY="; + hash = "sha256-0+lJnDiMntxCYbZBCSWvHOcKXexFfEzRfb49QbfOmK8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/5/migraphx/default.nix b/pkgs/development/rocm-modules/5/migraphx/default.nix index 5842cd1695d56..dc84e526823f1 100644 --- a/pkgs/development/rocm-modules/5/migraphx/default.nix +++ b/pkgs/development/rocm-modules/5/migraphx/default.nix @@ -49,7 +49,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "migraphx"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" @@ -63,7 +63,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "AMDMIGraphX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-7yL7Zn5I8GUPIAgB7tVLZI7OEHLv0E4FcLVx9xMfsNY="; + hash = "sha256-lg3pxHBpwqxBvdOQgE44YKLuumhkVF6b3Xx4+cw7jNQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/5/miopen/default.nix b/pkgs/development/rocm-modules/5/miopen/default.nix index d22518aa51c6f..a9a1cd5abe018 100644 --- a/pkgs/development/rocm-modules/5/miopen/default.nix +++ b/pkgs/development/rocm-modules/5/miopen/default.nix @@ -35,7 +35,7 @@ }: let - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; diff --git a/pkgs/development/rocm-modules/5/mivisionx/default.nix b/pkgs/development/rocm-modules/5/mivisionx/default.nix index d6e198eb4c778..7eac2a4ca4979 100644 --- a/pkgs/development/rocm-modules/5/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/5/mivisionx/default.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: { else "cpu" ); - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "GPUOpen-ProfessionalCompute-Libraries"; repo = "MIVisionX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Z7UIqJWuSD+/FoZ1VIbITp4R/bwaqFCQqsL8CRW73Ek="; + hash = "sha256-jmOgwESNALQt7ctmUY9JHgKq47tCwsW1ybynkX9236U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/5/rccl/default.nix b/pkgs/development/rocm-modules/5/rccl/default.nix index d4045252bae42..3f011d3fdfacf 100644 --- a/pkgs/development/rocm-modules/5/rccl/default.nix +++ b/pkgs/development/rocm-modules/5/rccl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rccl"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rccl"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Abrwmsjnkx9JVTrARP/BM965g+R10lY+XPwthy/SG0k="; + hash = "sha256-nFkou/kjGBmImorlPOZNTlCrxbfAYpDhgRveyoAufu8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/5/rdc/default.nix b/pkgs/development/rocm-modules/5/rdc/default.nix index 134b946c5f7ad..abdd121bce3c7 100644 --- a/pkgs/development/rocm-modules/5/rdc/default.nix +++ b/pkgs/development/rocm-modules/5/rdc/default.nix @@ -41,7 +41,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "rdc"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/5/rocalution/default.nix b/pkgs/development/rocm-modules/5/rocalution/default.nix index 80fd655557dfd..2a0e149bb3e92 100644 --- a/pkgs/development/rocm-modules/5/rocalution/default.nix +++ b/pkgs/development/rocm-modules/5/rocalution/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocalution"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/5/rocblas/default.nix b/pkgs/development/rocm-modules/5/rocblas/default.nix index 17732fd516814..ca6a9e6e723a6 100644 --- a/pkgs/development/rocm-modules/5/rocblas/default.nix +++ b/pkgs/development/rocm-modules/5/rocblas/default.nix @@ -73,7 +73,7 @@ let fallbacks = rocblas.overrideAttrs { pname = "rocblas-tensile-fallbacks"; }; in stdenv.mkDerivation (finalAttrs: { pname = "rocblas"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/5/rocdbgapi/default.nix b/pkgs/development/rocm-modules/5/rocdbgapi/default.nix index 41c1178f1089f..aef89d2330d1d 100644 --- a/pkgs/development/rocm-modules/5/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/5/rocdbgapi/default.nix @@ -38,7 +38,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "rocdbgapi"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/5/rocfft/default.nix b/pkgs/development/rocm-modules/5/rocfft/default.nix index ac50318622ceb..309a7f2fe2244 100644 --- a/pkgs/development/rocm-modules/5/rocfft/default.nix +++ b/pkgs/development/rocm-modules/5/rocfft/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocfft"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; diff --git a/pkgs/development/rocm-modules/5/rocgdb/default.nix b/pkgs/development/rocm-modules/5/rocgdb/default.nix index a2f4435ee7bcf..facec0cf16d34 100644 --- a/pkgs/development/rocm-modules/5/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/5/rocgdb/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocgdb"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; diff --git a/pkgs/development/rocm-modules/5/rocm-cmake/default.nix b/pkgs/development/rocm-modules/5/rocm-cmake/default.nix index 04ae947d3a4a8..d88912154f8bc 100644 --- a/pkgs/development/rocm-modules/5/rocm-cmake/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-cmake/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; @@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: { name = finalAttrs.pname; owner = finalAttrs.src.owner; repo = finalAttrs.src.repo; - page = "releases?per_page=2"; - filter = ".[1].tag_name | split(\"-\") | .[1]"; }; meta = with lib; { diff --git a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix index c3c4c5fab3cdf..8411c4d53cb34 100644 --- a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix @@ -15,7 +15,7 @@ let else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-comgr"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/rocm-modules/5/rocm-core/default.nix b/pkgs/development/rocm-modules/5/rocm-core/default.nix index aae431be8e620..a29575168b45d 100644 --- a/pkgs/development/rocm-modules/5/rocm-core/default.nix +++ b/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/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix index 594e210312843..844f38a9a4b21 100644 --- a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix @@ -14,13 +14,13 @@ let else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-device-libs"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-f6/LAhJ2mBDO1/JloHvl7MJyDo3WutbXd4IDknA9nzM="; + hash = "sha256-ARxs/yqyVoIUWliJkINzitumF+64/5u3fbB0tHB5hPU="; }; patches = [ ./cmake.patch ]; diff --git a/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix index 65d21daa5b503..220e89fe71d26 100644 --- a/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "rocm-docs-core"; - version = "0.25.0"; + version = "0.26.0"; format = "pyproject"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-docs-core"; rev = "v${version}"; - hash = "sha256-kOsoIK0vaPT60hGr960s5vc0eloSr5CECtd8Dy24YuM="; + hash = "sha256-Mr6/Ne6P+TapoCqN7xkKMNse3fTaIAvvLmMl0kVg7Vs="; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix index fd9182c8254de..79174c7032f03 100644 --- a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/rocm-modules/5/rocm-smi/default.nix b/pkgs/development/rocm-modules/5/rocm-smi/default.nix index 2e1692539e23c..66c1c765c13f0 100644 --- a/pkgs/development/rocm-modules/5/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-smi/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm_smi_lib"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-swCRO4PBMBJ6fO2bLq/xxFZIYw2IgiFB490wsU8Wm2o="; + hash = "sha256-NZR4jBgKVfpkRNQFPmav1yCZF872LkcrPBNNcBVTLDU="; }; patches = [ ./cmake.patch ]; diff --git a/pkgs/development/rocm-modules/5/rocm-thunk/default.nix b/pkgs/development/rocm-modules/5/rocm-thunk/default.nix index 73368dbb0e7f1..98fbc56517f93 100644 --- a/pkgs/development/rocm-modules/5/rocm-thunk/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-thunk/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-thunk"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/rocm-modules/5/rocminfo/default.nix b/pkgs/development/rocm-modules/5/rocminfo/default.nix index c9ff79e380ffa..c80dbc4aeacf7 100644 --- a/pkgs/development/rocm-modules/5/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/5/rocminfo/default.nix @@ -18,7 +18,7 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "5.7.0"; + version = "5.7.1"; pname = "rocminfo"; src = fetchFromGitHub { diff --git a/pkgs/development/rocm-modules/5/rocmlir/default.nix b/pkgs/development/rocm-modules/5/rocmlir/default.nix index 9b24112dce8af..74fe00e781cc1 100644 --- a/pkgs/development/rocm-modules/5/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/5/rocmlir/default.nix @@ -32,7 +32,7 @@ let else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocmlir${suffix}"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/5/rocprim/default.nix b/pkgs/development/rocm-modules/5/rocprim/default.nix index 1dd2555c6915a..10d1f187ba736 100644 --- a/pkgs/development/rocm-modules/5/rocprim/default.nix +++ b/pkgs/development/rocm-modules/5/rocprim/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/5/rocprofiler/default.nix b/pkgs/development/rocm-modules/5/rocprofiler/default.nix index ec24a3f41e59b..c77014b50cfde 100644 --- a/pkgs/development/rocm-modules/5/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/5/rocprofiler/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "rocprofiler"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-ue/2uiLbhOv/5XY4cIJuZ8DUMRhniYgxolq9xMwO1FY="; + hash = "sha256-1s/7C9y+73ADLF/17Vepw0pZNVtYnKoP24GdwKc9X2Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix index dfc8580b3e140..6dd0ec45b3b65 100644 --- a/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocr-debug-agent"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; diff --git a/pkgs/development/rocm-modules/5/rocrand/default.nix b/pkgs/development/rocm-modules/5/rocrand/default.nix index 954a299e317e8..d61b95394cab7 100644 --- a/pkgs/development/rocm-modules/5/rocrand/default.nix +++ b/pkgs/development/rocm-modules/5/rocrand/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocrand"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-cFH38fLD8tk6V9JERcqHokuwKemdDgHCZ75bZNEqmdY="; + hash = "sha256-VrpiHlZZQH+IOoaEDuDOfRgnMiqm1bpRIuNyrPz2SGY="; fetchSubmodules = true; # For inline hipRAND }; diff --git a/pkgs/development/rocm-modules/5/rocsolver/default.nix b/pkgs/development/rocm-modules/5/rocsolver/default.nix index 6490870ea48a1..ade9c69e534e7 100644 --- a/pkgs/development/rocm-modules/5/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/5/rocsolver/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsolver"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/5/rocsparse/default.nix b/pkgs/development/rocm-modules/5/rocsparse/default.nix index 945e03c0bc8bb..e19334df15145 100644 --- a/pkgs/development/rocm-modules/5/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/5/rocsparse/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsparse"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" diff --git a/pkgs/development/rocm-modules/5/rocthrust/default.nix b/pkgs/development/rocm-modules/5/rocthrust/default.nix index b80b161f5799c..4fe2e0828a16c 100644 --- a/pkgs/development/rocm-modules/5/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/5/rocthrust/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocThrust"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-i0XCtJth8caVQT5oUgsxWXNzcePa02Gb7AQsthYTOv8="; + hash = "sha256-+bcHcA87IToTcII7N/hm81C/JiokJKj0M1yAph/x9Qc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/5/roctracer/default.nix b/pkgs/development/rocm-modules/5/roctracer/default.nix index 92e557426b10c..7be3ea0f7505e 100644 --- a/pkgs/development/rocm-modules/5/roctracer/default.nix +++ b/pkgs/development/rocm-modules/5/roctracer/default.nix @@ -3,14 +3,13 @@ , fetchFromGitHub , rocmUpdateScript , cmake -, clang , clr , rocm-device-libs -, rocprofiler , libxml2 , doxygen , graphviz , gcc-unwrapped +, libbacktrace , rocm-runtime , python3Packages , buildDocs ? false # Nothing seems to be generated, so not making the output @@ -19,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "roctracer"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" @@ -38,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - clang clr ] ++ lib.optionals buildDocs [ doxygen @@ -46,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - rocprofiler libxml2 + libbacktrace python3Packages.python python3Packages.cppheaderparser ]; diff --git a/pkgs/development/rocm-modules/5/rocwmma/default.nix b/pkgs/development/rocm-modules/5/rocwmma/default.nix index 71d0e3fbe793a..e982e036c4778 100644 --- a/pkgs/development/rocm-modules/5/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/5/rocwmma/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocwmma"; - version = "5.7.0"; + version = "5.7.1"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocWMMA"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-/EuBBSjhlMwJfsqYvRb9oCNC0hNkEa1JH1KUDLMSs08="; + hash = "sha256-0otJxgVYLwvVYIWT/hjrrpuSj5jslP1dbJRt6GUOrDs="; }; patches = lib.optionals (buildTests || buildBenchmarks) [ diff --git a/pkgs/development/rocm-modules/5/rpp/default.nix b/pkgs/development/rocm-modules/5/rpp/default.nix index eee10f2ab7c82..a9456587ff3b6 100644 --- a/pkgs/development/rocm-modules/5/rpp/default.nix +++ b/pkgs/development/rocm-modules/5/rpp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { else "cpu" ); - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "GPUOpen-ProfessionalCompute-Libraries"; diff --git a/pkgs/development/rocm-modules/5/tensile/default.nix b/pkgs/development/rocm-modules/5/tensile/default.nix index 86dbaa95e192e..fa111c056c5cc 100644 --- a/pkgs/development/rocm-modules/5/tensile/default.nix +++ b/pkgs/development/rocm-modules/5/tensile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "tensile"; - version = "5.7.0"; + version = "5.7.1"; format = "pyproject"; src = fetchFromGitHub { diff --git a/pkgs/development/rocm-modules/5/update.nix b/pkgs/development/rocm-modules/5/update.nix index 1cc7e354d2409..e20697675c11d 100644 --- a/pkgs/development/rocm-modules/5/update.nix +++ b/pkgs/development/rocm-modules/5/update.nix @@ -5,8 +5,8 @@ { name ? "" , owner ? "" , repo ? "" -, page ? "releases?per_page=1" -, filter ? ".[0].tag_name | split(\"-\") | .[1]" +, page ? "releases/latest" +, filter ? ".tag_name | split(\"-\") | .[1]" }: let diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 54842ff641350..cb9075567274c 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.4.19"; - source.sha256 = "sha256-M03HlkODhHMv3xm/ovYjdTt+2FFg0Izh8gAJmEzvs2I="; + version = "2.4.20"; + source.sha256 = "sha256-dEsrGVHaYTryr2hU98H54W3ZC0tmzZrxonqfRIx2G+4="; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 1cbbdf0bf29d6..25412b45b40b7 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/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/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index f9655b201746e..34bb4303724b0 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.5.14"; + version = "2.5.15"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4F8cGcQJy8cbCE0wxM6B4qGjuc+SjeL7DMr6RdSkXBM="; + hash = "sha256-PVx66Ipvf+rISkuu9dw2ecFXXmuzITg2PogqRktFh5M="; }; patches = [ diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index 7be303a52a483..87344d747bf66 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -1,18 +1,34 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "cpplint"; version = "1.5.5"; + format = "setuptools"; # Fetch from github instead of pypi, since the test cases are not in the pypi archive src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-JXz2Ufo7JSceZVqYwCRkuAsOR08znZlIUk8GCLAyiI4="; + hash = "sha256-JXz2Ufo7JSceZVqYwCRkuAsOR08znZlIUk8GCLAyiI4="; }; - patches = [ ./0001-Remove-pytest-runner-version-pin.patch ]; + patches = [ + ./0001-Remove-pytest-runner-version-pin.patch + + # The patch below stops using the sre_compile module, which was deprecated + # in Python 3.11 and replaces it with re.compile. Upstream is unsure if it + # should use re.compile or re._compiler.compile, so we should monitor the + # thread for updates. + # + # https://github.com/cpplint/cpplint/pull/214 + # + (fetchpatch { + name = "python-3.11-compatibility.patch"; + url = "https://github.com/cpplint/cpplint/commit/e84e84f53915ae2a9214e756cf89c573a73bbcd3.patch"; + hash = "sha256-u57AFWaVmGFSsvSGq1x9gZmTsuZPqXvTC7mTfyb2164="; + }) + ]; postPatch = '' patchShebangs cpplint_unittest.py diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index e6b20bd5e1595..d4bd1e84b112f 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -25,11 +25,11 @@ let rizin = stdenv.mkDerivation rec { pname = "rizin"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - hash = "sha256-4poAo+IgBL3RAUbShrHM4OBhltQarkcpqvydeDIf+Gs="; + hash = "sha256-lfZMarnm2qnp+lY0OY649s206/LoFNouTLlp0x9FCcI="; }; mesonFlags = [ diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index aa09a5d2358ed..8758afea8211e 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; rev = "refs/tags/${version}"; - hash = "sha256-bJAmkE+sL9DqKpcjZdBf4/z9lz+m/o0Z87hlAwbVbTY="; + hash = "sha256-x2VN/6Kg/n6BW5S4nLKfG67dYrSR/G+Aowf6d2Vbc+0="; }; patches = [ diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 3e78f7a47688e..1b833d6d1f04a 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/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/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index 5b0aff8072c8a..64890d12cea96 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -57,6 +57,6 @@ python.pkgs.buildPythonApplication rec { changelog = "https://raw.githubusercontent.com/SConsProject/scons/rel_${version}/src/CHANGES.txt"; license = licenses.mit; platforms = platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/development/tools/build-managers/scons/setup-hook.sh b/pkgs/development/tools/build-managers/scons/setup-hook.sh index 67358ee843d12..bfd8f3cc07b92 100644 --- a/pkgs/development/tools/build-managers/scons/setup-hook.sh +++ b/pkgs/development/tools/build-managers/scons/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash disable=SC2206 + sconsBuildPhase() { runHook preBuild @@ -15,7 +17,7 @@ sconsBuildPhase() { $buildFlags ${buildFlagsArray[@]} ) - echoCmd 'build flags' "${flagsArray[@]}" + echoCmd 'scons build flags' "${flagsArray[@]}" scons "${flagsArray[@]}" runHook postBuild @@ -39,7 +41,7 @@ sconsInstallPhase() { ${installTargets:-install} ) - echoCmd 'install flags' "${flagsArray[@]}" + echoCmd 'scons install flags' "${flagsArray[@]}" scons "${flagsArray[@]}" runHook postInstall @@ -50,9 +52,9 @@ sconsCheckPhase() { if [ -z "${checkTarget:-}" ]; then if scons -n check >/dev/null 2>&1; then - checkTarget=check + checkTarget="check" elif scons -n test >/dev/null 2>&1; then - checkTarget=test + checkTarget="test" fi fi @@ -65,21 +67,21 @@ sconsCheckPhase() { ${checkFlagsArray[@]} ) - echoCmd 'check flags' "${flagsArray[@]}" + echoCmd 'scons check flags' "${flagsArray[@]}" scons "${flagsArray[@]}" fi runHook postCheck } -if [ -z "${buildPhase-}" ]; then +if [ -z "${dontUseSconsBuild-}" ] && [ -z "${buildPhase-}" ]; then buildPhase=sconsBuildPhase fi -if [ -z "${dontUseSconsInstall-}" -a -z "${installPhase-}" ]; then - installPhase=sconsInstallPhase +if [ -z "${dontUseSconsCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=sconsCheckPhase fi -if [ -z "${checkPhase-}" ]; then - checkPhase=sconsCheckPhase +if [ -z "${dontUseSconsInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=sconsInstallPhase fi diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 20f905a50ec99..dc78761cc256d 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2023.09.07"; + version = "2023.10.20"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-F7ePdITYKkGB6nsR3EFJ7zLDCUoT0g3i+AAjXzBd624="; + sha256 = "sha256-f9u/pk3CEEmiLgnS2biaUHpsMHjVEwZL2jyB/1PiZUY="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index a025de299ccd5..b89f4e4d28839 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -66,7 +66,7 @@ let package = buildPythonApplication rec { pname = "buildbot"; version = "3.9.2"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index b6e11c7eb4b10..0e76b6897fbaf 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/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 = [ diff --git a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix index dfca2742b58b5..899fdc7d82ef6 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix +++ b/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/pkgs/development/tools/database/litestream/default.nix b/pkgs/development/tools/database/litestream/default.nix index 818709ae1e967..83b1fb0c9f718 100644 --- a/pkgs/development/tools/database/litestream/default.nix +++ b/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/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index 1fa12861d9213..0236a5f51f3d5 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.14.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MQi8A7eWOShP/VhxuX4Uhz1ueLtKvOi1x4E7aFXEsQo="; + sha256 = "sha256-lCbxGW6+/r5AnsSXvrE7jYL1ZywcTlb4RK3MurL1JWg="; }; vendorHash = "sha256-yXWeINubvfZ2S+3gVFsrzeVO3XXIiZ14qfK+9Bj3SV4="; diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index cbd9080989655..6e1493528e2b5 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -40,7 +40,7 @@ let ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - knownVulnerabilities = optional (versionOlder version "22.0.0" || versions.major version == "23") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "25.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 92c4ce68c63c1..a3b470f78d7b7 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -884,7 +884,7 @@ "version": "2023-09-12", "url": "https://gn.googlesource.com/gn", "rev": "991530ce394efb58fcd848195469022fa17ae126", - "sha256": "1zpbaspb2mncbsabps8n1iwzc67nhr79ndc9dnqxx1w1qfvaldg2" + "hash": "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4=" } } }, @@ -1776,7 +1776,7 @@ "version": "2023-08-10", "url": "https://gn.googlesource.com/gn", "rev": "cc56a0f98bb34accd5323316e0292575ff17a5d4", - "sha256": "1ly7z48v147bfdb1kqkbc98myxpgqq3g6vgr8bjx1ikrk17l82ab" + "hash": "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M=" } } }, @@ -2620,7 +2620,7 @@ "version": "2023-06-09", "url": "https://gn.googlesource.com/gn", "rev": "4bd1a77e67958fb7f6739bd4542641646f264e5d", - "sha256": "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw" + "hash": "sha256-XP+NQG8kjzXPzQ25YaZiPymexZwAGwhpodqgdTWWCZI=" } } }, @@ -3440,7 +3440,7 @@ "version": "2023-04-19", "url": "https://gn.googlesource.com/gn", "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa", - "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk" + "hash": "sha256-U0rinjJAToVh4zCBd/9I3O4McxW88b7Bp6ibmmqCuQc=" } } }, diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py index 1ea11bd5bba98..128b1dc050672 100755 --- a/pkgs/development/tools/electron/update.py +++ b/pkgs/development/tools/electron/update.py @@ -188,7 +188,7 @@ def get_gn_source(repo): "version": datetime.fromisoformat(gn["date"]).date().isoformat(), "url": gn["url"], "rev": gn["rev"], - "sha256": gn["sha256"] + "hash": gn["hash"] } } diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index d9cffc192506d..cd42388f0f829 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { This package is only the Community Edition of the Flyway command-line tool. ''; + mainProgram = "flyway"; downloadPage = "https://github.com/flyway/flyway"; homepage = "https://flywaydb.org/"; changelog = "https://documentation.red-gate.com/fd/release-notes-for-flyway-engine-179732572.html"; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 5bfb0996e6604..62aaf9973c8be 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.54.2"; + version = "1.55.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-7nbgiUrp7S7sXt7uFXX8NHYbIRLZZQcg+18IdwAZBfE="; + hash = "sha256-77bhXeABkV6WZCzoGnRS447pEVcJyj4AF+wihJe62fc="; }; - vendorHash = "sha256-IyH5lG2a4zjsg/MUonCUiAgMl4xx8zSflRyzNgk8MR0="; + vendorHash = "sha256-3aHLilu+AZ6376bn9eS8kmSfo6fXikOFJKDRCYu+4a0="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/development/tools/java/dex2jar/default.nix b/pkgs/development/tools/java/dex2jar/default.nix index 97fa2298b051c..e0ce19dc8d2f8 100644 --- a/pkgs/development/tools/java/dex2jar/default.nix +++ b/pkgs/development/tools/java/dex2jar/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dex2jar"; - version = "2.1"; + version = "2.4"; src = fetchurl { - url = "https://github.com/pxb1988/dex2jar/releases/download/v${finalAttrs.version}/dex2jar-${finalAttrs.version}.zip"; - hash = "sha256-epvfhD1D3k0elOwue29VglAXsMSn7jn/gmYOJJOkbwg="; + url = "https://github.com/pxb1988/dex2jar/releases/download/v${finalAttrs.version}/dex-tools-v${finalAttrs.version}.zip"; + hash = "sha256-7nxF6zwdJHSmFF2NRH5lGnNqItlmS209O+WlqBfdojo="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index cae88d5416e75..63f6fff66b623 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/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/pkgs/development/tools/misc/complgen/default.nix b/pkgs/development/tools/misc/complgen/default.nix index f69b36fc4bc14..81cf9c120edd9 100644 --- a/pkgs/development/tools/misc/complgen/default.nix +++ b/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/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix index a137f5b21ba6e..6737e791f952c 100644 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ b/pkgs/development/tools/misc/dart-sass/default.nix @@ -29,6 +29,7 @@ buildDartApplication rec { }; pubspecLockFile = ./pubspec.lock; + depsListFile = ./deps.json; vendorHash = "sha256-PQvY+qFXovSXH5wuc60wCrt5RiooKcaGKYzbjKSvqso="; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/dart-sass/deps.json b/pkgs/development/tools/misc/dart-sass/deps.json new file mode 100644 index 0000000000000..75548f50d9003 --- /dev/null +++ b/pkgs/development/tools/misc/dart-sass/deps.json @@ -0,0 +1,930 @@ +[ + { + "name": "sass", + "version": "1.69.0", + "kind": "root", + "source": "root", + "dependencies": [ + "args", + "async", + "charcode", + "cli_pkg", + "cli_repl", + "collection", + "http", + "js", + "meta", + "native_synchronization", + "node_interop", + "package_config", + "path", + "pool", + "protobuf", + "pub_semver", + "source_maps", + "source_span", + "stack_trace", + "stream_channel", + "stream_transform", + "string_scanner", + "term_glyph", + "typed_data", + "watcher", + "analyzer", + "archive", + "crypto", + "dart_style", + "dartdoc", + "grinder", + "node_preamble", + "lints", + "protoc_plugin", + "pub_api_client", + "pubspec_parse", + "test", + "test_descriptor", + "test_process", + "yaml", + "cli_util" + ] + }, + { + "name": "cli_util", + "version": "0.4.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "path", + "version": "1.8.3", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "meta", + "version": "1.10.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "yaml", + "version": "3.1.2", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner" + ] + }, + { + "name": "string_scanner", + "version": "1.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.10.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "term_glyph", + "version": "1.2.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "collection", + "version": "1.18.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "test_process", + "version": "2.1.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "async", + "meta", + "path", + "test" + ] + }, + { + "name": "test", + "version": "1.24.6", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "boolean_selector", + "collection", + "coverage", + "http_multi_server", + "io", + "js", + "matcher", + "node_preamble", + "package_config", + "path", + "pool", + "shelf", + "shelf_packages_handler", + "shelf_static", + "shelf_web_socket", + "source_span", + "stack_trace", + "stream_channel", + "test_api", + "test_core", + "typed_data", + "web_socket_channel", + "webkit_inspection_protocol", + "yaml" + ] + }, + { + "name": "webkit_inspection_protocol", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "logging" + ] + }, + { + "name": "logging", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "web_socket_channel", + "version": "2.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "crypto", + "stream_channel" + ] + }, + { + "name": "stream_channel", + "version": "2.1.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "async", + "version": "2.11.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "crypto", + "version": "3.0.3", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "test_core", + "version": "0.5.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "async", + "boolean_selector", + "collection", + "coverage", + "frontend_server_client", + "glob", + "io", + "meta", + "package_config", + "path", + "pool", + "source_map_stack_trace", + "source_maps", + "source_span", + "stack_trace", + "stream_channel", + "test_api", + "vm_service", + "yaml" + ] + }, + { + "name": "vm_service", + "version": "11.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "test_api", + "version": "0.6.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph" + ] + }, + { + "name": "stack_trace", + "version": "1.11.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "boolean_selector", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" + ] + }, + { + "name": "source_maps", + "version": "0.10.12", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_map_stack_trace", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "source_maps", + "stack_trace" + ] + }, + { + "name": "pool", + "version": "1.5.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "stack_trace" + ] + }, + { + "name": "package_config", + "version": "2.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "io", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "string_scanner" + ] + }, + { + "name": "glob", + "version": "2.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "file", + "path", + "string_scanner" + ] + }, + { + "name": "file", + "version": "7.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "frontend_server_client", + "version": "3.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "coverage", + "version": "1.6.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "logging", + "package_config", + "path", + "source_maps", + "stack_trace", + "vm_service" + ] + }, + { + "name": "args", + "version": "2.4.2", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "analyzer", + "version": "5.13.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "_fe_analyzer_shared", + "collection", + "convert", + "crypto", + "glob", + "meta", + "package_config", + "path", + "pub_semver", + "source_span", + "watcher", + "yaml" + ] + }, + { + "name": "watcher", + "version": "1.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "pub_semver", + "version": "2.1.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "convert", + "version": "3.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "_fe_analyzer_shared", + "version": "61.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "shelf_web_socket", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "shelf", + "stream_channel", + "web_socket_channel" + ] + }, + { + "name": "shelf", + "version": "1.4.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "http_parser", + "path", + "stack_trace", + "stream_channel" + ] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + }, + { + "name": "shelf_static", + "version": "1.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "convert", + "http_parser", + "mime", + "path", + "shelf" + ] + }, + { + "name": "mime", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "shelf_packages_handler", + "version": "3.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "shelf", + "shelf_static" + ] + }, + { + "name": "node_preamble", + "version": "2.0.2", + "kind": "dev", + "source": "hosted", + "dependencies": [] + }, + { + "name": "matcher", + "version": "0.12.16", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "meta", + "stack_trace", + "term_glyph", + "test_api" + ] + }, + { + "name": "js", + "version": "0.6.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "http_multi_server", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "test_descriptor", + "version": "2.0.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "matcher", + "meta", + "path", + "term_glyph", + "test" + ] + }, + { + "name": "pubspec_parse", + "version": "1.2.3", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "checked_yaml", + "collection", + "json_annotation", + "pub_semver", + "yaml" + ] + }, + { + "name": "json_annotation", + "version": "4.8.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "checked_yaml", + "version": "2.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "json_annotation", + "source_span", + "yaml" + ] + }, + { + "name": "pub_api_client", + "version": "2.6.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "collection", + "http", + "oauth2", + "path", + "pubspec" + ] + }, + { + "name": "pubspec", + "version": "2.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "pub_semver", + "yaml", + "uri" + ] + }, + { + "name": "uri", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "matcher", + "quiver" + ] + }, + { + "name": "quiver", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "matcher" + ] + }, + { + "name": "oauth2", + "version": "2.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "crypto", + "http", + "http_parser" + ] + }, + { + "name": "http", + "version": "1.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "http_parser", + "meta" + ] + }, + { + "name": "protoc_plugin", + "version": "21.1.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "fixnum", + "path", + "protobuf" + ] + }, + { + "name": "protobuf", + "version": "3.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "fixnum", + "meta" + ] + }, + { + "name": "fixnum", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "lints", + "version": "2.1.1", + "kind": "dev", + "source": "hosted", + "dependencies": [] + }, + { + "name": "grinder", + "version": "0.9.4", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "cli_util", + "glob", + "meta", + "path", + "collection" + ] + }, + { + "name": "dartdoc", + "version": "6.3.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "cli_util", + "collection", + "crypto", + "glob", + "html", + "logging", + "markdown", + "meta", + "package_config", + "path", + "pub_semver", + "source_span", + "yaml" + ] + }, + { + "name": "markdown", + "version": "7.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "meta" + ] + }, + { + "name": "html", + "version": "0.15.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "csslib", + "source_span" + ] + }, + { + "name": "csslib", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "dart_style", + "version": "2.3.2", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "path", + "pub_semver", + "source_span" + ] + }, + { + "name": "archive", + "version": "3.3.9", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "crypto", + "path", + "pointycastle" + ] + }, + { + "name": "pointycastle", + "version": "3.7.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "convert", + "js" + ] + }, + { + "name": "stream_transform", + "version": "2.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "node_interop", + "version": "2.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "js" + ] + }, + { + "name": "native_synchronization", + "version": "0.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "ffi" + ] + }, + { + "name": "ffi", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "cli_repl", + "version": "0.2.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "js" + ] + }, + { + "name": "cli_pkg", + "version": "2.5.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "archive", + "async", + "charcode", + "cli_util", + "collection", + "crypto", + "glob", + "grinder", + "http", + "js", + "meta", + "node_interop", + "node_preamble", + "package_config", + "path", + "pool", + "pub_semver", + "pubspec_parse", + "retry", + "string_scanner", + "test", + "test_process", + "xml", + "yaml" + ] + }, + { + "name": "xml", + "version": "6.4.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "petitparser" + ] + }, + { + "name": "petitparser", + "version": "6.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "retry", + "version": "3.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "charcode", + "version": "1.3.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + } +] diff --git a/pkgs/development/tools/misc/indent/darwin.patch b/pkgs/development/tools/misc/indent/darwin.patch deleted file mode 100644 index 5458a0d93bff3..0000000000000 --- a/pkgs/development/tools/misc/indent/darwin.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/config.h.in b/config.h.in -index 07e6fce..0c57e2a 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -432,8 +432,8 @@ - # endif - # define _GL_EXTERN_INLINE extern - #else --# define _GL_INLINE static _GL_UNUSED --# define _GL_EXTERN_INLINE static _GL_UNUSED -+# define _GL_INLINE static -+# define _GL_EXTERN_INLINE static - #endif - - #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index a94a907c1024e..0d4c272e414e1 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -1,19 +1,46 @@ -{ lib, stdenv, fetchurl, texinfo, buildPackages, pkgsStatic }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, libintl +, texinfo +, buildPackages +, pkgsStatic +}: stdenv.mkDerivation rec { pname = "indent"; - version = "2.2.12"; + version = "2.2.13"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7"; + hash = "sha256-nmRjT8TOZ5eyBLy4iXzhT90KtIyldpb3h2fFnK5XgJU="; }; - patches = [ ./darwin.patch ]; + patches = [ + (fetchpatch { + name = "CVE-2023-40305.part-1.patch"; + url = "https://git.savannah.gnu.org/cgit/indent.git/patch/?id=df4ab2d19e247d059e0025789ba513418073ab6f"; + hash = "sha256-OLXBlYTdEuFK8SIsyC5Xr/hHWlvXiRqY2h79w+H5pGk="; + }) + (fetchpatch { + name = "CVE-2023-40305.part-2.patch"; + url = "https://git.savannah.gnu.org/cgit/indent.git/patch/?id=2685cc0bef0200733b634932ea7399b6cf91b6d7"; + hash = "sha256-t+QF7N1aqQ28J2O8esZ2bc5K042cUuZR4MeMeuWIgPw="; + }) + ]; + + # avoid https://savannah.gnu.org/bugs/?64751 + postPatch = '' + sed -E -i '/output\/else-comment-2-br(-ce)?.c/d' regression/TEST + sed -E -i 's/else-comment-2-br(-ce)?.c//g' regression/TEST + ''; + makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ]; strictDeps = true; nativeBuildInputs = [ texinfo ]; + buildInputs = [ libintl ]; pkgsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling env.NIX_CFLAGS_COMPILE = toString ( @@ -23,6 +50,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + doCheck = true; + passthru.tests.static = pkgsStatic.indent; meta = { homepage = "https://www.gnu.org/software/indent/"; diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/development/tools/misc/iozone/default.nix index fd25c767ab0e2..a724d67a1a047 100644 --- a/pkgs/development/tools/misc/iozone/default.nix +++ b/pkgs/development/tools/misc/iozone/default.nix @@ -14,11 +14,11 @@ in stdenv.mkDerivation rec { pname = "iozone"; - version = "3.493"; + version = "3.506"; src = fetchurl { - url = "http://www.iozone.org/src/current/iozone${lib.replaceStrings ["."] ["_"] version}.tgz"; - hash = "sha256-Y0wSNgC0u0LoJ0g/oVsq+uba2ikHt4SxTgFBWTPUMZg="; + url = "http://www.iozone.org/src/current/iozone${lib.replaceStrings ["."] ["_"] version}.tar"; + hash = "sha256-EUzlwHGHO5ose6bnPQXV735mVkOSrL/NwLMmHbEPy+c="; }; license = fetchurl { diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix deleted file mode 100644 index 8b38246d67d58..0000000000000 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, python3, bash }: - -stdenv.mkDerivation rec { - pname = "kconfig-frontends"; - version = "4.11.0.1"; - - src = fetchurl { - sha256 = "1xircdw3k7aaz29snf96q2fby1cs48bidz5l1kkj0a5gbivw31i3"; - url = "http://ymorin.is-a-geek.org/download/kconfig-frontends/kconfig-frontends-${version}.tar.xz"; - }; - - nativeBuildInputs = [ bison flex gperf pkg-config ]; - buildInputs = [ bash ncurses python3 ]; - - strictDeps = true; - - configureFlags = [ - "--enable-frontends=conf,mconf,nconf" - ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; - - meta = with lib; { - description = "Out of Linux tree packaging of the kconfig infrastructure"; - longDescription = '' - Configuration language and system for the Linux kernel and other - projects. Features simple syntax and grammar, limited yet adequate option - types, simple organization of options, and direct and reverse - dependencies. - ''; - homepage = "http://ymorin.is-a-geek.org/projects/kconfig-frontends"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ mbe ]; - }; -} diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index e33a288286ee2..9bc36338ff2e3 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.10.0"; + version = "5.10.1"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-MTWaGgDIDo3CaRHyHWqliKsPdbU/TZPsyfF7SoHTnhk="; + hash = "sha256-ACdiFkV138jDIrRe+baYo+r9vCO4cyRyO2ck7OKakFY="; }; - cargoHash = "sha256-8Vrp4d5luf91pKpUC4wWn4otsanqopCHwCjcnfTzyLk="; + cargoHash = "sha256-bEeQOOucXd4HNTR6SmidAfDkZ1tT7ORmUxrNx+3FNRw="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.9.2/.github/workflows/publish.yml#L117-L121 + # https://github.com/latex-lsp/texlab/blob/v5.10.1/.github/workflows/publish.yml#L117-L121 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; diff --git a/pkgs/development/tools/oxlint/default.nix b/pkgs/development/tools/oxlint/default.nix index 48534355f4619..79afce5dd8301 100644 --- a/pkgs/development/tools/oxlint/default.nix +++ b/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/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index 04174d1c43540..2e859c6ddbf54 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -2732,6 +2732,9 @@ "certbot-dns-inwx": [ "setuptools" ], + "certbot-dns-ovh": [ + "setuptools" + ], "certbot-dns-rfc2136": [ "setuptools" ], diff --git a/pkgs/development/tools/protoc-gen-dart/default.nix b/pkgs/development/tools/protoc-gen-dart/default.nix index 29892b954fc78..fa11e1b60e805 100644 --- a/pkgs/development/tools/protoc-gen-dart/default.nix +++ b/pkgs/development/tools/protoc-gen-dart/default.nix @@ -16,6 +16,7 @@ buildDartApplication rec { sourceRoot = "${src.name}/protoc_plugin"; pubspecLockFile = ./pubspec.lock; + depsListFile = ./deps.json; vendorHash = "sha256-yNgQLCLDCbA07v9tIwPRks/xPAzLVykNtIk+8C0twYM="; meta = with lib; { diff --git a/pkgs/development/tools/protoc-gen-dart/deps.json b/pkgs/development/tools/protoc-gen-dart/deps.json new file mode 100644 index 0000000000000..c00a66e0d8495 --- /dev/null +++ b/pkgs/development/tools/protoc-gen-dart/deps.json @@ -0,0 +1,549 @@ +[ + { + "name": "protoc_plugin", + "version": "21.1.0", + "kind": "root", + "source": "root", + "dependencies": [ + "fixnum", + "path", + "protobuf", + "collection", + "dart_flutter_team_lints", + "matcher", + "test" + ] + }, + { + "name": "test", + "version": "1.24.6", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "boolean_selector", + "collection", + "coverage", + "http_multi_server", + "io", + "js", + "matcher", + "node_preamble", + "package_config", + "path", + "pool", + "shelf", + "shelf_packages_handler", + "shelf_static", + "shelf_web_socket", + "source_span", + "stack_trace", + "stream_channel", + "test_api", + "test_core", + "typed_data", + "web_socket_channel", + "webkit_inspection_protocol", + "yaml" + ] + }, + { + "name": "yaml", + "version": "3.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner" + ] + }, + { + "name": "string_scanner", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "term_glyph", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "path", + "version": "1.8.3", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "collection", + "version": "1.18.0", + "kind": "dev", + "source": "hosted", + "dependencies": [] + }, + { + "name": "webkit_inspection_protocol", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "logging" + ] + }, + { + "name": "logging", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "web_socket_channel", + "version": "2.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "crypto", + "stream_channel" + ] + }, + { + "name": "stream_channel", + "version": "2.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "async", + "version": "2.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "meta", + "version": "1.9.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "crypto", + "version": "3.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "test_core", + "version": "0.5.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "async", + "boolean_selector", + "collection", + "coverage", + "frontend_server_client", + "glob", + "io", + "meta", + "package_config", + "path", + "pool", + "source_map_stack_trace", + "source_maps", + "source_span", + "stack_trace", + "stream_channel", + "test_api", + "vm_service", + "yaml" + ] + }, + { + "name": "vm_service", + "version": "11.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "test_api", + "version": "0.6.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph" + ] + }, + { + "name": "stack_trace", + "version": "1.11.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "boolean_selector", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" + ] + }, + { + "name": "source_maps", + "version": "0.10.12", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_map_stack_trace", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "source_maps", + "stack_trace" + ] + }, + { + "name": "pool", + "version": "1.5.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "stack_trace" + ] + }, + { + "name": "package_config", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "io", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "string_scanner" + ] + }, + { + "name": "glob", + "version": "2.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "file", + "path", + "string_scanner" + ] + }, + { + "name": "file", + "version": "7.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "frontend_server_client", + "version": "3.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "coverage", + "version": "1.6.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "logging", + "package_config", + "path", + "source_maps", + "stack_trace", + "vm_service" + ] + }, + { + "name": "args", + "version": "2.4.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "analyzer", + "version": "6.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "_fe_analyzer_shared", + "collection", + "convert", + "crypto", + "glob", + "meta", + "package_config", + "path", + "pub_semver", + "source_span", + "watcher", + "yaml" + ] + }, + { + "name": "watcher", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "pub_semver", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "convert", + "version": "3.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "_fe_analyzer_shared", + "version": "64.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "shelf_web_socket", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "shelf", + "stream_channel", + "web_socket_channel" + ] + }, + { + "name": "shelf", + "version": "1.4.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "http_parser", + "path", + "stack_trace", + "stream_channel" + ] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + }, + { + "name": "shelf_static", + "version": "1.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "convert", + "http_parser", + "mime", + "path", + "shelf" + ] + }, + { + "name": "mime", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "shelf_packages_handler", + "version": "3.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "shelf", + "shelf_static" + ] + }, + { + "name": "node_preamble", + "version": "2.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "matcher", + "version": "0.12.16", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "async", + "meta", + "stack_trace", + "term_glyph", + "test_api" + ] + }, + { + "name": "js", + "version": "0.6.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "http_multi_server", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "dart_flutter_team_lints", + "version": "1.0.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "lints" + ] + }, + { + "name": "lints", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "protobuf", + "version": "3.1.0", + "kind": "direct", + "source": "path", + "dependencies": [ + "collection", + "fixnum", + "meta" + ] + }, + { + "name": "fixnum", + "version": "1.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + } +] diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 1d075250a4157..688a475a1403f 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-pydnIUqUBMLHonEGcvB+K+48QQYQuFfZxbAETJjU+3o="; + hash = "sha256-I32DC0hzVM/LCSqS878sZd+UYZ0NfBuzBgd9Aed/Sq0="; }; - cargoHash = "sha256-VgLQfUk1xeAwr9KUo1Vz4Ndw0FAnYGw3af0v3ueNPuA="; + cargoHash = "sha256-CYy0YEWK9sHAr0yFIH9yzxPnzG6x/EcE8ZLkueYgSiE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index ea860cc0896b3..a635e8dbd8cb5 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/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/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index f2a9376e2fa3a..d27f17bfac2fc 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-codspeed"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; rev = "v${version}"; - hash = "sha256-AGbo38weLBPxkaXgJpi+FXGuhPh7nyZcJOhw6BCDYOc="; + hash = "sha256-oI6IfKvX+Zn3tYPXQVxHRQymVz4bBvXfg3mcrjClbY4="; }; - cargoHash = "sha256-NR+Z5oMaReEOZrLk7d/pB1F37k8tE7FXh4HdVnh+YFc="; + cargoHash = "sha256-ZZhYmyWoqZ8SbRpXCA5XsKCdeqAKAcE1NdNlrHhBiYI="; nativeBuildInputs = [ curl diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index fbb3aeb7cc9db..4de6345b9bf64 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.8"; + version = "0.6.13"; src = fetchCrate { inherit pname version; - hash = "sha256-ZFFrluvnm5kCOyIe4c+gT2N4W7aeg1Cv1666by92BJo="; + hash = "sha256-5WwbtubANrLHXvaWzO/u1NeeetVUvl/ujq89BqFZ2ZQ="; }; - cargoHash = "sha256-Nbs2pE9WqwsTJLV3nUAWVVz6gwcmhyk9hv/uaOoAkIQ="; + cargoHash = "sha256-25I1j0QiyeHtUq6IK7ehRK3JLKygiigtfvEe+N74TgY="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 0dc2a708afe38..f911f5ee58735 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/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/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 3bf3add13e165..00976e8b015d3 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/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/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix index cba3b4b3dd7df..5f8b3d2cdc6ec 100644 --- a/pkgs/development/tools/rust/crate2nix/default.nix +++ b/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/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index c9445882282da..999ae8b5ebab8 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/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/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index f17208fbfbdd1..55ce40832f9e5 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -10,17 +10,17 @@ let allSpecs = { x86_64-linux = { system = "linux64"; - sha256 = upstream-info.sha256_linux; + hash = upstream-info.hash_linux; }; x86_64-darwin = { system = "mac-x64"; - sha256 = upstream-info.sha256_darwin; + hash = upstream-info.hash_darwin; }; aarch64-darwin = { system = "mac-arm64"; - sha256 = upstream-info.sha256_darwin_aarch64; + hash = upstream-info.hash_darwin_aarch64; }; }; @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${version}/${spec.system}/chromedriver-${spec.system}.zip"; - sha256 = spec.sha256; + hash = spec.hash; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/tools/twitch-cli/default.nix b/pkgs/development/tools/twitch-cli/default.nix index 7daa9401a18b4..42dfe97d8c24e 100644 --- a/pkgs/development/tools/twitch-cli/default.nix +++ b/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/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 16dfcd878ab6c..4130c52ce1606 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/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/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index fbc6aecd1a4bf..b5f9229776195 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.0.6"; + version = "1.0.7"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-pkCAtO8JUcKJJ/CKbyl84fAT4h1Rf0ASibrq8uf9bsg="; + hash = "sha256-aPFKKCqjKZSz/ZX5G3RiIkLHIj89MGPp+PgFbE4vpgE="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-eHuUgje3lmLuCQC/Tu0+B62t6vu5S8AvPWyBXfwcgdc="; + hash = "sha256-u2UlimmIE2z7qsqkAbSfi7kxuOjlJGkX4RAsUGMklGc="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-NBSRgpWMjAFaTzgujpCPuj8Nk0nogIswqtAcZEHUsv4="; + hash = "sha256-MO01plCsZRR+2kC2J0/VhXJIhchMfLtMFvidPNAXtB4="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-OQ+jSHtdsTZspgwoy0wrntgNX85lndH2dC3ETGiJKQg="; + hash = "sha256-yw17x8DmKktE5fNBF3JQdVSEXFwAotA7hCzfLcd6JoI="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 1c832bb456db4..86ef8a4759f2f 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "minify"; - version = "2.12.9"; + version = "2.19.10"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - hash = "sha256-+NBYn+gEsoclROnq2msNB4knviGn/XA9vNAuB0JZNek="; + hash = "sha256-/OfNHhWbRZI7nRhBnjXfxL4Gf011ydlwEMDadCptFJY="; }; - vendorHash = "sha256-/Pw7fHVXWsovxfyzkWfb6UiRDBmiua82667N4Scl5+A="; + vendorHash = "sha256-ZtQbhhdt9mGRbTpgm6O4wnSPoKF9bAEswppmK+Urqhs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 13a50dc12db35..3c8abbb291880 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.18.0"; - sha256 = "sha256-5NTbrDY02Z+JLwDbR9p4+YSTwzlYLoqV+y3Vn1z+D5A="; + version = "18.18.2"; + sha256 = "sha256-ckni8K+UPsOFmVBPSyor0x+5OHhykbbMymyLrfAeO1Y="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index a4c83d32a3439..4f5ad039393e9 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.8.0"; - sha256 = "sha256-QSvoR65t9hAQup2jzD5r5bZ6oALjVOkZ9Z7INgNxcEw="; + version = "20.8.1"; + sha256 = "sha256-95nGb2pjhruKwsdaN490DEVel/H+lkOT3TnJ+fbvvHA="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch b/pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch new file mode 100644 index 0000000000000..4fe3e373afda6 --- /dev/null +++ b/pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch @@ -0,0 +1,11 @@ +--- a/src/headers.h ++++ b/src/headers.h +@@ -56,7 +56,7 @@ extern DECLSPEC int SDLCALL SDL_GetGamma(float *red, float *green, float *blue); + #define textdomain(x) while(false) + #endif + +-#if !defined(OpenBSD) && !defined(FreeBSD) && !defined(__APPLE__) ++#if !defined(OpenBSD) && !defined(FreeBSD) && !defined(__APPLE__) && !(defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 38) + static inline void strlcat(char *dest, const char *src, size_t n) { strncat(dest, src, n - 1); } + static inline void strlcpy(char *dest, const char *src, size_t n) { strncpy(dest, src, n); dest[n - 1] = 0; } + #endif diff --git a/pkgs/games/blobwars/default.nix b/pkgs/games/blobwars/default.nix index b0951064c24cf..dd94fc1096966 100644 --- a/pkgs/games/blobwars/default.nix +++ b/pkgs/games/blobwars/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "c406279f6cdf2aed3c6edb8d8be16efeda0217494acd525f39ee2bd3e77e4a99"; }; + patches = [ ./blobwars-2.00-glibc-2.38.patch ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf zlib ]; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" ]; diff --git a/pkgs/games/doom-ports/gzdoom/default.nix b/pkgs/games/doom-ports/gzdoom/default.nix index 4d737c6493342..b8d273c543579 100644 --- a/pkgs/games/doom-ports/gzdoom/default.nix +++ b/pkgs/games/doom-ports/gzdoom/default.nix @@ -10,6 +10,7 @@ , fluidsynth , game-music-emu , gtk3 +, imagemagick , libGL , libjpeg , libsndfile @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake copyDesktopItems + imagemagick makeWrapper ninja pkg-config @@ -81,6 +83,8 @@ stdenv.mkDerivation rec { name = "gzdoom"; exec = "gzdoom"; desktopName = "GZDoom"; + comment = meta.description; + icon = "gzdoom"; categories = [ "Game" ]; }) ]; @@ -88,6 +92,12 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/bin/gzdoom $out/share/games/doom/gzdoom makeWrapper $out/share/games/doom/gzdoom $out/bin/gzdoom + + for size in 16 24 32 48 64 128; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + convert -background none -resize "$size"x"$size" $src/src/win32/icon1.ico -flatten \ + $out/share/icons/hicolor/"$size"x"$size"/apps/gzdoom.png + done; ''; meta = with lib; { diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix index 8807852f24863..34bfd4151894f 100644 --- a/pkgs/games/eidolon/default.nix +++ b/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/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index a2614b2f1a9e9..446c692ad81f8 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/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/pkgs/games/freenukum/default.nix b/pkgs/games/freenukum/default.nix index 89c26099db096..ed6c41edac44d 100644 --- a/pkgs/games/freenukum/default.nix +++ b/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/pkgs/games/jumpy/Cargo.lock b/pkgs/games/jumpy/Cargo.lock index b01d46510f70b..55e2b382e6105 100644 --- a/pkgs/games/jumpy/Cargo.lock +++ b/pkgs/games/jumpy/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe21446ad43aa56417a767f3e2f3d7c4ca522904de1dd640529a76e9c5c3b33c" +checksum = "b1061f3ff92c2f65800df1f12fc7b4ff44ee14783104187dd04dfee6f11b0fd2" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -19,65 +19,113 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] -name = "addr2line" -version = "0.19.0" +name = "accesskit" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" dependencies = [ - "gimli", + "enumn", + "serde", ] [[package]] -name = "adler" -version = "1.0.2" +name = "accesskit_consumer" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00" +dependencies = [ + "accesskit", +] [[package]] -name = "ahash" -version = "0.7.6" +name = "accesskit_macos" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56" dependencies = [ - "getrandom 0.2.8", + "accesskit", + "accesskit_consumer", + "objc2", "once_cell", - "version_check", ] [[package]] +name = "accesskit_windows" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31" +dependencies = [ + "accesskit", + "accesskit_consumer", + "arrayvec", + "once_cell", + "paste", + "windows 0.48.0", +] + +[[package]] +name = "accesskit_winit" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0" +dependencies = [ + "accesskit", + "accesskit_macos", + "accesskit_windows", + "winit", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] name = "ahash" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", + "getrandom 0.2.10", "once_cell", + "serde", "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] -name = "aligned-vec" -version = "0.5.0" +name = "allocator-api2" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "alsa" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" +checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" dependencies = [ "alsa-sys", - "bitflags", + "bitflags 1.3.2", "libc", "nix 0.24.3", ] @@ -93,77 +141,55 @@ dependencies = [ ] [[package]] -name = "android_log-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" - -[[package]] -name = "android_logger" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a" -dependencies = [ - "android_log-sys", - "env_logger", - "log", - "once_cell", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" +name = "android-activity" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" dependencies = [ + "android-properties", + "bitflags 1.3.2", + "cc", + "jni-sys", "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum 0.6.1", ] [[package]] -name = "anstream" -version = "0.2.6" +name = "android-properties" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-wincon", - "concolor-override", - "concolor-query", - "is-terminal", - "utf8parse", -] +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" [[package]] -name = "anstyle" -version = "0.3.5" +name = "android_log-sys" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" [[package]] -name = "anstyle-parse" -version = "0.1.1" +name = "android_system_properties" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "utf8parse", + "libc", ] [[package]] -name = "anstyle-wincon" -version = "0.2.0" +name = "anyhow" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" -dependencies = [ - "anstyle", - "windows-sys 0.45.0", -] +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] -name = "anyhow" -version = "1.0.70" +name = "append-only-vec" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "f3cb8f874ecf419dd8165d0279746de966cb8966636d028845e3bd65d519812a" [[package]] name = "approx" @@ -176,9 +202,9 @@ dependencies = [ [[package]] name = "arboard" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" +checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc" dependencies = [ "clipboard-win", "core-graphics", @@ -187,8 +213,7 @@ dependencies = [ "objc", "objc-foundation", "objc_id", - "once_cell", - "parking_lot 0.12.1", + "parking_lot", "thiserror", "winapi", "x11rb", @@ -196,89 +221,58 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ash" -version = "0.37.2+1.3.238" +version = "0.37.3+1.3.251" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" dependencies = [ - "libloading", + "libloading 0.7.4", ] [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ - "concurrent-queue 2.1.0", - "event-listener", + "concurrent-queue", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-executor" -version = "1.5.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" dependencies = [ "async-lock", "async-task", - "concurrent-queue 2.1.0", - "fastrand", - "futures-lite", - "slab", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue 2.1.0", + "concurrent-queue", + "fastrand 2.0.1", "futures-lite", - "log", - "parking", - "polling", - "rustix", "slab", - "socket2", - "waker-fn", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" - -[[package]] -name = "async-timer" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d62d1c449a11d63d953da8602322493f7718b83c2f649c6a7ba9e08c7af188f" -dependencies = [ - "libc", - "wasm-bindgen", - "winapi", -] +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" [[package]] name = "atomic-arena" @@ -287,19 +281,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5450eca8ce5abcfd5520727e975ebab30ccca96030550406b0ca718b224ead10" [[package]] -name = "atomic-polyfill" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", -] - -[[package]] -name = "atomic_refcell" +name = "atomicell" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "857253367827bd9d0fd973f0ef15506a96e79e41b0ad7aa691203a4e3214f6c8" +checksum = "157342dd84c64f16899b4b16c1fb2cce54b887990362aac3c590b3d13810890f" [[package]] name = "autocfg" @@ -309,9 +294,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -324,72 +309,41 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.0" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bevy" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dae99b246505811f5bc19d2de1e406ec5d2816b421d58fa223779eb576f472c9" +checksum = "91c6d3ec4f89e85294dc97334c5b271ddc301fdf67ac9bb994fe44d9273e6ed7" dependencies = [ "bevy_internal", ] [[package]] -name = "bevy-inspector-egui" -version = "0.17.0" +name = "bevy_a11y" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be4f9fa859e4840e7cbcc0ddf2c8a1441ff8f663c317769c5ccc70cdf13bcf2" +checksum = "132c9e35a77c5395951f6d25fa2c52ee92296353426df4f961e60f3ff47e2e42" dependencies = [ - "bevy-inspector-egui-derive", + "accesskit", "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_core_pipeline", + "bevy_derive", "bevy_ecs", - "bevy_egui", - "bevy_hierarchy", - "bevy_log", - "bevy_math", - "bevy_pbr", - "bevy_reflect", - "bevy_render", - "bevy_utils", - "egui", - "image", - "once_cell", - "pretty-type-name", - "smallvec", -] - -[[package]] -name = "bevy-inspector-egui-derive" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97826e6225a5b56e77683e7b99418171f7531d48682b8531252dc6b8ef3e8113" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", ] [[package]] name = "bevy_app" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536e4d0018347478545ed8b6cb6e57b9279ee984868e81b7c0e78e0fb3222e42" +checksum = "f557a7d59e1e16892d7544fc37316506ee598cb5310ef0365125a30783c11531" dependencies = [ "bevy_derive", "bevy_ecs", "bevy_reflect", + "bevy_tasks", "bevy_utils", "downcast-rs", "wasm-bindgen", @@ -398,11 +352,12 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db1bb550168304df69c867c09125e1aae7ff51cf21575396e1598bf293442c4" +checksum = "9714af523da4cdf58c42a317e5ed40349708ad954a18533991fd64c8ae0a6f68" dependencies = [ "anyhow", + "async-channel", "bevy_app", "bevy_diagnostic", "bevy_ecs", @@ -410,13 +365,12 @@ dependencies = [ "bevy_reflect", "bevy_tasks", "bevy_utils", + "bevy_winit", "crossbeam-channel", "downcast-rs", - "fastrand", + "fastrand 1.9.0", "js-sys", - "ndk-glue", - "notify", - "parking_lot 0.12.1", + "parking_lot", "serde", "thiserror", "wasm-bindgen", @@ -426,9 +380,9 @@ dependencies = [ [[package]] name = "bevy_core" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96299aceb3c8362cb4aa39ff81c7ef758a5f4e768d16b5046a91628eff114ac0" +checksum = "3d5272321be5fcf5ce2fb16023bc825bb10dfcb71611117296537181ce950f48" dependencies = [ "bevy_app", "bevy_ecs", @@ -437,17 +391,17 @@ dependencies = [ "bevy_tasks", "bevy_utils", "bytemuck", - "serde", ] [[package]] name = "bevy_core_pipeline" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc128a9860aadf16fb343ae427f2768986fd91dce64d945455acda9759c48014" +checksum = "67382fa9c96ce4f4e5833ed7cedd9886844a8f3284b4a717bd4ac738dcdea0c3" dependencies = [ "bevy_app", "bevy_asset", + "bevy_core", "bevy_derive", "bevy_ecs", "bevy_math", @@ -455,27 +409,27 @@ dependencies = [ "bevy_render", "bevy_transform", "bevy_utils", - "bitflags", + "bitflags 2.4.0", "radsort", "serde", ] [[package]] name = "bevy_derive" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7baf73c58d41c353c6fd08e6764a2e7420c9f19e8227b391c50981db6d0282a6" +checksum = "a44e4e2784a81430199e4157e02903a987a32127c773985506f020e7d501b62e" dependencies = [ "bevy_macro_utils", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "bevy_diagnostic" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63bf96ec7980fa25b77ff6c72dfafada477936c0dab76c1edf6c028c0e5fe0e4" +checksum = "6babb230dc383c98fdfc9603e3a7a2a49e1e2879dbe8291059ef37dca897932e" dependencies = [ "bevy_app", "bevy_core", @@ -483,22 +437,23 @@ dependencies = [ "bevy_log", "bevy_time", "bevy_utils", + "sysinfo", ] [[package]] name = "bevy_dylib" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d193c3d56e3bdd106596327d15dd67ddfd862f8b5aa8260677efefe3ddef736" +checksum = "22ea11f830028e1c9d37f8bc88c5873f1c4c0346661209c2ba015f899c51863c" dependencies = [ "bevy_internal", ] [[package]] name = "bevy_ecs" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c071d7c6bc9801253485e05d0c257284150de755391902746837ba21c0cf74" +checksum = "266144b36df7e834d5198049e037ecdf2a2310a76ce39ed937d1b0a6a2c4e8c6" dependencies = [ "async-channel", "bevy_ecs_macros", @@ -507,30 +462,30 @@ dependencies = [ "bevy_tasks", "bevy_utils", "downcast-rs", - "event-listener", + "event-listener 2.5.3", "fixedbitset", - "fxhash", + "rustc-hash", "serde", + "thiserror", "thread_local", ] [[package]] name = "bevy_ecs_macros" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15bd45438eeb681ad74f2d205bb07a5699f98f9524462a30ec764afab2742ce" +checksum = "7157a9c3be038d5008ee3f114feb6cf6b39c1d3d32ee21a7cacb8f81fccdfa80" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "bevy_egui" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb8036050af170243e803eb68e0b5d34f549828a8de92479619fb6dac842f85" +version = "0.21.0" +source = "git+https://github.com/zicklag/bevy_egui?branch=feat/egui-0.23#aeb3d7f1eaaacc67cf3966974d1e31f31e8fad62" dependencies = [ "arboard", "bevy", @@ -541,65 +496,54 @@ dependencies = [ [[package]] name = "bevy_encase_derive" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962b6bb0d30e92ec2e6c29837acce9e55b920733a634e7c3c5fd5a514bea7a24" +checksum = "d0ac0f55ad6bca1be7b0f35bbd5fc95ed3d31e4e9db158fee8e5327f59006001" dependencies = [ "bevy_macro_utils", "encase_derive_impl", ] [[package]] -name = "bevy_fluent" -version = "0.5.0" +name = "bevy_gilrs" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b76fd2fd9c24ecf87bdf6c41bef009825d380c6e260016dac1e6d428d9e0dc69" +checksum = "65f4d79c55829f8016014593a42453f61a564ffb06ef79460d25696ccdfac67b" dependencies = [ - "anyhow", - "bevy", - "fluent", - "fluent-langneg", - "fluent_content", - "globset", - "indexmap", - "intl-memoizer", - "ron", - "serde", - "serde_yaml", + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_log", + "bevy_time", + "bevy_utils", + "gilrs", "thiserror", - "tracing", - "unic-langid", - "uuid", -] - -[[package]] -name = "bevy_framepace" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97caa0b25d627df47f7cfba0b2a9612f4b4ca9d0f53d897a3d70e02fcffea833" -dependencies = [ - "bevy", - "spin_sleep", ] [[package]] -name = "bevy_gilrs" -version = "0.9.1" +name = "bevy_gizmos" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4af552dad82f854b2fae24f36a389fd8ee99d65fe86ae876e854e70d53ff16d9" +checksum = "e286a3e7276431963f4aa29165ea5429fa7dbbc6d5c5ba0c531e7dd44ecc88a2" dependencies = [ "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", "bevy_ecs", - "bevy_input", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_transform", "bevy_utils", - "gilrs", ] [[package]] name = "bevy_hierarchy" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd6d50c48c6e1bcb5e08a768b765323292bb3bf3a439b992754c57ffb85b23a" +checksum = "103f8f58416ac6799b8c7f0b418f1fac9eba44fa924df3b0e16b09256b897e3d" dependencies = [ "bevy_app", "bevy_core", @@ -612,25 +556,25 @@ dependencies = [ [[package]] name = "bevy_input" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3378b5171284f4c4c0e8307081718a9fe458f846444616bd82d69110dcabca51" +checksum = "ffbd935401101ac8003f3c3aea70788c65ad03f7a32716a10608bedda7a648bc" dependencies = [ "bevy_app", "bevy_ecs", "bevy_math", "bevy_reflect", "bevy_utils", - "serde", "thiserror", ] [[package]] name = "bevy_internal" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c46014b7e885b1311de06b6039e448454a4db55b8d35464798ba88faa186e11" +checksum = "e0e35a9b2bd29aa784b3cc416bcbf2a298f69f00ca51fd042ea39d9af7fad37e" dependencies = [ + "bevy_a11y", "bevy_app", "bevy_asset", "bevy_core", @@ -639,6 +583,7 @@ dependencies = [ "bevy_diagnostic", "bevy_ecs", "bevy_gilrs", + "bevy_gizmos", "bevy_hierarchy", "bevy_input", "bevy_log", @@ -647,6 +592,7 @@ dependencies = [ "bevy_ptr", "bevy_reflect", "bevy_render", + "bevy_scene", "bevy_sprite", "bevy_tasks", "bevy_time", @@ -654,27 +600,13 @@ dependencies = [ "bevy_utils", "bevy_window", "bevy_winit", - "ndk-glue", -] - -[[package]] -name = "bevy_kira_audio" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b310ffe1c870e6ca5f0db228953f68af5a861302ec759edae43450f5835a0ece" -dependencies = [ - "anyhow", - "bevy", - "kira", - "parking_lot 0.12.1", - "thiserror", ] [[package]] name = "bevy_log" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c480bac54cf4ae76edc3ae9ae3fa7c5e1b385e7f2111ef5ec3fd00cf3a7998b" +checksum = "07dcc615ff4f617b06c3f9522fca3c55d56f9644db293318f8ab68fcdea5d4fe" dependencies = [ "android_log-sys", "bevy_app", @@ -688,39 +620,40 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022bb69196deeea691b6997414af85bbd7f2b34a8914c4aa7a7ff4dfa44f7677" +checksum = "23ddc18d489b4e57832d4958cde7cd2f349f0ad91e5892ac9e2f2ee16546b981" dependencies = [ "quote", - "syn 1.0.109", - "toml", + "rustc-hash", + "syn 2.0.38", + "toml_edit", ] [[package]] name = "bevy_math" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d434c77ab766c806ed9062ef8a7285b3b02b47df51f188d4496199c3ac062eaf" +checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b" dependencies = [ - "glam 0.22.0", + "glam", "serde", ] [[package]] name = "bevy_mikktspace" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfb5908d33fd613069be516180b8f138aaaf6e41c36b1fd98c6c29c00c24a13" +checksum = "6cfc2a21ea47970a9b1f0f4735af3256a8f204815bd756110051d10f9d909497" dependencies = [ - "glam 0.22.0", + "glam", ] [[package]] name = "bevy_pbr" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "310b1f260a475d81445623e138e1b7245759a42310bc1f84b550a3f4ff8763bf" +checksum = "63ca796a619e61cd43a0a3b11fde54644f7f0732a1fba1eef5d406248c6eba85" dependencies = [ "bevy_app", "bevy_asset", @@ -733,33 +666,35 @@ dependencies = [ "bevy_transform", "bevy_utils", "bevy_window", - "bitflags", + "bitflags 2.4.0", "bytemuck", + "naga_oil", "radsort", ] [[package]] name = "bevy_prototype_lyon" -version = "0.7.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c063aff10ca720d5cadf9cf669800eff2166f6f28cf7f20648ece1c3bdb2442" +checksum = "9e347c16caede05dc5f774ba388cefeef0ab558a5601fc6b5ffd6606bef77308" dependencies = [ "bevy", + "lyon_algorithms", "lyon_tessellation", "svgtypes", ] [[package]] name = "bevy_ptr" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ec44f7655039546bc5d34d98de877083473f3e9b2b81d560c528d6d74d3eff4" +checksum = "72c7586401a46f7d8e436028225c1df5288f2e0082d066b247a82466fea155c6" [[package]] name = "bevy_reflect" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6deae303a7f69dc243b2fa35b5e193cc920229f448942080c8eb2dbd9de6d37a" +checksum = "0778197a1eb3e095a71417c74b7152ede02975cdc95b5ea4ddc5251ed00a2eb5" dependencies = [ "bevy_math", "bevy_ptr", @@ -767,35 +702,37 @@ dependencies = [ "bevy_utils", "downcast-rs", "erased-serde", - "glam 0.22.0", + "glam", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "serde", "smallvec", + "smol_str", "thiserror", ] [[package]] name = "bevy_reflect_derive" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bf4cb9cd5acb4193f890f36cb63679f1502e2de025e66a63b194b8b133d018" +checksum = "342a4b2d09db22c48607d23ad59a056aff1ee004549050a51d490d375ba29528" dependencies = [ "bevy_macro_utils", "bit-set", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "uuid", ] [[package]] name = "bevy_render" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e3282a8f8779d2aced93207fbed73f740937c6c2bd27bd84f0799b081c7fca5" +checksum = "39df4824b760928c27afc7b00fb649c7a63c9d76661ab014ff5c86537ee906cb" dependencies = [ "anyhow", + "async-channel", "bevy_app", "bevy_asset", "bevy_core", @@ -808,57 +745,73 @@ dependencies = [ "bevy_mikktspace", "bevy_reflect", "bevy_render_macros", + "bevy_tasks", "bevy_time", "bevy_transform", "bevy_utils", "bevy_window", - "bitflags", + "bitflags 2.4.0", + "bytemuck", "codespan-reporting", "downcast-rs", "encase", "futures-lite", - "hex", "hexasphere", "image", + "js-sys", "naga", - "once_cell", - "parking_lot 0.12.1", + "naga_oil", + "parking_lot", "regex", "serde", "smallvec", "thiserror", "thread_local", + "wasm-bindgen", + "web-sys", "wgpu", + "wgpu-hal", ] [[package]] name = "bevy_render_macros" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7acae697776ac05bea523e1725cf2660c91c53abe72c66782ea1e1b9eedb572" +checksum = "0bd08c740aac73363e32fb45af869b10cec65bcb76fe3e6cd0f8f7eebf4c36c9" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] -name = "bevy_simple_tilemap" -version = "0.10.1" -source = "git+https://github.com/forbjok/bevy_simple_tilemap.git?rev=963d447fa1fd2d6f89228106275b7086840be762#963d447fa1fd2d6f89228106275b7086840be762" +name = "bevy_scene" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd47e1263506153bef3a8be97fe2d856f206d315668c4f97510ca6cc181d9681" dependencies = [ - "bevy", - "bitflags", - "bytemuck", - "rayon", + "anyhow", + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "ron", + "serde", + "thiserror", + "uuid", ] [[package]] name = "bevy_sprite" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec01c7db7f698d95bcb70708527c3ae6bcdc78fc247abe74f935cae8f0a1145" +checksum = "68a8ca824fad75c6ef74cfbbba0a4ce3ccc435fa23d6bf3f003f260548813397" dependencies = [ "bevy_app", "bevy_asset", @@ -871,7 +824,7 @@ dependencies = [ "bevy_render", "bevy_transform", "bevy_utils", - "bitflags", + "bitflags 2.4.0", "bytemuck", "fixedbitset", "guillotiere", @@ -881,76 +834,78 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "680b16b53df9c9f24681dd95f4d772d83760bd19adf8bca00f358a3aad997853" +checksum = "c73bbb847c83990d3927005090df52f8ac49332e1643d2ad9aac3cd2974e66bf" dependencies = [ "async-channel", "async-executor", "async-task", - "concurrent-queue 1.2.4", + "concurrent-queue", "futures-lite", - "once_cell", "wasm-bindgen-futures", ] [[package]] name = "bevy_time" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c38a6d3ea929c7f81e6adf5a6c62cf7e8c40f5106c2174d6057e9d8ea624d" +checksum = "3d58d6dbae9c8225d8c0e0f04d2c5dbb71d22adc01ecd5ab3cebc364139e4a6d" dependencies = [ "bevy_app", "bevy_ecs", "bevy_reflect", "bevy_utils", "crossbeam-channel", - "serde", + "thiserror", ] [[package]] name = "bevy_transform" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba13c57a040b89767191a6f6d720a635b7792793628bfa41a9e38b7026484aec" +checksum = "3b9b0ac0149a57cd846cb357a35fc99286f9848e53d4481954608ac9552ed2d4" dependencies = [ "bevy_app", "bevy_ecs", "bevy_hierarchy", "bevy_math", "bevy_reflect", - "serde", ] [[package]] -name = "bevy_tweening" -version = "0.6.0" +name = "bevy_utils" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d38b2abf5518df10c3c32ee57a54b9ba7067f3bd1c137b912e286d573962145" +checksum = "08d9484e32434ea84dc548cff246ce0c6f756c1336f5ea03f24ac120a48595c7" dependencies = [ - "bevy", - "interpolation", + "ahash", + "bevy_utils_proc_macros", + "getrandom 0.2.10", + "hashbrown 0.14.1", + "instant", + "petgraph", + "thiserror", + "tracing", + "uuid", ] [[package]] -name = "bevy_utils" -version = "0.9.1" +name = "bevy_utils_proc_macros" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16750aae52cd35bd7b60eb61cee883420b250e11b4a290b8d44b2b2941795739" +checksum = "5391b242c36f556db01d5891444730c83aa9dd648b6a8fd2b755d22cb3bddb57" dependencies = [ - "ahash 0.7.6", - "getrandom 0.2.8", - "hashbrown", - "instant", - "tracing", - "uuid", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] name = "bevy_window" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a44d3f3bd54a2261f4f57f614bf7bccc8d2832761493c0cd7dab81d98cc151e" +checksum = "bd584c0da7c4ada6557b09f57f30fb7cff21ccedc641473fc391574b4c9b7944" dependencies = [ "bevy_app", "bevy_ecs", @@ -958,46 +913,41 @@ dependencies = [ "bevy_math", "bevy_reflect", "bevy_utils", - "raw-window-handle 0.5.2", - "serde", + "raw-window-handle", ] [[package]] name = "bevy_winit" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7b7e647ecd0b3577468da37767dcdd7c26ca9f80da0060b2ec4c77336b6d2e1" +checksum = "bfdc044abdb95790c20053e6326760f0a2985f0dcd78613d397bf35f16039d53" dependencies = [ + "accesskit_winit", "approx", + "bevy_a11y", "bevy_app", + "bevy_derive", "bevy_ecs", + "bevy_hierarchy", "bevy_input", "bevy_math", + "bevy_tasks", "bevy_utils", "bevy_window", "crossbeam-channel", - "raw-window-handle 0.5.2", + "raw-window-handle", "wasm-bindgen", "web-sys", "winit", ] [[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] name = "bindgen" -version = "0.64.0" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cexpr", "clang-sys", "lazy_static", @@ -1008,7 +958,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -1027,243 +977,289 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] -name = "bitfield" -version = "0.14.0" +name = "bitflags" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bitfield-rle" -version = "0.2.0" +name = "bitflags" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8acc105b7bd3ed61e4bb7ad3e3b3f2a8da72205b2e0408cf71a499e8f57dd0" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" dependencies = [ - "failure", - "varinteger", + "serde", ] [[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] name = "bitset-core" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f421f1bcb30aa9d851a03c2920ab5d96ca920d5786645a597b5fc37922f8b89e" [[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] -name = "bones_asset" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "bevy_asset", - "bones_bevy_utils", - "bones_ecs", - "serde", - "type_ulid", - "ulid", + "generic-array", ] [[package]] -name = "bones_bevy_asset" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "block-sys" +version = "0.1.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_reflect", - "bevy_utils", - "bones_bevy_asset_macros", - "bones_bevy_utils", - "bones_lib", - "glam 0.22.0", - "serde", - "serde_json", - "serde_yaml", - "type_ulid", - "uuid", + "objc-sys", ] [[package]] -name = "bones_bevy_asset_macros" -version = "0.2.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "block2" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "ulid", + "block-sys", + "objc2-encode", ] [[package]] -name = "bones_bevy_renderer" -version = "0.1.2" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "bones_asset" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "bevy", - "bevy_prototype_lyon", - "bevy_simple_tilemap", - "bones_bevy_asset", - "bones_lib", - "glam 0.22.0", + "anyhow", + "append-only-vec", + "async-channel", + "bevy_tasks", + "bones_schema", + "bones_utils", + "bs58", + "dashmap", + "ehttp", + "erased-serde", + "event-listener 3.0.0", + "notify", + "once_cell", + "paste", + "path-absolutize", + "semver", "serde", "serde_json", "serde_yaml", - "type_ulid", + "sha2", + "tracing", + "ulid", ] [[package]] -name = "bones_bevy_utils" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "bones_bevy_renderer" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "bevy_ecs", - "type_ulid", + "anyhow", + "bevy", + "bevy_egui", + "bevy_prototype_lyon", + "bones_framework", + "directories 5.0.1", + "glam", + "serde", + "serde_yaml", + "web-sys", ] [[package]] name = "bones_ecs" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "aligned-vec", "anyhow", - "atomic_refcell", - "bevy_derive", + "atomicell", "bitset-core", - "bytemuck", - "either", - "fxhash", - "itertools", - "serde", + "bones_schema", + "bones_utils", + "glam", + "paste", "thiserror", - "type_ulid", ] [[package]] -name = "bones_input" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "bones_framework" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "bevy", - "bones_bevy_utils", - "glam 0.22.0", + "bones_asset", + "bones_lib", + "bones_schema", + "csscolorparser", + "egui", + "fluent", + "fluent-langneg", + "glam", + "hex", + "image", "instant", - "type_ulid", + "intl-memoizer", + "kira", + "noise", + "serde", + "serde_yaml", + "sys-locale", + "thiserror", + "tracing", + "ttf-parser", + "unic-langid", ] [[package]] name = "bones_lib" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "bones_asset", - "bones_bevy_utils", "bones_ecs", - "bones_input", - "bones_render", - "noise", - "serde", - "type_ulid", + "instant", ] [[package]] -name = "bones_matchmaker_proto" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff7e71011db4da9f456122f586cf576ee42b249b26a5b2a840eee2141c4ef38" +name = "bones_schema" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ + "append-only-vec", + "bones_schema_macros", + "bones_utils", + "erased-serde", + "glam", + "humantime", + "paste", "serde", + "sptr", + "ulid", ] [[package]] -name = "bones_render" -version = "0.1.2" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "bones_schema_macros" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "bevy_render", - "bevy_transform", - "bones_asset", - "bones_bevy_utils", - "bones_ecs", - "glam 0.22.0", - "hex", + "proc-macro2", + "quote", + "venial", +] + +[[package]] +name = "bones_utils" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" +dependencies = [ + "bevy_ptr", + "bones_utils_macros", + "branches", + "futures-lite", + "fxhash", + "getrandom 0.2.10", + "hashbrown 0.14.1", + "instant", + "maybe-owned", + "parking_lot", "serde", - "thiserror", - "type_ulid", + "smallvec", + "turborand", + "ulid", + "ustr", ] [[package]] -name = "bstr" -version = "1.4.0" +name = "bones_utils_macros" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" +dependencies = [ + "quote", + "venial", +] + +[[package]] +name = "branches" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7958fb9748a08a6f46ef773e87c43997a844709bc293b4c3de48135debaf9d2a" + +[[package]] +name = "bs58" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" dependencies = [ - "memchr", - "serde", + "tinyvec", ] [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +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" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.38", ] [[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cache-padded" -version = "1.2.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[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 = [ "jobserver", + "libc", ] [[package]] @@ -1301,52 +1297,10 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.7.4", ] [[package]] -name = "clap" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" -dependencies = [ - "anstream", - "anstyle", - "bitflags", - "clap_lex", - "strsim", -] - -[[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.13", -] - -[[package]] -name = "clap_lex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" - -[[package]] name = "clipboard-win" version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1358,43 +1312,6 @@ dependencies = [ ] [[package]] -name = "cobs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" -dependencies = [ - "bitflags", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", - "objc", -] - -[[package]] name = "codespan-reporting" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1411,6 +1328,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] name = "combine" version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1421,34 +1344,10 @@ dependencies = [ ] [[package]] -name = "concolor-override" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys 0.45.0", -] - -[[package]] -name = "concurrent-queue" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] - -[[package]] name = "concurrent-queue" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -1465,9 +1364,24 @@ dependencies = [ [[package]] name = "const_panic" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58baae561b85ca19b3122a9ddd35c8ec40c3bcd14fe89921824eae73f7baffbf" +checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" + +[[package]] +name = "const_soft_float" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff" + +[[package]] +name = "constgebra" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd23e864550e6dafc1e41ac78ce4f1ccddc8672b40c403524a04ff3f0518420" +dependencies = [ + "const_soft_float", +] [[package]] name = "core-foundation" @@ -1475,21 +1389,15 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "core-foundation-sys 0.8.3", + "core-foundation-sys", "libc", ] [[package]] name = "core-foundation-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "core-graphics" @@ -1497,7 +1405,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", "foreign-types", @@ -1506,32 +1414,31 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", - "foreign-types", "libc", ] [[package]] name = "coreaudio-rs" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ - "bitflags", - "core-foundation-sys 0.6.2", + "bitflags 1.3.2", + "core-foundation-sys", "coreaudio-sys", ] [[package]] name = "coreaudio-sys" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24" +checksum = "d8478e5bdad14dce236b9898ea002eabfa87cbe14f0aa538dbe3b6a4bec4332d" dependencies = [ "bindgen", ] @@ -1543,7 +1450,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" dependencies = [ "alsa", - "core-foundation-sys 0.8.3", + "core-foundation-sys", "coreaudio-rs", "dasp_sample", "jni 0.19.0", @@ -1554,7 +1461,7 @@ dependencies = [ "ndk-context", "oboe", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -1562,6 +1469,15 @@ dependencies = [ ] [[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] name = "crc32fast" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1571,12 +1487,6 @@ dependencies = [ ] [[package]] -name = "critical-section" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - -[[package]] name = "crossbeam" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1592,9 +1502,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1613,14 +1523,14 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.8.0", + "memoffset 0.9.0", "scopeguard", ] @@ -1636,14 +1546,24 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] [[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] name = "csscolorparser" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1653,55 +1573,27 @@ dependencies = [ ] [[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - -[[package]] name = "d3d12" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" dependencies = [ - "bitflags", - "libloading", + "bitflags 1.3.2", + "libloading 0.7.4", "winapi", ] [[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" +name = "dashmap" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", + "cfg-if", + "hashbrown 0.14.1", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] @@ -1711,43 +1603,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" [[package]] -name = "derive_more" -version = "0.99.17" +name = "data-encoding" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "block-buffer", + "crypto-common", ] [[package]] name = "directories" -version = "4.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +checksum = "72d337a64190607d4fcca2cb78982c5dd57f4916e19696b48a575fa746b6cb0f" dependencies = [ - "dirs-sys", + "libc", + "winapi", ] [[package]] -name = "dirs" -version = "4.0.0" +name = "directories" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ "dirs-sys", ] [[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]] @@ -1758,13 +1657,22 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", +] + +[[package]] +name = "document-features" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e493c573fce17f00dcab13b6ac057994f3ce17d1af4dc39bfd482b83c6eb6157" +dependencies = [ + "litrs", ] [[package]] @@ -1775,144 +1683,171 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "ecolor" -version = "0.20.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b601108bca3af7650440ace4ca55b2daf52c36f2635be3587d77b16efd8d0691" +checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af" dependencies = [ "bytemuck", + "serde", ] [[package]] name = "egui" -version = "0.20.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65a5e883a316e53866977450eecfbcac9c48109c2ab3394af29feb83fcde4ea9" +checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7" dependencies = [ - "ahash 0.8.3", + "accesskit", + "ahash", "epaint", "nohash-hasher", + "serde", ] [[package]] name = "egui_extras" -version = "0.20.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1975cd88ff7430f93b29e6b9868b648a8ff6a43b08b9ff8474ee0a648bd8f9a6" +checksum = "68ffe3fe5c00295f91c2a61a74ee271c32f74049c94ba0b1cea8f26eb478bc07" dependencies = [ "egui", + "enum-map", + "log", "serde", ] [[package]] +name = "ehttp" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f88f45662356f96afc7d9e2bc9910ad8352ee01417f7c69b8b16a53c8767a75d" +dependencies = [ + "document-features", + "js-sys", + "ureq", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "emath" -version = "0.20.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5277249c8c3430e7127e4f2c40a77485e7baf11ae132ce9b3253a8ed710df0a0" +checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0" dependencies = [ "bytemuck", + "serde", ] [[package]] name = "encase" -version = "0.4.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ec50086547d597b5c871a78399ec04a14828a6a5c445a61ed4687c540edec6" +checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c" dependencies = [ "const_panic", "encase_derive", - "glam 0.22.0", + "glam", "thiserror", ] [[package]] name = "encase_derive" -version = "0.4.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda93e9714c7683c474f49a461a2ae329471d2bda43c4302d41c6d8339579e92" +checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e" dependencies = [ "encase_derive_impl", ] [[package]] name = "encase_derive_impl" -version = "0.4.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec27b639e942eb0297513b81cc6d87c50f6c77dc8c37af00a39ed5db3b9657ee" +checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] [[package]] -name = "env_logger" -version = "0.10.0" +name = "enum-map" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5" dependencies = [ - "log", - "regex", + "enum-map-derive", + "serde", ] [[package]] -name = "epaint" -version = "0.20.0" +name = "enum-map-derive" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de14b65fe5e423e0058f77a8beb2c863b056d0566d6c4ce0d097aa5814cb705a" +checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" dependencies = [ - "ab_glyph", - "ahash 0.8.3", - "atomic_refcell", - "bytemuck", - "ecolor", - "emath", - "nohash-hasher", - "parking_lot 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] -name = "erased-serde" -version = "0.3.25" +name = "enumn" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" +checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ - "serde", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] -name = "errno" -version = "0.3.0" +name = "epaint" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.45.0", + "ab_glyph", + "ahash", + "bytemuck", + "ecolor", + "emath", + "nohash-hasher", + "parking_lot", + "serde", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "erased-serde" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ - "cc", - "libc", + "serde", ] [[package]] @@ -1941,46 +1876,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] -name = "failure" -version = "0.1.8" +name = "event-listener" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" dependencies = [ - "backtrace", - "failure_derive", + "concurrent-queue", + "parking", + "pin-project-lite", ] [[package]] -name = "failure_derive" -version = "0.1.8" +name = "fastrand" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", + "instant", ] [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" dependencies = [ - "instant", + "simd-adler32", ] [[package]] name = "filetime" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.45.0", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", ] [[package]] @@ -1991,9 +1930,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -2010,9 +1949,9 @@ dependencies = [ [[package]] name = "fluent" -version = "0.16.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +checksum = "bc4d7142005e2066e4844caf9f271b93fc79836ee96ec85057b8c109687e629a" dependencies = [ "fluent-bundle", "unic-langid", @@ -2053,29 +1992,6 @@ dependencies = [ ] [[package]] -name = "fluent_content" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a582c297515a2fb08cbaa1166498dd18b11ba0e4d7c9cad5b10386a6a2208c8a" -dependencies = [ - "fluent", - "fluent-langneg", - "intl-memoizer", - "thiserror", - "tracing", - "unic-langid", -] - -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "spin 0.9.7", -] - -[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2098,9 +2014,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -2115,29 +2031,10 @@ dependencies = [ ] [[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" +name = "funty" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures-core" @@ -2146,17 +2043,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] name = "futures-io" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2164,11 +2050,11 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -2178,53 +2064,22 @@ dependencies = [ ] [[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" +name = "fxhash" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", + "byteorder", ] [[package]] -name = "fxhash" -version = "0.2.1" +name = "generic-array" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ - "byteorder", + "typenum", + "version_check", ] [[package]] @@ -2250,9 +2105,9 @@ dependencies = [ [[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", "js-sys", @@ -2262,26 +2117,10 @@ dependencies = [ ] [[package]] -name = "ggrs" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1419c3c38e579884b075b99a8ade2ca507e87a2bde81940c6fe4aea895696831" -dependencies = [ - "bincode", - "bitfield-rle", - "bytemuck", - "instant", - "js-sys", - "parking_lot 0.11.2", - "rand 0.8.5", - "serde", -] - -[[package]] name = "gilrs" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0342acdc7b591d171212e17c9350ca02383b86d5f9af33c6e3598e03a6c57e" +checksum = "62fd19844d0eb919aca41d3e4ea0e0b6bf60e1e827558b101c269015b8f5f27a" dependencies = [ "fnv", "gilrs-core", @@ -2292,9 +2131,9 @@ dependencies = [ [[package]] name = "gilrs-core" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2244818258229abc01fe5a7817664e8b82af29eb70e67ab39d49018ae679912" +checksum = "5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d" dependencies = [ "core-foundation", "io-kit-sys", @@ -2302,61 +2141,42 @@ dependencies = [ "libc", "libudev-sys", "log", - "nix 0.25.1", + "nix 0.26.4", "uuid", "vec_map", "wasm-bindgen", "web-sys", - "windows 0.44.0", + "windows 0.51.1", ] [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glam" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" dependencies = [ "bytemuck", - "num-traits", + "mint", "serde", ] [[package]] -name = "glam" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c" - -[[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "globset" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] name = "glow" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" dependencies = [ "js-sys", "slotmap", @@ -2366,11 +2186,11 @@ dependencies = [ [[package]] name = "gpu-alloc" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gpu-alloc-types", ] @@ -2380,27 +2200,40 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi", + "windows 0.44.0", ] [[package]] name = "gpu-descriptor" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags", + "bitflags 2.4.0", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.14.1", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags", + "bitflags 2.4.0", ] [[package]] @@ -2414,60 +2247,38 @@ dependencies = [ ] [[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - -[[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", - "serde", -] [[package]] -name = "heapless" -version = "0.7.16" +name = "hashbrown" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version", + "ahash", + "allocator-api2", "serde", - "spin 0.9.7", - "stable_deref_trait", ] [[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.2.6" +name = "hassle-rs" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" dependencies = [ + "bitflags 1.3.2", + "com-rs", "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi", ] [[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" @@ -2475,12 +2286,12 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hexasphere" -version = "8.1.0" +version = "9.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd41d443f978bfa380a6dad58b62a08c43bcb960631f13e9d015b911eaf73588" +checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10" dependencies = [ - "glam 0.23.0", - "once_cell", + "constgebra", + "glam", ] [[package]] @@ -2490,6 +2301,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2506,36 +2326,20 @@ 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.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", ] [[package]] -name = "if-addrs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" -dependencies = [ - "libc", - "winapi", -] - -[[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -2553,17 +2357,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] [[package]] +name = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown 0.14.1", +] + +[[package]] name = "inotify" version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -2590,12 +2404,6 @@ dependencies = [ ] [[package]] -name = "interpolation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b7357d2bbc5ee92f8e899ab645233e43d21407573cceb37fed8bc3dede2c02" - -[[package]] name = "intl-memoizer" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2616,35 +2424,12 @@ dependencies = [ [[package]] name = "io-kit-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7789f7f3c9686f96164f5109d69152de759e76e284f736bd57661c6df5091919" -dependencies = [ - "core-foundation-sys 0.8.3", - "mach", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.45.0", -] - -[[package]] -name = "is-terminal" -version = "0.4.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" +checksum = "9b2d4429acc1deff0fbdece0325b4997bdb02b2c245ab7023fd5deca0f6348de" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.45.0", + "core-foundation-sys", + "mach2", ] [[package]] @@ -2658,21 +2443,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "iyes_loopless" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c47fd2cbdb1d7f295c25e6bfccfd78a84b6eef3055bc9f01b34ae861721b01ee" -dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_time", - "bevy_utils", -] +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jni" @@ -2726,9 +2499,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", ] @@ -2741,9 +2514,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -2752,91 +2525,28 @@ dependencies = [ name = "jumpy" version = "0.7.0" dependencies = [ - "anyhow", "async-channel", - "async-timer", - "base64 0.21.0", - "bevy", - "bevy-inspector-egui", "bevy_dylib", - "bevy_egui", - "bevy_fluent", - "bevy_framepace", - "bevy_kira_audio", - "bevy_prototype_lyon", - "bevy_tweening", - "bitfield", - "bones_bevy_asset", + "bevy_tasks", "bones_bevy_renderer", - "bones_lib", - "bones_matchmaker_proto", - "bytemuck", - "bytes", - "clap", - "directories", - "downcast-rs", + "bones_framework", + "directories 1.0.2", "egui_extras", - "either", - "fluent", - "fluent_content", - "fnv", - "futures-lite", - "getrandom 0.2.8", - "ggrs", - "iyes_loopless", - "jumpy_core", - "leafwing-input-manager", - "log", - "mdns-sd", - "mimalloc", - "normalize-path", - "numquant", - "once_cell", - "peg", - "ping-rs", - "postcard", - "puffin", - "puffin_egui", - "quinn", - "quinn_runtime_bevy", - "rand 0.8.5", - "rcgen", - "rustls", - "serde", - "serde_json", - "serde_yaml", - "smallvec", - "thiserror", - "tracing", - "turborand", - "type_ulid", - "unic-langid", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "jumpy_core" -version = "0.7.0" -dependencies = [ - "bevy", - "bones_bevy_asset", - "bones_lib", - "bytemuck", - "csscolorparser", - "glam 0.22.0", - "hex", "humantime-serde", - "indexmap", + "indexmap 2.0.2", "nalgebra", + "once_cell", "ordered-float", + "peg", "petgraph", "puffin", "rapier2d", "serde", + "serde_yaml", + "shiftnanigans", + "thiserror", "tracing", "turborand", - "type_ulid", ] [[package]] @@ -2846,27 +2556,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" dependencies = [ "libc", - "libloading", + "libloading 0.7.4", "pkg-config", ] [[package]] name = "kira" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e53aef6f6ec851da68a0ad6d6283bd99ea1a9164f38fd7ac353e28ccd6f5cda" +version = "0.8.5" +source = "git+https://github.com/zicklag/kira.git?branch=feat/sync#e587b155e862567677c114d0d6fc2963be37c14b" dependencies = [ "atomic-arena", "cpal", + "glam", + "mint", "ringbuf", "symphonia", ] [[package]] name = "kqueue" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" dependencies = [ "kqueue-sys", "libc", @@ -2874,11 +2585,11 @@ dependencies = [ [[package]] name = "kqueue-sys" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] @@ -2895,37 +2606,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "leafwing-input-manager" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb82c6ee7d41f195f9384497dcee11bde691d07c1703667724de8afdf67ae987" -dependencies = [ - "bevy", - "derive_more", - "fixedbitset", - "itertools", - "leafwing_input_manager_macros", - "petitset", - "serde", -] - -[[package]] -name = "leafwing_input_manager_macros" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec3d0a4b25f0e6a66547cc3a1eb98b8477814db58de8035063f3db42353a7de" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "libc" -version = "0.2.140" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -2938,20 +2622,20 @@ dependencies = [ ] [[package]] -name = "libm" -version = "0.2.6" +name = "libloading" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] [[package]] -name = "libmimalloc-sys" -version = "0.1.33" +name = "libm" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" -dependencies = [ - "cc", - "libc", -] +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libudev-sys" @@ -2964,16 +2648,16 @@ dependencies = [ ] [[package]] -name = "linux-raw-sys" -version = "0.3.1" +name = "litrs" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "f9275e0933cf8bb20f008924c0cb07a0692fe54d8064996520bf998de9eb79aa" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -2981,11 +2665,18 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lyon_algorithms" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" dependencies = [ - "cfg-if", + "lyon_path", + "num-traits", ] [[package]] @@ -3001,9 +2692,9 @@ dependencies = [ [[package]] name = "lyon_path" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8358c012e5651e4619cfd0b5b75c0f77866181a01b0909aab4bae14adf660" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" dependencies = [ "lyon_geom", "num-traits", @@ -3021,15 +2712,6 @@ dependencies = [ ] [[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[package]] name = "mach2" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3053,35 +2735,30 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] name = "matrixmultiply" -version = "0.3.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ + "autocfg", "rawpointer", ] [[package]] -name = "mdns-sd" -version = "0.7.2" +name = "maybe-owned" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0b1898d42fb934073c893ab88e8ae72076a5d862417dcf214c028011019753" -dependencies = [ - "flume", - "if-addrs", - "polling", - "socket2", -] +checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -3094,9 +2771,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -3107,7 +2784,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-graphics-types", "foreign-types", @@ -3116,15 +2793,6 @@ dependencies = [ ] [[package]] -name = "mimalloc" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" -dependencies = [ - "libmimalloc-sys", -] - -[[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3132,39 +2800,45 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", + "simd-adler32", ] [[package]] +name = "mint" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" + +[[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "naga" -version = "0.10.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "262d2840e72dbe250e8cf2f522d080988dfca624c4112c096238a4845f591707" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "codespan-reporting", "hexf-parse", - "indexmap", + "indexmap 1.9.3", "log", "num-traits", - "petgraph", "pp-rs", "rustc-hash", "spirv", @@ -3174,13 +2848,33 @@ dependencies = [ ] [[package]] +name = "naga_oil" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be942a5c21c58b9b0bf4d9b99db3634ddb7a916f8e1d1d0b71820cc4150e56b" +dependencies = [ + "bit-set", + "codespan-reporting", + "data-encoding", + "indexmap 1.9.3", + "naga", + "once_cell", + "regex", + "regex-syntax 0.6.29", + "rustc-hash", + "thiserror", + "tracing", + "unicode-ident", +] + +[[package]] name = "nalgebra" -version = "0.32.2" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511" +checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" dependencies = [ "approx", - "glam 0.22.0", + "glam", "matrixmultiply", "nalgebra-macros", "num-complex", @@ -3192,9 +2886,9 @@ dependencies = [ [[package]] name = "nalgebra-macros" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" +checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" dependencies = [ "proc-macro2", "quote", @@ -3202,22 +2896,16 @@ dependencies = [ ] [[package]] -name = "natord" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" - -[[package]] name = "ndk" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", "ndk-sys", - "num_enum", - "raw-window-handle 0.5.2", + "num_enum 0.5.11", + "raw-window-handle", "thiserror", ] @@ -3228,36 +2916,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] -name = "ndk-glue" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" -dependencies = [ - "android_logger", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-macro", - "ndk-sys", - "once_cell", - "parking_lot 0.12.1", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "ndk-sys" version = "0.4.1+23.1.7779620" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3272,7 +2930,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.6.5", @@ -3280,12 +2938,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.25.1" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", ] @@ -3318,27 +2975,31 @@ dependencies = [ ] [[package]] -name = "normalize-path" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf22e319b2e3cb517350572e3b70c6822e0a520abfb5c78f690e829a73e8d9f2" - -[[package]] name = "notify" -version = "5.1.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags", + "bitflags 2.4.0", "crossbeam-channel", "filetime", "fsevent-sys", "inotify", "kqueue", "libc", + "log", "mio", "walkdir", - "windows-sys 0.42.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", ] [[package]] @@ -3353,9 +3014,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -3394,31 +3055,30 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", ] [[package]] -name = "num_cpus" -version = "1.15.0" +name = "num_enum" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "hermit-abi 0.2.6", - "libc", + "num_enum_derive 0.5.11", ] [[package]] name = "num_enum" -version = "0.5.11" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.6.1", ] [[package]] @@ -3434,10 +3094,16 @@ dependencies = [ ] [[package]] -name = "numquant" -version = "0.2.0" +name = "num_enum_derive" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54809e43d79aa532432c0d03c6adf62fdd96f2e152b90cef6cd9a316c3da4d99" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.38", +] [[package]] name = "objc" @@ -3461,6 +3127,32 @@ dependencies = [ ] [[package]] +name = "objc-sys" +version = "0.2.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" + +[[package]] +name = "objc2" +version = "0.3.0-beta.3.patch-leaks.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +dependencies = [ + "block2", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "objc-sys", +] + +[[package]] name = "objc_exception" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3480,9 +3172,9 @@ dependencies = [ [[package]] name = "object" -version = "0.30.3" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3512,15 +3204,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] -name = "openssl-probe" -version = "0.1.5" +name = "option-ext" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "optional" @@ -3529,10 +3221,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978aa494585d3ca4ad74929863093e87cac9790d81fe7aba2b3dc2890643a0fc" [[package]] +name = "orbclient" +version = "0.3.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" +dependencies = [ + "redox_syscall 0.3.5", +] + +[[package]] name = "ordered-float" -version = "3.6.0" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a384337e997e6860ffbaa83708b2ef329fd8c54cb67a5f64d421e0f943254f" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" dependencies = [ "num-traits", ] @@ -3545,29 +3246,18 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25e9fb15717794fae58ab55c26e044103aad13186fbb625893f9a3bbcc24228" +checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" dependencies = [ "ttf-parser", ] [[package]] name = "parking" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - -[[package]] -name = "parking_lot" -version = "0.11.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] +checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" [[package]] name = "parking_lot" @@ -3576,48 +3266,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.5", ] [[package]] name = "parry2d" -version = "0.13.3" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49c6edd297a40754e762344dbeb454bdfb51472f03280473065b9b0898008ce3" +checksum = "104ae65232e20477a98f9f1e75ca9850eae24a2ea846a2b1a0af03ad752136ce" dependencies = [ "approx", "arrayvec", - "bitflags", + "bitflags 1.3.2", "downcast-rs", "either", - "indexmap", + "indexmap 1.9.3", "nalgebra", "num-derive", "num-traits", @@ -3630,9 +3306,27 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "path-absolutize" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5" +dependencies = [ + "path-dedot", +] + +[[package]] +name = "path-dedot" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397" +dependencies = [ + "once_cell", +] [[package]] name = "peeking_take_while" @@ -3642,9 +3336,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "peg" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07f2cafdc3babeebc087e499118343442b742cc7c31b4d054682cc598508554" +checksum = "400bcab7d219c38abf8bd7cc2054eb9bbbd4312d66f6a5557d572a203f646f61" dependencies = [ "peg-macros", "peg-runtime", @@ -3652,9 +3346,9 @@ dependencies = [ [[package]] name = "peg-macros" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a90084dc05cf0428428e3d12399f39faad19b0909f64fb9170c9fdd6d9cd49b" +checksum = "46e61cce859b76d19090f62da50a9fe92bab7c2a5f09e183763559a2ac392c90" dependencies = [ "peg-runtime", "proc-macro2", @@ -3663,49 +3357,31 @@ dependencies = [ [[package]] name = "peg-runtime" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739" - -[[package]] -name = "pem" -version = "1.1.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] +checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap", -] - -[[package]] -name = "petitset" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1a50d821a2526af6d5756c23c68e453532a986e361a3e12c9cc7fe61d862ac" -dependencies = [ - "serde", + "indexmap 2.0.2", ] [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", "phf_shared", @@ -3713,9 +3389,9 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared", "rand 0.8.5", @@ -3723,117 +3399,52 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", "phf_shared", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] [[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "ping-rs" -version = "0.1.2" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d873f038f84371f9c7fa13f6afea4d5f1fbcd5070ba8eb7af2a6d41c768eff8b" -dependencies = [ - "futures", - "mio", - "paste", - "socket2", - "windows 0.43.0", -] +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.7" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", + "fdeflate", "flate2", "miniz_oxide", ] [[package]] -name = "polling" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if", - "concurrent-queue 2.1.0", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.45.0", -] - -[[package]] -name = "postcard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00" -dependencies = [ - "cobs", - "heapless", - "serde", -] - -[[package]] name = "pp-rs" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3849,12 +3460,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "pretty-type-name" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f73cdaf19b52e6143685c3606206e114a4dfa969d6b14ec3894c88eb38bd4b" - -[[package]] name = "proc-macro-crate" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3866,126 +3471,46 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.55" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "profiling" -version = "1.0.7" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74605f360ce573babfe43964cbe520294dcb081afbf8c108fc6e23036b4da2df" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" [[package]] name = "puffin" -version = "0.14.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7b2c7a01f569fb03e2ff1f5376537f294001447bd23ce75ca51054fcd223fe4" +checksum = "76425abd4e1a0ad4bd6995dd974b52f414fca9974171df8e3708b3e660d05a21" dependencies = [ "anyhow", - "bincode", "byteorder", + "cfg-if", "instant", "once_cell", - "parking_lot 0.12.1", - "ruzstd", - "serde", - "zstd", -] - -[[package]] -name = "puffin_egui" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba98235ecff9f174793e135d2c6860f917cc7cd419a630b9978f1ab5d6026a3c" -dependencies = [ - "egui", - "indexmap", - "instant", - "natord", - "once_cell", - "puffin", - "time", - "vec1", -] - -[[package]] -name = "quinn" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "thiserror", - "tokio", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-proto" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring", - "rustc-hash", - "rustls", - "rustls-native-certs", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki", ] [[package]] -name = "quinn-udp" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" -dependencies = [ - "libc", - "quinn-proto", - "socket2", - "tracing", - "windows-sys 0.42.0", -] - -[[package]] -name = "quinn_runtime_bevy" -version = "0.1.0" +name = "quote" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4d0c40761a7f14497d4ad43c3887fff819aff1a68d6d731377d98b2106e3be" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "async-executor", - "async-io", - "bevy_tasks", - "futures-lite", - "pin-project", - "quinn", - "quinn-proto", - "quinn-udp", + "proc-macro2", ] [[package]] -name = "quote" -version = "1.0.26" +name = "radium" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -dependencies = [ - "proc-macro2", -] +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "radsort" @@ -4052,7 +3577,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", ] [[package]] @@ -4088,10 +3613,10 @@ dependencies = [ "approx", "arrayvec", "bit-vec", - "bitflags", + "bitflags 1.3.2", "crossbeam", "downcast-rs", - "indexmap", + "indexmap 1.9.3", "nalgebra", "num-derive", "num-traits", @@ -4102,15 +3627,6 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - -[[package]] -name = "raw-window-handle" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" @@ -4122,40 +3638,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "rcgen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" -dependencies = [ - "pem", - "ring", - "time", - "yasna", -] - -[[package]] name = "rectangle-pack" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4167,7 +3649,16 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", ] [[package]] @@ -4176,20 +3667,21 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", - "redox_syscall", + "getrandom 0.2.10", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.7.3" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "aaac441002f822bc9705a681810a4dd2963094b9ca0ddc41cb963a4c189189ea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-automata 0.4.2", + "regex-syntax 0.8.2", ] [[package]] @@ -4198,7 +3690,18 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5011c7e263a695dc8ca064cddb722af1be54e517a280b12a5356f98366899e5d" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", ] [[package]] @@ -4208,10 +3711,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] name = "renderdoc-sys" -version = "0.7.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" [[package]] name = "ring" @@ -4222,7 +3731,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin 0.5.2", + "spin", "untrusted", "web-sys", "winapi", @@ -4245,20 +3754,21 @@ checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea" [[package]] name = "ron" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64 0.13.1", - "bitflags", + "base64", + "bitflags 2.4.0", "serde", + "serde_derive", ] [[package]] name = "rustc-demangle" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -4267,83 +3777,38 @@ 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 = "rustix" -version = "0.37.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.45.0", -] - -[[package]] name = "rustls" -version = "0.20.8" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", + "rustls-webpki", "sct", - "webpki", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" -dependencies = [ - "base64 0.21.0", ] [[package]] -name = "ruzstd" -version = "0.3.1" +name = "rustls-webpki" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a15e661f0f9dac21f3494fe5d23a6338c0ac116a2d22c2b63010acd89467ffe" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "byteorder", - "thiserror", - "twox-hash", + "ring", + "untrusted", ] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safe_arch" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" dependencies = [ "bytemuck", ] @@ -4358,19 +3823,10 @@ dependencies = [ ] [[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -4383,29 +3839,6 @@ dependencies = [ ] [[package]] -name = "security-framework" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys 0.8.3", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" -dependencies = [ - "core-foundation-sys 0.8.3", - "libc", -] - -[[package]] name = "self_cell" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4413,35 +3846,38 @@ checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +dependencies = [ + "serde", +] [[package]] name = "serde" -version = "1.0.159" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -4450,11 +3886,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.19" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82e6c8c047aa50a7328632d067bcae6ef38772a79e28daf32f735e0e4f3dd10" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -4462,31 +3898,49 @@ dependencies = [ ] [[package]] -name = "sha1_smol" -version = "1.0.0" +name = "sha2" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] [[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", ] [[package]] +name = "shiftnanigans" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9635466532d454fa020acbb12f629f1fc02fc9b4d5b39cc72ca478be37e314bc" +dependencies = [ + "bitvec", + "fastrand 1.9.0", + "itertools", + "log", + "nohash-hasher", +] + +[[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 = "simba" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4" +checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" dependencies = [ "approx", "libm", @@ -4497,16 +3951,22 @@ dependencies = [ ] [[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -4522,28 +3982,27 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" dependencies = [ "serde", ] [[package]] -name = "socket2" -version = "0.4.9" +name = "smol_str" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" dependencies = [ - "libc", - "winapi", + "serde", ] [[package]] name = "spade" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1190e0e8f4eb17fc3dbb2d20e1142676e56aaac3daede39f64a3302d687b80f3" +checksum = "88e65803986868d2372c582007c39ba89936a36ea5f236bf7a7728dc258f04f9" dependencies = [ "num-traits", "optional", @@ -4558,39 +4017,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] -name = "spin" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0959fd6f767df20b231736396e4f602171e00d95205676286e79d4a4eb67bef" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spin_sleep" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cafa7900db085f4354dbc7025e25d7a839a14360ea13b5fc4fd717f2d3b23134" -dependencies = [ - "once_cell", - "winapi", -] - -[[package]] name = "spirv" version = "0.2.0+1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" dependencies = [ - "bitflags", + "bitflags 1.3.2", "num-traits", ] [[package]] -name = "stable_deref_trait" -version = "1.2.0" +name = "sptr" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" [[package]] name = "static_assertions" @@ -4605,12 +4045,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" [[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] name = "svg_fmt" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4627,9 +4061,9 @@ dependencies = [ [[package]] name = "symphonia" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3671dd6f64f4f9d5c87179525054cfc1f60de23ba1f193bd6ceab812737403f1" +checksum = "62e48dba70095f265fdb269b99619b95d04c89e619538138383e63310b14d941" dependencies = [ "lazy_static", "symphonia-codec-vorbis", @@ -4640,9 +4074,9 @@ dependencies = [ [[package]] name = "symphonia-codec-vorbis" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfed6f7b6bfa21d7cef1acefc8eae5db80df1608a1aca91871b07cbd28d7b74" +checksum = "3953397e3506aa01350c4205817e4f95b58d476877a42f0458d07b665749e203" dependencies = [ "log", "symphonia-core", @@ -4651,12 +4085,12 @@ dependencies = [ [[package]] name = "symphonia-core" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9567e2d8a5f866b2f94f5d366d811e0c6826babcff6d37de9e1a6690d38869" +checksum = "f7c73eb88fee79705268cc7b742c7bc93a7b76e092ab751d0833866970754142" dependencies = [ "arrayvec", - "bitflags", + "bitflags 1.3.2", "bytemuck", "lazy_static", "log", @@ -4664,9 +4098,9 @@ dependencies = [ [[package]] name = "symphonia-format-ogg" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474df6e86b871dcb56913130bada1440245f483057c4a2d8a2981455494c4439" +checksum = "9bf1a00ccd11452d44048a0368828040f778ae650418dbd9d8765b7ee2574c8d" dependencies = [ "log", "symphonia-core", @@ -4676,9 +4110,9 @@ dependencies = [ [[package]] name = "symphonia-metadata" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd35c263223ef6161000be79b124a75de3e065eea563bf3ef169b3e94c7bb2e" +checksum = "89c3e1937e31d0e068bbe829f66b2f2bfaa28d056365279e0ef897172c3320c0" dependencies = [ "encoding_rs", "lazy_static", @@ -4688,9 +4122,9 @@ dependencies = [ [[package]] name = "symphonia-utils-xiph" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce340a6c33ac06cb42de01220308ec056e8a2a3d5cc664aaf34567392557136b" +checksum = "a450ca645b80d69aff8b35576cbfdc7f20940b29998202aab910045714c951f8" dependencies = [ "symphonia-core", "symphonia-metadata", @@ -4709,9 +4143,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.13" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -4719,44 +4153,61 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "sysinfo" +version = "0.29.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "winapi", ] [[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[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", ] [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.38", ] [[package]] @@ -4771,9 +4222,9 @@ dependencies = [ [[package]] name = "tiff" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" dependencies = [ "flate2", "jpeg-decoder", @@ -4781,37 +4232,10 @@ dependencies = [ ] [[package]] -name = "time" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -dependencies = [ - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" -dependencies = [ - "time-core", -] - -[[package]] name = "tinystr" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" dependencies = [ "displaydoc", ] @@ -4832,49 +4256,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] -name = "tokio" -version = "1.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" -dependencies = [ - "autocfg", - "pin-project-lite", - "windows-sys 0.45.0", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap", + "indexmap 2.0.2", "toml_datetime", "winnow", ] [[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", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4882,20 +4285,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -4914,9 +4317,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", "nu-ansi-term", @@ -4943,31 +4346,21 @@ dependencies = [ [[package]] name = "ttf-parser" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" [[package]] name = "turborand" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68386c3caec086d54b19acec7f2ec3bd31109a71dfcea80b23c03520c9fb149" +checksum = "e28d61f1c96db8c016037a77961fa5da84fc3a57fe69a15283ace0ab1647bac0" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "instant", ] [[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - -[[package]] name = "type-map" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4977,38 +4370,19 @@ dependencies = [ ] [[package]] -name = "type_ulid" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" -dependencies = [ - "type_ulid_macros", - "ulid", -] - -[[package]] -name = "type_ulid_macros" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "ulid", -] - -[[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 = "ulid" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" +checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" dependencies = [ "rand 0.8.5", + "serde", ] [[package]] @@ -5038,9 +4412,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -5053,9 +4427,9 @@ dependencies = [ [[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" @@ -5065,9 +4439,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unsafe-libyaml" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" [[package]] name = "untrusted" @@ -5076,10 +4450,26 @@ 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", + "flate2", + "log", + "once_cell", + "rustls", + "rustls-webpki", + "url", + "webpki-roots", +] + +[[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -5087,20 +4477,26 @@ dependencies = [ ] [[package]] -name = "utf8parse" -version = "0.2.1" +name = "ustr" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "b050b13c1933490b043b8238a75bc7676cb49292f49768c9350eabb284eaeb87" +dependencies = [ + "ahash", + "byteorder", + "lazy_static", + "parking_lot", + "serde", +] [[package]] name = "uuid" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "serde", - "sha1_smol", ] [[package]] @@ -5110,24 +4506,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] -name = "varinteger" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea29db9f94ff08bb619656b8120878f280526f71dc88b5262c958a510181812" - -[[package]] -name = "vec1" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c" - -[[package]] name = "vec_map" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] +name = "venial" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61584a325b16f97b5b25fcc852eb9550843a251057a5e3e5992d2376f3df4bb2" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5135,15 +4529,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +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", @@ -5163,9 +4557,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5173,24 +4567,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -5200,9 +4594,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5210,28 +4604,39 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", +] [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -5239,30 +4644,26 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579cc485bd5ce5bfa0d738e4921dd0b956eca9800be1fd2e5257ebe95bc4617e" +checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" dependencies = [ "core-foundation", - "dirs", + "home", "jni 0.21.1", "log", "ndk-context", "objc", - "raw-window-handle 0.5.2", + "raw-window-handle", "url", "web-sys", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webpki-roots" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "weezl" @@ -5272,16 +4673,18 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "wgpu" -version = "0.14.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f643110d228fd62a60c5ed2ab56c4d5b3704520bd50561174ec4ec74932937" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" dependencies = [ "arrayvec", + "cfg-if", "js-sys", "log", "naga", - "parking_lot 0.12.1", - "raw-window-handle 0.5.2", + "parking_lot", + "profiling", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", @@ -5294,21 +4697,20 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.14.2" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6000d1284ef8eec6076fd5544a73125fd7eb9b635f18dceeb829d826f41724ca" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" dependencies = [ "arrayvec", "bit-vec", - "bitflags", - "cfg_aliases", + "bitflags 2.4.0", "codespan-reporting", - "fxhash", "log", "naga", - "parking_lot 0.12.1", + "parking_lot", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle", + "rustc-hash", "smallvec", "thiserror", "web-sys", @@ -5318,35 +4720,38 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.14.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc320a61acb26be4f549c9b1b53405c10a223fbfea363ec39474c32c348d12f" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags", + "bitflags 2.4.0", "block", "core-graphics-types", "d3d12", "foreign-types", - "fxhash", "glow", "gpu-alloc", + "gpu-allocator", "gpu-descriptor", + "hassle-rs", "js-sys", "khronos-egl", - "libloading", + "libc", + "libloading 0.8.1", "log", "metal", "naga", "objc", - "parking_lot 0.12.1", + "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.5.2", + "raw-window-handle", "renderdoc-sys", + "rustc-hash", "smallvec", "thiserror", "wasm-bindgen", @@ -5357,24 +4762,32 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.14.1" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb6b28ef22cac17b9109b25b3bf8c9a103eeb293d7c5f78653979b09140375f6" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" dependencies = [ - "bitflags", + "bitflags 2.4.0", + "js-sys", + "web-sys", ] [[package]] name = "wide" -version = "0.7.8" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223" +checksum = "ebecebefc38ff1860b4bc47550bbfa63af5746061cf0d29fcd7fa63171602598" dependencies = [ "bytemuck", "safe_arch", ] [[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5392,9 +4805,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", ] @@ -5416,63 +4829,72 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.43.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" dependencies = [ - "windows_aarch64_gnullvm", - "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", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.42.2", ] [[package]] name = "windows" -version = "0.44.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", ] [[package]] name = "windows" -version = "0.46.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets", + "windows-implement", + "windows-interface", + "windows-targets 0.48.5", ] [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" 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", + "windows-core", + "windows-targets 0.48.5", ] [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows_aarch64_gnullvm", - "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", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-implement" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-interface" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -5481,7 +4903,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.5", ] [[package]] @@ -5490,26 +4921,41 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", + "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", + "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2", ] [[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" +name = "windows_aarch64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -5518,10 +4964,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] -name = "windows_i686_gnu" -version = "0.36.1" +name = "windows_aarch64_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -5530,10 +4976,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] -name = "windows_i686_msvc" -version = "0.36.1" +name = "windows_i686_gnu" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -5542,10 +4988,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" +name = "windows_i686_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -5554,16 +5000,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" +name = "windows_x86_64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -5572,13 +5024,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] name = "winit" -version = "0.27.5" +version = "0.28.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" +checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" dependencies = [ - "bitflags", - "cocoa", + "android-activity", + "bitflags 1.3.2", + "cfg_aliases", "core-foundation", "core-graphics", "dispatch", @@ -5587,29 +5046,38 @@ dependencies = [ "log", "mio", "ndk", - "ndk-glue", - "objc", + "objc2", "once_cell", - "parking_lot 0.12.1", + "orbclient", "percent-encoding", - "raw-window-handle 0.4.3", - "raw-window-handle 0.5.2", + "raw-window-handle", + "redox_syscall 0.3.5", "wasm-bindgen", + "wayland-scanner", "web-sys", - "windows-sys 0.36.1", + "windows-sys 0.45.0", "x11-dl", ] [[package]] name = "winnow" -version = "0.4.1" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] [[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] name = "x11-dl" version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5643,40 +5111,7 @@ dependencies = [ ] [[package]] -name = "yasna" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" -dependencies = [ - "time", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" +name = "xml-rs" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" -dependencies = [ - "cc", - "libc", - "pkg-config", -] +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix index 8839c01085d6f..d4f8a8fcbdbc9 100644 --- a/pkgs/games/jumpy/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -16,29 +16,24 @@ rustPlatform.buildRustPackage rec { pname = "jumpy"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "fishfolk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-krO/iPGnzXeY3W8xSFerlKa1DvDl7ss00bGaAMkHUtw="; + sha256 = "sha256-ggePJH2kKJ17aOWRKUnLyolIdSzlc6Axf5Iw74iFfek="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "bevy_simple_tilemap-0.10.1" = "sha256-Q/AsBZjsr+uTIh/oN0OsIJxntZ4nuc1AReo0Ronj930="; - "bones_asset-0.1.0" = "sha256-YyY5OsbRLkpAgvNifRiXfmzfsgFw/oFV1nQVCkXG4j4="; + "bevy_egui-0.21.0" = "sha256-hu55tZQppw1NajwqIsYsw6de0IAwQwgra3D9OFzSSLc="; + "bones_asset-0.3.0" = "sha256-1UeOXW6O/gMQBBUnHxRreJgmiUTPC5SJB+uLn9V8aa4="; + "kira-0.8.5" = "sha256-z4R5aIaoRQQprL6JsVrFI69rwTOsW5OH01+jORS+hBQ="; }; }; - patches = [ - # jumpy uses an outdated version of mimalloc - # which fails to build on aarch64-linux - ./update-mimalloc.patch - ]; - nativeBuildInputs = [ makeWrapper pkg-config @@ -57,7 +52,7 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libXrandr ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk_11_0.frameworks.Cocoa rustPlatform.bindgenHook ]; @@ -67,11 +62,12 @@ rustPlatform.buildRustPackage rec { ZSTD_SYS_USE_PKG_CONFIG = true; }; + # jumpy only loads assets from the current directory + # https://github.com/fishfolk/bones/blob/f84d07c2f2847d9acd5c07098fe1575abc496400/framework_crates/bones_asset/src/io.rs#L50 postInstall = '' mkdir $out/share cp -r assets $out/share - wrapProgram $out/bin/jumpy \ - --set-default JUMPY_ASSET_DIR $out/share/assets + wrapProgram $out/bin/jumpy --chdir $out/share ''; postFixup = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/games/jumpy/update-mimalloc.patch b/pkgs/games/jumpy/update-mimalloc.patch deleted file mode 100644 index cd602e3af1d84..0000000000000 --- a/pkgs/games/jumpy/update-mimalloc.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2945,9 +2945,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" - - [[package]] - name = "libmimalloc-sys" --version = "0.1.31" -+version = "0.1.33" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ef2c45001fb108f37d41bed8efd715769acb14674c1ce3e266ef0e317ef5f877" -+checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" - dependencies = [ - "cc", - "libc", -@@ -3117,9 +3117,9 @@ dependencies = [ - - [[package]] - name = "mimalloc" --version = "0.1.35" -+version = "0.1.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "92666043c712f7f5c756d07443469ddcda6dd971cc15258bb7f3c3216fd1b7aa" -+checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" - dependencies = [ - "libmimalloc-sys", - ] ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -75,7 +75,7 @@ web-sys = { version = "0.3", features = ["Window", "Location", "Storage"] } - - [target.'cfg(not(target_arch = "wasm32"))'.dependencies] - bevy_dylib = "0.9.1" --mimalloc = { version = "0.1.32", default-features = false } -+mimalloc = { version = "0.1.37", default-features = false } - # Networking deps - ggrs = { version = "0.9.3", features = ["sync-send"] } - bitfield = "0.14.0" diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index e538a19938a7d..a28ccea53ca1f 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/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/pkgs/games/openra/build-engine.nix b/pkgs/games/openra/build-engine.nix index 664a4c0735b3a..10e8b49392155 100644 --- a/pkgs/games/openra/build-engine.nix +++ b/pkgs/games/openra/build-engine.nix @@ -36,7 +36,7 @@ buildDotnetModule rec { dontDotnetFixup = true; preBuild = '' - make VERSION=${version} version + make VERSION=${engine.build}-${version} version ''; postInstall = '' diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index c67626d0b0051..f9631c6d764f1 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -12,20 +12,20 @@ }: let - version = "2.1.0"; + version = "2.6.2"; src = fetchFromGitLab { owner = "portmod"; repo = "Portmod"; rev = "v${version}"; - hash = "sha256-b/ENApFovMPNUMbJhwY+TZCnSzpr1e/IKJ/5XAGTQjE="; + hash = "sha256-ufr2guaPdCvI5JOicL/lTrT3t6UlaY1hEB2xbwzhw6A="; }; portmod-rust = rustPlatform.buildRustPackage rec { inherit src version; pname = "portmod-rust"; - cargoHash = "sha256-3EfMMpSWSYsB3nXaoGGDuKQ9duyCKzbrT6oeATnzqLE="; + cargoHash = "sha256-sAjgGVVjgXaWbmN/eGEvatYjkHeFTZNX1GXFcJqs3GI="; nativeBuildInputs = [ python3Packages.python @@ -49,22 +49,32 @@ python3Packages.buildPythonApplication rec { inherit src version; pname = "portmod"; + format = "pyproject"; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; # build the rust library independantly prePatch = '' substituteInPlace setup.py \ - --replace "from setuptools_rust import Binding, RustExtension" "" \ - --replace "RustExtension(\"portmodlib.portmod\", binding=Binding.PyO3, strip=True)" "" + --replace "from setuptools_rust import Binding, RustExtension, Strip" "" \ + --replace "RustExtension(\"portmodlib.portmod\", binding=Binding.PyO3, strip=Strip.Debug)" "" + + substituteInPlace pyproject.toml \ + --replace '"setuptools-rust"' "" ''; + nativeBuildInputs = with python3Packages; [ + setuptools + wheel + ]; + propagatedBuildInputs = with python3Packages; [ setuptools-scm setuptools requests chardet colorama + deprecated restrictedpython appdirs gitpython @@ -95,6 +105,9 @@ python3Packages.buildPythonApplication rec { "test_sync" "test_manifest" "test_add_repo" + "test_init_prefix_interactive" + "test_scan_sources" + "test_unpack" ]; # for some reason, installPhase doesn't copy the compiled binary diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 3c777c5b27fbd..a1a5bfb03d26f 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/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/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index 3951f36f83bf7..e1bc4a8dbbcfe 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "starsector"; - version = "0.96a-RC8"; + version = "0.96a-RC10"; src = fetchzip { - url = "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-${version}.zip"; - sha256 = "sha256-RDXqFqiWpBG3kasofzbOl7Zp0a9LiMpJKsHcFaJtm2Y="; + url = "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-${version}.zip"; + sha256 = "sha256-RBSnms+QlKgTOhm3t2hDfv7OcMrQCk1rfkz9GaM74WM="; }; nativeBuildInputs = [ copyDesktopItems makeWrapper ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep common-updater-scripts set -eou pipefail; - version=$(curl -s https://fractalsoftworks.com/preorder/ | grep -oP "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-\K.*?(?=\.zip)" | head -1) + version=$(curl -s https://fractalsoftworks.com/preorder/ | grep -oP "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-\K.*?(?=\.zip)" | head -1) update-source-version ${pname} "$version" --file=./pkgs/games/starsector/default.nix ''; } diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index a6734b640638e..78c669614c07d 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -3,6 +3,7 @@ , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs , extraProfile ? "" # string to append to profile +, extraBwrapArgs ? [ ] # extra arguments to pass to bubblewrap , extraArgs ? "" # arguments to always pass to steam , extraEnv ? { } # Environment variables to pass to Steam , withGameSpecificLibraries ? true # include game specific libraries @@ -277,6 +278,8 @@ in buildFHSEnv rec { exec steam ${extraArgs} "$@" ''; + inherit extraBwrapArgs; + meta = if steam != null then @@ -287,21 +290,11 @@ in buildFHSEnv rec { description = "Steam dependencies (dummy package, do not use)"; }; - # allows for some gui applications to share IPC - # this fixes certain issues where they don't render correctly - unshareIpc = false; - - # Some applications such as Natron need access to MIT-SHM or other - # shared memory mechanisms. Unsharing the pid namespace - # breaks the ability for application to reference shared memory. - unsharePid = false; - passthru.run = buildFHSEnv { name = "steam-run"; targetPkgs = commonTargetPkgs; - inherit multiArch multiPkgs profile extraInstallCommands; - inherit unshareIpc unsharePid; + inherit multiArch multiPkgs profile extraInstallCommands extraBwrapArgs; runScript = writeShellScript "steam-run" '' run="$1" diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index f4b350ad38e75..70971fb1ad371 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.8.9-patch2"; + version = "4.8.13"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-ek2FDzo7EbgZGbQyZ6mBmVoPRKkJu0JFewbVvsGzZMA="; + hash = "sha256-16TpsKNLcm6lbi4exYxDZWfmRsvfAhT1ktP36zC9Psg="; }; dontUnpack = true; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 99d56af97c3d0..ba414d7aec5b3 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "cups"; - version = "2.4.6"; + version = "2.4.7"; src = fetchurl { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "sha256-WOlwzxlV4cyH0IR8MlJtnCzO4zXl8OOIKygxOLoOcmI="; + sha256 = "sha256-3VQijdkDUmQozn43lhr67SMK0xB4gUHadc66oINiz2w="; }; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index e66b44bad0cb9..013a358062672 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -61,11 +61,11 @@ let in stdenv.mkDerivation rec { pname = "ghostscript${lib.optionalString x11Support "-with-X"}"; - version = "10.01.2"; + version = "10.02.0"; src = fetchurl { url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${lib.replaceStrings ["."] [""] version}/ghostscript-${version}.tar.xz"; - hash = "sha512-7iDw4S9VOj0EV45xoNRd7+vHERfOTcLBQEOYW/5zSK1/iy/pj8m09bk17LMuUNw0C+Z9bvWBkFQuxtD52h3jgA=="; + hash = "sha512-xJNEFRBj6RWt1VoKhCwqZF2DYqXLymY70HY49L02maCMreN6nv6QWtWkHgFDU+XhsSaLeSXkMSitMNWwMTlrcQ=="; }; patches = [ diff --git a/pkgs/misc/ghostscript/test-corpus-render.nix b/pkgs/misc/ghostscript/test-corpus-render.nix index 26cad916e2091..089661293c25d 100644 --- a/pkgs/misc/ghostscript/test-corpus-render.nix +++ b/pkgs/misc/ghostscript/test-corpus-render.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation { pname = "ghostscript-test-corpus-render"; - version = "unstable-2022-12-01"; + version = "unstable-2023-05-19"; src = fetchgit { url = "git://git.ghostscript.com/tests.git"; - rev = "e81c3a1d7c679aab8230e9152165d8cffb687242"; - hash = "sha256-h+UHpCHASYOhf4xG6gkVJK9TEG85kE3jNx5cD1I3LQg="; + rev = "f7d5087d3d6c236707842dcd428818c6cb8fb041"; + hash = "sha256-xHOEo1ZJG1GCcEKqaXLDpfRRQxpbSy0bzicKju9hG40="; }; dontConfigure = true; diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix index 81c09685be8b6..81c09685be8b6 100755..100644 --- a/pkgs/misc/uq/default.nix +++ b/pkgs/misc/uq/default.nix diff --git a/pkgs/misc/vencord/default.nix b/pkgs/misc/vencord/default.nix index 287799bcf1e0d..0fa670faf61e3 100644 --- a/pkgs/misc/vencord/default.nix +++ b/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/pkgs/misc/vencord/package-lock.json b/pkgs/misc/vencord/package-lock.json index eb01a29cb26c8..3c06525bb5bbd 100644 --- a/pkgs/misc/vencord/package-lock.json +++ b/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/pkgs/misc/vencord/update.sh b/pkgs/misc/vencord/update.sh new file mode 100755 index 0000000000000..0317f695f91f7 --- /dev/null +++ b/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/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/pkgs/os-specific/darwin/CoreSymbolication/default.nix index aa73c7f86c405..5cf92a41a6f83 100644 --- a/pkgs/os-specific/darwin/CoreSymbolication/default.nix +++ b/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/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix index 8dd2fb77cb982..60eb45558469c 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${finalAttrs.version}"; - hash = "sha256-FntWC180wpUyxP5iYdo/p2LbP0dbv1y6CXersfBT5b4="; + hash = "sha256-QilZurp4QkwOo4jbYXMs4SesqyXXsEgF8dDwt/Kv94s="; }; buildInputs = [ diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/os-specific/darwin/utm/default.nix index 7ab35aee0b43d..f7055d378cbbb 100644 --- a/pkgs/os-specific/darwin/utm/default.nix +++ b/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/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index e1c026fb533a5..53a255fc21575 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/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/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 64749e209ba64..a86af7e6db260 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl , buildPackages, bison, flex, pkg-config , db, iptables, libelf, libmnl , gitUpdater @@ -6,27 +6,13 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-TFG43svH5NoVn/sGb1kM+5Pb+a9/+GsWR85Ct8F5onI="; + hash = "sha256-pwF5CF+huW08M7BAyAm3XitXVjrcUFpK0F4mCd83NGM="; }; - patches = [ - # To avoid ./configure failing due to invalid arguments: - (fetchpatch { # configure: restore backward compatibility - url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=a3272b93725a406bc98b67373da67a4bdf6fcdb0"; - sha256 = "0hyagh2lf6rrfss4z7ca8q3ydya6gg7vfhh25slhpgcn6lnk0xbv"; - }) - - # fix build on musl. applied anywhere to prevent patchrot. - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/main/iproute2/include.patch?id=bd46efb8a8da54948639cebcfa5b37bd608f1069"; - sha256 = "sha256-NpNnSXQntuzzpjswE42yzo7nqmrQgI5YcHR2kp9NEwA="; - }) - ]; - postPatch = '' # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 1c38f4b7f4913..9d97f73780d5b 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "kbd"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; - sha256 = "sha256-M+O7PD9VkzsQ8FOxS19pouJMKFQ+nsdpAkb+R2KN2U8="; + sha256 = "sha256-BJlsCNfRxGCWb7JEo9OIM1LCZ0t61SIAPZ9Oy4q0jes="; }; # vlock is moved into its own output, since it depends on pam. This diff --git a/pkgs/os-specific/linux/kbd/search-paths.patch b/pkgs/os-specific/linux/kbd/search-paths.patch index fad33be45bdcd..61e8918017c2a 100644 --- a/pkgs/os-specific/linux/kbd/search-paths.patch +++ b/pkgs/os-specific/linux/kbd/search-paths.patch @@ -18,34 +18,30 @@ Without this patch, kbd will only look inside DATADIR "/" KEYMAPDIR "/mac/include/", --- a/src/libkfont/context.c +++ b/src/libkfont/context.c -@@ -13,6 +13,7 @@ +@@ -13,5 +13,6 @@ /* search for the map file in these directories (with trailing /) */ static const char *const mapdirpath[] = { - "", + "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", NULL }; -@@ -28,6 +29,7 @@ static const char *const mapsuffixes[] = { +@@ -28,5 +29,6 @@ static const char *const mapsuffixes[] = { /* search for the font in these directories (with trailing /) */ static const char *const fontdirpath[] = { - "", + "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", NULL }; -@@ -42,6 +44,7 @@ static char const *const fontsuffixes[] = { +@@ -42,5 +44,6 @@ static char const *const fontsuffixes[] = { static const char *const unidirpath[] = { - "", + "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", NULL }; -@@ -55,6 +58,7 @@ static const char *const unisuffixes[] = { +@@ -55,5 +58,6 @@ static const char *const unisuffixes[] = { /* hide partial fonts a bit - loading a single one is a bad idea */ const char *const partfontdirpath[] = { - "", + "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", NULL diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 716a45820ca52..f978cb429df5f 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.5.7"; #zen - suffix = "zen2"; #zen - sha256 = "0qy3xn7kr16crm7iw1zhm3kpgxpmn66xc4g1yalvghwn6si0n81l"; #zen + version = "6.5.8"; #zen + suffix = "zen1"; #zen + sha256 = "0pg5q5alsxrbbf8hzbcgmwsyirs86715qijdzaldyw9sf74h4z1l"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.5.7"; #lqx + version = "6.5.8"; #lqx suffix = "lqx1"; #lqx - sha256 = "1c4093xhfnzx6h8frqcigdlikgy1n0vv34ajs0237v3w7psw99d7"; #lqx + sha256 = "1f10p7mriwjrgmdfz10vs48xiipdk9ljj884fsj63r5n1g7pz4bf"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix index a0663c9dbe4f9..715d261eea4f5 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix @@ -1,4 +1,4 @@ -{ +{ hostPlatform }: rec { @@ -65,7 +65,7 @@ rec { */ minimal-bootstrap-sources = derivation { inherit name; - system = builtins.currentSystem; + system = hostPlatform.system; outputHashMode = "recursive"; inherit outputHashAlgo outputHash; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix index 381902cd2c129..6cc7cddb82af4 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix @@ -12,12 +12,13 @@ # { lib +, hostPlatform , fetchFromGitHub , fetchpatch }: let - expected = import ./bootstrap-sources.nix { }; + expected = import ./bootstrap-sources.nix { inherit hostPlatform; }; in fetchFromGitHub { diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index e84d6aa6ac5c6..4482170d346ba 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/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/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix index c6ec0866791e6..4ff0c8c329134 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/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/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 68e00690652e1..9e75db6d27b51 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/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/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index 40ef0796dfa1e..61a27bd51f029 100644 --- a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix +++ b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -10,12 +10,12 @@ buildGoModule rec { pname = "oci-seccomp-bpf-hook"; - version = "1.2.9"; + version = "1.2.10"; src = fetchFromGitHub { owner = "containers"; repo = "oci-seccomp-bpf-hook"; rev = "v${version}"; - sha256 = "sha256-KPO9xqLgPML6smoO7P50yP81b4iCvRFIR74ciUiva7o="; + sha256 = "sha256-bWlm+JYNf7+faKSQfW5fhxoH/D2I8ujjakswH+1r49o="; }; vendorHash = null; diff --git a/pkgs/os-specific/linux/systemd/0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch b/pkgs/os-specific/linux/systemd/0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch new file mode 100644 index 0000000000000..dd9af6738c4e5 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Fri, 1 Sep 2023 09:57:02 +0200 +Subject: [PATCH] systemctl-edit: suggest `systemdctl edit --runtime` on system + scope + +This is a NixOS-specific change. When trying to modify a unit with +`systemctl edit` on NixOS, it'll fail with "Read-only file system": + + $ systemctl edit libvirtd + Failed to open "/etc/systemd/system/libvirtd.service.d/.#override.conffa9825a0c9a249eb": Read-only file system + +This is because `/etc/systemd/system` is a symlink into the store. In +fact, I'd consider this a feature rather than a bug since this ensures I +don't introduce state imperatively. + +However, people wrongly assume that it's not possible to edit units +ad-hoc and re-deploy their system for quick&dirty debugging where this +would be absolutely fine (and doable with `--runtime` which adds a +transient and non-persistent unit override in `/run`). + +To make sure that people learn about it quicker, this patch +throws an error which suggests using `--runtime` when running +`systemctl edit` on the system scope. + +For the user scope this isn't needed because user-level unit overrides +are written into `$XDG_CONFIG_HOME/systemd/user`. +--- + src/systemctl/systemctl-edit.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c +index e3f25d52d5..81c9c6f6b7 100644 +--- a/src/systemctl/systemctl-edit.c ++++ b/src/systemctl/systemctl-edit.c +@@ -323,6 +323,9 @@ int verb_edit(int argc, char *argv[], void *userdata) { + sd_bus *bus; + int r; + ++ if (!arg_runtime && arg_runtime_scope == RUNTIME_SCOPE_SYSTEM) ++ return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "The unit-directory '/etc/systemd/system' is read-only on NixOS, so it's not possible to edit system-units directly. Use 'systemctl edit --runtime' instead."); ++ + if (!on_tty()) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Cannot edit units if not on a tty."); + diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d96a6882d63c4..954977882ee93 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -201,6 +201,7 @@ stdenv.mkDerivation (finalAttrs: { ./0016-inherit-systemd-environment-when-calling-generators.patch ./0017-core-don-t-taint-on-unmerged-usr.patch ./0018-tpm2_context_init-fix-driver-name-checking.patch + ./0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { @@ -481,7 +482,6 @@ stdenv.mkDerivation (finalAttrs: { "-Dportabled=${lib.boolToString withPortabled}" "-Dhwdb=${lib.boolToString withHwdb}" "-Dremote=${lib.boolToString withRemote}" - "-Dsysusers=false" "-Dtimedated=${lib.boolToString withTimedated}" "-Dtimesyncd=${lib.boolToString withTimesyncd}" "-Duserdb=${lib.boolToString withUserDb}" diff --git a/pkgs/os-specific/linux/tailor-gui/default.nix b/pkgs/os-specific/linux/tailor-gui/default.nix index 86964ab4d36ab..ecbec75fd82d4 100644 --- a/pkgs/os-specific/linux/tailor-gui/default.nix +++ b/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/pkgs/os-specific/linux/tuxedo-rs/default.nix b/pkgs/os-specific/linux/tuxedo-rs/default.nix index c9fb057da68b6..04c1518aab83e 100644 --- a/pkgs/os-specific/linux/tuxedo-rs/default.nix +++ b/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/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 81ff2214bcadb..8adbb8cab8f91 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -76,25 +76,14 @@ stdenv'.mkDerivation { substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \ --replace "/etc/default" "$out/etc/default" - # TODO: drop when upgrading to 2.2.0 - ${if isUnstable then '' - substituteInPlace ./contrib/initramfs/Makefile.am \ - --replace "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools" - substituteInPlace ./udev/vdev_id \ - --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ - "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" - substituteInPlace ./config/zfs-build.m4 \ - --replace "bashcompletiondir=/etc/bash_completion.d" \ - "bashcompletiondir=$out/share/bash-completion/completions" - '' else '' - substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)/zfs" "$out/etc/zfs" - - find ./contrib/initramfs -name Makefile.am -exec sed -i -e 's|/usr/share/initramfs-tools|'$out'/share/initramfs-tools|g' {} \; - - substituteInPlace ./cmd/vdev_id/vdev_id \ - --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ - "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" - ''} + substituteInPlace ./contrib/initramfs/Makefile.am \ + --replace "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools" + substituteInPlace ./udev/vdev_id \ + --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ + "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" + substituteInPlace ./config/zfs-build.m4 \ + --replace "bashcompletiondir=/etc/bash_completion.d" \ + "bashcompletiondir=$out/share/bash-completion/completions" ''; nativeBuildInputs = [ autoreconfHook269 nukeReferences ] @@ -213,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/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix index 1a77396300ebf..3e53ba902cbd7 100644 --- a/pkgs/os-specific/linux/zfs/stable.nix +++ b/pkgs/os-specific/linux/zfs/stable.nix @@ -16,20 +16,13 @@ callPackage ./generic.nix args { if stdenv'.isx86_64 || removeLinuxDRM then kernel.kernelOlder "6.6" else kernel.kernelOlder "6.2"; + latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM then linuxKernel.packages.linux_6_5 else linuxKernel.packages.linux_6_1; - extraPatches = [ - # applied in version 2.2.x - (fetchpatch { - name = "musl.patch"; - url = "https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a.patch"; - sha256 = "XEaK227ubfOwlB2s851UvZ6xp/QOtYUWYsKTkEHzmo0="; - }) - ]; # this package should point to the latest release. - version = "2.1.13"; + version = "2.2.0"; - sha256 = "tqUCn/Hf/eEmyWRQthWQdmTJK2sDspnHiiEfn9rz2Kc="; + sha256 = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg="; } diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 23882322c0930..9c7e14c31bf38 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -23,9 +23,10 @@ callPackage ./generic.nix args { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs-<version>-staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.2.0-rc5"; + version = "2.2.1-unstable-2023-10-21"; + rev = "95785196f26e92d82cf4445654ba84e4a9671c57"; - sha256 = "sha256-97dTmSneAuhDR7LrJxG7/xPpI1hGv5mDDuq8HRTZKx0="; + sha256 = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg="; isUnstable = true; } diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/servers/akkoma/admin-fe/default.nix index 40c267b00ef60..f1a874b348bb5 100644 --- a/pkgs/servers/akkoma/admin-fe/default.nix +++ b/pkgs/servers/akkoma/admin-fe/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitea, fetchYarnDeps -, fixup_yarn_lock, yarn, nodejs +, prefetch-yarn-deps, yarn, nodejs , python3, pkg-config, libsass }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - fixup_yarn_lock + prefetch-yarn-deps yarn nodejs pkg-config @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { export HOME="$(mktemp -d)" yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg offlineCache} - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/cross-env diff --git a/pkgs/servers/akkoma/akkoma-fe/default.nix b/pkgs/servers/akkoma/akkoma-fe/default.nix index 07b4ea245b9e2..9024ad98c625b 100644 --- a/pkgs/servers/akkoma/akkoma-fe/default.nix +++ b/pkgs/servers/akkoma/akkoma-fe/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitea, fetchYarnDeps -, fixup_yarn_lock, yarn, nodejs +, prefetch-yarn-deps, yarn, nodejs , jpegoptim, oxipng, nodePackages }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - fixup_yarn_lock + prefetch-yarn-deps yarn nodejs jpegoptim @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { export HOME="$(mktemp -d)" yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg offlineCache} - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index 90c7c53525cc0..36fa26bd0181e 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/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/pkgs/servers/audiobookshelf/default.nix b/pkgs/servers/audiobookshelf/default.nix index 51dbc97b07b28..b3c2604d62ee0 100644 --- a/pkgs/servers/audiobookshelf/default.nix +++ b/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/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index 3977521a6f521..d3cf54114c3be 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -30,10 +30,11 @@ stdenv.mkDerivation { ''; buildPhase = '' - export # build the brickd binary mkdir src/daemonlib cp -r ${daemonlib}/* src/daemonlib + substituteInPlace src/daemonlib/utils.{c,h} \ + --replace "_GNU_SOURCE" "__GLIBC__" cd src/brickd make diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 7582ccdb954de..bc18c91ef7fe5 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "f3f4b1d49ec9b81113b14a38354b823bd4a470356ed7e8e555595b6fd1ac80c9"; + sha256 = "0d65d4b59f5df69b78c6295ade0a2ea7931831de7ef5eeee3e00f8a20af679e4"; }; outputs = [ "bin" "out" "dev" ]; @@ -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/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 128f20777fe2c..d1ebe9fefa178 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.10.3"; + version = "2023.10.5"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -2771,7 +2771,8 @@ sqlalchemy ]; "myq" = ps: with ps; [ - ]; # missing inputs: python-myq + python-myq + ]; "mysensors" = ps: with ps; [ aiohttp-cors janus @@ -5405,6 +5406,7 @@ "mullvad" "mutesync" "my" + "myq" "mysensors" "mystrom" "mythicbeastsdns" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9bc35bd882c95..1be1169c77862 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -30,6 +30,16 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (self: super: { + aioairq = super.aioairq.overridePythonAttrs (oldAttrs: rec { + version = "0.2.4"; + src = fetchFromGitHub { + owner = "CorantGmbH"; + repo = "aioairq"; + rev = "refs/tags/v${version}"; + hash = "sha256-+5FyBfsB3kjyX/V9CdZ072mZ3THyvALyym+uk7/kZLo="; + }; + }); + aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec { version = "0.1.1"; src = fetchFromGitHub { @@ -57,6 +67,16 @@ let ]; }); + blinkpy = super.blinkpy.overridePythonAttrs (oldAttrs: rec { + version = "0.21.0"; + src = fetchFromGitHub { + owner = "fronzbot"; + repo = "blinkpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-0sEZlnS6CJj8nMyjtSFZRALRKdmY0Uu5N6sozPiDG6w="; + }; + }); + dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec { version = "0.33"; src = fetchFromGitHub { @@ -87,6 +107,16 @@ let }; }); + holidays = super.holidays.overridePythonAttrs (oldAttrs: rec { + version = "0.28"; + src = fetchFromGitHub { + owner = "dr-prodigy"; + repo = "python-holidays"; + rev = "refs/tags/v.${version}"; + hash = "sha256-JHj7fSE8p3TLViDSegl6gm35u53D9NvN7Oa2TBjN9t4="; + }; + }); + jaraco-abode = super.jaraco-abode.overridePythonAttrs (oldAttrs: rec { version = "3.3.0"; src = fetchFromGitHub { @@ -96,6 +126,16 @@ let }; }); + justnimbus = super.justnimbus.overridePythonAttrs (oldAttrs: rec { + version = "0.6.0"; + src = fetchFromGitHub { + owner = "kvanzuijlen"; + repo = "justnimbus"; + rev = "refs/tags/${version}"; + hash = "sha256-uQ5Nc5sxqHeAuavyfX4Q6Umsd54aileJjFwOOU6X7Yg="; + }; + }); + # moto tests are a nuissance moto = super.moto.overridePythonAttrs (_: { doCheck = false; @@ -183,6 +223,16 @@ let }; }); + pydexcom = super.pydexcom.overridePythonAttrs (oldAttrs: rec { + version = "0.2.3"; + src = fetchFromGitHub { + owner = "gagebenne"; + repo = "pydexcom"; + rev = "refs/tags/${version}"; + hash = "sha256-ItDGnUUUTwCz4ZJtFVlMYjjoBPn2h8QZgLzgnV2T/Qk="; + }; + }); + pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { version = "1.0.1"; src = fetchFromGitHub { @@ -192,6 +242,16 @@ let }; }); + pysnooz = super.pysnooz.overridePythonAttrs (oldAttrs: rec { + version = "0.8.6"; + src = fetchFromGitHub { + owner = "AustinBrunkhorst"; + repo = "pysnooz"; + rev = "refs/tags/v${version}"; + hash = "sha256-hJwIObiuFEAVhgZXYB9VCeAlewBBnk0oMkP83MUCpyU="; + }; + }); + python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -201,6 +261,16 @@ let }; }); + python-tado = super.python-tado.overridePythonAttrs (oldAttrs: rec { + version = "0.15.0"; + src = fetchFromGitHub { + owner = "wmalgadey"; + repo = "PyTado"; + rev = "refs/tags/${version}"; + hash = "sha256-gduqQVw/a64aDzTHFmgZu7OVB53jZb7L5vofzL3Ho6s="; + }; + }); + pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { version = "9.0.1"; src = fetchFromGitHub { @@ -296,7 +366,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.10.3"; + hassVersion = "2023.10.5"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -312,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-7Eg6Ik8eiPPUTXyRedQLixaCnHDg9Dmikmhcq55+458="; + hash = "sha256-jVw0Mudb/L4Lw3AodwcOTrNJZctSfEIcXUzxozo7saA="; }; # Secondary source is git for tests @@ -320,7 +390,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-4J1BBC6PvfbN4fKD+zUpW19sMvoKALilitNJlwB0ZTk="; + hash = "sha256-wKxAwa4t3JbS4puDAufjpzcVLcvEY9Bk73qmg3JeLPk="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index adc7089741e9a..1397abf61cec3 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.10.1"; + 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-4TPjYBTyrJtnYVZ+F/Bxf6m0lZn6fQR3ai0+CDTqwVc="; + hash = "sha256-QCdNvEs2LFF43lWLLFX+9VMfQFg1oWUCh/cgxdBQV8w="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 279b1750b9e9f..8666f906fa958 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/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/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index 87ba408e1f72f..4024f3cc4ee6d 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/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/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 98a00afc519d4..c6e7ad1f56616 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.57"; + version = "2.4.58"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "sha256-28y4Su6V4JXt+7geXrkmzNJOatpV3Ng8rssmLlz5TSo="; + sha256 = "sha256-+hbXKgeCEKVMR91b7y+Lm4oB2UkJpRRTlWs+xkQupMU="; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index b0bb720c21cdd..0c83c2e750a03 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,26 +15,15 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.71"; + version = "1.4.72"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-uLaRXaIDlv3DVN8zJNXkQBabLl6nhZ46d1IThBMlr6w="; + sha256 = "sha256-98reTWm3VKB0jAFGPDPNi0VsqcwDuwnoWnG8vNVOVew="; }; - patches = [ - # disable tests for des/md5, which we don't support any more - ./disable-legacy-crypt-tests.patch - ]; - postPatch = '' patchShebangs tests - # Linux sandbox has an empty hostname and not /etc/hosts, which fails some tests - sed -ire '/[$]self->{HOSTNAME} *=/i if(length($name)==0) { $name = "127.0.0.1" }' tests/LightyTest.pm - # it's difficult to prevent this test from trying to use /var/tmp (which - # the sandbox doesn't have) so until libredirect has support for mkstemp - # calls it's easiest to disable it - sed -i '/test_mod_ssi/d' src/t/test_mod.c ''; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch b/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch deleted file mode 100644 index 4a411c0b98aed..0000000000000 --- a/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -uNr lighttpd-1.4.71.orig/tests/mod-fastcgi.t lighttpd-1.4.71.new/tests/mod-fastcgi.t ---- lighttpd-1.4.71.orig/tests/mod-fastcgi.t 2023-05-27 21:56:16.000000000 +0200 -+++ lighttpd-1.4.71.new/tests/mod-fastcgi.t 2023-06-01 07:01:59.789873512 +0200 -@@ -79,7 +79,7 @@ - ok($tf->handle_http($t) == 0, 'FastCGI + bin-copy-environment'); - - SKIP: { -- skip "no crypt-des under openbsd or MS Visual Studio", 2 if $^O eq 'openbsd' || $tf->{'win32native'}; -+ skip "no crypt-des", 2; - - $t->{REQUEST} = ( <<EOF - GET /get-server-env.php?env=REMOTE_USER HTTP/1.0 -diff -uNr lighttpd-1.4.71.orig/tests/request.t lighttpd-1.4.71.new/tests/request.t ---- lighttpd-1.4.71.orig/tests/request.t 2023-05-27 21:56:16.000000000 +0200 -+++ lighttpd-1.4.71.new/tests/request.t 2023-06-01 07:02:39.855940048 +0200 -@@ -1106,7 +1106,7 @@ - ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - plain'); - - SKIP: { -- skip "no crypt-des under openbsd or MS Visual Studio", 2 if $^O eq 'openbsd' || $tf->{'win32native'}; -+ skip "no crypt-des", 2; - $t->{REQUEST} = ( <<EOF - GET /server-config HTTP/1.0 - Host: auth-htpasswd.example.org -@@ -1163,9 +1163,7 @@ - ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - htpasswd (apr-md5, wrong password)'); - - SKIP: { -- skip "no crypt-md5 under cygwin", 1 if $^O eq 'cygwin'; -- skip "no crypt-md5 under darwin", 1 if $^O eq 'darwin'; -- skip "no crypt-md5 under openbsd",1 if $^O eq 'openbsd'; -+ skip "no crypt-md5", 1; - $t->{REQUEST} = ( <<EOF - GET /server-config HTTP/1.0 - Host: auth-htpasswd.example.org diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 1f175c03d8a85..8f90adab101b1 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -186,7 +186,7 @@ stdenv.mkDerivation { passthru = { inherit modules; tests = { - inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-proxyprotocol nginx-pubhtml nginx-sandbox nginx-sso nginx-status-page; + inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-proxyprotocol nginx-pubhtml nginx-sandbox nginx-sso nginx-status-page nginx-unix-socket; variants = lib.recurseIntoAttrs nixosTests.nginx-variants; acme-integration = nixosTests.acme; } // passthru.tests; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 13c8bd7e7c75e..c81449aa762e0 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/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 = { @@ -1022,8 +1023,8 @@ let self = { name = "zstd"; owner = "tokers"; repo = "zstd-nginx-module"; - rev = "25d88c262be47462cf90015ee7ebf6317b6848f9"; - sha256 = "sha256-YRluKekhx1tb6e5IL1FPK05jPtzfQPaHI47cdada928="; + rev = "0.1.0"; + hash = "sha256-8SBU9hJnKtNrwbpioy+Z/mfiVuqAx+U1t64m5tfEy6o="; }; inputs = [ zstd ]; diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix index 5f9ea8a1665d5..bd05943ac71f9 100644 --- a/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/pkgs/servers/http/tomcat/tomcat-native.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-native"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; - hash = "sha256-lY0fEhZRwQxhVW133J0NQfO1OYiiGVRC3krG9MuHg4g="; + hash = "sha256-vmF8V26SO2B50LdSBtcG2ifdBDzr9Qv7leOpwKodGjU="; }; sourceRoot = "${pname}-${version}-src/native"; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index e053da656be56..5d1da4c470602 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/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/pkgs/servers/invidious/lsquic.nix b/pkgs/servers/invidious/lsquic.nix index c9cdd9958ede8..9c88ae004aabc 100644 --- a/pkgs/servers/invidious/lsquic.nix +++ b/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/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 75285e94405ec..3458da342ead8 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "60fae015d8b5e4b0bfac8306065db07f93c4c661", - "sha256": "sha256-yYTkDlQl6osvIC+k2mCXXsF8/33TB34vqOcZXPV1z/8=", - "version": "unstable-2023-10-07" + "rev": "3b219a4c7f932867f5a12608d8604436c722c1a0", + "sha256": "sha256-+uhq97H5frDbks9U0dQ0TK3VmtM71mlyFQzq0Dd2ZIc=", + "version": "unstable-2023-10-20" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 334a24b1ed003..ba2a894e12b89 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchPypi +, fetchpatch }: with python3.pkgs; @@ -17,6 +18,10 @@ buildPythonPackage rec { patches = [ ./0001-Disable-broken-test_help_output-testcase.patch + (fetchpatch { + url = "https://gitlab.com/mailman/hyperkitty/-/commit/5bb394662882bfc73c3e877458da44343aa06922.patch"; + hash = "sha256-9vcY6nu3txDftH6aYpdh9qSrLzZceGjVFxuD1Ux18gw="; + }) ]; postPatch = '' diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index 0ae9bc5f4eaef..47d09bff6717b 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -2,7 +2,6 @@ , fetchpatch , python3 , fetchPypi -, sphinx , postfix , lynx }: @@ -30,7 +29,6 @@ buildPythonPackage rec { flufl_i18n flufl_lock gunicorn - importlib-resources lazr_config passlib requests @@ -52,6 +50,11 @@ buildPythonPackage rec { url = "https://gitlab.com/mailman/mailman/-/commit/9613154f3c04fa2383fbf017031ef263c291418d.patch"; sha256 = "0vyw87s857vfxbf7kihwb6w094xyxmxbi1bpdqi3ybjamjycp55r"; }) + (fetchpatch { + url = "https://gitlab.com/mailman/mailman/-/commit/5e4431af6bb7d672a7ed7e3329f8fac7812d47f8.patch"; + excludes = [ ".gitlab-ci.yml" ]; + hash = "sha256-y2AE9hU4Z1BpBlJywxMWiuRvltWkk+R9YgMkpemvlIo="; + }) ./log-stderr.patch ]; diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index 7c6edbd5e9ea2..e4f96db0224d1 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -20,6 +20,14 @@ python3.override { */ django = super.django_3; + elasticsearch = super.elasticsearch.overridePythonAttrs ({ pname, ... }: rec { + version = "7.17.9"; + src = fetchPypi { + inherit pname version; + hash = "sha256-ZsTs4q3+fMEg4rameYof1cd3rs+C7sObuVzvfPx+orM="; + }; + }); + # https://gitlab.com/mailman/hyperkitty/-/merge_requests/541 mistune = super.mistune.overridePythonAttrs (old: rec { version = "2.0.5"; @@ -29,6 +37,15 @@ python3.override { hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ="; }; }); + + # django-q tests fail with redis 5.0.0. + redis = super.redis.overridePythonAttrs ({ pname, ... }: rec { + version = "4.5.4"; + src = fetchPypi { + inherit pname version; + hash = "sha256-c+w12k2iZ9aEfkf2hzD91fYuLKaePvWIXGp4qTdMOJM="; + }; + }); }) overlay; diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index ed5c267ad0c2d..21fa64085d57a 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchPypi +{ lib, python3, fetchPypi, fetchpatch , sassc, hyperkitty, postorius }: @@ -14,6 +14,13 @@ buildPythonPackage rec { sha256 = "sha256-UWdqrcx529r6kwgf0YEHiDrpZlGoUBR6OdYtHMTPMGY="; }; + patches = [ + (fetchpatch { + url = "https://gitlab.com/mailman/mailman-web/-/commit/448bba249d39c09c0cef5e059415cc07a3ce569c.patch"; + hash = "sha256-rs1vaV4YyLyJ0+EGY70CirvjArpGQr29DOTvgj68wgs="; + }) + ]; + postPatch = '' # Django is depended on transitively by hyperkitty and postorius, # and mailman_web has overly restrictive version bounds on it, so diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 04077ad2c261c..9de7a7e093f1d 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -113,10 +113,6 @@ python3.pkgs.buildPythonApplication rec { sentry = [ sentry-sdk ]; - opentracing = [ - jaeger-client - opentracing - ]; jwt = [ authlib ]; diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/servers/matrix-synapse/tools/synadm.nix index 37023092a0795..5ae3077060caa 100644 --- a/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/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/pkgs/servers/monitoring/alerta/client.nix b/pkgs/servers/monitoring/alerta/client.nix index b22e995ed5ed0..d8de093c2765a 100644 --- a/pkgs/servers/monitoring/alerta/client.nix +++ b/pkgs/servers/monitoring/alerta/client.nix @@ -5,11 +5,11 @@ python3.pkgs.buildPythonApplication rec { pname = "alerta"; - version = "8.5.1"; + version = "8.5.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-O13Ic2iHjNF/llp6vdaAiiWExcTBPsz46GAWY3oGDY8="; + sha256 = "sha256-5KLR+F5GtNkFXJMctJ5F4OvkQRhohd6SWB2ZFVtc/0s="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/monitoring/alerta/default.nix b/pkgs/servers/monitoring/alerta/default.nix index 06383d436085f..e69599498182f 100644 --- a/pkgs/servers/monitoring/alerta/default.nix +++ b/pkgs/servers/monitoring/alerta/default.nix @@ -5,11 +5,11 @@ python3.pkgs.buildPythonApplication rec { pname = "alerta-server"; - version = "8.7.0"; + version = "9.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EM3owmj+6gFjU0ARaQP3FLYXliGaGCRSaLgkiPwhGdU="; + sha256 = "sha256-v4+0l5Sx9RTxmNFnKCoKrWFl1xu1JIRZ/kiI6zi/y0I="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 79780d39d8534..409ae5f37562d 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cadvisor"; - version = "unstable-2023-07-28"; + version = "unstable-2023-10-22"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; - rev = "fdd3d9182bea6f7f11e4f934631c4abef3aa0584"; - hash = "sha256-U6oZ80EYx56FJ7VsDKzCXH4TvFEH+oPmgK/Nd8T/Zp4="; + rev = "bf2a7fee4170e418e7ac774af7679257fe26dc69"; + hash = "sha256-wf5TtUmBC8ikpaUp3KLs8rBMunFPevNYYoactudHMsU="; }; modRoot = "./cmd"; - vendorHash = "sha256-hvgObwmNKk6yTJSyEHuHZ5abuXGPwPC42xUSAAF8UA0="; + vendorHash = "sha256-LEtiJC3L6Q7MZH2gvpR9y2Zn9vig+9mWlRyVuKY3rsA="; ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ]; diff --git a/pkgs/servers/monitoring/cockpit/update.sh b/pkgs/servers/monitoring/cockpit/update.sh deleted file mode 100755 index c1834db9d39c8..0000000000000 --- a/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/pkgs/servers/monitoring/librenms/default.nix b/pkgs/servers/monitoring/librenms/default.nix index 79b550e281466..0fab1b334890e 100644 --- a/pkgs/servers/monitoring/librenms/default.nix +++ b/pkgs/servers/monitoring/librenms/default.nix @@ -23,7 +23,6 @@ let phpPackage = php82.withExtensions ({ enabled, all }: enabled ++ [ all.memcached ]); in phpPackage.buildComposerProject rec { - name = pname + "-" + version; pname = "librenms"; version = "23.9.1"; diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index f0b6055f2ba04..8b2573db4f774 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/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/pkgs/servers/monitoring/prometheus/promscale/default.nix b/pkgs/servers/monitoring/prometheus/promscale/default.nix index d4a67bc83501f..821cab907850a 100644 --- a/pkgs/servers/monitoring/prometheus/promscale/default.nix +++ b/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/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 0f92847a23788..aa781f7e26fb8 100644 --- a/pkgs/servers/mpd/default.nix +++ b/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/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index c59678418c31a..5f102f1c4162c 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/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/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix index 91f24a42927b5..51ab46ec73b98 100644 --- a/pkgs/servers/ps3netsrv/default.nix +++ b/pkgs/servers/ps3netsrv/default.nix @@ -1,31 +1,34 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { +{ lib, stdenv, fetchzip, mbedtls, meson, ninja, fetchFromGitHub }: +let + webManModVersion = "1.47.42"; +in +stdenv.mkDerivation rec { pname = "ps3netsrv"; - version = "1.1.0"; - - enableParallelBuilding = true; + version = "20220813"; - src = fetchFromGitHub { - owner = "dirkvdb"; - repo = "ps3netsrv--"; - rev = "e54a66cbf142b86e2cffc1701984b95adb921e81"; - sha256 = "sha256-SpPyRhPwOhTONAYH/eqLGmVl2XzhA1r1nUwKj7+rGyY="; - fetchSubmodules = true; + src = fetchzip { + url = "https://github.com/aldostools/webMAN-MOD/releases/download/${webManModVersion}/${pname}_${version}.zip"; + hash = "sha256-ynFuCD+tp8E/DDdB/HU9BCmwKcmQy6NBx26MKnP4W0o="; }; - buildPhase = "make CXX=$CXX"; - installPhase = '' - mkdir -p $out/bin - cp ps3netsrv++ $out/bin + sourceRoot = "./source/${pname}"; + + buildInputs = [ + meson + ninja + mbedtls + ]; + + postInstall = '' + install -Dm644 ../LICENSE.TXT $out/usr/share/licenses/${pname}/LICENSE.TXT ''; meta = { - description = "C++ implementation of the ps3netsrv server"; - homepage = "https://github.com/dirkvdb/ps3netsrv--"; - license = lib.licenses.mit; + description = "PS3 Net Server (mod by aldostools)"; + homepage = "https://github.com/aldostools/webMAN-MOD/"; + license = lib.licenses.gpl3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ makefu ]; - mainProgram = "ps3netsrv++"; + mainProgram = "ps3netsrv"; }; } diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index fe701f7b819d0..686b68c6c6744 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -143,6 +143,8 @@ stdenv.mkDerivation rec { + '' moveToOutput lib/cmake "$dev" rm -f $out/.bin-unwrapped/qpaeq # this is packaged by the "qpaeq" package now, because of missing deps + + cp config.h $dev/include/pulse ''; preFixup = lib.optionalString (stdenv.isLinux && (stdenv.hostPlatform == stdenv.buildPlatform)) '' diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index 894da7a652eef..59933570d7b15 100644 --- a/pkgs/servers/rt/default.nix +++ b/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/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index ed8744ef3c626..4665402361d56 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -51,11 +51,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.18.6"; + version = "4.19.1"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - hash = "sha256-KEyKmUzpich81oCMOQ/LnQDDayGg3BqKdUdLZ8nnFec="; + hash = "sha256-zjt/DRi/kapf1kbouzhaOzU3W3A8blEjsCuFoavIGHk="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index 5072869c39b67..2cfd41f7caf8b 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, git }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, nixosTests, git, bash }: buildGoModule rec { pname = "soft-serve"; @@ -20,10 +20,14 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' + # Soft-serve generates git-hooks at run-time. + # The scripts require git and bash inside the path. wrapProgram $out/bin/soft \ - --prefix PATH : "${lib.makeBinPath [ git ]}" + --prefix PATH : "${lib.makeBinPath [ git bash ]}" ''; + passthru.tests = nixosTests.soft-serve; + meta = with lib; { description = "A tasty, self-hosted Git server for the command line"; homepage = "https://github.com/charmbracelet/soft-serve"; diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 7f6cfa0f898a2..dd47de9075761 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.pgbouncer.org/"; + mainProgram = "pgbouncer"; description = "Lightweight connection pooler for PostgreSQL"; changelog = "https://github.com/pgbouncer/pgbouncer/releases/tag/pgbouncer_${replaceStrings ["."] ["_"] version}"; license = licenses.isc; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index efe3c431dca02..a567db9481215 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.12.1"; + version = "2.12.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - hash = "sha256-vl9DTbmRMs+2kpcCm7hY9Xd356bo2TlMzH4zWc6r8mQ="; + hash = "sha256-bZHgkcCmkheTupVLOBZ5UsgIVyy7aIJoge+ot2SmMFg="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] diff --git a/pkgs/servers/tacacsplus/default.nix b/pkgs/servers/tacacsplus/default.nix index 9acba46310258..7761695042f47 100644 --- a/pkgs/servers/tacacsplus/default.nix +++ b/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/pkgs/servers/teleport/11/default.nix b/pkgs/servers/teleport/11/default.nix index 59d788872b887..3a935b630e721 100644 --- a/pkgs/servers/teleport/11/default.nix +++ b/pkgs/servers/teleport/11/default.nix @@ -1,7 +1,7 @@ { callPackage, ... }@args: callPackage ../generic.nix ({ - version = "11.3.25"; - hash = "sha256-KIbRn90BUJp8Uc8GMHuIMMSn5tJQbxzE0ntngx1ELaE="; + version = "11.3.27"; + hash = "sha256-A3EeFQsDOaggfb5S+eyRCe/vm054MabfRrcHPxhO0So="; vendorHash = "sha256-hjMv/H4dlinlv3ku7i1km2/b+6uCdbznHtVOMIjDlUc="; yarnHash = "sha256-hip0WQVZpx2qfVDmEy4nk4UFYEjX1Xhj8HsIIQ8PF1Y="; cargoLock = { diff --git a/pkgs/servers/teleport/12/Cargo.lock b/pkgs/servers/teleport/12/Cargo.lock index 895145e3927f6..c150d003f3ac4 100644 --- a/pkgs/servers/teleport/12/Cargo.lock +++ b/pkgs/servers/teleport/12/Cargo.lock @@ -1734,9 +1734,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ "ring", "untrusted 0.7.1", diff --git a/pkgs/servers/teleport/12/default.nix b/pkgs/servers/teleport/12/default.nix index e53fdcce494a4..ee166f5d4721a 100644 --- a/pkgs/servers/teleport/12/default.nix +++ b/pkgs/servers/teleport/12/default.nix @@ -1,9 +1,9 @@ { callPackage, ... }@args: callPackage ../generic.nix ({ - version = "12.4.20"; - hash = "sha256-Qz+JOS4YPj2865Fkj7eVJMdilHMOGbTD179bQ5wHY7A="; - vendorHash = "sha256-cS8ylLujgp9Is+D2JjoK4yGgWRCVRyRw3NPQAAuE2vY="; - yarnHash = "sha256-tOdT7X8jM+tl1GZ7lBN2aW8KRiVW/zWK9fZIU7CSHVE="; + version = "12.4.22"; + hash = "sha256-UEiS+GiderYTU34GHsQr4G8XrasV5ewmPcdrec4v5B4="; + vendorHash = "sha256-etutgK/5u+e86kx7ha3x+di9np7Tcr7hpGUMKZxJNT4="; + yarnHash = "sha256-MBTElkMH5rb33l+AYWH+zguSLQf+ntXpOkHZpjLAx/Q="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/pkgs/servers/teleport/13/Cargo.lock b/pkgs/servers/teleport/13/Cargo.lock index b82c0b0e435f7..d22467c3e7dce 100644 --- a/pkgs/servers/teleport/13/Cargo.lock +++ b/pkgs/servers/teleport/13/Cargo.lock @@ -1786,9 +1786,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ "ring", "untrusted 0.7.1", diff --git a/pkgs/servers/teleport/13/default.nix b/pkgs/servers/teleport/13/default.nix index 58d682f52ac2e..65cbed70d9cc2 100644 --- a/pkgs/servers/teleport/13/default.nix +++ b/pkgs/servers/teleport/13/default.nix @@ -1,9 +1,9 @@ { callPackage, ... }@args: callPackage ../generic.nix ({ - version = "13.4.1"; - hash = "sha256-wgSaek4eq5Jx9SZFenvdRSU1wEtfJHzTz9GdczzUU2w="; - vendorHash = "sha256-DesT18nV/SxOsKCC+Nt0hgtH7CRtRL0B5FQhE1J148I="; - yarnHash = "sha256-iyMcP9L6dwBhN8JL9eSVEzsXI2EOjfyxjF9Dm4Gs04s="; + version = "13.4.3"; + hash = "sha256-x8G94jKycK3nYwqDA5RPc63GHIk9y4pHfSwSBqGBINk="; + vendorHash = "sha256-Pb3eO9zqLgTD7otM7yGRWicQjvpIXg7xKV8Oc4yh8PA="; + yarnHash = "sha256-GnoiLqzqGV0UZm5zePCDBUUX63NTIIo1dcxtiWQDPqc="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/pkgs/servers/teleport/14/Cargo.lock b/pkgs/servers/teleport/14/Cargo.lock index 8b18ac74ae704..c9b50a388b0ba 100644 --- a/pkgs/servers/teleport/14/Cargo.lock +++ b/pkgs/servers/teleport/14/Cargo.lock @@ -1789,9 +1789,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ "ring", "untrusted 0.7.1", diff --git a/pkgs/servers/teleport/14/default.nix b/pkgs/servers/teleport/14/default.nix index 15a594ef13e65..71036da070ef1 100644 --- a/pkgs/servers/teleport/14/default.nix +++ b/pkgs/servers/teleport/14/default.nix @@ -1,9 +1,9 @@ { callPackage, ... }@args: callPackage ../generic.nix ({ - version = "14.0.1"; - hash = "sha256-esQwk2PFnk3/REzLr3ExtzEcUs2q4Tn/2KpfFWAx5uU="; - vendorHash = "sha256-lzwrkW0dHxCHBSJjzNhXgq3Av8Zj8xEn3kfTRtT/q04="; - yarnHash = "sha256-Y2dVxRyKPLD2xjwr0QqrKHf/4gnMCErmDzievu5zTGg="; + version = "14.0.3"; + hash = "sha256-X+vekYmuTE7n22SH/z2GWO3wnBsIef1GEjR7WOJpjc8="; + vendorHash = "sha256-+R6f2HrlN/RLec83YutccDFJW6gq6HXbxoJVtxMgdp8="; + yarnHash = "sha256-udM4DNaTGiMkqfkllJjmT+Nk6PNbGUzT34ixQOhmScw="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index 2a992d01ad6a9..d837b6b264274 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/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/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index ff6103c94d4c0..41b6ae78a8780 100644 --- a/pkgs/servers/traefik/default.nix +++ b/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/pkgs/servers/unifi-video/default.nix b/pkgs/servers/unifi-video/default.nix index 45a9b5c6fb61e..45a9b5c6fb61e 100755..100644 --- a/pkgs/servers/unifi-video/default.nix +++ b/pkgs/servers/unifi-video/default.nix diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 0ab0d0f7db294..293a0a0c72598 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }: let - version = "4.1.4"; + version = "4.3"; versionParts = lib.take 2 (lib.splitVersion version); # 4.2 -> 402, 3.11 -> 311 @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz"; - hash = "sha256-mfJV5KHOG401N8gHFWYygsRRVnlWyn0SojD1H5KAvPQ="; + hash = "sha256-zLBFUyadpsqGeEhBCPrh3KKWn6f3zCy64YxTBMLIGsk="; }; phpConfig = writeText "config.php" '' diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/servers/web-apps/rss-bridge/default.nix index 70cf53e725be6..e1c459541e847 100644 --- a/pkgs/servers/web-apps/rss-bridge/default.nix +++ b/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/pkgs/servers/web-apps/rss-bridge/paths.patch b/pkgs/servers/web-apps/rss-bridge/paths.patch new file mode 100644 index 0000000000000..b226676cb28a0 --- /dev/null +++ b/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/pkgs/servers/windmill/Cargo.lock b/pkgs/servers/windmill/Cargo.lock index badaac718eb99..89e22cadf65df 100644 --- a/pkgs/servers/windmill/Cargo.lock +++ b/pkgs/servers/windmill/Cargo.lock @@ -142,7 +142,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -152,7 +152,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -292,9 +292,9 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.25", + "rustix 0.37.26", "slab", - "socket2 0.4.9", + "socket2 0.4.10", "waker-fn", ] @@ -388,9 +388,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.4.1" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" @@ -854,6 +854,12 @@ dependencies = [ ] [[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" + +[[package]] name = "byteorder" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -887,6 +893,184 @@ dependencies = [ ] [[package]] +name = "candle-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d648a16c5e5a9ffa4a6630e13d32b6d7c106f6885fd6d8453e1d8b405c390322" +dependencies = [ + "byteorder", + "candle-gemm", + "half", + "memmap2", + "num-traits", + "num_cpus", + "rand 0.8.5", + "rand_distr", + "rayon", + "safetensors", + "thiserror", + "yoke", + "zip", +] + +[[package]] +name = "candle-gemm" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef9b07a4b0ba1a304b44432006580980ddff9748c201261c279437e7b11bba68" +dependencies = [ + "candle-gemm-c32", + "candle-gemm-c64", + "candle-gemm-common", + "candle-gemm-f16", + "candle-gemm-f32", + "candle-gemm-f64", + "dyn-stack", + "lazy_static", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "candle-gemm-c32" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f595241dad99811de285e029889f57c29dd98e33de7a8a6b881867b1488d7d4a" +dependencies = [ + "candle-gemm-common", + "dyn-stack", + "lazy_static", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "candle-gemm-c64" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "648f22fd8f5a4f330e29d791845b514966421308a6a2b5fedb949ee07e54c77f" +dependencies = [ + "candle-gemm-common", + "dyn-stack", + "lazy_static", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "candle-gemm-common" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e03c01b4ca3b9d71e4eb89e42946a08f8b0d2f1b861f7fa2ea0966233f1e0b08" +dependencies = [ + "dyn-stack", + "lazy_static", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "candle-gemm-f16" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97f8af2a482131713d28a337abff6debf26c529afa1837caf2ba190909b2107c" +dependencies = [ + "candle-gemm-common", + "candle-gemm-f32", + "dyn-stack", + "half", + "lazy_static", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "candle-gemm-f32" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938927961e2f0c0a6064fcf3524ea3f7f455fe5708419532a6fea9aea1ab45ae" +dependencies = [ + "candle-gemm-common", + "dyn-stack", + "lazy_static", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "candle-gemm-f64" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d192d7126e59b81ef4cf13cd9f194e6dbdc09171f65d0074d059dc009ac06775" +dependencies = [ + "candle-gemm-common", + "dyn-stack", + "lazy_static", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "candle-nn" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00e438605fbbd1235dbfc5b10beda5ebe4bb0a19969b864a85b922c97ac9f686" +dependencies = [ + "candle-core", + "half", + "num-traits", + "rayon", + "safetensors", + "serde", + "thiserror", +] + +[[package]] +name = "candle-transformers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196742c5676b9af54c782304609f3e480c871e5588451d9806b2df8fc11e324c" +dependencies = [ + "candle-core", + "candle-nn", + "num-traits", + "rand 0.8.5", + "rayon", + "serde", + "serde_json", + "tracing", + "wav", +] + +[[package]] name = "cargo-lock" version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -935,7 +1119,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -1059,6 +1243,19 @@ dependencies = [ ] [[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", +] + +[[package]] name = "console_error_panic_hook" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1139,9 +1336,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", ] @@ -1350,7 +1547,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.1", + "hashbrown 0.14.2", "lock_api", "once_cell", "parking_lot_core", @@ -1387,7 +1584,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ "serde", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -1574,8 +1771,8 @@ dependencies = [ "flate2", "serde", "tokio", - "uuid 1.4.1", - "windows-sys", + "uuid 1.5.0", + "windows-sys 0.48.0", ] [[package]] @@ -1702,6 +1899,15 @@ dependencies = [ ] [[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] name = "dirs-next" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1712,6 +1918,18 @@ dependencies = [ ] [[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] name = "dirs-sys-next" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1763,6 +1981,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "131726693bce13b09331bee70734fe266666332b6ddfef23e9dca5b8bf6dea66" [[package]] +name = "dyn-stack" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe7f8d7bcc523381d3c437b82cf74805de3931de0da69309ae0fe1bdf7a256e" +dependencies = [ + "bytemuck", + "reborrow", +] + +[[package]] name = "either" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1781,6 +2009,12 @@ dependencies = [ ] [[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] name = "encoding_rs" version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1802,7 +2036,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "esaxx-rs" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +dependencies = [ + "cc", ] [[package]] @@ -1813,7 +2056,7 @@ checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" dependencies = [ "cfg-if", "home", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1852,7 +2095,7 @@ dependencies = [ "cfg-if", "libc", "redox_syscall 0.3.5", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2157,7 +2400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2284,6 +2527,19 @@ dependencies = [ ] [[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", + "num-traits", + "rand 0.8.5", + "rand_distr", +] + +[[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2303,9 +2559,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ "ahash 0.8.3", "allocator-api2", @@ -2317,7 +2573,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.1", + "hashbrown 0.14.2", ] [[package]] @@ -2366,6 +2622,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hf-hub" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" +dependencies = [ + "dirs", + "indicatif", + "log", + "native-tls", + "rand 0.8.5", + "serde", + "serde_json", + "thiserror", + "ureq", +] + +[[package]] name = "hkdf" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2389,7 +2662,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2470,7 +2743,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -2568,7 +2841,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.2", +] + +[[package]] +name = "indicatif" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", ] [[package]] @@ -2594,7 +2880,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2623,8 +2909,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.19", - "windows-sys", + "rustix 0.38.20", + "windows-sys 0.48.0", ] [[package]] @@ -2941,9 +3227,9 @@ 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", @@ -2988,6 +3274,22 @@ dependencies = [ ] [[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] name = "magic-crypt" version = "3.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3078,6 +3380,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", + "stable_deref_trait", +] + +[[package]] name = "memoffset" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3126,7 +3438,28 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "monostate" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f370ae88093ec6b11a710dec51321a61d420fafd1bad6e30d01bd9c920e8ee" +dependencies = [ + "monostate-impl", + "serde", +] + +[[package]] +name = "monostate-impl" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -3171,7 +3504,7 @@ dependencies = [ "priority-queue", "serde", "serde_json", - "socket2 0.5.4", + "socket2 0.5.5", "thiserror", "tokio", "tokio-native-tls", @@ -3215,7 +3548,7 @@ dependencies = [ "subprocess", "thiserror", "time", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -3355,6 +3688,12 @@ dependencies = [ ] [[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] name = "object" version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3370,6 +3709,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] name = "opaque-debug" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3431,6 +3792,12 @@ dependencies = [ ] [[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] name = "outref" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3444,9 +3811,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" @@ -3460,15 +3827,15 @@ 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", + "windows-targets 0.48.5", ] [[package]] @@ -3805,10 +4172,16 @@ dependencies = [ "libc", "log", "pin-project-lite", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] +name = "portable-atomic" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" + +[[package]] name = "postgres" version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3866,7 +4239,7 @@ dependencies = [ "postgres-protocol", "serde", "serde_json", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -4114,7 +4487,7 @@ checksum = "f69f8d22fa3f34f3083d9a4375c038732c7a7e964de1beb81c544da92dfc40b8" dependencies = [ "ahash 0.8.3", "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.2", "parking_lot", ] @@ -4202,6 +4575,16 @@ dependencies = [ ] [[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] name = "rand_hc" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4211,6 +4594,52 @@ dependencies = [ ] [[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-cond" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +dependencies = [ + "either", + "itertools 0.11.0", + "rayon", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "reborrow" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" + +[[package]] name = "redis" version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4226,7 +4655,7 @@ dependencies = [ "pin-project-lite", "ryu", "sha1_smol", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tokio-util", "url", @@ -4251,6 +4680,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" @@ -4301,6 +4739,12 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" +version = "0.7.5" +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" @@ -4372,6 +4816,12 @@ dependencies = [ ] [[package]] +name = "riff" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b1a3d5f46d53f4a3478e2be4a5a5ce5108ea58b100dcd139830eae7f79a3a1" + +[[package]] name = "ring" version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4388,16 +4838,16 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.4" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce3045ffa7c981a6ee93f640b538952e155f1ae3a1a02b84547fc7a56b7059a" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", "getrandom 0.2.10", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4414,7 +4864,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -4582,29 +5032,29 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.25" +version = "0.37.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" +checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes", "libc", "linux-raw-sys 0.3.8", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "rustix" -version = "0.38.19" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" dependencies = [ "bitflags 2.4.1", "errno", "libc", "linux-raw-sys 0.4.10", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4717,6 +5167,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] +name = "safetensors" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93279b86b3de76f820a8854dd06cbc33cfa57a417b19c47f6a25280112fb1df" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] name = "samael" version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4740,7 +5200,7 @@ dependencies = [ "serde", "thiserror", "url", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -4764,7 +5224,7 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4778,7 +5238,7 @@ dependencies = [ "schemars_derive", "serde", "serde_json", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -4887,6 +5347,12 @@ dependencies = [ ] [[package]] +name = "seq-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" + +[[package]] name = "serde" version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5228,9 +5694,9 @@ checksum = "d4b756ac662e92a0e5b360349bea5f0b0784d4be4541eff2972049dfdfd7f862" [[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", @@ -5238,12 +5704,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5298,6 +5764,18 @@ dependencies = [ ] [[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom", + "serde", + "unicode-segmentation", +] + +[[package]] name = "sql-builder" version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5373,7 +5851,7 @@ dependencies = [ "tokio-stream", "tracing", "url", - "uuid 1.4.1", + "uuid 1.5.0", "webpki-roots 0.24.0", ] @@ -5457,7 +5935,7 @@ dependencies = [ "stringprep", "thiserror", "tracing", - "uuid 1.4.1", + "uuid 1.5.0", "whoami", ] @@ -5500,7 +5978,7 @@ dependencies = [ "stringprep", "thiserror", "tracing", - "uuid 1.4.1", + "uuid 1.5.0", "whoami", ] @@ -5525,7 +6003,7 @@ dependencies = [ "sqlx-core", "tracing", "url", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -6014,6 +6492,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] +name = "synstructure" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "unicode-xid", +] + +[[package]] name = "system-configuration" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6049,8 +6539,8 @@ dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix 0.38.19", - "windows-sys", + "rustix 0.38.20", + "windows-sys 0.48.0", ] [[package]] @@ -6084,18 +6574,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", @@ -6177,6 +6667,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] +name = "tinyvector" +version = "0.1.0" +source = "git+https://github.com/windmill-labs/tinyvector#20823b94c20f2b9093f318badd24026cf54dcc85" +dependencies = [ + "anyhow", + "bincode", + "lazy_static", + "rayon", + "schemars", + "serde", + "thiserror", + "tracing", +] + +[[package]] +name = "tokenizers" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9be88c795d8b9f9c4002b3a8f26a6d0876103a6f523b32ea3bac52d8560c17c" +dependencies = [ + "aho-corasick", + "clap", + "derive_builder", + "esaxx-rs", + "getrandom 0.2.10", + "indicatif", + "itertools 0.11.0", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand 0.8.5", + "rayon", + "rayon-cond", + "regex", + "regex-syntax 0.7.5", + "serde", + "serde_json", + "spm_precompiled", + "thiserror", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + +[[package]] name = "tokio" version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6190,10 +6728,10 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "tracing", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -6248,7 +6786,7 @@ dependencies = [ "postgres-protocol", "postgres-types", "rand 0.8.5", - "socket2 0.5.4", + "socket2 0.5.5", "tokio", "tokio-util", "whoami", @@ -6438,9 +6976,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.39" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", "pin-project-lite", @@ -6628,7 +7166,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" dependencies = [ "rand 0.8.5", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -6732,6 +7270,15 @@ dependencies = [ ] [[package]] +name = "unicode-normalization-alignments" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" +dependencies = [ + "smallvec", +] + +[[package]] name = "unicode-segmentation" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6780,6 +7327,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] +name = "ureq" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +dependencies = [ + "base64 0.21.4", + "flate2", + "log", + "native-tls", + "once_cell", + "rustls", + "rustls-webpki", + "serde", + "serde_json", + "url", + "webpki-roots 0.25.2", +] + +[[package]] name = "url" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6827,9 +7393,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", @@ -6855,9 +7421,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" [[package]] name = "vcpkg" @@ -7018,6 +7584,15 @@ dependencies = [ ] [[package]] +name = "wav" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a65e199c799848b4f997072aa4d673c034f80f40191f97fe2f0a23f410be1609" +dependencies = [ + "riff", +] + +[[package]] name = "web-sys" version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7033,7 +7608,7 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.4", + "ring 0.17.5", "untrusted 0.9.0", ] @@ -7070,7 +7645,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.19", + "rustix 0.38.20", ] [[package]] @@ -7116,7 +7691,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windmill" -version = "1.184.0" +version = "1.188.1" dependencies = [ "anyhow", "axum", @@ -7140,7 +7715,7 @@ dependencies = [ "tokio-metrics", "tracing", "url", - "uuid 1.4.1", + "uuid 1.5.0", "windmill-api", "windmill-api-client", "windmill-common", @@ -7150,7 +7725,7 @@ dependencies = [ [[package]] name = "windmill-api" -version = "1.184.0" +version = "1.188.1" dependencies = [ "anyhow", "argon2", @@ -7161,6 +7736,9 @@ dependencies = [ "axum", "base64 0.21.4", "bytes", + "candle-core", + "candle-nn", + "candle-transformers", "chrono", "chrono-tz", "cookie", @@ -7168,6 +7746,7 @@ dependencies = [ "futures", "git-version", "hex", + "hf-hub", "hmac", "hyper", "itertools 0.11.0", @@ -7192,6 +7771,8 @@ dependencies = [ "sqlx", "tempfile", "time", + "tinyvector", + "tokenizers", "tokio", "tokio-tar", "tokio-util", @@ -7201,7 +7782,7 @@ dependencies = [ "tracing", "tracing-subscriber", "urlencoding", - "uuid 1.4.1", + "uuid 1.5.0", "windmill-audit", "windmill-common", "windmill-parser", @@ -7211,7 +7792,7 @@ dependencies = [ [[package]] name = "windmill-api-client" -version = "1.184.0" +version = "1.188.1" dependencies = [ "base64 0.21.4", "chrono", @@ -7224,12 +7805,12 @@ dependencies = [ "serde", "serde_json", "syn 1.0.109", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] name = "windmill-audit" -version = "1.184.0" +version = "1.188.1" dependencies = [ "chrono", "serde", @@ -7242,7 +7823,7 @@ dependencies = [ [[package]] name = "windmill-common" -version = "1.184.0" +version = "1.188.1" dependencies = [ "anyhow", "axum", @@ -7265,12 +7846,12 @@ dependencies = [ "tracing", "tracing-flame", "tracing-subscriber", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] name = "windmill-parser" -version = "1.184.0" +version = "1.188.1" dependencies = [ "serde", "serde_json", @@ -7278,7 +7859,7 @@ dependencies = [ [[package]] name = "windmill-parser-bash" -version = "1.184.0" +version = "1.188.1" dependencies = [ "anyhow", "lazy_static", @@ -7289,7 +7870,7 @@ dependencies = [ [[package]] name = "windmill-parser-go" -version = "1.184.0" +version = "1.188.1" dependencies = [ "anyhow", "gosyn", @@ -7301,7 +7882,7 @@ dependencies = [ [[package]] name = "windmill-parser-graphql" -version = "1.184.0" +version = "1.188.1" dependencies = [ "anyhow", "lazy_static", @@ -7312,7 +7893,7 @@ dependencies = [ [[package]] name = "windmill-parser-py" -version = "1.184.0" +version = "1.188.1" dependencies = [ "anyhow", "itertools 0.11.0", @@ -7323,7 +7904,7 @@ dependencies = [ [[package]] name = "windmill-parser-py-imports" -version = "1.184.0" +version = "1.188.1" dependencies = [ "anyhow", "async-recursion", @@ -7340,7 +7921,7 @@ dependencies = [ [[package]] name = "windmill-parser-sql" -version = "1.184.0" +version = "1.188.1" dependencies = [ "anyhow", "lazy_static", @@ -7351,7 +7932,7 @@ dependencies = [ [[package]] name = "windmill-parser-ts" -version = "1.184.0" +version = "1.188.1" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7368,7 +7949,7 @@ dependencies = [ [[package]] name = "windmill-parser-wasm" -version = "1.184.0" +version = "1.188.1" dependencies = [ "anyhow", "getrandom 0.2.10", @@ -7386,7 +7967,7 @@ dependencies = [ [[package]] name = "windmill-queue" -version = "1.184.0" +version = "1.188.1" dependencies = [ "anyhow", "async-recursion", @@ -7410,14 +7991,14 @@ dependencies = [ "tokio", "tracing", "ulid", - "uuid 1.4.1", + "uuid 1.5.0", "windmill-audit", "windmill-common", ] [[package]] name = "windmill-worker" -version = "1.184.0" +version = "1.188.1" dependencies = [ "anyhow", "async-recursion", @@ -7460,7 +8041,7 @@ dependencies = [ "tokio-postgres", "tracing", "urlencoding", - "uuid 1.4.1", + "uuid 1.5.0", "windmill-audit", "windmill-common", "windmill-parser", @@ -7480,7 +8061,16 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", ] [[package]] @@ -7489,7 +8079,22 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "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]] @@ -7498,53 +8103,95 @@ 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", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" @@ -7565,7 +8212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -7596,12 +8243,68 @@ dependencies = [ ] [[package]] +name = "yoke" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "synstructure", +] + +[[package]] +name = "zerofrom" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "synstructure", +] + +[[package]] name = "zeroize" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" [[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", +] + +[[package]] name = "zstd" version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/servers/windmill/default.nix b/pkgs/servers/windmill/default.nix index 70998153c29cf..6b822ade08b69 100644 --- a/pkgs/servers/windmill/default.nix +++ b/pkgs/servers/windmill/default.nix @@ -24,13 +24,13 @@ let pname = "windmill"; - version = "1.184.0"; + version = "1.188.1"; fullSrc = fetchFromGitHub { owner = "windmill-labs"; repo = "windmill"; rev = "v${version}"; - hash = "sha256-K7nF2B52dEzvdZxj21i89uJveh3/cM7uq7y/EE45ooY"; + hash = "sha256-IiCIiP5KYRw10aPlR40RPW0ynXq5itf0LLtpDtxCNE4="; }; pythonEnv = python3.withPackages (ps: [ ps.pip-tools ]); @@ -43,7 +43,7 @@ let sourceRoot = "${fullSrc.name}/frontend"; - npmDepsHash = "sha256-pGTJfVXo7nPIzwVIVxOm1pTd+7CbnKCnaQMYC+GkSAI="; + npmDepsHash = "sha256-TgAv3iUD0kP2mOvMVOW4yYCDCsf2Cr8IfXK+V+f35uw"; # without these you get a # FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory @@ -94,6 +94,7 @@ rustPlatform.buildRustPackage { lockFile = ./Cargo.lock; outputHashes = { "progenitor-0.3.0" = "sha256-F6XRZFVIN6/HfcM8yI/PyNke45FL7jbcznIiqj22eIQ="; + "tinyvector-0.1.0" = "sha256-NYGhofU4rh+2IAM+zwe04YQdXY8Aa4gTmn2V2HtzRfI="; }; }; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 311606a40cc75..eb9c1ced67111 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -874,11 +874,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontutil = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-util"; - version = "1.4.0"; + version = "1.4.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-util-1.4.0.tar.xz"; - sha256 = "0z8gsi0bz5nnpsl008fyb4isrkrqrmhxjar5ywwpx30j83wlnwlz"; + url = "mirror://xorg/individual/font/font-util-1.4.1.tar.xz"; + sha256 = "15fcd3rzlgm51fwgfapg6vzyd1kkd28rj149xq7iajqr7h9697sw"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1118,11 +1118,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpthreadstubs, libxcb, xtrans, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libX11"; - version = "1.8.6"; + version = "1.8.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.8.6.tar.xz"; - sha256 = "1jawl8zp1h7hdmxx1sc6kmxkki187d9yixr2l03ai6wqqry5nlsr"; + url = "mirror://xorg/individual/lib/libX11-1.8.7.tar.xz"; + sha256 = "1vlrgrdibp4lr84wgmsdy1ihzaai8bvvqc68npi1m19wir36gwh5"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1478,11 +1478,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXpm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt, gettext, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXpm"; - version = "3.5.16"; + version = "3.5.17"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXpm-3.5.16.tar.xz"; - sha256 = "0lczckznwbzsf5pca487g8bzbqjgj3a96z78cz69pgcxlskmvg76"; + url = "mirror://xorg/individual/lib/libXpm-3.5.17.tar.xz"; + sha256 = "0hvf49qy55gwldpwpw7ihcmn5i2iinpjh2rbha63hzcy060izcv4"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1779,11 +1779,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libpthreadstubs = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libpthread-stubs"; - version = "0.4"; + version = "0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xcb/libpthread-stubs-0.4.tar.bz2"; - sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; + url = "mirror://xorg/individual/xcb/libpthread-stubs-0.5.tar.xz"; + sha256 = "1g224hyy694jch54357zc895z46r90xs193hg4m7rfnfxinmdnjr"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1799,11 +1799,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libxcb = callPackage ({ stdenv, pkg-config, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libxcb"; - version = "1.15"; + version = "1.16"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libxcb-1.15.tar.xz"; - sha256 = "0nd035rf83xf531cnjzsf9ykb5w9rdzz6bbyhi683xkwh57p8f6c"; + url = "mirror://xorg/individual/lib/libxcb-1.16.tar.xz"; + sha256 = "0w8xf6ff6axvla734lfb2291hrjrqqhn6mqabvdrdwgvl1m5cj23"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2239,11 +2239,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcbproto = callPackage ({ stdenv, pkg-config, fetchurl, python3, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcb-proto"; - version = "1.15.2"; + version = "1.16.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/proto/xcb-proto-1.15.2.tar.xz"; - sha256 = "1vak6q53abwxnkfn6by7j24m48kd2iy7jnskkqzzx8l0ysqvwwkh"; + url = "mirror://xorg/individual/proto/xcb-proto-1.16.0.tar.xz"; + sha256 = "06aij66rs8g378wg8swd7b3g73wqrrbbwl8shhnsi29amm41hnm7"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2679,11 +2679,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-libinput"; - version = "1.3.0"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-libinput-1.3.0.tar.xz"; - sha256 = "1fqsik2hdibz7zx7bb2rkh6wadz0p31xpd50ljsnij9bl8hblihl"; + url = "mirror://xorg/individual/driver/xf86-input-libinput-1.4.0.tar.xz"; + sha256 = "1673ydfrvfqd4inz3vx1qyxa0mhr0f4bi0r7mrcmpisxi76i8g9s"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 9396899111bed..e7c93e10bacb9 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -1,5 +1,5 @@ https://invisible-mirror.net/archives/luit/luit-20190106.tgz -mirror://xorg/individual/xcb/libpthread-stubs-0.4.tar.bz2 +mirror://xorg/individual/xcb/libpthread-stubs-0.5.tar.xz mirror://xorg/individual/xcb/xcb-util-0.4.1.tar.xz mirror://xorg/individual/xcb/xcb-util-cursor-0.1.4.tar.xz mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz @@ -80,7 +80,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.12.tar.gz mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz mirror://xorg/individual/driver/xf86-input-keyboard-2.0.0.tar.xz -mirror://xorg/individual/driver/xf86-input-libinput-1.3.0.tar.xz +mirror://xorg/individual/driver/xf86-input-libinput-1.4.0.tar.xz mirror://xorg/individual/driver/xf86-input-mouse-1.9.5.tar.xz mirror://xorg/individual/driver/xf86-input-synaptics-1.9.2.tar.xz mirror://xorg/individual/driver/xf86-input-vmmouse-13.2.0.tar.xz @@ -163,7 +163,7 @@ mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz -mirror://xorg/individual/font/font-util-1.4.0.tar.xz +mirror://xorg/individual/font/font-util-1.4.1.tar.xz mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2 @@ -174,10 +174,10 @@ mirror://xorg/individual/lib/libICE-1.1.1.tar.xz mirror://xorg/individual/lib/libpciaccess-0.17.tar.xz mirror://xorg/individual/lib/libSM-1.2.4.tar.xz mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.8.6.tar.xz +mirror://xorg/individual/lib/libX11-1.8.7.tar.xz mirror://xorg/individual/lib/libXau-1.0.11.tar.xz mirror://xorg/individual/lib/libXaw-1.0.15.tar.xz -mirror://xorg/individual/lib/libxcb-1.15.tar.xz +mirror://xorg/individual/lib/libxcb-1.16.tar.xz mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz mirror://xorg/individual/lib/libXcursor-1.2.1.tar.xz mirror://xorg/individual/lib/libxcvt-0.1.2.tar.xz @@ -193,7 +193,7 @@ mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz mirror://xorg/individual/lib/libxkbfile-1.1.2.tar.xz mirror://xorg/individual/lib/libXmu-1.1.4.tar.xz mirror://xorg/individual/lib/libXp-1.0.4.tar.xz -mirror://xorg/individual/lib/libXpm-3.5.16.tar.xz +mirror://xorg/individual/lib/libXpm-3.5.17.tar.xz mirror://xorg/individual/lib/libXpresent-1.0.1.tar.xz mirror://xorg/individual/lib/libXrandr-1.5.3.tar.xz mirror://xorg/individual/lib/libXrender-0.9.11.tar.xz @@ -209,7 +209,7 @@ mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.5.tar.xz mirror://xorg/individual/lib/xtrans-1.5.0.tar.xz -mirror://xorg/individual/proto/xcb-proto-1.15.2.tar.xz +mirror://xorg/individual/proto/xcb-proto-1.16.0.tar.xz mirror://xorg/individual/proto/xorgproto-2023.2.tar.xz mirror://xorg/individual/util/bdftopcf-1.1.1.tar.xz mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 34b8f9504f8b3..acd7494fd3cc9 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -22,7 +22,7 @@ }: let - version = "0.85.0"; + version = "0.86.0"; in rustPlatform.buildRustPackage { @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-/c3JTgIT+T41D0S7irQ0jq2MDzmx3os4pYpVr10cL3E="; + hash = "sha256-jUZKqsu0/RO4mc+hzjis1mNrohj1JzM17Z8e2Ggxlfs="; }; - cargoHash = "sha256-lBipwX72j0Af3PCat18s9NIjJiKZFZTcU9Utwt+eQzI="; + cargoHash = "sha256-WDGhuc2ZGDwfh7X/oRTZLzmKPj1jSnQFL4sy7KYt5Js="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index 8643faccd8ffe..5aa0adae6ebb3 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/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/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix index dfe2a4062c89a..bb3f631cf225d 100644 --- a/pkgs/shells/nushell/plugins/default.nix +++ b/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/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 5f75951b8c955..0603ba9bfb6b4 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/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/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index bf788098a5eb9..e35a7c483d86f 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/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/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix new file mode 100644 index 0000000000000..940b2d0aff021 --- /dev/null +++ b/pkgs/shells/nushell/plugins/net.nix @@ -0,0 +1,43 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, IOKit +, CoreFoundation +, nix-update-script +}: + +rustPlatform.buildRustPackage { + pname = "nu-plugin-net"; + version = "unstable-2023-09-27"; + + src = fetchFromGitHub { + owner = "fennewald"; + repo = "nu_plugin_net"; + rev = "1761ed3d7f68925f1234316bd62c91d1d9d7cb4d"; + hash = "sha256-ZEktfN/zg/VIiBGq/o0T05tLViML2TzfuLw0qliPQg8="; + }; + + cargoHash = "sha256-bRw9V75VnOL1n2jPs6QI/A3pik00pGiA9ZzQk1F1JRI="; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + CoreFoundation + IOKit + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + 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/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 25097a5d6297b..b34d0b17df13b 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/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/pkgs/shells/nushell/plugins/regex.nix b/pkgs/shells/nushell/plugins/regex.nix index 457c7170a5b3e..24cffddc27c2a 100644 --- a/pkgs/shells/nushell/plugins/regex.nix +++ b/pkgs/shells/nushell/plugins/regex.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , rustPlatform , fetchFromGitHub , nix-update-script diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 5c03312cc75f0..35cdb6311df32 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -68,7 +68,7 @@ mipsel-linux = import ./bootstrap-files/mipsel-unknown-linux-gnu.nix; mips64el-linux = import (if localSystem.isMips64n32 - then ./bootstrap-files/mips64el-unknown-linux-gnuabin32.nix.nix + then ./bootstrap-files/mips64el-unknown-linux-gnuabin32.nix else ./bootstrap-files/mips64el-unknown-linux-gnuabi64.nix); powerpc64le-linux = import ./bootstrap-files/powerpc64le-unknown-linux-gnu.nix; riscv64-linux = import ./bootstrap-files/riscv64-unknown-linux-gnu.nix; diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 8809030989e69..74009c97980d2 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -30,6 +30,13 @@ in stdenv.mkDerivation { $CXX -o cxx-check ${./cxx-main.cc} ${emulator} ./cxx-check + # test for https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1431745905 + # .../include/cxxabi.h:20:10: fatal error: '__cxxabi_config.h' file not found + # in libcxxStdenv + echo "checking whether cxxabi.h can be included... " >&2 + $CXX -o include-cxxabi ${./include-cxxabi.cc} + ${emulator} ./include-cxxabi + ${lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) '' echo "checking whether compiler can build with CoreFoundation.framework... " >&2 mkdir -p foo/lib diff --git a/pkgs/test/cc-wrapper/include-cxxabi.cc b/pkgs/test/cc-wrapper/include-cxxabi.cc new file mode 100644 index 0000000000000..6ffc97e414a56 --- /dev/null +++ b/pkgs/test/cc-wrapper/include-cxxabi.cc @@ -0,0 +1,8 @@ +#include <cxxabi.h> +#include <iostream> + +int main(int argc, char **argv) +{ + std::cerr << "ok" << std::endl; + return 0; +} diff --git a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix index ddf267702592a..f3ddbcd3e0167 100644 --- a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix +++ b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix @@ -25,7 +25,7 @@ let # This is a statically linked version of stack, so it should be usable within # the Nixpkgs builder (at least on x86_64-linux). stackDownloadUrl = - "https://github.com/commercialhaskell/stack/releases/download/v${stack.version}/stack-${stack.version}-linux-x86_64-static.tar.gz"; + "https://github.com/commercialhaskell/stack/releases/download/v${stack.version}/stack-${stack.version}-linux-x86_64.tar.gz"; # This test code has been explicitly pulled out of the derivation below so # that it can be hashed and added to the `name` of the derivation. This is @@ -49,10 +49,11 @@ let ) # Fetch the statically-linked upstream Stack binary. + echo "Trying to download a statically linked stack binary from ${stackDownloadUrl} to ./stack.tar.gz ..." "''${curl[@]}" "${stackDownloadUrl}" > ./stack.tar.gz tar xf ./stack.tar.gz - upstream_stack_version_output="$(./stack-${stack.version}-linux-x86_64-static/stack --version)" + upstream_stack_version_output="$(./stack-${stack.version}-linux-x86_64/stack --version)" echo "upstream \`stack --version\` output: $upstream_stack_version_output" nixpkgs_stack_version_output="$(stack --version)" diff --git a/pkgs/test/make-binary-wrapper/add-flags.c b/pkgs/test/make-binary-wrapper/add-flags.c index 3ae8678d4421a..d998a5f6f983c 100644 --- a/pkgs/test/make-binary-wrapper/add-flags.c +++ b/pkgs/test/make-binary-wrapper/add-flags.c @@ -3,19 +3,21 @@ #include <assert.h> int main(int argc, char **argv) { - char **argv_tmp = calloc(4 + argc + 2 + 1, sizeof(*argv_tmp)); + char **argv_tmp = calloc(6 + argc + 2 + 1, sizeof(*argv_tmp)); assert(argv_tmp != NULL); argv_tmp[0] = argv[0]; argv_tmp[1] = "-x"; argv_tmp[2] = "-y"; argv_tmp[3] = "-z"; argv_tmp[4] = "-abc"; + argv_tmp[5] = "-g"; + argv_tmp[6] = "*.txt"; for (int i = 1; i < argc; ++i) { - argv_tmp[4 + i] = argv[i]; + argv_tmp[6 + i] = argv[i]; } - argv_tmp[4 + argc + 0] = "-foo"; - argv_tmp[4 + argc + 1] = "-bar"; - argv_tmp[4 + argc + 2] = NULL; + argv_tmp[6 + argc + 0] = "-foo"; + argv_tmp[6 + argc + 1] = "-bar"; + argv_tmp[6 + argc + 2] = NULL; argv = argv_tmp; argv[0] = "/send/me/flags"; diff --git a/pkgs/test/make-binary-wrapper/add-flags.cmdline b/pkgs/test/make-binary-wrapper/add-flags.cmdline index f42d26f3adf0e..1ca964ab4e7a7 100644 --- a/pkgs/test/make-binary-wrapper/add-flags.cmdline +++ b/pkgs/test/make-binary-wrapper/add-flags.cmdline @@ -1,3 +1,4 @@ --append-flags "-foo -bar" \ --add-flags "-x -y -z" \ - --add-flags -abc + --add-flags -abc \ + --add-flags "-g *.txt" diff --git a/pkgs/test/make-binary-wrapper/add-flags.env b/pkgs/test/make-binary-wrapper/add-flags.env index 3626b8cf97b06..f0641ef36f7c3 100644 --- a/pkgs/test/make-binary-wrapper/add-flags.env +++ b/pkgs/test/make-binary-wrapper/add-flags.env @@ -4,5 +4,7 @@ SUBST_ARGV0 -y -z -abc +-g +*.txt -foo -bar diff --git a/pkgs/tools/X11/xssstate/default.nix b/pkgs/tools/X11/xssstate/default.nix index a1ce545a5f133..53fd1138c29dd 100644 --- a/pkgs/tools/X11/xssstate/default.nix +++ b/pkgs/tools/X11/xssstate/default.nix @@ -4,29 +4,31 @@ , libX11 , libXScrnSaver }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xssstate"; - # - # Use the date of the last commit, since there were bug fixes after the 1.1 - # release. - # - version = "unstable-2022-09-24"; + version = "1.1-unstable-2022-09-24"; + src = fetchgit { url = "https://git.suckless.org/xssstate/"; rev = "5d8e9b49ce2970f786f1e5aa12bbaae83900453f"; hash = "sha256-Aor12tU1I/qNZCdBhZcvNK1FWFh0HYK8CEI29X5yoeA="; }; - makeFlags = [ "VERSION=${version}" ]; - - installFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ + libX11 + libXScrnSaver + ]; - buildInputs = [ libX11 libXScrnSaver ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "VERSION=${finalAttrs.version}" + ]; meta = with lib; { description = "A simple tool to retrieve the X screensaver state"; license = licenses.mit; maintainers = with maintainers; [ onemoresuza ]; platforms = platforms.linux; + mainProgram = "xssstate"; }; -} +}) diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix index efbbe49a5b8d0..545e22f6b58a3 100644 --- a/pkgs/tools/admin/aws-google-auth/default.nix +++ b/pkgs/tools/admin/aws-google-auth/default.nix @@ -15,6 +15,9 @@ , tzlocal , nose , mock +, setuptools +, aws-google-auth +, testers , withU2F ? false, python-u2flib-host }: @@ -22,6 +25,8 @@ buildPythonApplication rec { pname = "aws-google-auth"; version = "0.0.38"; + pyproject = true; + # Pypi doesn't ship the tests, so we fetch directly from GitHub # https://github.com/cevoaustralia/aws-google-auth/issues/120 src = fetchFromGitHub { @@ -31,6 +36,10 @@ buildPythonApplication rec { sha256 = "sha256-/Xe4RDA9sBEsBBV1VP91VX0VfO8alK8L70m9WrB7qu4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ beautifulsoup4 boto3 @@ -55,6 +64,16 @@ buildPythonApplication rec { export HOME=$TMPDIR ''; + # with pyproject the tests aren't attempted + # without pyproject the tests try to access internet + doCheck = false; + + pythonImportsCheck = [ "aws_google_auth" ]; + + passthru.tests.version = testers.testVersion { + package = aws-google-auth; + }; + meta = with lib; { description = "Acquire AWS STS (temporary) credentials via Google Apps SAML Single Sign On"; homepage = "https://github.com/cevoaustralia/aws-google-auth"; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 78aacae846830..2e022467ce678 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -17,6 +17,13 @@ let hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; }; }); + urllib3 = prev.urllib3.overridePythonAttrs (prev: { + format = "setuptools"; + src = prev.src.override { + version = "1.26.16"; + hash = "sha256-jxNfZQJ1a95rKpsomJ31++h8mXDOyqaQQe3M5/BYmxQ="; + }; + }); }); }; @@ -37,7 +44,9 @@ with py.pkgs; buildPythonApplication rec { substituteInPlace pyproject.toml \ --replace 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \ --replace 'flit_core>=3.7.1,<3.8.1' 'flit_core>=3.7.1' \ - --replace 'awscrt>=0.16.4,<=0.16.16' 'awscrt>=0.16.4' + --replace 'awscrt>=0.16.4,<=0.16.16' 'awscrt>=0.16.4' \ + --replace 'docutils>=0.10,<0.20' 'docutils>=0.10' \ + --replace 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24' substituteInPlace requirements-base.txt \ --replace "wheel==0.38.4" "wheel>=0.38.4" \ diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index cc5550395febe..13589edd6bdc8 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/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/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix index 43e5ad9d650bf..1d09e02b6ba68 100644 --- a/pkgs/tools/admin/oci-cli/default.nix +++ b/pkgs/tools/admin/oci-cli/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchPypi , python3 }: @@ -10,10 +11,10 @@ let click = super.click.overridePythonAttrs (oldAttrs: rec { version = "7.1.2"; - src = oldAttrs.src.override { + src = fetchPypi { + pname = "click"; inherit version; hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; - sha256 = ""; }; disabledTests = [ "test_bytes_args" ]; # https://github.com/pallets/click/commit/6e05e1fa1c2804 }); diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix b/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix index 5dcd156d555bc..74d9bb28a5013 100644 --- a/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix +++ b/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/pkgs/tools/admin/rset/default.nix b/pkgs/tools/admin/rset/default.nix index e164e133f9851..32e401ecc40c9 100644 --- a/pkgs/tools/admin/rset/default.nix +++ b/pkgs/tools/admin/rset/default.nix @@ -44,5 +44,10 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ ]; + # 2023-08-19, fails to compile with glibc-2.38 because of strlcpy. + # At the time of writing, this was 4 minors behind already and + # the `paths.patch` didn't apply anymore, so this is now considered + # broken until somebody cares enough to fix and upgrade this. + broken = true; }; } diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 3f6567b09f0c8..c596c709977c2 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.92.0"; + version = "0.93.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-YmzizpcAfE4+Rfq5ydQnDQBo4R+pAyudfi+fqD9EZP0="; + hash = "sha256-e8d+CK7rRbyHeRHOjK3tGFIBHuosdV4AMetUQar54E4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-siOZWhHqNokkYAPwuXQCs4T1yBiEWUTJzhfbH/Z2uBk="; + vendorHash = "sha256-BUCe2v80tHAqMBwa6xae3ZOTOok8msM6hFh6d9D4xZA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/archivers/payload-dumper-go/default.nix b/pkgs/tools/archivers/payload-dumper-go/default.nix index bb1572e1ceb67..bb1572e1ceb67 100755..100644 --- a/pkgs/tools/archivers/payload-dumper-go/default.nix +++ b/pkgs/tools/archivers/payload-dumper-go/default.nix diff --git a/pkgs/tools/audio/piper/default.nix b/pkgs/tools/audio/piper/default.nix index d753d7bb3e1ea..d68ffa2b77ead 100644 --- a/pkgs/tools/audio/piper/default.nix +++ b/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/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index bdd0f58235e5a..d4147faf960f1 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/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/pkgs/tools/audio/whisper-ctranslate2/default.nix b/pkgs/tools/audio/whisper-ctranslate2/default.nix index 7238a54932458..dd928ab3e418e 100644 --- a/pkgs/tools/audio/whisper-ctranslate2/default.nix +++ b/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/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index 94cb3790a567f..b5cd6b9e50c2c 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/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/pkgs/tools/cd-dvd/ventoy/default.nix b/pkgs/tools/cd-dvd/ventoy/default.nix index cf3bd1fe6c52a..f7b90e6e252d3 100644 --- a/pkgs/tools/cd-dvd/ventoy/default.nix +++ b/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/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 879075101b2c2..602e1ff770714 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/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/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index e44e961e3aeb6..f32d026ac1cf3 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/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/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index d1daee70967f2..e25df7288094a 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional fuseSupport "--enable-fuse"; meta = with lib; { + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/"; description = "Userspace utilities for linux-erofs file system"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ ehmry nikstur ]; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 71892916ad7a6..20b296de802c8 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "graphviz"; - version = "8.1.0"; + version = "9.0.0"; src = fetchFromGitLab { owner = "graphviz"; repo = "graphviz"; rev = version; - hash = "sha256-xTdrtwSpizqf5tNRX0Q0w10mEk4S0X7cmxHj3Us14kY="; + hash = "sha256-lLESaULvHkWJjbKjjG9VIcVInqsDmY1OAAKfjCFDThQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/evscript/Cargo.lock b/pkgs/tools/inputmethods/evscript/Cargo.lock deleted file mode 100644 index 437ec68557af6..0000000000000 --- a/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/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/tools/inputmethods/evscript/default.nix index aecfaf9492588..d1440bea357fd 100644 --- a/pkgs/tools/inputmethods/evscript/default.nix +++ b/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/pkgs/tools/inputmethods/evsieve/default.nix b/pkgs/tools/inputmethods/evsieve/default.nix new file mode 100644 index 0000000000000..4497448cad129 --- /dev/null +++ b/pkgs/tools/inputmethods/evsieve/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, libevdev +}: + +rustPlatform.buildRustPackage rec { + pname = "evsieve"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "KarsMulder"; + repo = "evsieve"; + rev = "v${version}"; + hash = "sha256-R/y3iyKGE4dzAyNnDwrMCr8JFshYJwNcgHQ8UbtuRj8="; + }; + + cargoHash = "sha256-jkm+mAHejCBZFalUbJNaIxtIl2kwnlPR2wsaYlcfSz8="; + + buildInputs = [ libevdev ]; + + doCheck = false; # unit tests create uinput devices + + meta = with lib; { + description = "A utility for mapping events from Linux event devices"; + homepage = "https://github.com/KarsMulder/evsieve"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ tsowell ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/audible-cli/default.nix b/pkgs/tools/misc/audible-cli/default.nix index f83a87a75b250..e7f073451b5db 100644 --- a/pkgs/tools/misc/audible-cli/default.nix +++ b/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/pkgs/tools/misc/blflash/default.nix b/pkgs/tools/misc/blflash/default.nix index 8cb5d6fcba118..db243a185f97f 100644 --- a/pkgs/tools/misc/blflash/default.nix +++ b/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/pkgs/tools/misc/cc2538-bsl/default.nix b/pkgs/tools/misc/cc2538-bsl/default.nix index 16c858fc58172..c90fc3914d418 100644 --- a/pkgs/tools/misc/cc2538-bsl/default.nix +++ b/pkgs/tools/misc/cc2538-bsl/default.nix @@ -1,23 +1,26 @@ -{ lib, fetchFromGitHub, fetchpatch, python3Packages }: +{ lib +, fetchFromGitHub +, fetchpatch +, python3Packages +}: python3Packages.buildPythonPackage rec { pname = "cc2538-bsl"; - version = "unstable-2022-08-03"; - format = "setuptools"; + version = "unstable-2023-08-14"; + format = "pyproject"; src = fetchFromGitHub { owner = "JelmerT"; - repo = pname; - rev = "538ea0deb99530e28fdf1b454e9c9d79d85a3970"; + repo = "cc2538-bsl"; + rev = "641305fb5cae98415a28cbfab6e63436c1753abf"; hash = "sha256-fPY12kValxbJORi9xNyxzwkGpD9F9u3M1+aa9IlSiaE="; }; patches = [ - # https://github.com/JelmerT/cc2538-bsl/pull/138 (fetchpatch { - name = "clean-up-install-dependencies.patch"; - url = "https://github.com/JelmerT/cc2538-bsl/commit/bf842adf8e99a9eb8528579e5b85e59ee23be08d.patch"; - hash = "sha256-XKQ0kfl8yFrSF5RosHY9OvJR18Fh0dmAN1FlfZ024ME="; + # fix extras specification in setup.py; https://github.com/JelmerT/cc2538-bsl/pull/143 + url = "https://github.com/JelmerT/cc2538-bsl/commit/c70f58ec0222357db8020176711d6d45cf24da35.patch"; + hash = "sha256-Rxm/TRcm87WgRfq60cu0loyrbJmZou09XYR7uhrhhj8="; }) ]; diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index f9309ecf81ddf..549cb543af192 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -1,17 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev, stdenv +{ lib, wrapQtAppsHook, fetchFromGitHub, substituteAll, udev, stdenv , pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu -, withPulseaudio ? stdenv.isLinux, libpulseaudio +, withPulseaudio ? stdenv.isLinux, libpulseaudio, quazip }: -mkDerivation rec { - version = "0.5.0"; +stdenv.mkDerivation rec { + version = "0.6.0"; pname = "ckb-next"; src = fetchFromGitHub { owner = "ckb-next"; repo = "ckb-next"; rev = "v${version}"; - sha256 = "sha256-yR1myagAqavAR/7lPdufcrJpPmXW7r4N4pxTMF6NbuE="; + hash = "sha256-G0cvET3wMIi4FlBmaTkdTyYtcdVGzK4X0C2HYZr43eg="; }; buildInputs = [ @@ -22,9 +22,11 @@ mkDerivation rec { qttools qtx11extras libdbusmenu + quazip ] ++ lib.optional withPulseaudio libpulseaudio; nativeBuildInputs = [ + wrapQtAppsHook pkg-config cmake ]; diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/tools/misc/codebraid/default.nix index 0ecde80c238d6..f4d8fa4940f00 100644 --- a/pkgs/tools/misc/codebraid/default.nix +++ b/pkgs/tools/misc/codebraid/default.nix @@ -2,15 +2,17 @@ python3Packages.buildPythonApplication rec { pname = "codebraid"; - version = "0.5.0-unstable-2020-08-14"; + version = "0.11.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "gpoore"; repo = pname; - rev = "526a223c4fc32c37d6c5c9133524dfa0e1811ca4"; - sha256 = "0qkqaj49k584qzgx9jlsf5vlv4lq7x403s1kig8v87i0kgh55p56"; + rev = "v${version}"; + hash = "sha256-E9vzGK9ZEVwF+UBpSkdM+hm6vINen/A+LgnnPpc77QQ="; }; + nativeBuildInputs = with python3Packages; [ setuptools ]; propagatedBuildInputs = with python3Packages; [ bespon ]; # unfortunately upstream doesn't contain tests checkPhase = '' diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/tools/misc/czkawka/default.nix index 3379c0fbe012d..14908c0a402e9 100644 --- a/pkgs/tools/misc/czkawka/default.nix +++ b/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/pkgs/tools/misc/domine/default.nix b/pkgs/tools/misc/domine/default.nix index cd62b9bd1a744..421b49a9d4a45 100644 --- a/pkgs/tools/misc/domine/default.nix +++ b/pkgs/tools/misc/domine/default.nix @@ -12,6 +12,6 @@ buildDartApplication rec { }; pubspecLockFile = ./pubspec.lock; - + depsListFile = ./deps.json; vendorHash = "16z3paq1nxlnzs20qlljnwa2ff6xfhdqzcq8d8izkl7w1j4hyxgn"; } diff --git a/pkgs/tools/misc/domine/deps.json b/pkgs/tools/misc/domine/deps.json new file mode 100644 index 0000000000000..baa466f5e2f2e --- /dev/null +++ b/pkgs/tools/misc/domine/deps.json @@ -0,0 +1,190 @@ +[ + { + "name": "domine", + "version": "1.1.0+3", + "kind": "root", + "source": "root", + "dependencies": [ + "args", + "dart_openai", + "dio", + "dio_smart_retry", + "tint", + "lints" + ] + }, + { + "name": "lints", + "version": "2.1.1", + "kind": "dev", + "source": "hosted", + "dependencies": [] + }, + { + "name": "tint", + "version": "2.0.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "dio_smart_retry", + "version": "5.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "dio", + "http_parser", + "path" + ] + }, + { + "name": "path", + "version": "1.8.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "collection", + "version": "1.17.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "string_scanner", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "term_glyph", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "dio", + "version": "5.3.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "http_parser", + "meta", + "path" + ] + }, + { + "name": "meta", + "version": "1.9.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "async", + "version": "2.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "dart_openai", + "version": "4.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "http", + "meta", + "collection", + "fetch_client" + ] + }, + { + "name": "fetch_client", + "version": "1.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "fetch_api", + "http" + ] + }, + { + "name": "http", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "http_parser", + "meta" + ] + }, + { + "name": "fetch_api", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "js" + ] + }, + { + "name": "js", + "version": "0.6.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "args", + "version": "2.4.2", + "kind": "direct", + "source": "hosted", + "dependencies": [] + } +] diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix index b3a1be04d9290..8cd59df31b1e5 100644 --- a/pkgs/tools/misc/envsubst/default.nix +++ b/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/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index b791cac21bd48..ef128ff264d0f 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.9.3"; + version = "2023.10.3"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-SyXEiGh1/s9EJ0UPYC8R04JUYkCPhCtNUcGvVCycKGM="; + hash = "sha256-rvU2eA9HEZv77cn2K4xEL/hqBk2hauFv7eUHZzR5Q5s="; }; postPatch = '' diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index bb7dc0a8f2884..563b35d665b53 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/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/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 23e00e00363ce..84da1044f1a46 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.7.0"; + version = "8.7.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - hash = "sha256-y7IrwMLQnvz1PeKt8BE9hbEBwQBiUXM4geYbiTjMymw="; + hash = "sha256-euQiMVPKE1/YG04VKMFUA27OtoGENNhqeE0iiF/X7uc="; }; - cargoHash = "sha256-AstE8KGICgPhqRKlJecrE9iPUUWaOvca6ocWf85IzNo="; + cargoHash = "sha256-doeZTjFPXmxIPYX3IBtetePoNkIHnl6oPJFtXD1tgZY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 5ba9ffb86f9ff..19e926c5caf68 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/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/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 3c9c6169192d8..39c0b680b0022 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, cmake , removeReferencesTo , cppSupport ? false , fortranSupport ? false @@ -34,10 +35,12 @@ stdenv.mkDerivation rec { + lib.optionalString threadsafe "-threadsafe"; src = fetchurl { - url = let + url = + let majorMinor = lib.versions.majorMinor version; majorMinorPatch = with lib.versions; "${major version}.${minor version}.${patch version}"; - in "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${majorMinor}/hdf5-${majorMinorPatch}/src/hdf5-${version}.tar.bz2"; + in + "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${majorMinor}/hdf5-${majorMinorPatch}/src/hdf5-${version}.tar.bz2"; sha256 = "sha256-6jxeJX7zIq9ed/weUurTrWvzu0rAZIDdF+45ANeiTPs="; }; @@ -57,7 +60,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ removeReferencesTo ] + nativeBuildInputs = [ removeReferencesTo cmake ] ++ optional fortranSupport fortran; buildInputs = optional fortranSupport fortran @@ -67,24 +70,18 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional zlibSupport zlib ++ optional mpiSupport mpi; - configureFlags = optional cppSupport "--enable-cxx" - ++ optional fortranSupport "--enable-fortran" - ++ optional szipSupport "--with-szlib=${szip}" - ++ optionals mpiSupport [ "--enable-parallel" "CC=${mpi}/bin/mpicc" ] - ++ optional enableShared "--enable-shared" - ++ optional javaSupport "--enable-java" - ++ optional usev110Api "--with-default-api-version=v110" - # hdf5 hl (High Level) library is not considered stable with thread safety and should be disabled. - ++ optionals threadsafe [ "--enable-threadsafe" "--disable-hl" ]; - - patches = [ - # Avoid non-determinism in autoconf build system: - # - build time - # - build user - # - uname -a (kernel version) - # Can be dropped once/if we switch to cmake. - ./hdf5-more-determinism.patch - ]; + cmakeFlags = [ + "-DHDF5_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake" + ] ++ 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" ] + ++ lib.optional enableShared "-DBUILD_SHARED_LIBS=ON" + ++ lib.optional javaSupport "-DHDF5_BUILD_JAVA=ON" + ++ lib.optional usev110Api "-DDEFAULT_API_VERSION=v110" + ++ lib.optionals threadsafe [ "-DDHDF5_ENABLE_THREADSAFE:BOOL=ON" "-DHDF5_BUILD_HL_LIB=OFF" ] + ; postInstall = '' find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + diff --git a/pkgs/tools/misc/hdf5/hdf5-more-determinism.patch b/pkgs/tools/misc/hdf5/hdf5-more-determinism.patch deleted file mode 100644 index 9a9bfe24af7b5..0000000000000 --- a/pkgs/tools/misc/hdf5/hdf5-more-determinism.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in -index a4d4af6..70f1909 100644 ---- a/src/libhdf5.settings.in -+++ b/src/libhdf5.settings.in -@@ -4,10 +4,7 @@ - General Information: - ------------------- - HDF5 Version: @H5_VERSION@ -- Configured on: @CONFIG_DATE@ -- Configured by: @CONFIG_USER@ - Host system: @host_cpu@-@host_vendor@-@host_os@ -- Uname information: @UNAME_INFO@ - Byte sex: @BYTESEX@ - Installation point: @prefix@ - diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix index c140b9ba1a816..84f1d440c586e 100644 --- a/pkgs/tools/misc/ideviceinstaller/default.nix +++ b/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/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index 1fdb0ef0d44bc..353402658db92 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazydocker"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "sha256-BxIv0HCdrR9U9mmJnBdQqiUf/vbK+XEnL8ALPkuap0M="; + sha256 = "sha256-nW3eaSisXLqoWZ+5YLLCfC1k4lTXWd5ZqY2xTM/I0PY="; }; vendorHash = null; diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index d5cddeb6e245e..e928544d240a5 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/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/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index 113da6a8f406f..039e9acb2e8e9 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/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/pkgs/tools/misc/rkvm/default.nix b/pkgs/tools/misc/rkvm/default.nix new file mode 100644 index 0000000000000..688c774209c6b --- /dev/null +++ b/pkgs/tools/misc/rkvm/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, libevdev +, openssl +, makeWrapper +, nixosTests +}: + +rustPlatform.buildRustPackage rec { + pname = "rkvm"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "htrefil"; + repo = pname; + rev = version; + hash = "sha256-3IdwBMN+VZBrcoT5vF7pF6xoNWZBn4k/jRJqADlpM7k="; + }; + + cargoHash = "sha256-/SZKJI4gMkike2m8UVzbwfMqj697A8zbJEKAnnbSx3s="; + + nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook makeWrapper ]; + buildInputs = [ libevdev ]; + + postInstall = '' + install -Dm444 -t "$out/lib/systemd/system" systemd/rkvm-*.service + install -Dm444 example/server.toml "$out/etc/rkvm/server.example.toml" + install -Dm444 example/client.toml "$out/etc/rkvm/client.example.toml" + + wrapProgram $out/bin/rkvm-certificate-gen --prefix PATH : ${lib.makeBinPath [ openssl ]} + ''; + + passthru.tests = { + inherit (nixosTests) rkvm; + }; + + meta = with lib; { + description = "Virtual KVM switch for Linux machines"; + homepage = "https://github.com/htrefil/rkvm"; + changelog = "https://github.com/htrefil/rkvm/releases/tag/${version}"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ ckie ]; + }; +} diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index 61ca001563f59..579aa7fcc5e9c 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/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/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index eadfd64b60f07..ddc1ad6d639af 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/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/pkgs/tools/misc/starfetch/default.nix b/pkgs/tools/misc/starfetch/default.nix index ba6309c97ecbd..ba6309c97ecbd 100755..100644 --- a/pkgs/tools/misc/starfetch/default.nix +++ b/pkgs/tools/misc/starfetch/default.nix diff --git a/pkgs/tools/misc/szyszka/default.nix b/pkgs/tools/misc/szyszka/default.nix index 58d839acf0785..58d839acf0785 100755..100644 --- a/pkgs/tools/misc/szyszka/default.nix +++ b/pkgs/tools/misc/szyszka/default.nix diff --git a/pkgs/tools/misc/timer/default.nix b/pkgs/tools/misc/timer/default.nix index 29e087c86581f..962ad1a6dd695 100644 --- a/pkgs/tools/misc/timer/default.nix +++ b/pkgs/tools/misc/timer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "timer"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "caarlos0"; repo = "timer"; rev = "v${version}"; - hash = "sha256-9p/L3Hj3VqlNiyY3lfUAhCjwTl1iSTegWxaVEGB4qHM="; + hash = "sha256-8BVzijAXsJ8Q8BhDmhzFbEQ23fUEBdmbUsCPxfpXyBA="; }; - vendorHash = "sha256-j7Xik0te6GdjfhXHT7DRf+MwM+aKjfgTGvroxnlD3MM="; + vendorHash = "sha256-1n5vZKlOWoB2SFdDdv+pPWLybzCIJG/wdBYqLMatjNA="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index f900eafaacd13..757cb69cbb0bd 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "12.0.2"; + version = "13.0.0"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-PfrtTegJULzPAmKUk/6P9rD+ttPJOhaf2505og64C0Y="; + hash = "sha256-BuYwLD8HlmFjCpR8043GhrYK3XWffeqEaeEDqWhxZVI="; }; - cargoHash = "sha256-S6jSI/KuHocYD2dhg3o1NSyA8Q04Xo215TWl8Y1C7g8="; + cargoHash = "sha256-+kSvA9AC0peXeFLVjenATRfnIS9qaOr/f1ozPbifiPI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index 23ab910924158..b0496914b354e 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/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/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix index 7becc090a83bf..a136031dfc137 100644 --- a/pkgs/tools/misc/ttyplot/default.nix +++ b/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/pkgs/tools/misc/turbo/default.nix b/pkgs/tools/misc/turbo/default.nix index c887fdc131c22..50192d6166764 100644 --- a/pkgs/tools/misc/turbo/default.nix +++ b/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/pkgs/tools/misc/tvnamer/default.nix b/pkgs/tools/misc/tvnamer/default.nix index 459e3889efc63..a2d5c9e87a4a6 100644 --- a/pkgs/tools/misc/tvnamer/default.nix +++ b/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/pkgs/tools/misc/ugs/default.nix b/pkgs/tools/misc/ugs/default.nix index 61a124faaa1b5..c40fbc7a01b8a 100644 --- a/pkgs/tools/misc/ugs/default.nix +++ b/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/pkgs/tools/misc/url-parser/default.nix b/pkgs/tools/misc/url-parser/default.nix index 27df534d8756c..418e35b03a9d0 100644 --- a/pkgs/tools/misc/url-parser/default.nix +++ b/pkgs/tools/misc/url-parser/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "url-parser"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "thegeeklab"; repo = "url-parser"; rev = "refs/tags/v${version}"; - hash = "sha256-A+uoxwPdWdy12Avl2Ci+zd9TFmQFA22pMbsxtWpNPpc="; + hash = "sha256-YZAcu1TDPTE2vLA9vQNWHhGIRQs4hkGAmz/zi27n0H0="; }; vendorHash = "sha256-8doDVHyhQKsBeN1H73KV/rxhpumDLIzjahdjtW79Bek="; diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index bd4941afe5bf1..52b561e579046 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/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/pkgs/tools/misc/wakapi/default.nix b/pkgs/tools/misc/wakapi/default.nix index 5a68dd7a79554..abc36f63bd0bd 100644 --- a/pkgs/tools/misc/wakapi/default.nix +++ b/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/pkgs/tools/networking/cfspeedtest/default.nix b/pkgs/tools/networking/cfspeedtest/default.nix index 33b1c0046f1a1..ed015ef4f5d24 100644 --- a/pkgs/tools/networking/cfspeedtest/default.nix +++ b/pkgs/tools/networking/cfspeedtest/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cfspeedtest"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "code-inflation"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uQe9apG4SdFEUT2aOrzF2C8bbrl0fOiqnMZrWDQvbxk="; + hash = "sha256-ZbE8/mh9hb81cGz0Wxq3gTa9BueKfQApeq5z2DGUak0="; }; - cargoSha256 = "sha256-wJmLUPXGSg90R92iW9R02r3E3e7XU1gJwd8IqIC+QMA="; + cargoHash = "sha256-+cKQkogZc4iIIVMyHtbS44DNkCKD2cWkVN2o9m+WFbM="; meta = with lib; { description = "Unofficial CLI for speed.cloudflare.com"; diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/tools/networking/containerlab/default.nix index 39982a6ab886f..0a8b02af7cf5e 100644 --- a/pkgs/tools/networking/containerlab/default.nix +++ b/pkgs/tools/networking/containerlab/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "containerlab"; - version = "0.46.0"; + version = "0.46.2"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-uBT9whv1qL3yfO6VoeW2SqLIzG11mk+SU09c/xqboM8="; + hash = "sha256-TzHTiAcN57FDdKBkZq5YwFwjP3s6OmN3431XGoMgnwI="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-mkQR0lZXYe6Dz4PngxF7d7Bkr4R3HmL/imQDLridmlA="; + vendorHash = "sha256-3ALEwpFDnbSoTm3bxHZmRGkw1DeQ4Ikl6PpTosa1S6E="; ldflags = [ "-s" diff --git a/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch b/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch index 2d97338a1fe9c..088f9b4032d27 100644 --- a/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch +++ b/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch @@ -7,11 +7,11 @@ autoconf in the bootstrap loop just to regenerate a patched configure.ac. --- a/configure 2021-10-16 00:51:59.000000000 +0100 +++ b/configure 2021-10-16 01:06:46.000000000 +0100 -@@ -20810,7 +20810,7 @@ +@@ -21556,7 +221556,7 @@ if test "x$build_for_macos" != xno; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -- LDFLAGS="$LDFLAGS -framework CoreFoundation -framework SystemConfiguration" +- LDFLAGS="$LDFLAGS -framework CoreFoundation -framework CoreServices -framework SystemConfiguration" + LDFLAGS="$LDFLAGS -framework CoreFoundation" else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index aced6d6653a94..c99f09e7f93a0 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -47,14 +47,14 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.3.0"; + version = "8.4.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz" "https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-N21id2fWxPBRBattSXsNmrpxEXcN2dmVIlR4IJw36mM="; + hash = "sha256-FsYqnErw9wPSi9pte783ukcFWtNBTXDexj4uYzbyqC0="; }; patches = [ diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index b75d21ede847a..68088a03bc203 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/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/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix new file mode 100644 index 0000000000000..eafba0d4f5274 --- /dev/null +++ b/pkgs/tools/networking/ddclient/default.nix @@ -0,0 +1,53 @@ +{ lib, fetchFromGitHub, perlPackages, autoreconfHook, iproute2, perl, curl }: + +let + myPerl = perl.withPackages (ps: [ ps.JSONPP ]); +in +perlPackages.buildPerlPackage rec { + pname = "ddclient"; + version = "3.11.0"; + + outputs = [ "out" ]; + + src = fetchFromGitHub { + owner = "ddclient"; + repo = "ddclient"; + rev = "v${version}"; + sha256 = "sha256-s/gdTvEY4QIVidqNnN7GYrpCsp4nZ0GEH8Jv+LkSr48="; + }; + + postPatch = '' + touch Makefile.PL + ''; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ curl myPerl ]; + + # Prevent ddclient from picking up build time perl which is implicitly added + # by buildPerlPackage. + configureFlags = [ + "--with-perl=${lib.getExe myPerl}" + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 ddclient $out/bin/ddclient + install -Dm644 -t $out/share/doc/ddclient COP* README.* ChangeLog.md + + runHook postInstall + ''; + + # TODO: run upstream tests + doCheck = false; + + meta = with lib; { + description = "Client for updating dynamic DNS service entries"; + homepage = "https://ddclient.net/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + mainProgram = "ddclient"; + }; +} diff --git a/pkgs/tools/networking/globalping-cli/default.nix b/pkgs/tools/networking/globalping-cli/default.nix index bc07f20a5b11e..c88688bca71d7 100644 --- a/pkgs/tools/networking/globalping-cli/default.nix +++ b/pkgs/tools/networking/globalping-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "globalping-cli"; - version = "1.1.0"; + version = "1.1.5"; src = fetchFromGitHub { owner = "jsdelivr"; repo = pname; rev = "v${version}"; - hash = "sha256-UY+SAmkE8h/K92Em5iikcMiNixkqnDVkhlrKVq1ZkVM="; + hash = "sha256-k89tqQpGvX0WiYqEwPj+tDViUKDjLR5MrkA0CQI/A+o="; }; vendorHash = "sha256-fUB7WIEAPBot8A2f7WQ5wUDtCrOydZd4nd4qDuy1vzg="; diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index a75fae9f724c8..56b8bf7760b24 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/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/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index 9885066397b6c..80b12b6d6d67f 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -4,16 +4,16 @@ }: buildGo121Module rec { pname = "hysteria"; - version = "2.0.3"; + version = "2.1.1"; src = fetchFromGitHub { owner = "apernet"; repo = pname; rev = "app/v${version}"; - hash = "sha256-0ekw92T9yWrKu5MxSssOCXlUFubiVLoH6ZLEMDFkcis="; + hash = "sha256-CvhDOtXyGxnTy8m7qN5lmQxOxwkExfW+1ZT3LrLjsmo="; }; - vendorHash = "sha256-Hf+Jx/z+hJ6jqWLJHGK7umNgNzNKYgQtCdAosdrqvPg="; + vendorHash = "sha256-Io7EN+Cza7drMLB9JF4nRDxq+eVxW5sYj45WWvXtDsY="; proxyVendor = true; ldflags = [ diff --git a/pkgs/tools/networking/ipfetch/default.nix b/pkgs/tools/networking/ipfetch/default.nix index b9b675366e56e..b9b675366e56e 100755..100644 --- a/pkgs/tools/networking/ipfetch/default.nix +++ b/pkgs/tools/networking/ipfetch/default.nix diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index 30a400df0a1ac..aef393c919378 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/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/pkgs/tools/networking/nethoscope/default.nix b/pkgs/tools/networking/nethoscope/default.nix index 9a17adc3800de..478220210b3d8 100644 --- a/pkgs/tools/networking/nethoscope/default.nix +++ b/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/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 74fb6508794b4..ebf56f3cc29d4 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.42.8"; + version = "1.44.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-AzfnWD0uxa3iui6MYl0vCe7M2h0ig27imqcpJdOZw1M="; + sha256 = "sha256-7coJY30YL4BrOxLYxWI9e629c8zKGuY74g0vKYd5+58="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { "-Dkernel_firmware_dir=/run/current-system/firmware" # Platform + "-Dmodprobe=${kmod}/bin/modprobe" "-Dsession_tracking=systemd" "-Dlibaudit=yes-disabled-by-default" "-Dpolkit_agent_helper_1=/run/wrappers/bin/polkit-agent-helper-1" @@ -118,7 +119,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - inherit iputils kmod openconnect ethtool gnused systemd; + inherit iputils openconnect ethtool gnused systemd; inherit runtimeShell; }) diff --git a/pkgs/tools/networking/networkmanager/fix-install-paths.patch b/pkgs/tools/networking/networkmanager/fix-install-paths.patch index 71fbd4842c2e4..2b2af0b2ad465 100644 --- a/pkgs/tools/networking/networkmanager/fix-install-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-install-paths.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 6813e52ac1..ecdb78ca54 100644 +index f71c9fd4aa..deddf28816 100644 --- a/meson.build +++ b/meson.build -@@ -999,9 +999,9 @@ meson.add_install_script( +@@ -1022,9 +1022,9 @@ meson.add_install_script( join_paths('tools', 'meson-post-install.sh'), nm_datadir, nm_bindir, diff --git a/pkgs/tools/networking/networkmanager/fix-paths.patch b/pkgs/tools/networking/networkmanager/fix-paths.patch index 2491b099c9f1b..6c97b672e679a 100644 --- a/pkgs/tools/networking/networkmanager/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-paths.patch @@ -11,10 +11,10 @@ index 148acade5c..6395fbfbe5 100644 LABEL="nm_drivers_end" diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index e23b3a5282..c7246a3b61 100644 +index f09ae86ceb..b2ecb405ef 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in -@@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@ +@@ -9,7 +9,7 @@ BindsTo=dbus.service [Service] Type=dbus BusName=org.freedesktop.NetworkManager @@ -24,10 +24,10 @@ index e23b3a5282..c7246a3b61 100644 ExecStart=@sbindir@/NetworkManager --no-daemon Restart=on-failure diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c -index 3565c04d59..52c58fec24 100644 +index 2038e2f205..90bf9fa28b 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c -@@ -14005,14 +14005,14 @@ nm_device_start_ip_check(NMDevice *self) +@@ -14275,14 +14275,14 @@ nm_device_start_ip_check(NMDevice *self) gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET); if (gw) { nm_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf); @@ -45,10 +45,10 @@ index 3565c04d59..52c58fec24 100644 } } diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build -index 143126c51a..a7143443ec 100644 +index fb879dca47..13cc2867e1 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build -@@ -172,7 +172,6 @@ if enable_introspection +@@ -173,7 +173,6 @@ if enable_introspection input: libnm_core_settings_sources, output: 'nm-propery-infos-' + info + '.xml', command: [ @@ -56,7 +56,7 @@ index 143126c51a..a7143443ec 100644 join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py'), info, '@OUTPUT@', -@@ -229,7 +228,6 @@ if enable_introspection +@@ -230,7 +229,6 @@ if enable_introspection 'env', 'GI_TYPELIB_PATH=' + gi_typelib_path, 'LD_LIBRARY_PATH=' + ld_library_path, @@ -64,27 +64,14 @@ index 143126c51a..a7143443ec 100644 join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', -diff --git a/src/libnm-platform/nm-platform-utils.c b/src/libnm-platform/nm-platform-utils.c -index bebc53a851..93710455d5 100644 ---- a/src/libnm-platform/nm-platform-utils.c -+++ b/src/libnm-platform/nm-platform-utils.c -@@ -2209,7 +2209,7 @@ nmp_utils_modprobe(GError **error, gboolean suppress_error_logging, const char * - - /* construct the argument list */ - argv = g_ptr_array_sized_new(4); -- g_ptr_array_add(argv, "/sbin/modprobe"); -+ g_ptr_array_add(argv, "@kmod@/bin/modprobe"); - g_ptr_array_add(argv, "--use-blacklist"); - g_ptr_array_add(argv, (char *) arg1); - diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c -index 476fbe518e..2641dbf637 100644 +index cbe76f5f1c..8515f94994 100644 --- a/src/libnmc-base/nm-vpn-helpers.c +++ b/src/libnmc-base/nm-vpn-helpers.c -@@ -198,25 +198,8 @@ nm_vpn_openconnect_authenticate_helper(const char *host, - gs_free const char **output_v = NULL; +@@ -284,15 +284,6 @@ nm_vpn_openconnect_authenticate_helper(NMSettingVpn *s_vpn, GPtrArray *secrets, const char *const *iter; const char *path; + const char *opt; - const char *const DEFAULT_PATHS[] = { - "/sbin/", - "/usr/sbin/", @@ -94,6 +81,12 @@ index 476fbe518e..2641dbf637 100644 - "/usr/local/bin/", - NULL, - }; + const char *oc_argv[(12 + 2 * G_N_ELEMENTS(oc_property_args))]; + const char *gw; + int port; +@@ -311,15 +302,7 @@ nm_vpn_openconnect_authenticate_helper(NMSettingVpn *s_vpn, GPtrArray *secrets, + + port = extract_url_port(gw); - path = nm_utils_file_search_in_paths("openconnect", - "/usr/sbin/openconnect", @@ -106,10 +99,10 @@ index 476fbe518e..2641dbf637 100644 - return FALSE; + path = "@openconnect@/bin/openconnect"; - if (!g_spawn_sync(NULL, - (char **) NM_MAKE_STRV(path, "--authenticate", host), + oc_argv[oc_argc++] = path; + oc_argv[oc_argc++] = "--authenticate"; diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build -index cf8a21fc80..61b992a50e 100644 +index cf8a21fc80..61d8e140e2 100644 --- a/src/libnmc-setting/meson.build +++ b/src/libnmc-setting/meson.build @@ -7,7 +7,6 @@ if enable_docs @@ -120,8 +113,16 @@ index cf8a21fc80..61b992a50e 100644 join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py'), '@OUTPUT@', nm_property_infos_xml['nmcli'], +@@ -20,7 +19,6 @@ if enable_docs + input: settings_docs_input_xml, + output: 'settings-docs.h', + command: [ +- python.path(), + join_paths(meson.source_root(), 'tools', 'generate-docs-settings-docs.py'), + '--output', '@OUTPUT@', + '--xml', '@INPUT@' diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build -index 6dc0f2a2c8..0a32977a59 100644 +index 8c36e40559..cfb6649a21 100644 --- a/src/tests/client/meson.build +++ b/src/tests/client/meson.build @@ -6,7 +6,6 @@ test( @@ -130,5 +131,13 @@ index 6dc0f2a2c8..0a32977a59 100644 source_root, - python.path(), '--', + 'TestNmcli', ], - env: [ +@@ -23,7 +22,6 @@ if enable_nm_cloud_setup + args: [ + build_root, + source_root, +- python.path(), + '--', + 'TestNmCloudSetup', + ], diff --git a/pkgs/tools/networking/norouter/default.nix b/pkgs/tools/networking/norouter/default.nix index e76cc4544e329..c3fdd57a592e4 100644 --- a/pkgs/tools/networking/norouter/default.nix +++ b/pkgs/tools/networking/norouter/default.nix @@ -31,5 +31,7 @@ buildGoModule rec { homepage = "https://github.com/norouter/norouter"; license = licenses.asl20; maintainers = with maintainers; [ blaggacao ]; + # out is empty + broken = true; }; } diff --git a/pkgs/tools/networking/nqptp/default.nix b/pkgs/tools/networking/nqptp/default.nix index 5261a6afb58f0..2db121e2d1891 100644 --- a/pkgs/tools/networking/nqptp/default.nix +++ b/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/pkgs/tools/networking/nqptp/remove-setcap.patch b/pkgs/tools/networking/nqptp/remove-setcap.patch new file mode 100644 index 0000000000000..2fa56ac0150a4 --- /dev/null +++ b/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/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix index e850ba1af0a57..dfc31498ddd1f 100644 --- a/pkgs/tools/networking/pmacct/default.nix +++ b/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/pkgs/tools/networking/requestly/default.nix b/pkgs/tools/networking/requestly/default.nix index 33d03140c3984..3a4128c0806de 100644 --- a/pkgs/tools/networking/requestly/default.nix +++ b/pkgs/tools/networking/requestly/default.nix @@ -5,11 +5,11 @@ let pname = "requestly"; - version = "1.5.6"; + version = "1.5.12"; src = fetchurl { url = "https://github.com/requestly/requestly-desktop-app/releases/download/v${version}/Requestly-${version}.AppImage"; - hash = "sha256-Yb90OGIIvExfNPoJPmuZSvtU5OQVuGqh4EmyKltE+is="; + hash = "sha256-HM3+j9E67J1bAklnDtSN5/rOK9Wn7N7h+qlPKR/E8Ns="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/tools/networking/rosenpass/default.nix b/pkgs/tools/networking/rosenpass/default.nix index 07669cfeb01e7..9467904fe6983 100644 --- a/pkgs/tools/networking/rosenpass/default.nix +++ b/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/pkgs/tools/networking/rosenpass/tools.nix b/pkgs/tools/networking/rosenpass/tools.nix new file mode 100644 index 0000000000000..fb59436b38105 --- /dev/null +++ b/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/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index db8aefa1f6fbe..460f6f4e039e5 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/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/pkgs/tools/networking/tayga/default.nix b/pkgs/tools/networking/tayga/default.nix index ef393f5bb1521..382b010515e8f 100644 --- a/pkgs/tools/networking/tayga/default.nix +++ b/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/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index e47478b9206b9..4030e3d14ec1a 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.87"; + version = "1.0.88"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nDYNXQJqCtwlm4HTPTMuUbn6FA8JRYEqxbYUAev2R3o="; + sha256 = "sha256-tLc+viPufR6P5texDs9lU8wsOTzrjSK0Qz/r4/L8M5k="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 1f135aecd851d..a1a908340003b 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , openssl , nettle , expat @@ -55,6 +56,15 @@ stdenv.mkDerivation rec { hash = "sha256-PalUkKhc/2Qg8m+uC4Skn1ES3xvxt/w0+HJPAggstxI="; }; + patches = [ + # Backport: fix libunbound with nettle. + (fetchpatch { + url = "https://github.com/NLnetLabs/unbound/commit/654a7eab62cbd1844d483cc4a0f2cf2fbcbaf00a.patch"; + excludes = [ "doc/Changelog" ]; + hash = "sha256-n3FCeZESFrrn6Wcf28Hb8WZs1eMHWjbsf2WCFOXU3lI="; + }) + ]; + outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB nativeBuildInputs = [ makeWrapper pkg-config ] diff --git a/pkgs/tools/networking/uwimap/clang-fix.patch b/pkgs/tools/networking/uwimap/clang-fix.patch new file mode 100644 index 0000000000000..7c10a212922f3 --- /dev/null +++ b/pkgs/tools/networking/uwimap/clang-fix.patch @@ -0,0 +1,306 @@ +diff -ur a/src/c-client/netmsg.c b/src/c-client/netmsg.c +--- a/src/c-client/netmsg.c 2011-07-22 20:20:18.000000000 -0400 ++++ b/src/c-client/netmsg.c 2023-10-17 22:23:29.026638315 -0400 +@@ -29,6 +29,7 @@ + + #include <stdio.h> + #include <errno.h> ++#include <time.h> + extern int errno; /* just in case */ + #include "c-client.h" + #include "netmsg.h" +diff -ur a/src/c-client/nntp.c b/src/c-client/nntp.c +--- a/src/c-client/nntp.c 2011-07-22 20:20:18.000000000 -0400 ++++ b/src/c-client/nntp.c 2023-10-17 22:23:05.195194961 -0400 +@@ -29,6 +29,7 @@ + + #include <ctype.h> + #include <stdio.h> ++#include <time.h> + #include "c-client.h" + #include "newsrc.h" + #include "netmsg.h" +diff -ur a/src/dmail/dmail.c b/src/dmail/dmail.c +--- a/src/dmail/dmail.c 2011-07-22 20:19:57.000000000 -0400 ++++ b/src/dmail/dmail.c 2023-10-17 22:44:23.049223758 -0400 +@@ -27,6 +27,7 @@ + */ + + #include <stdio.h> ++#include <ctype.h> + #include <pwd.h> + #include <errno.h> + extern int errno; /* just in case */ +diff -ur a/src/mlock/mlock.c b/src/mlock/mlock.c +--- a/src/mlock/mlock.c 2011-07-22 20:19:57.000000000 -0400 ++++ b/src/mlock/mlock.c 2023-10-17 22:44:44.533985203 -0400 +@@ -31,6 +31,9 @@ + #include <stdio.h> + #include <sysexits.h> + #include <syslog.h> ++#include <ctype.h> ++#include <time.h> ++#include <unistd.h> + #include <grp.h> + #include <sys/types.h> + #include <sys/file.h> +diff -ur a/src/osdep/unix/dummy.c b/src/osdep/unix/dummy.c +--- a/src/osdep/unix/dummy.c 2011-07-22 20:20:10.000000000 -0400 ++++ b/src/osdep/unix/dummy.c 2023-10-17 22:23:17.123963204 -0400 +@@ -30,6 +30,7 @@ + #include <stdio.h> + #include <ctype.h> + #include <errno.h> ++#include <time.h> + extern int errno; /* just in case */ + #include "mail.h" + #include "osdep.h" +diff -ur a/src/osdep/unix/mbx.c b/src/osdep/unix/mbx.c +--- a/src/osdep/unix/mbx.c 2011-07-22 20:20:11.000000000 -0400 ++++ b/src/osdep/unix/mbx.c 2023-10-17 22:25:13.189158845 -0400 +@@ -41,6 +41,7 @@ + #include "mail.h" + #include "osdep.h" + #include <pwd.h> ++#include <utime.h> + #include <sys/stat.h> + #include <sys/time.h> + #include "misc.h" +diff -ur a/src/osdep/unix/mh.c b/src/osdep/unix/mh.c +--- a/src/osdep/unix/mh.c 2011-07-22 20:20:09.000000000 -0400 ++++ b/src/osdep/unix/mh.c 2023-10-17 22:31:50.240740603 -0400 +@@ -30,6 +30,7 @@ + #include <stdio.h> + #include <ctype.h> + #include <errno.h> ++#include <utime.h> + extern int errno; /* just in case */ + #include "mail.h" + #include "osdep.h" +@@ -103,8 +104,8 @@ + long options); + long mh_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data); + +-int mh_select (struct direct *name); +-int mh_numsort (const void *d1,const void *d2); ++int mh_select (const struct direct *name); ++int mh_numsort (const struct dirent **d1,const struct dirent **d2); + char *mh_file (char *dst,char *name); + long mh_canonicalize (char *pattern,char *ref,char *pat); + void mh_setdate (char *file,MESSAGECACHE *elt); +@@ -1194,7 +1195,7 @@ + * Returns: T to use file name, NIL to skip it + */ + +-int mh_select (struct direct *name) ++int mh_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -1209,10 +1210,10 @@ + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int mh_numsort (const void *d1,const void *d2) ++int mh_numsort (const struct dirent **d1,const struct dirent **d2) + { +- return atoi ((*(struct direct **) d1)->d_name) - +- atoi ((*(struct direct **) d2)->d_name); ++ return atoi ((*d1)->d_name) - ++ atoi ((*d2)->d_name); + } + + +diff -ur a/src/osdep/unix/mix.c b/src/osdep/unix/mix.c +--- a/src/osdep/unix/mix.c 2011-07-22 20:20:10.000000000 -0400 ++++ b/src/osdep/unix/mix.c 2023-10-17 22:35:22.368131654 -0400 +@@ -125,7 +125,7 @@ + long mix_create (MAILSTREAM *stream,char *mailbox); + long mix_delete (MAILSTREAM *stream,char *mailbox); + long mix_rename (MAILSTREAM *stream,char *old,char *newname); +-int mix_rselect (struct direct *name); ++int mix_rselect (const struct direct *name); + MAILSTREAM *mix_open (MAILSTREAM *stream); + void mix_close (MAILSTREAM *stream,long options); + void mix_abort (MAILSTREAM *stream); +@@ -140,8 +140,8 @@ + long mix_ping (MAILSTREAM *stream); + void mix_check (MAILSTREAM *stream); + long mix_expunge (MAILSTREAM *stream,char *sequence,long options); +-int mix_select (struct direct *name); +-int mix_msgfsort (const void *d1,const void *d2); ++int mix_select (const struct direct *name); ++int mix_msgfsort (const struct dirent **d1,const struct dirent **d2); + long mix_addset (SEARCHSET **set,unsigned long start,unsigned long size); + long mix_burp (MAILSTREAM *stream,MIXBURP *burp,unsigned long *reclaimed); + long mix_burp_check (SEARCHSET *set,size_t size,char *file); +@@ -587,7 +587,7 @@ + * Returns: T if mix file name, NIL otherwise + */ + +-int mix_rselect (struct direct *name) ++int mix_rselect (const struct direct *name) + { + return mix_dirfmttest (name->d_name); + } +@@ -1146,7 +1146,7 @@ + * ".mix" with no suffix was used by experimental versions + */ + +-int mix_select (struct direct *name) ++int mix_select (const struct direct *name) + { + char c,*s; + /* make sure name has prefix */ +@@ -1165,10 +1165,10 @@ + * Returns: -1 if d1 < d2, 0 if d1 == d2, 1 d1 > d2 + */ + +-int mix_msgfsort (const void *d1,const void *d2) ++int mix_msgfsort (const struct dirent **d1,const struct dirent **d2) + { +- char *n1 = (*(struct direct **) d1)->d_name + sizeof (MIXNAME) - 1; +- char *n2 = (*(struct direct **) d2)->d_name + sizeof (MIXNAME) - 1; ++ char *n1 = (*d1)->d_name + sizeof (MIXNAME) - 1; ++ char *n2 = (*d2)->d_name + sizeof (MIXNAME) - 1; + return compare_ulong (*n1 ? strtoul (n1,NIL,16) : 0, + *n2 ? strtoul (n2,NIL,16) : 0); + } +diff -ur a/src/osdep/unix/mmdf.c b/src/osdep/unix/mmdf.c +--- a/src/osdep/unix/mmdf.c 2011-07-22 20:20:10.000000000 -0400 ++++ b/src/osdep/unix/mmdf.c 2023-10-17 22:25:37.095313031 -0400 +@@ -33,6 +33,7 @@ + #include "mail.h" + #include "osdep.h" + #include <time.h> ++#include <utime.h> + #include <sys/stat.h> + #include "pseudo.h" + #include "fdstring.h" +diff -ur a/src/osdep/unix/mtx.c b/src/osdep/unix/mtx.c +--- a/src/osdep/unix/mtx.c 2011-07-22 20:20:10.000000000 -0400 ++++ b/src/osdep/unix/mtx.c 2023-10-17 22:26:48.973160400 -0400 +@@ -37,6 +37,7 @@ + #include <stdio.h> + #include <ctype.h> + #include <errno.h> ++#include <utime.h> + extern int errno; /* just in case */ + #include "mail.h" + #include "osdep.h" +diff -ur a/src/osdep/unix/mx.c b/src/osdep/unix/mx.c +--- a/src/osdep/unix/mx.c 2011-07-22 20:20:09.000000000 -0400 ++++ b/src/osdep/unix/mx.c 2023-10-17 22:33:25.621907970 -0400 +@@ -30,6 +30,7 @@ + #include <stdio.h> + #include <ctype.h> + #include <errno.h> ++#include <utime.h> + extern int errno; /* just in case */ + #include "mail.h" + #include "osdep.h" +@@ -98,8 +99,8 @@ + long mx_append_msg (MAILSTREAM *stream,char *flags,MESSAGECACHE *elt, + STRING *st,SEARCHSET *set); + +-int mx_select (struct direct *name); +-int mx_numsort (const void *d1,const void *d2); ++int mx_select (const struct direct *name); ++int mx_numsort (const struct dirent **d1,const struct dirent **d2); + char *mx_file (char *dst,char *name); + long mx_lockindex (MAILSTREAM *stream); + void mx_unlockindex (MAILSTREAM *stream); +@@ -1110,7 +1111,7 @@ + * Returns: T to use file name, NIL to skip it + */ + +-int mx_select (struct direct *name) ++int mx_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -1125,10 +1126,10 @@ + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int mx_numsort (const void *d1,const void *d2) ++int mx_numsort (const struct dirent **d1,const struct dirent **d2) + { +- return atoi ((*(struct direct **) d1)->d_name) - +- atoi ((*(struct direct **) d2)->d_name); ++ return atoi ((*d1)->d_name) - ++ atoi ((*d2)->d_name); + } + + +diff -ur a/src/osdep/unix/news.c b/src/osdep/unix/news.c +--- a/src/osdep/unix/news.c 2011-07-22 20:20:10.000000000 -0400 ++++ b/src/osdep/unix/news.c 2023-10-17 22:29:32.461013229 -0400 +@@ -76,8 +76,8 @@ + long news_delete (MAILSTREAM *stream,char *mailbox); + long news_rename (MAILSTREAM *stream,char *old,char *newname); + MAILSTREAM *news_open (MAILSTREAM *stream); +-int news_select (struct direct *name); +-int news_numsort (const void *d1,const void *d2); ++int news_select (const struct direct *name); ++int news_numsort (const struct dirent **d1,const struct dirent **d2); + void news_close (MAILSTREAM *stream,long options); + void news_fast (MAILSTREAM *stream,char *sequence,long flags); + void news_flags (MAILSTREAM *stream,char *sequence,long flags); +@@ -402,7 +402,7 @@ + * Returns: T to use file name, NIL to skip it + */ + +-int news_select (struct direct *name) ++int news_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -417,10 +417,10 @@ + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int news_numsort (const void *d1,const void *d2) ++int news_numsort (const struct dirent **d1,const struct dirent **d2) + { +- return atoi ((*(struct direct **) d1)->d_name) - +- atoi ((*(struct direct **) d2)->d_name); ++ return atoi ((*d1)->d_name) - ++ atoi ((*d2)->d_name); + } + + +diff -ur a/src/osdep/unix/tenex.c b/src/osdep/unix/tenex.c +--- a/src/osdep/unix/tenex.c 2011-07-22 20:20:10.000000000 -0400 ++++ b/src/osdep/unix/tenex.c 2023-10-17 22:26:15.349497223 -0400 +@@ -42,6 +42,8 @@ + #include <stdio.h> + #include <ctype.h> + #include <errno.h> ++#include <time.h> ++#include <utime.h> + extern int errno; /* just in case */ + #include "mail.h" + #include "osdep.h" +diff -ur a/src/osdep/unix/unix.c b/src/osdep/unix/unix.c +--- a/src/osdep/unix/unix.c 2011-07-22 20:20:10.000000000 -0400 ++++ b/src/osdep/unix/unix.c 2023-10-17 22:24:46.358134773 -0400 +@@ -45,6 +45,7 @@ + #include "mail.h" + #include "osdep.h" + #include <time.h> ++#include <utime.h> + #include <sys/stat.h> + #include "unix.h" + #include "pseudo.h" +diff -ur a/src/tmail/tmail.c b/src/tmail/tmail.c +--- a/src/tmail/tmail.c 2011-07-22 20:19:58.000000000 -0400 ++++ b/src/tmail/tmail.c 2023-10-17 22:36:32.723585260 -0400 +@@ -27,6 +27,7 @@ + */ + + #include <stdio.h> ++#include <ctype.h> + #include <pwd.h> + #include <errno.h> + extern int errno; /* just in case */ diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index e9bfb368cc062..a39f0d4660fb4 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -25,10 +25,15 @@ stdenv.mkDerivation rec { (if stdenv.isDarwin then libkrb5 else pam) # Matches the make target. ]; - patches = [ (fetchpatch { - url = "https://salsa.debian.org/holmgren/uw-imap/raw/dcb42981201ea14c2d71c01ebb4a61691b6f68b3/debian/patches/1006_openssl1.1_autoverify.patch"; - sha256 = "09xb58awvkhzmmjhrkqgijzgv7ia381ablf0y7i1rvhcqkb5wga7"; - }) ]; + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/holmgren/uw-imap/raw/dcb42981201ea14c2d71c01ebb4a61691b6f68b3/debian/patches/1006_openssl1.1_autoverify.patch"; + sha256 = "09xb58awvkhzmmjhrkqgijzgv7ia381ablf0y7i1rvhcqkb5wga7"; + }) + # Required to build with newer versions of clang. Fixes call to undeclared functions errors + # and incompatible function pointer conversions. + ./clang-fix.patch + ]; postPatch = '' sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl.dev},' diff --git a/pkgs/tools/networking/voms/default.nix b/pkgs/tools/networking/voms/default.nix index a16648b9a8337..cafc812032b7a 100644 --- a/pkgs/tools/networking/voms/default.nix +++ b/pkgs/tools/networking/voms/default.nix @@ -13,7 +13,8 @@ , zlib # Configuration overridable with .override # If not null, the builder will - # move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc. + # create a new output "etc", move "$out/etc" to "$etc/etc" + # and symlink "$out/etc" to externalEtc. , externalEtc ? "/etc" }: @@ -46,7 +47,8 @@ stdenv.mkDerivation rec{ zlib ]; - outputs = [ "bin" "out" "dev" "man" ]; + outputs = [ "bin" "out" "dev" "man" ] + ++ lib.optional (externalEtc != null) "etc"; preAutoreconf = '' mkdir -p aux src/autogen @@ -65,13 +67,12 @@ stdenv.mkDerivation rec{ configureFlags = [ "--with-gsoap-wsdl2h=${gsoap}/bin/wsdl2h" + "--sysconfdir=${placeholder "out"}/etc" ]; - postFixup = '' - ${lib.optionalString (externalEtc != null) '' - mv "$out"/etc{,.orig} - ln -s ${lib.escapeShellArg externalEtc} "$out/etc" - ''} + postFixup = lib.optionalString (externalEtc != null) '' + moveToOutput etc "$etc" + ln -s ${lib.escapeShellArg externalEtc} "$out/etc" ''; meta = with lib; { diff --git a/pkgs/tools/networking/wget2/default.nix b/pkgs/tools/networking/wget2/default.nix index 0bc5c2942d1b3..03eb6135ccd9d 100644 --- a/pkgs/tools/networking/wget2/default.nix +++ b/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/pkgs/tools/networking/xdp-tools/default.nix b/pkgs/tools/networking/xdp-tools/default.nix index d3eb90f258ba1..cf24360b1d7fe 100644 --- a/pkgs/tools/networking/xdp-tools/default.nix +++ b/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/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index c4dc973a81d10..9d87db3408ef5 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.19.1"; + version = "0.19.4"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-R15l73ApQ5apZsJ9+wLuse50nqZObTLurt0pXu5p5BE="; + sha256 = "sha256-L+qHcC5SQPHiflTc4vYmVyME1KyfG9wug3fO7ib7Ffk="; }; - cargoSha256 = "sha256-GGn5cNOIgCBl4uEIYxw5CIgd6uPHkid9MHnLCpuNX7I="; + cargoSha256 = "sha256-W6fqZJcyKm5+4DFm+lFxIACw3nvQ6TK3sZJdIrkxjjw="; buildFeatures = lib.optional withNativeTls "native-tls"; diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index 47496173642c6..e32139fdfcebd 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -39,7 +39,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-SLmxv8opN7z4V07S9kLGo8HG7Ql62iZQLtf3zGemwA8="; }; - outputs = [ "bin" "out" "dev" "man" ]; + outputs = [ "bin" "out" "dev" "man" ] + ++ lib.optional (externalEtc != null) "etc"; passthru.fetchxrd = callPackage ./fetchxrd.nix { xrootd = finalAttrs.finalPackage; }; passthru.tests = @@ -118,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram "$FILE" "''${makeWrapperArgs[@]}" done < <(find "$bin/bin" -mindepth 1 -maxdepth 1 -type f,l -perm -a+x) '' + lib.optionalString (externalEtc != null) '' - mv "$out"/etc{,.orig} + moveToOutput etc "$etc" ln -s ${lib.escapeShellArg externalEtc} "$out/etc" ''; diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix index 0e5d59ee8f887..2dc35be811067 100644 --- a/pkgs/tools/nix/alejandra/default.nix +++ b/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/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py index 8564297efdd3a..26fdcea907dd0 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py @@ -208,7 +208,7 @@ def test_attr_span_escaping() -> None: content='\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False, children=[ Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, - content='[a]{#bar}', markup='', info='', meta={}, block=False, hidden=False) + content='[a]{#bar}', markup='\\[', info='escape', meta={}, block=False, hidden=False) ]), Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, content='', markup='', info='', meta={}, block=True, hidden=False) @@ -220,7 +220,7 @@ def test_attr_span_escaping() -> None: content='\\\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False, children=[ Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, - content='\\', markup='', info='', meta={}, block=False, hidden=False), + content='\\', markup='\\\\', info='escape', meta={}, block=False, hidden=False), Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'bar'}, map=None, level=0, children=None, content='', markup='', info='', meta={}, block=False, hidden=False), Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, @@ -237,7 +237,7 @@ def test_attr_span_escaping() -> None: Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, children=[ Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, - content='\\[a]{#bar}', markup='', info='', meta={}, block=False, hidden=False) + content='\\[a]{#bar}', markup='\\\\', info='escape', meta={}, block=False, hidden=False) ], content='\\\\\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False), Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 3f9814b36ac59..dcd1e24ff34a9 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/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/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index bc4ba3f630f81..5e57c69642384 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/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/pkgs/tools/package-management/zkg/default.nix b/pkgs/tools/package-management/zkg/default.nix deleted file mode 100644 index 9d6700469722c..0000000000000 --- a/pkgs/tools/package-management/zkg/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -, pkgs -}: - -python3.pkgs.buildPythonApplication rec { - pname = "zkg"; - version = "2.14.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "zeek"; - repo = "package-manager"; - rev = "refs/tags/v${version}"; - hash = "sha256-HdOzxSU3XWz1ZH96woDWrHzKbpJW3/IKkpc2tGfyi9o="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - btest - gitpython - semantic-version - sphinx - sphinx-rtd-theme - pkgs.bash - ]; - - # No tests available - doCheck = false; - - pythonImportsCheck = [ - "zeekpkg" - ]; - - meta = with lib; { - description = "Package manager for Zeek"; - homepage = "https://github.com/zeek/package-manager"; - changelog = "https://github.com/zeek/package-manager/blob/${version}/CHANGES"; - license = licenses.ncsa; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 41ce0d7e5e892..84ce6b59d7871 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/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/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 0762a437dfbed..014b39f87c924 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-10-20"; + version = "2023-10-21"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-v9myewSoa0U/1EjmBejHj7M2iL8k8xNpFzi74IN4dS0="; + hash = "sha256-Un8Wnctd8943JXA9GlKlaR2b6mP8BfcYLHSjxpysg3U="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index 41c858ba9797b..1a67b89855f9d 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/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/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 1f6dd8baeeb1e..ae6e1d78f6fa8 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,18 +5,17 @@ buildGoModule rec { pname = "nuclei"; - version = "2.9.15"; + version = "3.0.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/7013cf9nnDiKqcwFOYZUF1D+wkQKXPBcwz3YhpBUK0="; + hash = "sha256-5Z40wc8ihN2UR3DyMCaD0MOKpgbUQX0OJMyZw2gVNYM="; }; - vendorHash = "sha256-b5CY66c2vfGaqlFENw2lnK47Cf2+buh/LtbJyPSAbOA="; + vendorHash = "sha256-CaeYAw7QU/KySFDSkUr4oHrG3wyPHxty3KCZ6zlPqIk="; - modRoot = "./v2"; subPackages = [ "cmd/nuclei/" ]; diff --git a/pkgs/tools/security/pynitrokey/default.nix b/pkgs/tools/security/pynitrokey/default.nix index 9c36ceb3c841e..690d566c476d8 100644 --- a/pkgs/tools/security/pynitrokey/default.nix +++ b/pkgs/tools/security/pynitrokey/default.nix @@ -10,12 +10,12 @@ with python3Packages; buildPythonApplication rec { pname = "pynitrokey"; - version = "0.4.39"; + version = "0.4.40"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-KXYHeWwV9Tw1ZpO/vASHjDnceeb+1K0yIUohb7EcRAI="; + hash = "sha256-Hu+8UooDzv4GhkWt0sCckQQyHjWn4V/zt2ADlVCoHmk="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index 2820f473c11b9..c27416e29d2ee 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -4,13 +4,13 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "1.2.2"; + version = "1.3.2"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - hash = "sha256-U7KxkPYVAy3/olXsEgPMX/kzg0KvYMovLO4LWw8guE4="; + hash = "sha256-QiK+ixVURf5Fsx9YPgzYCuCy1wYjxTUXGVr4FIn41Xc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -23,7 +23,7 @@ let ''; }; - vendorHash = "sha256-hZyoVlNrPKE6ub94jVEOLGvxWoXKxFYcsEZyRrZuNkQ="; + vendorHash = "sha256-0379IX5W51Z48CffK1F2ZCPGLUq0g8lZXIQqaupC5io="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/sbctl/default.nix b/pkgs/tools/security/sbctl/default.nix index 6471425a85814..0778406b40cb5 100644 --- a/pkgs/tools/security/sbctl/default.nix +++ b/pkgs/tools/security/sbctl/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sbctl"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "Foxboron"; repo = pname; rev = version; - hash = "sha256-kApPb8X1JCP1XfyVFcoCDd+yrytTKSkNWRHKDA3mGaQ="; + hash = "sha256-1dA+a8GS4teaLmclatJNKt+OjhabLO4j/+p4Q95yG/s="; }; - vendorHash = "sha256-WbPYTETTOzqWH+q6fzyDgm0wMScbLWlksLxkDjopF4E="; + vendorHash = "sha256-kVXzHTONPCE1UeAnUiULjubJeZFD0DAxIk+w8/Dqs6c="; ldflags = [ "-s" "-w" "-X github.com/foxboron/sbctl.DatabasePath=${databasePath}" ]; diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index aad2873d4aca0..d2b8228f6511f 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "scrypt"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "https://www.tarsnap.com/scrypt/${pname}-${version}.tgz"; - sha256 = "1hnl0r6pmyxiy4dmafmqk1db7wpc0x9rqpzqcwr9d2cmghcj6byz"; + sha256 = "sha256-1jLBGTQgrG+uv5SC5l4z06VmTszWQ7CaUJ0h0cHym+I="; }; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/tools/security/sequoia-sqop/default.nix b/pkgs/tools/security/sequoia-sqop/default.nix index f4cae90b546b8..fdefbdea9e503 100644 --- a/pkgs/tools/security/sequoia-sqop/default.nix +++ b/pkgs/tools/security/sequoia-sqop/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { pname = "sequoia-sqop"; - version = "0.28.0"; + version = "0.30.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage rec { # generated etc repo = "sequoia-sop"; rev = "v${version}"; - hash = "sha256-4A0eZMXzFtojRD5cXQQUVoS32sQ2lWtFll+q6yhnwG4="; + hash = "sha256-2fRlHkT2jhUp1dIqKe8r7ktSbgudCmzuiiyF0WcbYIE="; }; - cargoHash = "sha256-gH5WM+PmciViD+eFVlp8tzdc0KdYy1WZLQi92UEWVG4="; + cargoHash = "sha256-/LLW0AHCgqi2pAOkhZXNGlmNF/+u0TmSstd/B6mDr6M="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/uncover/default.nix b/pkgs/tools/security/uncover/default.nix index 1ea2f41447801..f0ee8aa23757f 100644 --- a/pkgs/tools/security/uncover/default.nix +++ b/pkgs/tools/security/uncover/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "uncover"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FJtd73z6Cc56+nBderYncjrac3xRydDeoiJqn8xW29U="; + hash = "sha256-CJA+rDLubghaQT+yb0zQY3y8hF0/5ISH9YFvIQHwH2Y="; }; - vendorHash = "sha256-mpojOzGedkTthD+fHl9Uhul7tOCN1EGIin+7USoaNmE="; + vendorHash = "sha256-A7XPsl27Q5CaQXQUEvNB05B2M3mFGz/yZ4sOnOHxhw8="; meta = with lib; { description = "API wrapper to search for exposed hosts"; diff --git a/pkgs/tools/security/vault-ssh-plus/default.nix b/pkgs/tools/security/vault-ssh-plus/default.nix index 44be0d6e014dc..a1c77e5d0a29f 100644 --- a/pkgs/tools/security/vault-ssh-plus/default.nix +++ b/pkgs/tools/security/vault-ssh-plus/default.nix @@ -8,16 +8,16 @@ }: buildGoModule rec { pname = "vault-ssh-plus"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "isometry"; repo = pname; rev = "v${version}"; - hash = "sha256-t987QIMXrG+p+mmRnVrYnhvsmkqCFe/qe1AEtzKArnY="; + hash = "sha256-IRmFC5WsLmHfPjS/jW5V7dNF5rNvmsh3YKwW7rGII24="; }; - vendorHash = "sha256-VUsy4z1kIK6TDb5RYNwgDsoqjO6bsTNrXVMO7IXkjO4="; + vendorHash = "sha256-cuU7rEpJrwrbiXLajdv4h6GePbpZclweyB9qZ3SIjP0="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/webanalyze/default.nix b/pkgs/tools/security/webanalyze/default.nix index cfce48228b570..3b49b496f62e2 100644 --- a/pkgs/tools/security/webanalyze/default.nix +++ b/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/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 11a45fbe391aa..e5eebb727b54f 100644 --- a/pkgs/tools/system/at/default.nix +++ b/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/pkgs/tools/system/at/install.patch b/pkgs/tools/system/at/install.patch deleted file mode 100644 index 41a35a7895388..0000000000000 --- a/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/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 5d9286a1c4d1a..aaa597d4c7863 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -2,13 +2,13 @@ , CoreFoundation, IOKit, libossp_uuid , nixosTests , netdata-go-plugins -, bash, curl, jemalloc, libuv, zlib, libyaml +, bash, curl, jemalloc, json_c, libuv, zlib, libyaml , libcap, libuuid, lm_sensors, protobuf , withCups ? false, cups , withDBengine ? true, lz4 , withIpmi ? (!stdenv.isDarwin), freeipmi , withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct -, withCloud ? (!stdenv.isDarwin), json_c +, withCloud ? false , withCloudUi ? false , withConnPubSub ? false, google-cloud-cpp, grpc , withConnPrometheus ? false, snappy @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # Don't forget to update go.d.plugin.nix as well - version = "1.42.4"; + version = "1.43.0"; pname = "netdata"; src = fetchFromGitHub { @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { repo = "netdata"; rev = "v${version}"; hash = if withCloudUi - then "sha256-MaU9sOQD+Y03M+yoSWt1GuV+DrBlD7+r/Qm2JJ9s8EU=" - else "sha256-41QntBt0MoO1hAsDb8LhHgvvNMzt9R1ZdgiPaR7NrPU="; + then "sha256-hrwuJLO9/K5QT3j8d5RYHcpBHChpKvwajaCoUfikw88=" + else "sha256-+bX6pVpW6N1ms04k63sJg0E9XMOai5K9IjEQPeVCzs8="; fetchSubmodules = true; # Remove v2 dashboard distributed under NCUL1. Make sure an empty @@ -42,14 +42,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ]; # bash is only used to rewrite shebangs - buildInputs = [ bash curl jemalloc libuv zlib libyaml ] + buildInputs = [ bash curl jemalloc json_c libuv zlib libyaml ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ lib.optionals (!stdenv.isDarwin) [ libcap libuuid ] ++ lib.optionals withCups [ cups ] ++ lib.optionals withDBengine [ lz4 ] ++ lib.optionals withIpmi [ freeipmi ] ++ lib.optionals withNetfilter [ libmnl libnetfilter_acct ] - ++ lib.optionals withCloud [ json_c ] ++ lib.optionals withConnPubSub [ google-cloud-cpp grpc ] ++ lib.optionals withConnPrometheus [ snappy ] ++ lib.optionals (withCloud || withConnPrometheus) [ protobuf ] diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 4fcb7a6d43ce3..2114374bc61b9 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -1,17 +1,17 @@ -{ lib, fetchFromGitHub, buildGoModule, nixosTests }: +{ lib, fetchFromGitHub, buildGo121Module, nixosTests }: -buildGoModule rec { +buildGo121Module rec { pname = "netdata-go-plugins"; - version = "0.56.1"; + version = "0.56.3"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - hash = "sha256-OA//50j7MWCNyQ85DzSkk0kI8XonBOMpEmsIJ7QLbHY="; + hash = "sha256-T7UB7qrcMTqIFRzBxbXmSqtcEFgZd0/z4EYuH/ydVi4="; }; - vendorHash = "sha256-1ir6paAz4NyJDPivBrHyiTrNwJMJ00Q4/sWBLBnwqPM="; + vendorHash = "sha256-N0p03urHC3d17VQ4TIs7mAemW9ZSpQw20EwwD6lSLLc="; doCheck = false; diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix index 34f9202cfa05e..db947ca2cc38e 100644 --- a/pkgs/tools/text/igrep/default.nix +++ b/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/pkgs/tools/text/mdhtml/default.nix b/pkgs/tools/text/mdhtml/default.nix new file mode 100644 index 0000000000000..b5d12e7b3dcf6 --- /dev/null +++ b/pkgs/tools/text/mdhtml/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitea +}: + +buildGoModule rec { + pname = "mdhtml"; + version = "0.2.2"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "Tomkoid"; + repo = pname; + rev = version; + hash = "sha256-893pqrrTftzKqPYZgukV/yx2gkukVZWDTgg7ufx1MsY="; + }; + + vendorHash = null; + + meta = with lib; { + description = "Really simple CLI Markdown to HTML converter with styling support"; + homepage = "https://codeberg.org/Tomkoid/mdhtml"; + license = licenses.mit; + changelog = "https://codeberg.org/Tomkoid/mdhtml/releases"; + maintainers = with maintainers; [ tomkoid ]; + mainProgram = "mdhtml"; + }; +} diff --git a/pkgs/tools/text/nerdfix/default.nix b/pkgs/tools/text/nerdfix/default.nix index 91a34796518df..8bb9113f013ac 100644 --- a/pkgs/tools/text/nerdfix/default.nix +++ b/pkgs/tools/text/nerdfix/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "nerdfix"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "loichyan"; repo = "nerdfix"; rev = "v${version}"; - hash = "sha256-cqTaup/MrtLcBIoY+1vQLLlU+Cmu3iODH4jmZImjGrg="; + hash = "sha256-V9f39/9k9kYjngYOSXJYblaKDABPCZbVWxD0p3ZWzlY="; }; - cargoHash = "sha256-V/M70ARqOyN0f/uudWPHc4bGc3WXK3PpcM8r2MBEWAs="; + cargoHash = "sha256-PkUQZPLzvVJ7s1D9TkMmgIVQiR/E79BRCYmjZVcHIv8="; meta = with lib; { description = "Nerdfix helps you to find/fix obsolete nerd font icons in your project"; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 7ac57de731a5d..d4ed3ba55a951 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.29.1"; + version = "2.29.6"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-bvj0K7d23E5QKree+PLfA9AgKFqL6YDtlmh/nEtrPbE="; + hash = "sha256-0btFCTpVB50097yQEggpm1rmm4aciTgfdLAkczQ1mj4="; }; - vendorHash = "sha256-YUazrbTeioRV+L6Ku+oJRJzp16WCLPzlAH6F25TT6Dg="; + vendorHash = "sha256-EbhLz4agDWAlALfBcGUbVNz+teUvgroxzaSN8T19AJY="; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/tools/typesetting/typstfmt/Cargo.lock b/pkgs/tools/typesetting/typstfmt/Cargo.lock index f5abd5a1e9ea6..8f560ac59e5de 100644 --- a/pkgs/tools/typesetting/typstfmt/Cargo.lock +++ b/pkgs/tools/typesetting/typstfmt/Cargo.lock @@ -4,14 +4,20 @@ version = 3 [[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 = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] name = "bstr" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -24,9 +30,9 @@ 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", "serde", @@ -60,6 +66,18 @@ dependencies = [ ] [[package]] +name = "confy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e37668cb35145dcfaa1931a5f37fde375eeae8068b4c0d2f289da28a270b2d2c" +dependencies = [ + "directories", + "serde", + "thiserror", + "toml 0.5.11", +] + +[[package]] name = "console" version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -72,6 +90,26 @@ dependencies = [ ] [[package]] +name = "directories" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] name = "ecow" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -105,6 +143,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] name = "globmatch" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -122,7 +171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", - "bstr 1.6.2", + "bstr 1.7.0", "fnv", "log", "regex", @@ -130,15 +179,15 @@ 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" [[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", @@ -146,9 +195,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.32.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e02c584f4595792d09509a94cdb92a3cef7592b1eb2d9877ee6f527062d0ea" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "lazy_static", @@ -180,9 +229,9 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401" [[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 = "linked-hash-map" @@ -198,9 +247,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[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 = "nu-ansi-term" @@ -232,9 +281,9 @@ checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[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", ] @@ -249,14 +298,34 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + +[[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-automata 0.4.3", "regex-syntax", ] @@ -268,9 +337,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[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", @@ -279,9 +348,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 = "same-file" @@ -294,22 +363,22 @@ dependencies = [ [[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", ] [[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]] @@ -323,18 +392,18 @@ 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", ] [[package]] name = "similar" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" dependencies = [ "bstr 0.2.17", "unicode-segmentation", @@ -375,9 +444,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", @@ -385,6 +454,26 @@ dependencies = [ ] [[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] name = "thread_local" version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -396,6 +485,15 @@ dependencies = [ [[package]] name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" @@ -430,11 +528,10 @@ dependencies = [ [[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", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -442,20 +539,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.37", + "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", @@ -504,15 +601,16 @@ dependencies = [ [[package]] name = "typstfmt" -version = "0.2.5" +version = "0.2.6" dependencies = [ + "confy", "lexopt", "typstfmt_lib", ] [[package]] name = "typstfmt_lib" -version = "0.2.5" +version = "0.2.6" dependencies = [ "globmatch", "insta", @@ -520,7 +618,7 @@ dependencies = [ "regex", "serde", "similar-asserts", - "toml", + "toml 0.7.8", "tracing", "tracing-subscriber", "typst-syntax", @@ -568,6 +666,12 @@ dependencies = [ ] [[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -666,9 +770,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[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", ] diff --git a/pkgs/tools/typesetting/typstfmt/default.nix b/pkgs/tools/typesetting/typstfmt/default.nix index 7f84fc1cc5e7b..c6c054888f82a 100644 --- a/pkgs/tools/typesetting/typstfmt/default.nix +++ b/pkgs/tools/typesetting/typstfmt/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "typstfmt"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "astrale-sharp"; repo = "typstfmt"; rev = version; - hash = "sha256-+iQOS+WPCWevUFurLfuC5mhuRdJ/1ZsekFoFDzZviag="; + hash = "sha256-UUVbnxIj7kQVpZvSbbB11i6wAvdTnXVk5cNSNoGBeRM="; }; cargoLock = { diff --git a/pkgs/tools/video/go2rtc/default.nix b/pkgs/tools/video/go2rtc/default.nix index 8e44cd8f9685d..3fde1c8a7671d 100644 --- a/pkgs/tools/video/go2rtc/default.nix +++ b/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/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index b7ca158d2e70a..70e95cb4f0166 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -16,23 +16,6 @@ let rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; - # TODO: if another package starts using cargo-c (seems likely), - # factor this out into a makeCargoChook expression in - # pkgs/build-support/rust/hooks/default.nix - ccForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; - cxxForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; - ccForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; - cxxForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; - rustBuildPlatform = rust.toRustTarget stdenv.buildPlatform; - rustTargetPlatform = rust.toRustTarget stdenv.hostPlatform; - setEnvVars = '' - env \ - "CC_${rustBuildPlatform}"="${ccForBuild}" \ - "CXX_${rustBuildPlatform}"="${cxxForBuild}" \ - "CC_${rustTargetPlatform}"="${ccForHost}" \ - "CXX_${rustTargetPlatform}"="${cxxForHost}" \ - ''; - in rustPlatform.buildRustPackage rec { pname = "rav1e"; version = "0.6.6"; @@ -64,13 +47,11 @@ in rustPlatform.buildRustPackage rec { checkType = "debug"; postBuild = '' - ${setEnvVars} \ - cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} ''; postInstall = '' - ${setEnvVars} \ - cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} ''; meta = with lib; { diff --git a/pkgs/tools/wayland/clipman/default.nix b/pkgs/tools/wayland/clipman/default.nix index d7ff425e1a3dc..cf229b3c2e725 100644 --- a/pkgs/tools/wayland/clipman/default.nix +++ b/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/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9d2e755ca144a..d399c8ee659c9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -92,7 +92,6 @@ mapAliases ({ bird2 = bird; # Added 2022-02-21 bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 - ddclient = throw "ddclient has been removed on the request of the upstream maintainer because it is unmaintained and has bugs. Please switch to a different software like `inadyn` or `knsupdate`."; # Added 2023-07-04 bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10 boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08 boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08 @@ -653,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"; @@ -973,6 +973,7 @@ mapAliases ({ ### Z ### zinc = zincsearch; # Added 2023-05-28 + zkg = throw "'zkg' has been replaced by 'zeek'"; zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06 ### UNSORTED ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 860a152807e28..1d5029170dc92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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) @@ -3267,10 +3264,6 @@ with pkgs; apitrace = libsForQt5.callPackage ../applications/graphics/apitrace { }; - argagg = callPackage ../development/libraries/argagg { }; - - argtable = callPackage ../development/libraries/argtable { }; - arguments = callPackage ../development/libraries/arguments { }; argus = callPackage ../tools/networking/argus { }; @@ -4655,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 { }; @@ -6151,9 +6142,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 { }; @@ -6977,6 +6966,8 @@ with pkgs; evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { }; + evsieve = callPackage ../tools/inputmethods/evsieve { }; + eyedropper = callPackage ../applications/graphics/eyedropper { }; persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { }; @@ -7425,6 +7416,8 @@ with pkgs; ddcutil = callPackage ../tools/misc/ddcutil { }; + ddclient = callPackage ../tools/networking/ddclient { }; + dd_rescue = callPackage ../tools/system/dd_rescue { }; ddh = callPackage ../tools/system/ddh { }; @@ -7496,9 +7489,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 +7570,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 +8016,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 +8565,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 +8965,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 { }; @@ -10259,6 +10246,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; protobuf = protobuf3_21; }; + netdataCloud = netdata.override { + withCloud = !stdenv.isDarwin; + withCloudUi = true; + }; # Exposed here so the bots can auto-upgrade it netdata-go-plugins = callPackage ../tools/system/netdata/go.d.plugin.nix { }; @@ -11498,9 +11489,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 { }; @@ -12783,6 +12772,8 @@ with pkgs; rkflashtool = callPackage ../tools/misc/rkflashtool { }; + rkvm = callPackage ../tools/misc/rkvm { }; + rkrlv2 = callPackage ../applications/audio/rkrlv2 { }; rmlint = callPackage ../tools/misc/rmlint { @@ -12838,6 +12829,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 { }; @@ -13675,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 { }; @@ -13799,7 +13790,6 @@ with pkgs; }; teleport_14 = callPackage ../servers/teleport/14 { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - buildGoModule = buildGo121Module; }; teleport = teleport_14; @@ -13828,6 +13818,7 @@ with pkgs; tewisay = callPackage ../tools/misc/tewisay { }; texmacs = libsForQt5.callPackage ../applications/editors/texmacs { + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; tex = texlive.combined.scheme-small; extraFonts = true; }; @@ -14052,6 +14043,7 @@ with pkgs; trezord = callPackage ../servers/trezord { inherit (darwin.apple_sdk.frameworks) AppKit; + buildGoModule = buildGo120Module; }; trezor_agent = with python3Packages; toPythonApplication trezor_agent; @@ -15402,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 { }; @@ -15823,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 { }; @@ -17159,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 { @@ -17513,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 @@ -17697,9 +17685,7 @@ with pkgs; groovy = callPackage ../development/interpreters/groovy { }; - inherit (callPackages ../applications/networking/cluster/hadoop { - openssl = openssl_1_1; - }) + inherit (callPackages ../applications/networking/cluster/hadoop {}) hadoop_3_3 hadoop_3_2 hadoop2; @@ -17730,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 { }; @@ -17880,11 +17868,11 @@ with pkgs; # available as `pythonPackages.tkinter` and can be used as any other Python package. # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md python2 = python27; - python3 = python310; + python3 = python311; # pythonPackages further below, but assigned here because they need to be in sync python2Packages = dontRecurseIntoAttrs python27Packages; - python3Packages = dontRecurseIntoAttrs python310Packages; + python3Packages = dontRecurseIntoAttrs python311Packages; pypy = pypy2; pypy2 = pypy27; @@ -18214,9 +18202,9 @@ with pkgs; # Needed for autogen guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { }; - guile_2_2 = callPackage ../development/interpreters/guile/2.2.nix { }; + guile_2_2 = darwin.apple_sdk_11_0.callPackage ../development/interpreters/guile/2.2.nix { }; - guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { }; + guile_3_0 = darwin.apple_sdk_11_0.callPackage ../development/interpreters/guile/3.0.nix { }; guile = guile_3_0; @@ -18402,7 +18390,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 { }; @@ -19007,7 +18997,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; @@ -19510,10 +19500,6 @@ with pkgs; kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; - kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { - gperf = gperf_3_0; - }; - kcgi = callPackage ../development/web/kcgi { }; kcov = callPackage ../development/tools/analysis/kcov { }; @@ -19999,9 +19985,7 @@ with pkgs; withPEPatterns = true; }; - reviewdog = callPackage ../development/tools/misc/reviewdog { - buildGoModule = buildGo121Module; - }; + reviewdog = callPackage ../development/tools/misc/reviewdog { }; revive = callPackage ../development/tools/revive { }; @@ -20277,9 +20261,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 { }; @@ -20840,6 +20822,8 @@ with pkgs; certbot-full = certbot.withPlugins (cp: with cp; [ certbot-dns-cloudflare + certbot-dns-google + certbot-dns-ovh certbot-dns-rfc2136 certbot-dns-route53 ]); @@ -21275,9 +21259,9 @@ with pkgs; # update to ffmpeg # Packages which use ffmpeg as a library, should pin to the relevant major # version number which the upstream support. - ffmpeg = ffmpeg_5; - ffmpeg-headless = ffmpeg_5-headless; - ffmpeg-full = ffmpeg_5-full; + ffmpeg = ffmpeg_6; + ffmpeg-headless = ffmpeg_6-headless; + ffmpeg-full = ffmpeg_6-full; ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { }; @@ -24509,8 +24493,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 { }; @@ -24743,6 +24725,8 @@ with pkgs; readline82 = callPackage ../development/libraries/readline/8.2.nix { }; + readmdict = with python3Packages; toPythonApplication readmdict; + readosm = callPackage ../development/libraries/readosm { }; recastnavigation = callPackage ../development/libraries/recastnavigation { }; @@ -24992,7 +24976,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 { }; @@ -25898,9 +25882,9 @@ with pkgs; ### DEVELOPMENT / GO # the unversioned attributes should always point to the same go version - go = go_1_20; - buildGoModule = buildGo120Module; - buildGoPackage = buildGo120Package; + go = go_1_21; + buildGoModule = buildGo121Module; + buildGoPackage = buildGo121Package; # requires a newer Apple SDK go_1_19 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.19.nix { @@ -26302,8 +26286,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 { }; @@ -26457,9 +26439,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 { }; @@ -26619,7 +26599,9 @@ with pkgs; mackerel-agent = callPackage ../servers/monitoring/mackerel-agent { }; - mailmanPackages = callPackage ../servers/mail/mailman { }; + mailmanPackages = callPackage ../servers/mail/mailman { + python3 = python310; + }; inherit (mailmanPackages) mailman mailman-hyperkitty; mailman-web = mailmanPackages.web; @@ -27112,14 +27094,14 @@ with pkgs; postgresql_15_jit postgresql_16_jit ; - postgresql = postgresql_14.override { this = postgresql; }; - postgresql_jit = postgresql_14_jit.override { this = postgresql_jit; }; + postgresql = postgresql_15.override { this = postgresql; }; + postgresql_jit = postgresql_15_jit.override { this = postgresql_jit; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresqlJitPackages = recurseIntoAttrs postgresql_jit.pkgs; postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs; - postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs; + postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs; postgresql16Packages = recurseIntoAttrs postgresql_16.pkgs; postgresql11JitPackages = recurseIntoAttrs postgresql_11_jit.pkgs; postgresql12JitPackages = recurseIntoAttrs postgresql_12_jit.pkgs; @@ -27127,7 +27109,7 @@ with pkgs; postgresql14JitPackages = recurseIntoAttrs postgresql_14_jit.pkgs; postgresql15JitPackages = recurseIntoAttrs postgresql_15_jit.pkgs; postgresql16JitPackages = recurseIntoAttrs postgresql_16_jit.pkgs; - postgresql14Packages = postgresqlPackages; + postgresql15Packages = postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; @@ -27403,9 +27385,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 { }; @@ -28318,7 +28298,9 @@ with pkgs; checkMeta = callPackage ../stdenv/generic/check-meta.nix { }; }); minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix { }; - make-minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix { }; + make-minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix { + inherit (stdenv) hostPlatform; + }; mingetty = callPackage ../os-specific/linux/mingetty { }; @@ -29732,7 +29714,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 { }; @@ -30203,8 +30187,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 { }; @@ -30908,10 +30890,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 { }; @@ -31013,6 +30991,12 @@ with pkgs; cordless = callPackage ../applications/networking/instant-messengers/cordless { }; + cosmic-comp = callPackage ../applications/window-managers/cosmic/comp { }; + + cosmic-applets = callPackage ../applications/window-managers/cosmic/applets { }; + + cosmic-panel = callPackage ../applications/window-managers/cosmic/panel { }; + coursera-dl = callPackage ../applications/misc/coursera-dl { }; coyim = callPackage ../applications/networking/instant-messengers/coyim { }; @@ -34454,7 +34438,7 @@ with pkgs; wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { }; obsidian = callPackage ../applications/misc/obsidian { - electron = electron_24; + electron = electron_25; }; octoprint = callPackage ../applications/misc/octoprint { }; @@ -35371,8 +35355,6 @@ with pkgs; tart = callPackage ../applications/virtualization/tart { }; - tecoc = callPackage ../applications/editors/tecoc { }; - viber = callPackage ../applications/networking/instant-messengers/viber { }; wavebox = libsForQt5.callPackage ../applications/networking/instant-messengers/wavebox { }; @@ -41167,7 +41149,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 @@ -41247,9 +41229,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 { }; @@ -41275,9 +41255,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 { }; @@ -41488,8 +41466,6 @@ with pkgs; xbps = callPackage ../tools/package-management/xbps { }; - zkg = callPackage ../tools/package-management/zkg { }; - xcftools = callPackage ../tools/graphics/xcftools { }; xhyve = callPackage ../applications/virtualization/xhyve { @@ -42119,4 +42095,6 @@ with pkgs; }; code-maat = callPackage ../development/tools/code-maat {}; + + mdhtml = callPackage ../tools/text/mdhtml { }; } diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 71d3f7a7869c3..6b129e6aca01a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -24,10 +24,13 @@ let "ghc944" "ghc945" "ghc946" + "ghc947" "ghc94" "ghc96" "ghc962" "ghc963" + "ghc981" + "ghc98" "ghcHEAD" ]; @@ -46,9 +49,12 @@ let "ghc944" "ghc945" "ghc946" + "ghc947" "ghc96" "ghc962" "ghc963" + "ghc98" + "ghc981" "ghcHEAD" ]; @@ -333,7 +339,31 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc94 = compiler.ghc946; + ghc947 = callPackage ../development/compilers/ghc/9.4.7.nix { + bootPkgs = + # Building with 9.2 is broken due to + # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 + # Use 8.10 as a workaround where possible to keep bootstrap path short. + + # On ARM text won't build with GHC 8.10.* + if stdenv.hostPlatform.isAarch then + # TODO(@sternenseemann): package bindist + packages.ghc902 + # No suitable bindists for powerpc64le + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc902 + else + packages.ghc8107Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # Support range >= 10 && < 14 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; + }; + ghc94 = compiler.ghc947; ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -371,6 +401,19 @@ in { llvmPackages = pkgs.llvmPackages_15; }; ghc96 = compiler.ghc963; + ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix { + # No bindist packaged for 9.4.* yet + bootPkgs = packages.ghc947; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # Support range >= 11 && < 16 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; + llvmPackages = pkgs.llvmPackages_15; + }; + ghc98 = compiler.ghc981; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -517,7 +560,12 @@ in { ghc = bh.compiler.ghc946; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; - ghc94 = packages.ghc946; + ghc947 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc947; + ghc = bh.compiler.ghc947; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; + }; + ghc94 = packages.ghc947; ghc962 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc962; ghc = bh.compiler.ghc962; @@ -529,6 +577,12 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; ghc96 = packages.ghc963; + ghc981 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc981; + ghc = bh.compiler.ghc981; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; + }; + ghc98 = packages.ghc981; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index edf5349f82814..c9d57a8d14706 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/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/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 872e67262a575..01010c77061ba 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/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/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 889ddccb0e1b5..79be645162ea7 100644 --- a/pkgs/top-level/packages-config.nix +++ b/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/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 425ece6b7beea..8a6ee04760616 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/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 ]; @@ -4954,7 +4954,12 @@ with self; { url = "mirror://cpan/authors/id/B/BA/BARTB/Crypt-HSXKPasswd-v3.6.tar.gz"; hash = "sha256-lZ3MX58BG/ALha0i31ZrerK/XqHTYrDeD7WuKfvEWLM="; }; - buildInputs = [ Clone DateTime FileHomeDir FileShare FileShareDir GetoptLong JSON ListMoreUtils MathRound Readonly TextUnidecode TypeTiny ]; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + propagatedBuildInputs = [ Clone DateTime FileHomeDir FileShare FileShareDir GetoptLong JSON ListMoreUtils MathRound Readonly TextUnidecode TypeTiny ]; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/hsxkpasswd + ''; + meta = { description = "A secure memorable password generator"; homepage = "http://www.bartb.ie/hsxkpasswd"; @@ -6257,13 +6262,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 ]; @@ -7290,10 +7295,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 ]; @@ -9222,7 +9227,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 ]; }; }; @@ -10195,6 +10200,21 @@ with self; { }; }; + FutureQueue = buildPerlModule { + pname = "Future-Queue"; + version = "0.51"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-Queue-0.51.tar.gz"; + hash = "sha256-HVAcOpot3/x8YPlvpmlp1AyykuCSBM9t7NHCuLUAPNY="; + }; + buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ Future ]; + meta = { + description = "A FIFO queue of values that uses L<Future>s"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GamesSolitaireVerify = buildPerlModule { pname = "Games-Solitaire-Verify"; version = "0.2403"; @@ -10236,10 +10256,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 ]; @@ -10732,7 +10752,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 ]; }; }; @@ -12768,11 +12810,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; @@ -19944,10 +19986,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 = @@ -19957,6 +19999,7 @@ with self; { meta = { description = "Objected-oriented Perl interface to ImageMagick. Use it to read, manipulate, or write an image or image sequence from within a Perl script"; license = with lib.licenses; [ imagemagick ]; + broken = true; # tests fail }; }; @@ -20219,7 +20262,7 @@ with self; { url = "mirror://cpan/authors/id/M/MR/MREISNER/PLS-0.905.tar.gz"; hash = "sha256-RVW1J5nBZBXDy/5eMB6gLKDrvDQhTH/lLx19ykUwLik="; }; - propagatedBuildInputs = [ Future IOAsync PPI PPR PathTiny PerlCritic PerlTidy PodMarkdown URI ]; + propagatedBuildInputs = [ Future FutureQueue IOAsync PPI PPR PathTiny PerlCritic PerlTidy PodMarkdown URI ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/pls @@ -24614,7 +24657,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/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 66be4900a11b1..0d7e6321d548f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -290,6 +290,7 @@ mapAliases ({ pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 PyMVGLive = pymvglive; # added 2023-02-19 + pymyq = python-myq; # added 2023-10-20 pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09 pyramid_beaker = pyramid-beaker; # added 2023-08-23 pyramid_chameleon = pyramid-chameleon; # added 2023-08-23 @@ -350,9 +351,11 @@ 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 + ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 recaptcha_client = throw "recaptcha_client has been removed since it is no longer maintained"; # added 2023-10-20 rednose = throw "rednose is no longer maintained (since February 2018)"; # added 2023-08-06 @@ -405,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/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43a62d19c1a68..60dd73c24a54f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -198,6 +198,8 @@ self: super: with self; { aioecowitt = callPackage ../development/python-modules/aioecowitt { }; + aioelectricitymaps = callPackage ../development/python-modules/aioelectricitymaps { }; + aioemonitor = callPackage ../development/python-modules/aioemonitor { }; aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; @@ -1775,6 +1777,8 @@ self: super: with self; { canopen = callPackage ../development/python-modules/canopen { }; + cantools = callPackage ../development/python-modules/cantools { }; + camelot = callPackage ../development/python-modules/camelot { }; capstone = callPackage ../development/python-modules/capstone { @@ -1876,11 +1880,13 @@ self: super: with self; { certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; + certbot-dns-google = callPackage ../development/python-modules/certbot-dns-google { }; + certbot-dns-inwx = callPackage ../development/python-modules/certbot-dns-inwx { }; - certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { }; + certbot-dns-ovh = callPackage ../development/python-modules/certbot-dns-ovh { }; - certbot-dns-google = callPackage ../development/python-modules/certbot-dns-google { }; + certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { }; certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { }; @@ -2373,6 +2379,8 @@ self: super: with self; { cryptg = callPackage ../development/python-modules/cryptg { }; + cryptodatahub = callPackage ../development/python-modules/cryptodatahub { }; + cryptography = callPackage ../development/python-modules/cryptography { inherit (pkgs.darwin) libiconv; inherit (pkgs.darwin.apple_sdk.frameworks) Security; @@ -2482,6 +2490,8 @@ self: super: with self; { patches = [ ]; }); + cython-test-exception-raiser = callPackage ../development/python-modules/cython-test-exception-raiser { }; + cytoolz = callPackage ../development/python-modules/cytoolz { }; dacite = callPackage ../development/python-modules/dacite { }; @@ -2877,6 +2887,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 { }; @@ -3047,6 +3060,8 @@ self: super: with self; { django-scim2 = callPackage ../development/python-modules/django-scim2 { }; + django-shortuuidfield = callPackage ../development/python-modules/django-shortuuidfield { }; + django-scopes = callPackage ../development/python-modules/django-scopes { }; djangoql = callPackage ../development/python-modules/djangoql { }; @@ -3936,6 +3951,8 @@ self: super: with self; { flammkuchen = callPackage ../development/python-modules/flammkuchen { }; + flasgger = callPackage ../development/python-modules/flasgger { }; + flashtext = callPackage ../development/python-modules/flashtext { }; flask-admin = callPackage ../development/python-modules/flask-admin { }; @@ -5920,7 +5937,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 { }; @@ -6125,6 +6142,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 { @@ -6440,6 +6459,8 @@ self: super: with self; { inherit (pkgs) libxml2 libxslt zlib; }; + lxml-stubs = callPackage ../development/python-modules/lxml-stubs { }; + lyricwikia = callPackage ../development/python-modules/lyricwikia { }; lz4 = callPackage ../development/python-modules/lz4 { }; @@ -6905,6 +6926,8 @@ self: super: with self; { mock = callPackage ../development/python-modules/mock { }; + mockfs = callPackage ../development/python-modules/mockfs { }; + mockito = callPackage ../development/python-modules/mockito { }; mock-open = callPackage ../development/python-modules/mock-open { }; @@ -8358,7 +8381,7 @@ self: super: with self; { }; onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { - protobuf = protobuf3; + inherit (pkgs) protobuf; }; onnxmltools = callPackage ../development/python-modules/onnxmltools { }; @@ -8716,6 +8739,8 @@ self: super: with self; { parver = callPackage ../development/python-modules/parver { }; arpeggio = callPackage ../development/python-modules/arpeggio { }; + pasimple = callPackage ../development/python-modules/pasimple { }; + passlib = callPackage ../development/python-modules/passlib { }; paste = callPackage ../development/python-modules/paste { }; @@ -9368,12 +9393,12 @@ self: super: with self; { poetry-semver = callPackage ../development/python-modules/poetry-semver { }; - poezio = callPackage ../applications/networking/instant-messengers/poezio { }; - polars = callPackage ../development/python-modules/polars { }; polarizationsolver = callPackage ../development/python-modules/polarizationsolver { }; + polling = callPackage ../development/python-modules/polling { }; + polib = callPackage ../development/python-modules/polib { }; policy-sentry = callPackage ../development/python-modules/policy-sentry { }; @@ -9886,8 +9911,12 @@ self: super: with self; { pydantic-core = callPackage ../development/python-modules/pydantic-core { }; + pydantic-extra-types = callPackage ../development/python-modules/pydantic-extra-types { }; + pydantic-scim = callPackage ../development/python-modules/pydantic-scim { }; + pydantic-settings = callPackage ../development/python-modules/pydantic-settings { }; + pydash = callPackage ../development/python-modules/pydash { }; pydata-google-auth = callPackage ../development/python-modules/pydata-google-auth { }; @@ -10450,7 +10479,7 @@ self: super: with self; { pymvglive = callPackage ../development/python-modules/pymvglive { }; - pymyq = callPackage ../development/python-modules/pymyq { }; + python-myq = callPackage ../development/python-modules/python-myq { }; pymysensors = callPackage ../development/python-modules/pymysensors { }; @@ -11553,6 +11582,8 @@ self: super: with self; { python-uinput = callPackage ../development/python-modules/python-uinput { }; + python-ulid = callPackage ../development/python-modules/python-ulid { }; + python-unshare = callPackage ../development/python-modules/python-unshare { }; python-utils = callPackage ../development/python-modules/python-utils { }; @@ -11826,7 +11857,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 { }; @@ -11989,8 +12020,6 @@ self: super: with self; { ratelimit = callPackage ../development/python-modules/ratelimit { }; - ratelimiter = callPackage ../development/python-modules/ratelimiter { }; - rauth = callPackage ../development/python-modules/rauth { }; raven = callPackage ../development/python-modules/raven { }; @@ -12024,6 +12053,8 @@ self: super: with self; { readlike = callPackage ../development/python-modules/readlike { }; + readmdict = callPackage ../development/python-modules/readmdict { }; + readme = callPackage ../development/python-modules/readme { }; readme_renderer = callPackage ../development/python-modules/readme_renderer { }; @@ -12052,6 +12083,8 @@ self: super: with self; { redis = callPackage ../development/python-modules/redis { }; + redis-om = callPackage ../development/python-modules/redis-om { }; + redshift-connector = callPackage ../development/python-modules/redshift-connector { }; reedsolo = callPackage ../development/python-modules/reedsolo { }; @@ -12912,6 +12945,8 @@ self: super: with self; { slowapi = callPackage ../development/python-modules/slowapi { }; + slpp = callPackage ../development/python-modules/slpp { }; + slugid = callPackage ../development/python-modules/slugid { }; sly = callPackage ../development/python-modules/sly { }; @@ -13720,6 +13755,8 @@ self: super: with self; { textile = callPackage ../development/python-modules/textile { }; + textparser = callPackage ../development/python-modules/textparser { }; + textual = callPackage ../development/python-modules/textual { }; textual-universal-directorytree = callPackage ../development/python-modules/textual-universal-directorytree { }; @@ -14141,7 +14178,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/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 3f24254538298..d55eef8d04127 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -70,8 +70,10 @@ let ghc928 ghc945 ghc946 + ghc947 ghc962 ghc963 + ghc981 ]; # packagePlatforms applied to `haskell.packages.*` @@ -482,33 +484,55 @@ let # and to confirm that critical packages for the # package sets (like Cabal, jailbreak-cabal) are # working as expected. - cabal-install = released; - Cabal_3_10_1_0 = released; - Cabal-syntax_3_10_1_0 = released; - cabal2nix = released; - cabal2nix-unstable = released; + cabal-install = lib.subtractLists [ + compilerNames.ghc981 + ] released; + Cabal_3_10_1_0 = lib.subtractLists [ + compilerNames.ghc981 + ] released; + Cabal-syntax_3_10_1_0 = lib.subtractLists [ + compilerNames.ghc981 + ] released; + cabal2nix = lib.subtractLists [ + compilerNames.ghc981 + ] released; + cabal2nix-unstable = lib.subtractLists [ + compilerNames.ghc981 + ] released; funcmp = released; haskell-language-server = lib.subtractLists [ # Support ceased as of 1.9.0.0 compilerNames.ghc884 + # Support ceased as of 2.3.0.0 + compilerNames.ghc8107 + # Not yet supported + compilerNames.ghc981 ] released; hoogle = lib.subtractLists [ compilerNames.ghc962 compilerNames.ghc963 + compilerNames.ghc981 ] released; hlint = lib.subtractLists [ compilerNames.ghc962 compilerNames.ghc963 + compilerNames.ghc981 + ] released; + hpack = lib.subtractLists [ + compilerNames.ghc981 ] released; - hpack = released; hsdns = released; jailbreak-cabal = released; - language-nix = released; + language-nix = lib.subtractLists [ + compilerNames.ghc981 + ] released; large-hashable = [ compilerNames.ghc928 ]; nix-paths = released; - titlecase = released; + titlecase = lib.subtractLists [ + compilerNames.ghc981 + ] released; ghc-api-compat = [ compilerNames.ghc884 compilerNames.ghc8107 @@ -518,9 +542,15 @@ let compilerNames.ghc884 compilerNames.ghc8107 ]; - ghc-lib = released; - ghc-lib-parser = released; - ghc-lib-parser-ex = released; + ghc-lib = lib.subtractLists [ + compilerNames.ghc981 + ] released; + ghc-lib-parser = lib.subtractLists [ + compilerNames.ghc981 + ] released; + ghc-lib-parser-ex = lib.subtractLists [ + compilerNames.ghc981 + ] released; ghc-source-gen = [ # Feel free to remove these as they break, # ghc-source-gen currently doesn't support GHC 9.4 @@ -529,20 +559,13 @@ let compilerNames.ghc902 compilerNames.ghc928 ]; - ghc-tags = [ - compilerNames.ghc8107 - compilerNames.ghc902 - compilerNames.ghc924 - compilerNames.ghc925 - compilerNames.ghc926 - compilerNames.ghc927 - compilerNames.ghc928 - compilerNames.ghc945 - compilerNames.ghc946 - compilerNames.ghc962 - compilerNames.ghc963 - ]; - hashable = released; + ghc-tags = lib.subtractLists [ + compilerNames.ghc884 + compilerNames.ghc981 + ] released; + hashable = lib.subtractLists [ + compilerNames.ghc981 + ] released; primitive = released; weeder = [ compilerNames.ghc8107 @@ -554,6 +577,7 @@ let compilerNames.ghc928 compilerNames.ghc945 compilerNames.ghc946 + compilerNames.ghc947 compilerNames.ghc962 compilerNames.ghc963 ]; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 691f50708ace7..33080d5620f07 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -35,12 +35,13 @@ let name = "python-tested"; meta.description = "Release-critical packages from the python package sets"; constituents = [ - jobs.remarshal.x86_64-linux # Used in pkgs.formats helper - jobs.python39Packages.buildcatrust.x86_64-linux # Used in pkgs.cacert - jobs.python39Packages.colorama.x86_64-linux # Used in nixos test-driver - jobs.python39Packages.ptpython.x86_64-linux # Used in nixos test-driver - jobs.python39Packages.requests.x86_64-linux # Almost ubiquous package - jobs.python39Packages.sphinx.x86_64-linux # Document creation for many packages + jobs.nixos-render-docs.x86_64-linux # Used in nixos manual + jobs.remarshal.x86_64-linux # Used in pkgs.formats helper + jobs.python311Packages.buildcatrust.x86_64-linux # Used in pkgs.cacert + jobs.python311Packages.colorama.x86_64-linux # Used in nixos test-driver + jobs.python311Packages.ptpython.x86_64-linux # Used in nixos test-driver + jobs.python311Packages.requests.x86_64-linux # Almost ubiquous package + jobs.python311Packages.sphinx.x86_64-linux # Document creation for many packages ]; }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 37ef0a50c260a..a8ef5bc49667a 100644 --- a/pkgs/top-level/release-small.nix +++ b/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/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f66179d2e90d4..034dccdcd475c 100644 --- a/pkgs/top-level/release.nix +++ b/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 */ ]; }; |